amr, v4l2, configuration and ebuild cleanup

(Portage version: 2.1_pre4-r1)

4 files changed, 103 insertions, 47 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a12b90ac808d..aa6c1adcd73a 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.128 2006/03/04 17:51:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.129 2006/03/05 00:24:52 lu_zero Exp $
+
+  05 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20060302.ebuild:
+  Improved ebuild with amr and v4l2 support, thanks to Philip Kovacs
+  <kovacsp3@comcast.net> for the improved ebuild, other minor fixes
 
   04 Mar 2006; Luca Barbato <lu_zero@gentoo.org>
   files/ffmpeg-shared-gcc4.1.patch:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4428eb9a71f5..ff361cce4e3b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,9 @@
 MD5 fdc365bead3fc7a6bff768591bf644d4 ChangeLog 19017
 RMD160 93627e367f16748146d959521c1acffe12fe4589 ChangeLog 19017
 SHA256 834688c880490fa73eb98d07312c1a254e788b25b8f7d3b00d51a97c38c98f21 ChangeLog 19017
+MD5 eaa7c809574887b364632fcdf08d0374 attachment.cgi?id=81343 6432
+RMD160 536786d8c7847f719c399099dbee14cd8efbba50 attachment.cgi?id=81343 6432
+SHA256 bae28b4078211feb0fda11cbf80149e9bd29fa18ac66cd235427885f00be3d64 attachment.cgi?id=81343 6432
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -16,9 +19,9 @@ SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0
 MD5 a0bb2c92819f677e9a54da4e25610aaf ffmpeg-0.4.9_p20051216.ebuild 5657
 RMD160 5f63e67a19662dde24d487c879aa2a0e02ec1483 ffmpeg-0.4.9_p20051216.ebuild 5657
 SHA256 4eff2720f2eeed0ed8d0bce81f2a9ca5efcff9309eeeb352b1b9d600460b93d8 ffmpeg-0.4.9_p20051216.ebuild 5657
-MD5 7ae240d3bd16b3d6bb08455fe2330610 ffmpeg-0.4.9_p20060302.ebuild 5642
-RMD160 e6017db13df3574529612331d5b5f46cf423cf6c ffmpeg-0.4.9_p20060302.ebuild 5642
-SHA256 823d647bfb365cf3ac3e70dccff1f900591dd70542f8121830b302280bc698cf ffmpeg-0.4.9_p20060302.ebuild 5642
+MD5 d8550229731ff9a307482f5de010f951 ffmpeg-0.4.9_p20060302.ebuild 7067
+RMD160 b092d20dbbf3264fe52d0721bf18c917c3a0d8a3 ffmpeg-0.4.9_p20060302.ebuild 7067
+SHA256 a17b22d23b3b22a1f54549926d1d3f4a3ad1acb96f6ffd2209a85a14aba3bad7 ffmpeg-0.4.9_p20060302.ebuild 7067
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -37,9 +40,9 @@ SHA256 33cdf4a536d64f29d47f5712a2bf9a63a6a07e87a69ae8b235168a838d1f375d files/di
 MD5 901fef6a53861dbe2d583688478546ac files/digest-ffmpeg-0.4.9_p20051216 76
 RMD160 b2fa9ae9699ba46efeef82025bac9d493f8bf45f files/digest-ffmpeg-0.4.9_p20051216 76
 SHA256 61b82cac8ca3bda3af573eef3b528771d181495e46e8fab0f859d6e05394c05e files/digest-ffmpeg-0.4.9_p20051216 76
-MD5 b730a7485f2894ec94a9ba81177653de files/digest-ffmpeg-0.4.9_p20060302 274
-RMD160 acf9632a7aaeede589bf7590cbe1aea33b32a0a6 files/digest-ffmpeg-0.4.9_p20060302 274
-SHA256 4b3dda281426894d303210283098b28ecd11a7f67015827d05a8baceed88341c files/digest-ffmpeg-0.4.9_p20060302 274
+MD5 7fb55dd969da83d7f7224f769d373d6c files/digest-ffmpeg-0.4.9_p20060302 714
+RMD160 1119c53182aa3203cf623204ff94e994dab64c82 files/digest-ffmpeg-0.4.9_p20060302 714
+SHA256 06f9e13780a1730bdd77cce2e1821b99f6b1baa0c1017ee9b026eb512e3f18f3 files/digest-ffmpeg-0.4.9_p20060302 714
 MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
 RMD160 e9b87f2fc0f1f1b1847df573f3098af331056a0b files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
 SHA256 ee18f6a837fd5724f08720b9785f0603f85db97b22120f33586b8a9811c5efef files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
