Adding patch to detect new ffmpeg headers location. Thanks to Rafał Mużyło and Martin von Gagern in bug 218088.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-hg1 i686

4 files changed, 137 insertions, 12 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 5667e1ae0d36..d13f01aa0256 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.77 2008/08/03 08:02:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.78 2008/08/06 22:37:28 yngwin Exp $
+
+*alsa-plugins-1.0.17-r1 (06 Aug 2008)
+
+  06 Aug 2008; Ben de Groot <yngwin@gentoo.org> +files/ffmpeg-headers.patch,
+  +alsa-plugins-1.0.17-r1.ebuild:
+  Adding patch to detect new ffmpeg headers location. Thanks to Rafał
+  Mużyło and Martin von Gagern in bug 218088.
 
   03 Aug 2008; Petteri Räty <betelgeuse@gentoo.org>
   alsa-plugins-1.0.14.ebuild, alsa-plugins-1.0.16.ebuild:
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 8658b25104f5..4ba7d7d23a52 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,12 +1,10 @@
------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
 AUX alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 SHA1 ad5ff0d6c6eb807ce06d71d2dff2600877bc3ac6 SHA256 04a820b2c2a0ce7c518fceafa290965b9caec62a6293938b74c1c828080f2ce0
 AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e
 AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0
+AUX ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45
 DIST alsa-plugins-1.0.13.tar.bz2 230257 RMD160 c13fef547fc29bb2f7fd60e3a962e4c299cf677a SHA1 5c8c36516fe234e93c858ac640a815c1b6dcd32a SHA256 9a1a68f13e00400a2f8b7fe77c33d715b4a048931908d7c8c082adaf55c207a0
 DIST alsa-plugins-1.0.14.tar.bz2 305631 RMD160 3e13375caf25909a08d8683ebff1025743c0ee03 SHA1 a983bc6b0398d0bbd6b8c474efb50d1f466d1acd SHA256 c897b1bdec8a392ce4420e5f35d9e559787011c84f2214a27dae43b74dad1638
 DIST alsa-plugins-1.0.14rc1a.tar.bz2 253102 RMD160 94c868b1e94159fae20f82d8a7e384370ca0c347 SHA1 9a23e8ba2e911bfb06a45cdd4989a1e4ef891e0f SHA256 b9109ec30746fa3532f674f0aeb7a9d2629650aad46bc7124d2b54533e8a322b
@@ -21,13 +19,7 @@ EBUILD alsa-plugins-1.0.14_rc1-r1.ebuild 1974 RMD160 3d49e987e642b26cf763dd0a918
 EBUILD alsa-plugins-1.0.15.ebuild 2185 RMD160 3389c1ebbad1bd2e2a5e9b25bd895c0ca885fc6b SHA1 814347e456cf4f923a7c4d717a4659aa5fcd672c SHA256 bbea051f98ae1f8078e51d728cce0fc0ee4a3d2e211c7a6cd97fd1edb573242a
 EBUILD alsa-plugins-1.0.16.ebuild 2199 RMD160 8be103cba6c1213b0b846ab124f5f28e4c852dde SHA1 0217716ff51d5ea931da448e219f2c1a49338519 SHA256 48469aa1bc70722677330a5a6a9939394e8a6f5a196ad125548ef370cec3992b
 EBUILD alsa-plugins-1.0.16_rc1.ebuild 2191 RMD160 1d501f76749da2831c0b874cec5bef215801dcb5 SHA1 b3a808442e22f852d21584cbf452c90d8516e9d8 SHA256 4c595776df9060d48048f4d8b21331f815fb953ebc9e4b6930effeb2b3c82f3f
+EBUILD alsa-plugins-1.0.17-r1.ebuild 1998 RMD160 c0497b50c678d0f2ce333925e44a0cc12e729b7c SHA1 d7c77da8649a676ac863c4c9e20591cf82c3808a SHA256 72b58499c5701d61965b984536f6a5508745fb03ee149ad89d05d97fb4ad7ccd
 EBUILD alsa-plugins-1.0.17.ebuild 1973 RMD160 930cead3800a12b58075df9837721a0ffd2636aa SHA1 3a7ff17483c15c1c60c8c4b742b4380a47317929 SHA256 fd7655c4031bc3b5a28383629b47022193fd2abd223105f3816b809e4301210b
