diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..45f7801 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +alsa-oss-1.0.17.tar.bz2 diff --git a/alsa-oss-1.0.12-aoss.patch b/alsa-oss-1.0.12-aoss.patch new file mode 100644 index 0000000..c3baf6f --- /dev/null +++ b/alsa-oss-1.0.12-aoss.patch @@ -0,0 +1,58 @@ +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 ++# aoss [-32] ++ ++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 diff --git a/alsa-oss-glibc-open.patch b/alsa-oss-glibc-open.patch new file mode 100644 index 0000000..bdbdfea --- /dev/null +++ b/alsa-oss-glibc-open.patch @@ -0,0 +1,12 @@ +--- 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, ...) \ + { \ diff --git a/alsa-oss.spec b/alsa-oss.spec new file mode 100644 index 0000000..67acd9b --- /dev/null +++ b/alsa-oss.spec @@ -0,0 +1,131 @@ +Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS +Name: alsa-oss +Version: 1.0.17 +Release: 2%{?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 +* Sun Sep 21 2008 Ville Skyttä - 1.0.17-2 +- Fix Patch:/%%patch0 mismatch. + +* Tue Jul 29 2008 Jaroslav Kysela 1.0.17-1 +- New upstream version + +* Mon Oct 22 2007 Patrick "Jima" Laughton 1.0.15-0.1 +- New upstream version + +* Thu Aug 16 2007 Patrick "Jima" Laughton 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 1.0.14-2 +- binutils/gcc bug rebuild (#249435) + +* Tue Jul 24 2007 Patrick "Jima" Laughton 1.0.14-1 +- Updated to match F8 alsa-libs +- Changed reference to patch filename + +* Thu Feb 08 2007 Patrick "Jima" Laughton 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 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 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 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 1.0.11-1.rc3 +- Initial build. diff --git a/dead.package b/dead.package deleted file mode 100644 index d108d0d..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Retired on 2013-08-19 due to lack of a maintainer in preparation to branch Fedora 20 diff --git a/sources b/sources new file mode 100644 index 0000000..e34fa00 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +1b1850c2fc91476a73d50f537cbd402f alsa-oss-1.0.17.tar.bz2