synced media-plugins/alsa-plugins with portage tree

3 files changed, 79 insertions, 3 deletions

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index c2eeecbd3..3cf6efe91 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,3 +1,4 @@
 AUX alsa-plugins-1.0.19-missing-avutil.patch 489 RMD160 d32cfe36584809e4aa979a2ee12d4059607c710a SHA1 2a3e565e9e630fbadef45fe1643d78bb83d4be2b SHA256 8b3f3469043f0cf9d313f6a0869080f711e5c0635085f7951a7510b1ddb8168a
+AUX alsa-plugins-1.0.19-speex.patch 2741 RMD160 60df99a4085979c313ffc69b2444d7acd81d0ea2 SHA1 294ceb536f66dd81b09ecdae436780439a3d6e2d SHA256 2768121c051d4ddd1581b8a5790369136591538550d2ca48c0f32816c03310f4
 DIST alsa-plugins-1.0.19.tar.bz2 315471 RMD160 662d945b89c71dca3e7190bc6f80bcf134fb4b18 SHA1 578ae437b04961ca4841c41439441f7ad0dac890 SHA256 67be087c24af9d2a380b29d6e90b7187b337a0c484c31438a0d38ff429c71100
-EBUILD alsa-plugins-1.0.19.ebuild 2061 RMD160 9ae396aeb6ff8ea28fe1c2a08078a21d19a92250 SHA1 4de9c6ae230b58769438860a0a6884d37739f46b SHA256 3f2ab83c18b598894822b1eece975dec1706f965e4966292ef77965ccf3a5339
+EBUILD alsa-plugins-1.0.19.ebuild 2140 RMD160 d06bafec0ca4abfd2b2afb44c6de20d9dd720d15 SHA1 4efe700f229fe11f500a9ee7e5a42afb99f13f62 SHA256 4e4efa04033d216397729145108512aeace44d80a4e909d9b5b1c85c734ec9bc
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild
index 295ca5ae0..8aab0bf2b 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild,v 1.4 2009/01/29 17:45:11 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild,v 1.11 2009/07/02 19:16:09 maekke Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh sparc x86"
 IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
@@ -43,6 +43,8 @@ src_prepare() {
 
 	# Bug #256119
 	epatch "${FILESDIR}/${P}-missing-avutil.patch"
+	# Bug 272682, fixed upstream
+	use speex && epatch "${FILESDIR}/${P}-speex.patch"
 
 	eautoreconf
 }
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch
new file mode 100644
index 000000000..5f339a3e1
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.19-speex.patch
@@ -0,0 +1,73 @@
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 21 Jan 2009 15:53:36 +0000 (+0100)
+Subject: Fix build of pph plugin with speex-1.2rc1
+X-Git-Tag: v1.0.20~10
+X-Git-Url: http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff_plain;h=ba7cd8e0a04798479f851741ec29fef97889aa39;hp=c547b535a20a0909c17cb6dd14e5e364b2ae0fe9
+
+Fix build of pph plugin with speex-1.2rc1
+
+The resampler code is moved to libspeexdsp instead of libspeex.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+
+diff --git a/configure.in b/configure.in
+index 837934f..ce95b5d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -106,16 +106,18 @@ AC_SUBST(AVCODEC_CFLAGS)
+ AC_SUBST(AVCODEC_LIBS)
+ AC_SUBST(AVCODEC_HEADER)
+ 
+-USE_LIBSPEEX=""
++PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""])
++AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes")
++
+ AC_ARG_WITH([speex],
+ 	AS_HELP_STRING([--with-speex={builtin|lib|no}],
+ 		[build speex resampler (built-in code, link with external lib, or no build)]),
+ 	[PPH=$withval], [PPH="lib"])
+ 
++USE_LIBSPEEX=""
+ if test "$PPH" = "lib"; then
+-	PKG_CHECK_MODULES(speex, [speex >= 1.2], [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""])
+-	if test "$USE_LIBSPEEX" = "yes"; then
+-		AC_CHECK_LIB([speex], [speex_resampler_init],
++	if test "$HAVE_SPEEXDSP" = "yes"; then
++		AC_CHECK_LIB([speexdsp], [speex_resampler_init],
+ 			[USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""])
+ 	fi
+ 	if test "$USE_LIBSPEEX" = "yes"; then
+@@ -197,6 +199,6 @@ if test "$HAVE_AVCODEC" = "yes"; then
+ fi
+ echo "Speex rate plugin:  $PPH"
+ if test "$PPH" = "lib"; then
+-  echo "  speex_CFLAGS: $speex_CFLAGS"
+-  echo "  speex_LIBS: $speex_LIBS"
++  echo "  speexdsp_CFLAGS: $speexdsp_CFLAGS"
++  echo "  speexdsp_LIBS: $speexdsp_LIBS"
+ fi
+diff --git a/pph/Makefile.am b/pph/Makefile.am
+index d24176c..551e5bd 100644
+--- a/pph/Makefile.am
++++ b/pph/Makefile.am
+@@ -2,15 +2,16 @@ asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la
+ 
+ asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@
+ 
+-AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
++AM_CFLAGS = -DVAR_ARRAYS -Wall -g @ALSA_CFLAGS@
+ AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined $(LDFLAGS_NOUNDEFINED)
+ 
+ libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c
+ libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@
+ if USE_LIBSPEEX
+-AM_CFLAGS += @speex_CFLAGS@
+-libasound_module_rate_speexrate_la_LIBADD += @speex_LIBS@
++AM_CFLAGS += @speexdsp_CFLAGS@
++libasound_module_rate_speexrate_la_LIBADD += @speexdsp_LIBS@
+ else
++AM_CFLAGS += -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX 
+ libasound_module_rate_speexrate_la_SOURCES += resample.c
+ libasound_module_rate_speexrate_la_LIBADD += -lm
+ endif