From 770c712744ad1ca94f5073b4568b6580fbfe186b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 14 Dec 2004 12:10:21 +0000 Subject: [PATCH] Using 'aac' instead of faad and faac. --- media-video/avidemux/ChangeLog | 6 +++- media-video/avidemux/Manifest | 30 +++++++++---------- .../avidemux/avidemux-2.0.34_rc1-r1.ebuild | 11 ++++--- .../avidemux/avidemux-2.0.34_rc2.ebuild | 11 ++++--- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index fcd1fc857bf9..892d20cf88e3 100644 --- a/media-video/avidemux/ChangeLog +++ b/media-video/avidemux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/avidemux # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.60 2004/12/12 16:42:39 zypher Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.61 2004/12/14 12:10:21 eradicator Exp $ + + 14 Dec 2004; Jeremy Huddleston + avidemux-2.0.34_rc1-r1.ebuild, avidemux-2.0.34_rc2.ebuild: + Using 'aac' instead of faad and faac. *avidemux-2.0.34_rc2 (11 Dec 2004) diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index aca288e2386e..5867054585e1 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,30 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 18dce9727e88a4a94a2483f950c4caf3 ChangeLog 11129 +MD5 3b29556d712f7c76e71e4d3ef22db111 ChangeLog 11292 +MD5 dc94855a01eb66b0d3c329e46eb85e76 avidemux-2.0.34_rc1-r1.ebuild 3078 +MD5 f334c41a1a1d4817b41fe11cf35eac21 avidemux-2.0.34_rc2.ebuild 2636 +MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251 -MD5 6d949c882a5b18378b29e39d48ec0c49 avidemux-2.0.34_rc2.ebuild 2675 MD5 5846b93f88b88de1c06950c94bf09e21 avidemux-2.0.34_rc1.ebuild 2417 -MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482 -MD5 ab3162ca7bbd22cd158aac547a2a1754 avidemux-2.0.34_rc1-r1.ebuild 3117 -MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519 MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607 MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717 -MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672 -MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044 -MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631 +MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74 MD5 f9121be7bae99c7b33f4140c70799dce files/digest-avidemux-2.0.34_rc2 71 MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68 -MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713 -MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618 +MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819 -MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74 +MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618 +MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672 +MD5 277683ec9bcbe17a0b7fea610eba9cfb files/avidemux-2.0.30_fixes.patch 1713 MD5 04305efde8b8b115e0a0c8e1885cf194 files/avidemux-2.0.30_amd64_cpuutil.patch 1539 -MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1-r1 74 +MD5 634a8594c2fead1220505d3071037788 files/avidemux-2.0.32_mpeg_ps_fix.patch 519 +MD5 7b49ecad9a48d74f4e99127f434ce29b files/avidemux-2.0.34-test1_faac.patch 631 +MD5 c850494d08353a205ed94f81f6005aa4 files/digest-avidemux-2.0.34_rc1 74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBvHW1RPjscZbntocRAuK7AJ9AfNQdWyqLboxXXR87G2RfbaGrrgCdH03P -+yl6he45N31ZFXTepFuAodc= -=zi1T +iD8DBQFBvthQArHZZzCEUG0RAul6AJ49x6L0TRuvvF4X7O7GCSFPHEueIQCdFwTp +oUABoPLuPsp22IwLfXlloDo= +=AI1z -----END PGP SIGNATURE----- diff --git a/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild b/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild index be4f39dfde74..c80ffd186a83 100644 --- a/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild +++ b/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild,v 1.1 2004/11/30 06:53:09 zypher Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.34_rc1-r1.ebuild,v 1.2 2004/12/14 12:10:21 eradicator Exp $ inherit eutils flag-o-matic @@ -12,15 +12,15 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="2" KEYWORDS="~x86 ~ppc ~amd64" -IUSE="a52 alsa altivec arts debug encode faac faad mad mmx nls oggvorbis pic sdl truetype xvid xv" +IUSE="a52 aac alsa altivec arts debug encode mad mmx nls oggvorbis pic sdl truetype xvid xv" RDEPEND="virtual/x11 a52? ( >=media-libs/a52dec-0.7.4 ) encode? ( >=media-sound/lame-3.93 ) >=dev-libs/libxml2-2.6.7 >=x11-libs/gtk+-2.4.1 - faac? ( >=media-libs/faac-1.23.5 ) - faad? ( >=media-libs/faad2-2.0-r2 ) + aac? ( >=media-libs/faac-1.23.5 + >=media-libs/faad2-2.0-r2 ) mad? ( media-libs/libmad ) xvid? ( >=media-libs/xvid-1.0.0 ) x86? ( dev-lang/nasm ) @@ -63,8 +63,7 @@ src_compile() { # --disable-closure don't delay template instantiation use debug && myconf="${myconf} --enable-debug=full" - use faac || myconf="${myconf} --disable-faac" - use faad || myconf="${myconf} --disable-faad" + use aac || myconf="${myconf} --disable-faac --disable-faad" use arts || export ac_cv_path_ART_CONFIG=no use alsa || export ac_cv_header_alsa_asoundlib_h=no diff --git a/media-video/avidemux/avidemux-2.0.34_rc2.ebuild b/media-video/avidemux/avidemux-2.0.34_rc2.ebuild index 52c0c43b94a8..50c1480814de 100644 --- a/media-video/avidemux/avidemux-2.0.34_rc2.ebuild +++ b/media-video/avidemux/avidemux-2.0.34_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.34_rc2.ebuild,v 1.1 2004/12/12 16:42:39 zypher Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.34_rc2.ebuild,v 1.2 2004/12/14 12:10:21 eradicator Exp $ inherit eutils flag-o-matic @@ -12,15 +12,15 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tgz" LICENSE="GPL-2" SLOT="2" KEYWORDS="~x86 ~ppc ~amd64" -IUSE="a52 alsa altivec arts debug encode faac faad mad mmx nls oggvorbis pic sdl truetype xvid xv" +IUSE="a52 aac alsa altivec arts debug encode mad mmx nls oggvorbis pic sdl truetype xvid xv" RDEPEND="virtual/x11 a52? ( >=media-libs/a52dec-0.7.4 ) encode? ( >=media-sound/lame-3.93 ) >=dev-libs/libxml2-2.6.7 >=x11-libs/gtk+-2.4.1 - faac? ( >=media-libs/faac-1.23.5 ) - faad? ( >=media-libs/faad2-2.0-r2 ) + aac? ( >=media-libs/faac-1.23.5 + >=media-libs/faad2-2.0-r2 ) mad? ( media-libs/libmad ) xvid? ( >=media-libs/xvid-1.0.0 ) x86? ( dev-lang/nasm ) @@ -64,8 +64,7 @@ src_compile() { use a52 || export ac_cv_header_a52dec_a52=no use debug && myconf="${myconf} --enable-debug=full" - use faac || myconf="${myconf} --disable-faac" - use faad || myconf="${myconf} --disable-faad" + use aac || myconf="${myconf} --disable-faac --disable-faad" use mmx || myconf="${myconf} --disable-mmx" econf \ -- 2.26.2