Compare commits

...

7 commits

7 changed files with 1 additions and 230 deletions

View file

@ -1 +0,0 @@
alsa-oss-1.0.17.tar.bz2

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: alsa-oss
# $Id: Makefile,v 1.1 2006/10/06 14:10:30 jima Exp $
NAME := alsa-oss
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -1,58 +0,0 @@
diff -urN alsa-oss-1.0.12/alsa/aoss.1 alsa-oss-1.0.12-patched/alsa/aoss.1
--- alsa-oss-1.0.12/alsa/aoss.1 2006-08-22 13:43:53.000000000 -0500
+++ alsa-oss-1.0.12-patched/alsa/aoss.1 2007-02-08 09:34:47.000000000 -0600
@@ -3,7 +3,7 @@
aoss \- Wrapper script to facilitate use of the ALSA OSS compatibility
library.
.SH SYNOPSIS
-\fBaoss\fP \fIosscommand\fP [arguments]
+\fBaoss\fP [-32] \fIosscommand\fP [arguments]
.SH DESCRIPTION
\fBaoss\fP is a simple wrapper script which facilitates the use of the
@@ -38,6 +38,8 @@
.SS Arguments
.TP
+\f-32\fP
+Use 32-bit alsa-oss library (on 64-bit systems)
\fIosscommand\fP
A command that uses the OSS API
.TP
diff -urN alsa-oss-1.0.12/alsa/aoss.in alsa-oss-1.0.12-patched/alsa/aoss.in
--- alsa-oss-1.0.12/alsa/aoss.in 2006-08-22 13:43:53.000000000 -0500
+++ alsa-oss-1.0.12-patched/alsa/aoss.in 2007-02-08 09:47:20.000000000 -0600
@@ -2,12 +2,29 @@
# A simple script to facilitate the use of the OSS compatibility library.
# Usage:
-# aoss <command> <command options and arguments>
+# aoss [-32] <command> <command options and arguments>
+
+if [ -f @prefix@/lib64/libaoss.so.0 ]
+then
+ AOSS_LIBDIR=@prefix@/lib64
+else
+ AOSS_LIBDIR=@prefix@/lib
+fi
+
+if [ "$1" = "-32" ]
+then
+ if [ -f @prefix@/lib/libaoss.so.0 ]
+ then
+ AOSS_LIBDIR=@prefix@/lib
+ shift
+ else
+ echo "$0 -32 called, but 32-bit alsa-oss-libs not found! Exiting..."
+ exit 2
+ fi
+fi
if [ -d /proc/asound ]; then
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- LD_PRELOAD=${exec_prefix}/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
+ LD_PRELOAD=${AOSS_LIBDIR}/libaoss.so.0${LD_PRELOAD:+:$LD_PRELOAD} exec "$@"
else
exec "$@"
fi

View file

@ -1,12 +0,0 @@
--- alsa-oss-1.0.14/alsa/alsa-oss.c.orig 2007-05-31 03:11:51.000000000 -0500
+++ alsa-oss-1.0.14/alsa/alsa-oss.c 2007-08-16 16:21:27.000000000 -0500
@@ -284,6 +284,9 @@ static int mixer_open_helper(const char
return fd;
}
+#undef open
+#undef open64
+
#define DECL_OPEN(name, callback) \
int name(const char *file, int oflag, ...) \
{ \

View file

@ -1,137 +0,0 @@
Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS
Name: alsa-oss
Version: 1.0.17
Release: 4%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
Patch0: %{name}-1.0.12-aoss.patch
Patch1: %{name}-glibc-open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{version}
%ifarch x86_64
BuildRequires: automake, libtool
%endif
Requires: %{name}-libs = %{version}-%{release}
%description
This package contains the compatibility library and wrapper script for
running legacy OSS applications through ALSA. Unlike the kernel
driver, this has the advantage of supporting DMIX software mixing.
%package libs
Summary: ALSA/OSS wrapper libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description libs
System libraries for alsa-oss.
%package devel
Summary: Headers for ALSA wrapper for OSS
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, %{name}-libs = %{version}-%{release}
%description devel
Header files for alsa-oss.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%ifarch x86_64
autoreconf -f -i
%endif
%configure \
%ifarch x86_64
--disable-rpath \
%endif
--disable-static
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/aoss
%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*
%{_mandir}/man?/*
%files devel
%defattr(-,root,root,-)
%doc oss-redir/README
%{_includedir}/*
%{_libdir}/*.a
%{_libdir}/*.so
%changelog
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0.17-2
- Fix Patch:/%%patch0 mismatch.
* Tue Jul 29 2008 Jaroslav Kysela <jkysela@redhat.com> 1.0.17-1
- New upstream version
* Mon Oct 22 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.15-0.1
- New upstream version
* Thu Aug 16 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.14-3
- License clarification
- Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch
* Wed Jul 25 2007 Warren Togami <wtogami@redhat.com> 1.0.14-2
- binutils/gcc bug rebuild (#249435)
* Tue Jul 24 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.14-1
- Updated to match F8 alsa-libs
- Changed reference to patch filename
* Thu Feb 08 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.12-4
- Split out libraries to -libs subpackage, fixing BZ#221711
- Implemented changes as recommended by Jason Tibbitts
- Adjusted aoss patch to allow for 32-bit library use on x86_64
- Added reference in man page to added functionality
- Resultant alsa-oss package reports no-binary error (necessary evil, I guess)
* Fri Oct 06 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.12-3
- Added conditionalized rpath fixes for x86_64 (thanks Denis!)
- Re-added *.a to -devel package
- Added %%defattr for -devel, added oss-redir/README as %%doc
* Thu Oct 05 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.12-2
- Adding --disable-static to configure
- Removing *.a from -devel package
- Adding name and version to patch
- Removing commented-out autoreconf line
- Forcibly deleting *.a files in %%install (why didn't it believe me?)
* Tue Oct 03 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> 1.0.12-1
- Hijacked from stalled review (BZ#187706)
- Bumped to 1.0.12 for devel branch
- Removed Req for /sbin/ldconfig (unnecessary when using -p in scriptlets)
- Added dist tag!
- Made macros slightly more consistent
- Deleted .la files in %%install
* Sun Apr 2 2006 Michel Salim <michel.salim@gmail.com> 1.0.11-1.rc3
- Initial build.

1
dead.package Normal file
View file

@ -0,0 +1 @@
Retired on 2013-08-19 due to lack of a maintainer in preparation to branch Fedora 20

View file

@ -1 +0,0 @@
1b1850c2fc91476a73d50f537cbd402f alsa-oss-1.0.17.tar.bz2