@@ -79,3 +82,6 @@ SHA256 65a9dcc2191708ec64a82616dad202d80465b30a696386ec30bd1b459d4a3d83 files/ge
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
+MD5 eaa7c809574887b364632fcdf08d0374 patch 6432
+RMD160 536786d8c7847f719c399099dbee14cd8efbba50 patch 6432
+SHA256 bae28b4078211feb0fda11cbf80149e9bd29fa18ac66cd235427885f00be3d64 patch 6432
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index a07108cf7e0f..dca9256704db 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.3 2006/03/04 06:58:43 lu_zero Exp $
+# $Header:
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -12,7 +12,9 @@ S_BASE=${WORKDIR}/${MY_P}
 S_STATIC=${S_BASE}-static
 S_SHARED=${S_BASE}-shared
 
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	amr? ( http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-510.zip
+	       http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-510.zip )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,8 +22,8 @@ SLOT="0"
 # ~ia64 ~arm ~mips ~hppa
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test
-theora threads truetype v4l x264 xvid dts network zlib sdl"
+IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
+	test theora threads truetype v4l v4l2 x264 xvid dts network zlib sdl"
 
 DEPEND="imlib? ( media-libs/imlib2 )
 	truetype? ( >=media-libs/freetype-2 )
@@ -39,12 +41,30 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	ieee1394? ( =media-libs/libdc1394-1*
 	            sys-libs/libraw1394 )
 	test? ( net-misc/wget )
-	x264? ( media-libs/x264-svn )"
+	x264? ( media-libs/x264-svn )
+	amr? ( app-arch/unzip )"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S_BASE}
 
+	# amr (float) support
+	if use amr; then
+		einfo "Including amr wide and narrow band (float) support ... "
+
+		# narrow band codec
+		mkdir ${S_BASE}/libavcodec/amr_float
+		cd ${S_BASE}/libavcodec/amr_float
+		unzip -q ${WORKDIR}/26104-510_ANSI_C_source_code.zip
+
+		# wide band codec
+		mkdir ${S_BASE}/libavcodec/amrwb_float
+		cd ${S_BASE}/libavcodec/amrwb_float
+		unzip -q ${WORKDIR}/26204-510_ANSI-C_source_code.zip
+	fi
+
+	cd ${S_BASE}
+
 	#Append -fomit-frame-pointer to avoid some common issues
 	use debug || append-flags "-fomit-frame-pointer"
 
