Sync live ebuild with latest snapshot; merely add speex useflag and remove unused make targets

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.10 x86_64

3 files changed, 23 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index be194b825231..6422b9f65c63 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.252 2008/12/22 14:20:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.253 2008/12/23 12:13:03 aballier Exp $
+
+  23 Dec 2008; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  Sync live ebuild with latest snapshot; merely add speex useflag and remove
+  unused make targets
 
   22 Dec 2008; Raúl Porcel <armin76@gentoo.org>
   ffmpeg-0.4.9_p20081014.ebuild, ffmpeg-0.4.9_p20081219.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index fd5d92d40310..b22b4cea23d8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ffmpeg-0.4.9_p20081014-sparc-gcc43.patch 503 RMD160 3b7b0deb5c8ceac2b8ec39c45d761c6f6f9158f3 SHA1 f538896e44e15bb07fd500d0bf0360c96bc6a9da SHA256 4f7675477d51ddce885a7a1bb647a30663e0294db0f6936fa37d162f2d4a94b0
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
 DIST ffmpeg-0.4.9-p20081014.tar.bz2 2676641 RMD160 6b7e556292425dabcf1f6e94c01d493a3d353835 SHA1 016fdd2798ce442dddfe4551e04a2324b0587428 SHA256 a039ac78b31e24b1a1a06daa927bdf24fc3cc7b73adbb7a5d936a0c828b84018
 DIST ffmpeg-0.4.9-p20081219.tar.bz2 2669507 RMD160 0de7935340bfd477d6be9407285bcc066e8b6347 SHA1 b1af74fbed65c4060b8882bd1ea3e029263cd811 SHA256 626184a86ad8159b1702c93e80714e87aec5b17163e7a5360d6b976ecc4453fc
 EBUILD ffmpeg-0.4.9_p20081014.ebuild 6344 RMD160 913d3831b0964bf5a3491d81524003d338cde01e SHA1 808abc3b8327df36652ba0394906201da22a1e29 SHA256 53c4d4c97d508a5ec5e4c1a580ad510bc2e55f613efc5b83b3798898299a40ba
 EBUILD ffmpeg-0.4.9_p20081219.ebuild 6082 RMD160 4268ea444574c8cafc38aad097767ff0760a6141 SHA1 5331dc52ae6116dd1bcf63f6f6fb2717d53c8711 SHA256 ae26866f48ae223d6e85f150f44b703ffc95c8695adf0bf3aa2041a5a1468d57
-EBUILD ffmpeg-9999.ebuild 5974 RMD160 f6bc36d94525aea1beec1ffe82c417be9e387f13 SHA1 606722ed6b43fc71a94d148097dbd6ea486a597b SHA256 9daeb655fe046b4aeccf18d65752483e9f30c226189cd13b7e5b655c15b43aa6
-MISC ChangeLog 38402 RMD160 6d4d9400507e3e4b32b5a5a71828c447db1f168f SHA1 d0b6c0e34592cf852c81b255edd3c0307e5dd23d SHA256 22254826ae3eaa4e53b7af9f0fcbafee36685b8b1823da2b31147f2d42545b54
+EBUILD ffmpeg-9999.ebuild 5988 RMD160 c4d280e3db7b3b58662202eae6746c9e69e5591f SHA1 88c81abff96716d3d77a666401ffb1dc990ab78e SHA256 eee316db9e33ff6cb63f273cd27c72d881ff4e69035155b2255fd3d9b1f0a782
+MISC ChangeLog 38575 RMD160 6d12b20f682f2a4d777808bbcf73d8def3e8045e SHA1 70c8d1dbe44ad7c28dbc82d01165ac9b91b9b5b7 SHA256 bfe5354618ca0a06f4d8728fd22b98db571b929b7d0d211c8d4d1664f7897e53
 MISC metadata.xml 1158 RMD160 f666c9d210c950f862cbf0fcc323a7085f5febe7 SHA1 e5c84b8a4916b9bb20960ae16345c6d0844baa81 SHA256 ab916e46e6a91bf195e25dfe23c777436744017dfdb96d3330fd633bec599e2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklQ1dUACgkQvFcC4BYPU0okogCeMpNbDECHBs+zE5aVYwzM+vIG
+w0cAmgJS+QC7itsAccnq2qhdQx88T9Pr
+=yOwo
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 2bef594b7b03..7f55044e1993 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.1 2008/12/20 19:16:27 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.2 2008/12/23 12:13:03 aballier Exp $
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="aac altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis
 	  test theora threads x264 xvid network zlib sdl X mp3 schroedinger
-	  hardcoded-tables bindist v4l v4l2 ssse3 vhook"
+	  hardcoded-tables bindist v4l v4l2 speex ssse3 vhook"
 
 RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
 	sdl? ( >=media-libs/libsdl-1.2.10 )
@@ -26,13 +26,14 @@ RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
 		theora? ( media-libs/libtheora media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	aac? ( media-libs/faad2 )
+	aac? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )
 	ieee1394? ( media-libs/libdc1394
 				sys-libs/libraw1394 )
 	dirac? ( media-video/dirac )
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	schroedinger? ( media-libs/schroedinger )
+	speex? ( media-libs/speex )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	amr? ( media-libs/amrnb media-libs/amrwb )"
 
@@ -89,6 +90,7 @@ src_compile() {
 	use aac && myconf="${myconf} --enable-libfaad"
 	use dirac && myconf="${myconf} --enable-libdirac"
 	use schroedinger && myconf="${myconf} --enable-libschroedinger"
+	use speex && myconf="${myconf} --enable-libspeex"
 	if use gsm; then
 		myconf="${myconf} --enable-libgsm"
 		# Crappy detection or our installation is weird, pick one (FIXME)
@@ -167,14 +169,12 @@ src_compile() {
 		--cc="$(tc-getCC)" \
 		${myconf} || die "configure failed"
 
-	emake -j1 depend || die "depend failed"
 	emake || die "make failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die "Install Failed"
+	emake DESTDIR="${D}" install || die "Install Failed"
 
-	use doc && emake -j1 documentation
 	dodoc Changelog README INSTALL
 	dodoc doc/*
 }