-MISC ChangeLog 11676 RMD160 1a98f574edaa87109b94615338e6ed49c52c4e70 SHA1 324230f740611978e918d8ecb8ffeef27a92c137 SHA256 68c89ec2957512aef7701469fab56df2954de38fccf73e57e8251882670ddbaa
+MISC ChangeLog 11942 RMD160 7fcac5c3cae8657495b6287577f9190b62ccccd2 SHA1 243ed2254b185dca7363281f6d77f3af539f0a74 SHA256 1e8ab40a559ebd30b82d2f1cf76af1ed3a44f6478aff10dd367f8ff99ad89e94
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiVZgMACgkQcxLzpIGCsLQL6gCfdAcusdAGllgELobOioNANH48
-VAgAn1IcVNPQrY1KpHePjiJOUpFYWmoh
-=/Lpg
------END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.17-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.17-r1.ebuild
new file mode 100644
index 000000000000..90b3e0b0de06
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.17-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 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.17-r1.ebuild,v 1.1 2008/08/06 22:37:28 yngwin Exp $
+
+inherit libtool autotools eutils flag-o-matic
+
+MY_P="${P/_/}"
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+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"
+IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}
+	ffmpeg? ( media-video/ffmpeg )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pulseaudio? ( media-sound/pulseaudio )
+	speex? ( media-libs/speex )
+	!media-plugins/alsa-jack"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.17-automagic.patch"
+	epatch "${FILESDIR}/${PN}-1.0.14_rc1-init-ffmpeg.patch"
+	epatch "${FILESDIR}"/ffmpeg-headers.patch
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i -e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		"${S}/pulse/Makefile.am"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	use debug || append-flags -DNDEBUG
+
+	econf \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
+		$(use_with speex speex lib) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cd "${S}/doc"
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use pulseaudio && dodoc README-pulse
+	use ffmpeg && dodoc lavcrate.txt a52.txt
+}
diff --git a/media-plugins/alsa-plugins/files/ffmpeg-headers.patch b/media-plugins/alsa-plugins/files/ffmpeg-headers.patch
new file mode 100644
index 000000000000..86026d48d54c
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/ffmpeg-headers.patch
@@ -0,0 +1,54 @@
+diff -ru alsa-plugins-1.0.17.orig/a52/pcm_a52.c alsa-plugins-1.0.17/a52/pcm_a52.c
+--- alsa-plugins-1.0.17.orig/a52/pcm_a52.c	2008-08-06 18:28:39.000000000 +0200
++++ alsa-plugins-1.0.17/a52/pcm_a52.c	2008-08-06 18:28:54.000000000 +0200
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <string.h>
+ #define __USE_XOPEN
+@@ -25,7 +26,11 @@
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm_external.h>
+ #include <alsa/pcm_plugin.h>
++#ifdef HAVE_FFMPEG_AVCODEC_H
+ #include <ffmpeg/avcodec.h>
++#elif defined(HAVE_LIBAVCODEC_AVCODEC_H)
++#include <libavcodec/avcodec.h>
++#endif
+ 
+ struct a52_ctx {
+ 	snd_pcm_ioplug_t io;
+diff -ru alsa-plugins-1.0.17.orig/configure.in alsa-plugins-1.0.17/configure.in
+--- alsa-plugins-1.0.17.orig/configure.in	2008-08-06 18:28:39.000000000 +0200
++++ alsa-plugins-1.0.17/configure.in	2008-08-06 18:31:00.000000000 +0200
+@@ -77,7 +77,7 @@
+ if test "x$enable_avcodec" != "xno"; then
+ 	AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
+ 	if test x$HAVE_AVCODEC = xyes; then
+-	  AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
++	  AC_CHECK_HEADERS([ffmpeg/avcodec.h], , [AC_CHECK_HEADERS([libavcodec/avcodec.h], , [HAVE_AVCODEC=no])])
+ 	fi
+ fi
+ AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
+diff -ru alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c
+--- alsa-plugins-1.0.17.orig/rate-lavc/rate_lavcrate.c	2008-08-06 18:28:39.000000000 +0200
++++ alsa-plugins-1.0.17/rate-lavc/rate_lavcrate.c	2008-08-06 18:28:54.000000000 +0200
+@@ -16,10 +16,15 @@
+  * Lesser General Public License for more details.
+  */
+ 
++#include "config.h"
+ #include <stdio.h>
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm_rate.h>
++#ifdef HAVE_FFMPEG_AVCODEC_H
+ #include <ffmpeg/avcodec.h>
++#elif defined(HAVE_LIBAVCODEC_AVCODEC_H)
++#include <libavcodec/avcodec.h>
++#endif
+ #include "gcd.h"
+ 
+ static int filter_size = 16;