--- a/ChangeLog Wed Oct 20 20:58:37 2010 +0000
+++ b/ChangeLog Wed Oct 20 21:13:00 2010 +0000
@@ -1,6 +1,7 @@
2010-10-23 Milan Jurik <[email protected]>
* SFEalsa-lib.spec: bump to 1.0.23
+ * SFEalsa-plugins.spec: bump to 1.0.23
2010-10-18 Alex Viskovatoff <[email protected]>
--- a/SFEalsa-plugins.spec Wed Oct 20 20:58:37 2010 +0000
+++ b/SFEalsa-plugins.spec Wed Oct 20 21:13:00 2010 +0000
@@ -12,6 +12,8 @@
%include base.inc
%use alsa = alsa-plugins.spec
+%define oss %(/usr/bin/pkginfo -q oss && echo 1 || echo 0)
+
Name: SFEalsa-plugins
Summary: %{alsa.summary}
Version: %{alsa.version}
@@ -20,7 +22,11 @@
Group: Audio
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-Requires: oss
+%if %oss
+BuildRequires: oss
+%else
+BuildRequires: SUNWaudh
+%endif
BuildRequires: SUNWdbus-devel
Requires: SUNWdbus
BuildRequires: SFEalsa-lib-devel
@@ -72,6 +78,8 @@
%config %{_sysconfdir}/asound.conf
%changelog
+* Wed Oct 20 2010 - Milan Jurik
+- bump to 1.0.23
* Fri Aug 15 2008 - [email protected]
- Add license and grouping
* Sun Aug 12 2007 - [email protected]
--- a/base-specs/alsa-plugins.spec Wed Oct 20 20:58:37 2010 +0000
+++ b/base-specs/alsa-plugins.spec Wed Oct 20 21:13:00 2010 +0000
@@ -7,16 +7,18 @@
%define src_name alsa-plugins
%define src_url ftp://ftp.alsa-project.org/pub/plugins
-Name: alsa-plugins
-Summary: ALSA Plugins
-Version: 1.0.14
-Source: %{src_url}/%{src_name}-%{version}.tar.bz2
-Source1: asound.conf
-Patch1: alsa-plugins-01-configure.diff
-Patch2: alsa-plugins-02-oss.diff
-Patch3: alsa-plugins-03-dsp.diff
-Patch4: alsa-plugins-04-jack.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Name: alsa-plugins
+Summary: ALSA Plugins
+Version: 1.0.23
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Source1: asound.conf
+Patch1: alsa-plugins-01-configure.diff
+Patch2: alsa-plugins-02-oss.diff
+Patch3: alsa-plugins-03-dsp.diff
+Patch4: alsa-plugins-04-jack.diff
+Patch5: alsa-plugins-05-byteswap.diff
+Patch6: alsa-plugins-06-usb_stream.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%prep
%setup -q -n %{src_name}-%{version}
@@ -24,6 +26,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -47,7 +51,7 @@
if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q amd64 ) ; then
export CFLAGS="$CFLAGS -m64"
export LDFLAGS="-Wl,-64 -L%{_libdir} -R%{_libdir} $LDFLAGS"
- pulseopt=--with-pulseaudio=no
+ pulseopt=--disable-pulseaudio
fi
libtoolize -f -c
@@ -64,6 +68,7 @@
--sysconfdir=%{_sysconfdir} \
--enable-shared \
--disable-static \
+ --disable-avcodec \
$pulseopt
gmake -j$CPUS
@@ -79,5 +84,7 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 20 2010 - Milan Jurik
+- bump to 1.0.23
* Sun Aug 12 2007 - [email protected]
- Initial version
--- a/patches/alsa-plugins-01-configure.diff Wed Oct 20 20:58:37 2010 +0000
+++ b/patches/alsa-plugins-01-configure.diff Wed Oct 20 21:13:00 2010 +0000
@@ -1,8 +1,7 @@
-diff -ur alsa-plugins-1.0.14.orig/configure.in alsa-plugins-1.0.14/configure.in
---- alsa-plugins-1.0.14.orig/configure.in 2007-05-31 15:06:51.000000000 +0700
-+++ alsa-plugins-1.0.14/configure.in 2007-08-12 00:10:12.158016751 +0700
-@@ -31,6 +31,23 @@
- AC_DEFINE(USE_RESOURCE_MANAGER, 1,"Use dbus server as a resouce manager")
+--- alsa-plugins-1.0.23.orig/configure.in Mon Sep 20 00:01:33 2010
++++ alsa-plugins-1.0.23/configure.in Mon Sep 20 00:03:29 2010
+@@ -63,6 +63,23 @@
+ fi
fi
+AC_CHECK_HEADERS([alloca.h endian.h byteswap.h sys/byteorder.h search.h err.h])
@@ -22,25 +21,6 @@
+ AC_DEFINE([HAVE_LIBSOCKET], 1, [Have libsocket])
+fi
+
- AC_ARG_WITH([avcodec-includedir],
- AS_HELP_STRING([--with-avcodec-includedir=dir],
- [AVcodec include directory]),
---- alsa-plugins-1.0.14/configure.in.orig 2007-08-12 17:27:04.984403672 +0700
-+++ alsa-plugins-1.0.14/configure.in 2007-08-12 16:49:55.651001349 +0700
-@@ -18,7 +18,16 @@
- PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
- AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes)
+ AC_ARG_ENABLE([avcodec],
+ AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
-+AC_ARG_WITH([pulseaudio],
-+ AS_HELP_STRING([--with-pulseaudio={yes|no}],
-+ [build with Pulse Audio [[default=yes]]]),
-+ [TESTPULSE=$withval] , [TESTPULSE="yes"])
-+
-+if test "$TESTPULSE" = "yes"; then
- PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no])
-+else
-+HAVE_PULSE=no
-+fi
- AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes)
-
- PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
--- a/patches/alsa-plugins-02-oss.diff Wed Oct 20 20:58:37 2010 +0000
+++ b/patches/alsa-plugins-02-oss.diff Wed Oct 20 21:13:00 2010 +0000
@@ -1,6 +1,20 @@
-diff -ur alsa-plugins-1.0.14.orig/oss/ctl_oss.c alsa-plugins-1.0.14/oss/ctl_oss.c
---- alsa-plugins-1.0.14.orig/oss/ctl_oss.c 2007-05-31 15:06:51.000000000 +0700
-+++ alsa-plugins-1.0.14/oss/ctl_oss.c 2007-08-12 00:42:43.821350537 +0700
+diff -ur alsa-plugins-1.0.14.orig/oss/pcm_oss.c alsa-plugins-1.0.14/oss/pcm_oss.c
+--- alsa-plugins-1.0.14.orig/oss/pcm_oss.c 2007-05-31 15:06:51.000000000 +0700
++++ alsa-plugins-1.0.14/oss/pcm_oss.c 2007-08-12 00:37:48.119259201 +0700
+@@ -22,7 +22,11 @@
+ #include <sys/ioctl.h>
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm_external.h>
++#if defined(HAVE_LINUX_SOUNDCARD_H)
+ #include <linux/soundcard.h>
++#else
++#include <sys/soundcard.h>
++#endif
+
+ typedef struct snd_pcm_oss {
+ snd_pcm_ioplug_t io;
+--- alsa-plugins-1.0.23.orig/oss/ctl_oss.c Mon Sep 20 00:06:53 2010
++++ alsa-plugins-1.0.23/oss/ctl_oss.c Mon Sep 20 00:09:55 2010
@@ -26,7 +26,11 @@
#include <sys/ioctl.h>
#include <alsa/asoundlib.h>
@@ -30,7 +44,7 @@
+#endif
};
- static const char *rec_devices[SOUND_MIXER_NRDEVICES] = {
+ static const char *const rec_devices[SOUND_MIXER_NRDEVICES] = {
@@ -81,7 +91,9 @@
[SOUND_MIXER_DIGITAL1] = "IEC958 Capture Switch",
[SOUND_MIXER_DIGITAL2] = "Digital Capture Switch",
@@ -51,18 +65,3 @@
[SOUND_MIXER_VIDEO] = "Video",
[SOUND_MIXER_RADIO] = "Radio",
};
-diff -ur alsa-plugins-1.0.14.orig/oss/pcm_oss.c alsa-plugins-1.0.14/oss/pcm_oss.c
---- alsa-plugins-1.0.14.orig/oss/pcm_oss.c 2007-05-31 15:06:51.000000000 +0700
-+++ alsa-plugins-1.0.14/oss/pcm_oss.c 2007-08-12 00:37:48.119259201 +0700
-@@ -22,7 +22,11 @@
- #include <sys/ioctl.h>
- #include <alsa/asoundlib.h>
- #include <alsa/pcm_external.h>
-+#if defined(HAVE_LINUX_SOUNDCARD_H)
- #include <linux/soundcard.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
-
- typedef struct snd_pcm_oss {
- snd_pcm_ioplug_t io;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/alsa-plugins-05-byteswap.diff Wed Oct 20 21:13:00 2010 +0000
@@ -0,0 +1,14 @@
+--- SFEalsa-plugins-1.0.23/amd64/alsa-plugins-1.0.23/usb_stream/pcm_usb_stream.c Fri Apr 16 13:11:10 2010
++++ alsa-plugins-1.0.23/usb_stream/pcm_usb_stream.c Mon Sep 20 00:14:21 2010
+@@ -18,7 +18,11 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#ifdef HAVE_BYTESWAP_H
+ #include <byteswap.h>
++#else
++#include <byteswap-compat.h>
++#endif
+ #define _GNU_SOURCE
+ #include <sys/mman.h>
+ #include <sys/shm.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/alsa-plugins-06-usb_stream.diff Wed Oct 20 21:13:00 2010 +0000
@@ -0,0 +1,8 @@
+--- alsa-plugins-1.0.23.orig/Makefile.am Fri Apr 16 13:11:10 2010
++++ alsa-plugins-1.0.23/Makefile.am Mon Sep 20 00:26:51 2010
+@@ -1,4 +1,4 @@
+-SUBDIRS = oss mix usb_stream arcam-av doc
++SUBDIRS = oss mix arcam-av doc
+ if HAVE_JACK
+ SUBDIRS += jack
+ endif