fix compilation with USE=speex enabled, thanks for Pacho Ramos for providing the patch on bug 272682

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 95 insertions, 4 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 824f09e51b0e..34a8d5b862ad 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.100 2009/06/16 17:39:17 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.101 2009/07/02 09:58:01 fauli Exp $
+
+  02 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  alsa-plugins-1.0.19.ebuild, +files/alsa-plugins-1.0.19-speex.patch:
+  fix compilation with USE=speex enabled, thanks for Pacho Ramos for
+  providing the patch on bug 272682
 
   16 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
   alsa-plugins-1.0.19.ebuild:
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index dc84a9899c35..0a67a66128a2 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.14_rc3-gcd.h 1567 RMD160 23b2bd9c9d6cb35e60d5bc56a95a58e6de4c6935 SHA1 e06b6cf70e63d3600de36b6287dcbe85702f4764 SHA256 7a46d8751b1f6bfe0c44b1a62d68452d2c8f4283af00e56e4b97af77d0ce47a1
 AUX alsa-plugins-1.0.11-automagic.patch 2387 RMD160 7ba1283bd2ac8c94b690db18ed80f2154df4e755 SHA1 fd6242d06959e20ecf4f69dabefd0f29e2fe192c SHA256 ce8a8a7de749167dce31008283045548077fc8a29704ab7742071e7deff87d39
 AUX alsa-plugins-1.0.12-automagic.patch 2414 RMD160 bef06a60e3a97d3a672df70314113e7d35a159fc SHA1 93a44aa404869de2f6966a18b0b9f614e56dfdd1 SHA256 95d0bf84d68d2c8452b926d9dba4bf7a0c35c107b850d05dc78df6e9d7de29e0
@@ -6,6 +9,7 @@ AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3
 AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0
 AUX alsa-plugins-1.0.18-automagic.patch 2980 RMD160 792d3b3c49849a47dba14db36a552531928f434e SHA1 42975db4ed1c14805e1c9656f238d98d72c94f12 SHA256 bcdf59d7d2d55498cb67b14dd6539c6b7944d837aa504f3f3993e130d1c4bbd3
 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
 AUX ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45
 DIST alsa-plugins-1.0.15.tar.bz2 306676 RMD160 8064f45f5ffeb24a0e70b0465ba1c15837744133 SHA1 513ce4035bd4bd95f1e2d125aab567be53160d72 SHA256 3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95
 DIST alsa-plugins-1.0.16.tar.bz2 306914 RMD160 8ff2960cc139b1e9988c2c10cc45b9950193cb39 SHA1 692bbe5871547db33ffd8cf78e5f894cb2080a2d SHA256 ff6da9a1208363be135c27ee31d26e45dc2ff2124654f03f9fd1c20ac99f78da
@@ -17,7 +21,14 @@ EBUILD alsa-plugins-1.0.15.ebuild 2095 RMD160 636bd6a3e8e7d352ffb07b1f742d9ffb32
 EBUILD alsa-plugins-1.0.16.ebuild 2085 RMD160 4258dac17fe4cf2e9b11760fadf624d3270c085b SHA1 497dfb04d17370a22c109d2a734fa621169ab811 SHA256 1de918d975e79389b1bd584d7157fd5d04afb78fad2023b7e91948f95288b92f
 EBUILD alsa-plugins-1.0.17-r1.ebuild 1990 RMD160 99442ca679493f10dbbacab62212f1f236b2aa07 SHA1 3bc23f97c9b97046731ff473d9bb5359f7b2c84c SHA256 0f5135a143812b1f1ea1b15838eaa14c395e45db42488b5354a376429920db4b
 EBUILD alsa-plugins-1.0.18.ebuild 1992 RMD160 bd6680f030cdccac1da874a9e9e99c8e52d38c1c SHA1 4b77d9b73890e0d5210065aeb288c468b677392b SHA256 07ec281c1e13c9b84c8fb497efa0039ee962e0bf554a0b81b2a3b6684dc5d664
-EBUILD alsa-plugins-1.0.19.ebuild 1972 RMD160 994e2b99c40711684dab7e3337ca633fa6bdc178 SHA1 da1218f1ccc0bc0fd0dd3af366fbf429a4185ef6 SHA256 d026a70d991babcb51ba7eeb7f1440ad387df59f7de9eaae5d2303f457f840e4
+EBUILD alsa-plugins-1.0.19.ebuild 2051 RMD160 9406c78e749ba6ebaf67296fc030092c0c3a4d71 SHA1 a36b202d321324e1f73f9e7fcfbad3b7a475f6c0 SHA256 e3e0fee09d8f1b542326cb6c23586f934d3c0e877ecebecc1d7d84b1a191fffe
 EBUILD alsa-plugins-1.0.20.ebuild 1984 RMD160 a05941d1db65d68ac43ba18f05b7f582c6aa82bf SHA1 c82306259829d4cc4139ed7fb2789e74cb3e6b07 SHA256 483e0db838487ea29dc2ca88799782ca9fa11ddb0bcb3cfdd76583dd0dc7787c
-MISC ChangeLog 15441 RMD160 0f004750d88a1ada6850b41368ff296441d5f152 SHA1 9195e554ce55024b0e39e76674e4358226f0342c SHA256 dfc5e29f4684a34a1717720c4887c15d04f9d5285d2b9c3b322526042d1b7481
+MISC ChangeLog 15669 RMD160 1f5ee4fe354e28445c5c8f2db156225d45dcf94a SHA1 609a9eb9b25e1abda17a10730d4a4a7d6a872ea8 SHA256 6d8ff1818d9ad37ebdf24adb0195bcbac8c08616f3ef1b5de543c22615d2f426
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpMhK8ACgkQNQqtfCuFneOfGQCgh1pmw+IKL5DtMlymg4wCENkR
+I8kAniBXFrJdjmVtKWYc2bxeJyFIy3yV
+=tHBp
+-----END PGP SIGNATURE-----
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 17e086e8c1dc..72159406fabd 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.7 2009/06/16 17:39:17 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.19.ebuild,v 1.8 2009/07/02 09:58:01 fauli Exp $
 
 EAPI=2
 
@@ -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 000000000000..5f339a3e1e81
--- /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