@@ -71,7 +91,6 @@ src_unpack() {
 	mv ${S_BASE} ${S_SHARED}
 	cd ${S_SHARED}
 	epatch "${FILESDIR}/ffmpeg-shared-gcc4.1.patch"
-
 }
 
 src_compile() {
@@ -81,11 +100,9 @@ src_compile() {
 
 	local myconf=""
 
-	#disable mmx accelerated code if not requirested, or if PIC is required
+	#disable mmx accelerated code if not requested, or if PIC is required
 	# as the provided asm decidedly is not PIC.
-	if ( ! has_pic && use mmx ) || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
+	if ( gcc-specs-pie || ! use mmx ) && ( ! use amd64 ); then
 		myconf="${myconf} --disable-mmx"
 	fi
 
@@ -93,31 +110,44 @@ src_compile() {
 		myconf="${myconf} --enable-memalign-hack"
 	fi
 
-	myconf="${myconf}
-		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable encode mp3lame) \
-		$(use_enable a52) --disable-a52bin \
-		$(use_enable oss audio-oss) \
-		$(use_enable v4l) \
-		$(use_enable ieee1394 dv1394) $(use_enable ieee1394 dc1394) \
-		$(use_enable threads pthreads) \
-		$(use_enable xvid) \
-		$(use_enable ogg libogg) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable dts) \
-		$(use_enable network) \
-		$(use_enable zlib) \
-		$(use_enable sdl ffplay) \
-		$(use_enable x264) \
-		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
-		--enable-gpl \
-		--enable-pp \
-		--disable-opts"
-
+	# enabled by default
+	use altivec || myconf="${myconf} --disable-altivec"
+	use debug || myconf="${myconf} --disable-debug"
+	use oss || myconf="${myconf} --disable-audio-oss"
+	use v4l || myconf="${myconf} --disable-v4l"
+	use v4l2 || myconf="${myconf} --disable-v4l2"
+	use ieee1394 || myconf="${myconf} --disable-dv1394"
+	use network || myconf="${myconf} --disable-network"
+	use zlib || myconf="${myconf} --disable-zlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	myconf="${myconf} --disable-opts"
+
+	# disabled by default
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use a52 && myconf="${myconf} --enable-a52"
+	use ieee1394 && myconf="${myconf} --enable-dc1394"
+	use threads && myconf="${myconf} --enable-pthreads"
+	use xvid && myconf="${myconf} --enable-xvid"
+	use ogg && myconf="${myconf} --enable-libogg"
+	use vorbis && myconf="${myconf} --enable-vorbis"
+	use theora && myconf="${myconf} --enable-theora"
+	use dts && myconf="${myconf} --enable-dts"
+	use x264 && myconf="${myconf} --enable-x264"
+	use aac && myconf="${myconf} --enable-faad --enable-faac"
+	use amr && myconf="${myconf} --enable-amr_nb --enable-amr_wb"
+
+	myconf="${myconf} --enable-gpl --enable-pp"
+	
 	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
+	#econf generates configure options unknown to ffmpeg's configure, so configure manually
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--enable-static --disable-shared \
+		${myconf} || die "static failed"
+
+
 	emake CC="$(tc-getCC)" || die "static failed"
 
 	# Specific workarounds for too-few-registers arch...
@@ -125,15 +155,24 @@ src_compile() {
 		filter-flags -fforce-addr -momit-leaf-frame-pointer
 		append-flags -fomit-frame-pointer
 		is-flag -O? || append-flags -O2
-		ewarn ""
-		ewarn "Debug information will be almost useless as the frame pointer is omitted."
-		ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-		ewarn "difficult to fix. Please have that in mind."
-		ewarn ""
+		if (use debug); then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
 	fi
 
 	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
+	#econf generates configure options unknown to ffmpeg's configure, so configure manually
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--disable-static --enable-shared \
+		${myconf} || die "shared failed"
+
 	emake CC="$(tc-getCC)" || die "shared failed"
 }
 
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060302 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060302
index 519d3e1963f1..9b1f992ca6f3 100644
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060302
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20060302
@@ -1,3 +1,9 @@
+MD5 9b575d01f94f50dd4dcf570cd8a14dda 26104-510.zip 291836
+RMD160 0ff97a27fe5d08dd43571fd1982ce0f07bce3bca 26104-510.zip 291836
+SHA256 75fdf6416950c155ccbfd7fae4ffd6529f162ad6b427ab242c3e00685e303f46 26104-510.zip 291836
+MD5 607a14d090898ffb0f72c1aa6aa6ce31 26204-510.zip 246663
+RMD160 1b68232bc40d84298b134c57697e29a842e63ffd 26204-510.zip 246663
+SHA256 069ebd6ed8ef846d99bdd13d6c47fdb99fe5583b0ed5f405e1392a1a21a1b991 26204-510.zip 246663
 MD5 618efa3f8d44f363d80da557f11c0c66 ffmpeg-0.4.9-p20060302.tar.bz2 1759647
 RMD160 e1e2c826c95d2eddd06d91b7df8fba1a3dc277bd ffmpeg-0.4.9-p20060302.tar.bz2 1759647
 SHA256 17bd539cc1244a00e0de1d0d4ae3ea731553a8405be616bfc79858496633391d ffmpeg-0.4.9-p20060302.tar.bz2 1759647