From: Diego Elio Pettenò Date: Mon, 8 Jan 2007 13:46:22 +0000 (+0000) Subject: Add patch that initialises FFmpeg and allows the a52 plugin to actually work. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5222619edfad9dd7dac985391d0fedc615fbd939;p=gentoo.git Add patch that initialises FFmpeg and allows the a52 plugin to actually work. Package-Manager: portage-2.1.2_rc4-r7 --- diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog index a9765c5cdc96..3fb57bc19cd9 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.39 2007/01/04 17:41:08 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.40 2007/01/08 13:46:22 flameeyes Exp $ + +*alsa-plugins-1.0.14_rc1-r2 (08 Jan 2007) + + 08 Jan 2007; Diego Pettenò + +files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch, + +alsa-plugins-1.0.14_rc1-r2.ebuild: + Add patch that initialises FFmpeg and allows the a52 plugin to actually work. 04 Jan 2007; Gustavo Zacarias alsa-plugins-1.0.14_rc1-r1.ebuild: diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest index ce7528bd521d..f6ec09d3b79e 100644 --- a/media-plugins/alsa-plugins/Manifest +++ b/media-plugins/alsa-plugins/Manifest @@ -13,6 +13,10 @@ AUX alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c0731 MD5 903355c77eb3b9e47cdd95e4f6acdff2 files/alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 files/alsa-plugins-1.0.14_rc1-automagic.patch 2892 SHA256 04a820b2c2a0ce7c518fceafa290965b9caec62a6293938b74c1c828080f2ce0 files/alsa-plugins-1.0.14_rc1-automagic.patch 2892 +AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e +MD5 c85ba95999a4ccdbcebb53163b5dc4a4 files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 +RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 +SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 DIST alsa-plugins-1.0.11.tar.bz2 236440 RMD160 24a80f68467c9a3dae9ab8c27f8e826ac1dc7ab3 SHA1 1456255d25a848e433438a79bed7e82259fb5f29 SHA256 9aef5b1e7649c279ef69b41c556d65d0c74364f015f93ac99e33eb2a7db9b3fd DIST alsa-plugins-1.0.13.tar.bz2 230257 RMD160 c13fef547fc29bb2f7fd60e3a962e4c299cf677a SHA1 5c8c36516fe234e93c858ac640a815c1b6dcd32a SHA256 9a1a68f13e00400a2f8b7fe77c33d715b4a048931908d7c8c082adaf55c207a0 DIST alsa-plugins-1.0.14rc1a.tar.bz2 253102 RMD160 94c868b1e94159fae20f82d8a7e384370ca0c347 SHA1 9a23e8ba2e911bfb06a45cdd4989a1e4ef891e0f SHA256 b9109ec30746fa3532f674f0aeb7a9d2629650aad46bc7124d2b54533e8a322b @@ -28,10 +32,14 @@ EBUILD alsa-plugins-1.0.14_rc1-r1.ebuild 2033 RMD160 068e65c82c94fd009f46d26622b MD5 31427844acb5a11433a7082acf4a0c99 alsa-plugins-1.0.14_rc1-r1.ebuild 2033 RMD160 068e65c82c94fd009f46d26622b749859ecc15bb alsa-plugins-1.0.14_rc1-r1.ebuild 2033 SHA256 bca2d90ef51b779e88d05ea9387cec6b1eda9cfd72dc23a0fd8f09b44dc95e76 alsa-plugins-1.0.14_rc1-r1.ebuild 2033 -MISC ChangeLog 6134 RMD160 7ea08f8e23ff91254eb9df56bd2784140d09389b SHA1 89275e4ce18e4fad148113b745ad1020147ed604 SHA256 507d9ae517aaca8b1d974b9574198442c660ed67bcea8c2f6818ac38559e8755 -MD5 7a3895907bbbe540e27cedf5c6272494 ChangeLog 6134 -RMD160 7ea08f8e23ff91254eb9df56bd2784140d09389b ChangeLog 6134 -SHA256 507d9ae517aaca8b1d974b9574198442c660ed67bcea8c2f6818ac38559e8755 ChangeLog 6134 +EBUILD alsa-plugins-1.0.14_rc1-r2.ebuild 2081 RMD160 771bb015beb182fb096d6697cfb9b1e7a06dd8b9 SHA1 32f046978d641c6677fb4c51d580706ac30deaa1 SHA256 e61cc625a5a1b360097e2c6c10a10261db4756df6f6561681d0d275283c069b8 +MD5 5438115bd7a4528481ff0ed4e73bdcd5 alsa-plugins-1.0.14_rc1-r2.ebuild 2081 +RMD160 771bb015beb182fb096d6697cfb9b1e7a06dd8b9 alsa-plugins-1.0.14_rc1-r2.ebuild 2081 +SHA256 e61cc625a5a1b360097e2c6c10a10261db4756df6f6561681d0d275283c069b8 alsa-plugins-1.0.14_rc1-r2.ebuild 2081 +MISC ChangeLog 6402 RMD160 ec634b88c4f46b6c0a7af565cf3aeaac3ea909b4 SHA1 e02061adbdf8e33d3b9d602b3ccf653ff54b5ac8 SHA256 f299a3d555f758fbb20b1de66dbce4bc6e7ac7f5fe47e498514364681ab14208 +MD5 26f7e385a47b23f232f4017905e503ec ChangeLog 6402 +RMD160 ec634b88c4f46b6c0a7af565cf3aeaac3ea909b4 ChangeLog 6402 +SHA256 f299a3d555f758fbb20b1de66dbce4bc6e7ac7f5fe47e498514364681ab14208 ChangeLog 6402 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -45,10 +53,13 @@ SHA256 2b594d9cf70f24ecde16e8490847dcfb6af2d0798118499a70ca8dd121d0e5da files/di MD5 b9da0eb6c825f1335da114643e86019e files/digest-alsa-plugins-1.0.14_rc1-r1 274 RMD160 065fb23936a36039c9fea104769307ed86a5ee5c files/digest-alsa-plugins-1.0.14_rc1-r1 274 SHA256 312aabedc10ebec429bc2e873989bbc3be013f3761a9f6cbb786a1f0ba5b42cd files/digest-alsa-plugins-1.0.14_rc1-r1 274 +MD5 b9da0eb6c825f1335da114643e86019e files/digest-alsa-plugins-1.0.14_rc1-r2 274 +RMD160 065fb23936a36039c9fea104769307ed86a5ee5c files/digest-alsa-plugins-1.0.14_rc1-r2 274 +SHA256 312aabedc10ebec429bc2e873989bbc3be013f3761a9f6cbb786a1f0ba5b42cd files/digest-alsa-plugins-1.0.14_rc1-r2 274 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFnTw9KRy60XGEcJIRAnPAAJ9yAWr4SO//g6/1JEvQDxv6WiwGQgCfTny4 -QJVAuTxS2F7vfXu/ggmvmdM= -=rqNX +iD8DBQFFoktDAiZjviIA2XgRAkWdAKDzAfCdbCGnIaT0kHDBx/dkAUK4cwCgskn5 +bMdwRuNgb3ztG47TruZq4dU= +=2lyG -----END PGP SIGNATURE----- diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.14_rc1-r2.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.14_rc1-r2.ebuild new file mode 100644 index 000000000000..f6ab2d0f0adb --- /dev/null +++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.14_rc1-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2007 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.14_rc1-r2.ebuild,v 1.1 2007/01/08 13:46:22 flameeyes Exp $ + +WANT_AUTOMAKE=latest +WANT_AUTOCONF=latest + +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}a.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="jack ffmpeg libsamplerate pulseaudio debug" + +RDEPEND=">=media-libs/alsa-lib-1.0.12_rc1 + jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) + ffmpeg? ( media-video/ffmpeg ) + libsamplerate? ( media-libs/libsamplerate ) + pulseaudio? ( media-sound/pulseaudio ) + !media-plugins/alsa-jack" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.0.14_rc1-automagic.patch" + epatch "${FILESDIR}/${P}-init-ffmpeg.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 + + # D-Bus is used for Maemo SDK, that standing to the + # changelog is related to n770... disable it until + # someone ask for it explicitely, to be on the safe + # side. + econf \ + $(use_enable jack) \ + $(use_enable libsamplerate samplerate) \ + $(use_enable ffmpeg avcodec) \ + $(use_enable pulseaudio) \ + --disable-dbus \ + --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 +} diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch new file mode 100644 index 000000000000..c0bc1be37cc9 --- /dev/null +++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.14_rc1-init-ffmpeg.patch @@ -0,0 +1,13 @@ +Index: alsa-plugins-1.0.14rc1/a52/pcm_a52.c +=================================================================== +--- alsa-plugins-1.0.14rc1.orig/a52/pcm_a52.c ++++ alsa-plugins-1.0.14rc1/a52/pcm_a52.c +@@ -421,6 +421,8 @@ static int a52_prepare(snd_pcm_ioplug_t + { + struct a52_ctx *rec = io->private_data; + ++ avcodec_init(); ++ + a52_free(rec); + + rec->avctx = avcodec_alloc_context(); diff --git a/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.14_rc1-r2 b/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.14_rc1-r2 new file mode 100644 index 000000000000..c17e4d610246 --- /dev/null +++ b/media-plugins/alsa-plugins/files/digest-alsa-plugins-1.0.14_rc1-r2 @@ -0,0 +1,3 @@ +MD5 be16afcc36afb4292b4420e1737d6cb5 alsa-plugins-1.0.14rc1a.tar.bz2 253102 +RMD160 94c868b1e94159fae20f82d8a7e384370ca0c347 alsa-plugins-1.0.14rc1a.tar.bz2 253102 +SHA256 b9109ec30746fa3532f674f0aeb7a9d2629650aad46bc7124d2b54533e8a322b alsa-plugins-1.0.14rc1a.tar.bz2 253102