Fixed bug #67947. -fPIC logic makes sense now. Thanks to Kevin Quin for supplying the logic.

Package-Manager: portage-2.0.51-r15

4 files changed, 151 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 2eeafd605e8c..74a1721923d3 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.53 2005/03/07 05:45:55 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.54 2005/03/09 22:39:19 chriswhite Exp $
+
+*ffmpeg-0.4.9_p20050226-r1 (10 Mar 2005)
+
+  10 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +ffmpeg-0.4.9_p20050226-r1.ebuild:
+  Fixed bug #67947. -fPIC logic makes sense now. Thanks to Kevin Quin for
+  supplying the logic.
 
   07 Mar 2005; Chris White <chriswhite@gentoo.org>
   ffmpeg-0.4.9_p20050226.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a2625d04f0f2..08d83fe80ea9 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e41df683cec77ecf1f67f3c170c275b ChangeLog 7808
+MD5 5ff8068676ed8fb2852fc1bd0aa98eda ChangeLog 8036
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
 MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
@@ -10,6 +10,7 @@ MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 d3856e4fa892514cb368877e255f234f ffmpeg-0.4.9_p20050226.ebuild 3270
+MD5 6bfcfe205b20e3c2ad1ec95b5eca6274 ffmpeg-0.4.9_p20050226-r1.ebuild 3845
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
@@ -19,12 +20,13 @@ MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
 MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
-MD5 3ec4083f7fb077a5a3c40d1dd46a9a1f files/gentoo-ffmpeg001.patch 1098
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
+MD5 3ec4083f7fb077a5a3c40d1dd46a9a1f files/gentoo-ffmpeg001.patch 1098
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCK+Z9FdQwWVoAgN4RAgixAJ9ULzg2JLo/OLeIbFBtTewe0brCrwCeNA95
-i0WQknv2Unxzq83x4+enWFA=
-=FR1v
+iD8DBQFCL3MbFdQwWVoAgN4RAleMAJ0eKeFTIDrbvXeOpoFQfQvYQjogHwCfdpOL
+nWa5XX8Bbk97fic3LKE07xg=
+=lIkl
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
new file mode 100644
index 000000000000..913d332dbb29
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 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_p20050226-r1.ebuild,v 1.1 2005/03/09 22:39:19 chriswhite Exp $
+
+inherit eutils flag-o-matic gcc
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
+IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l pic"
+
+DEPEND="imlib? (media-libs/imlib2)
+		truetype? (>=media-libs/freetype-2)
+		sdl? (>=media-libs/libsdl-1.2.1)
+		doc? (app-text/texi2html)
+		encode? (media-sound/lame)
+		oggvorbis? (media-libs/libvorbis
+					media-libs/libogg)
+		!alpha?( aac? (media-libs/faad2 media-libs/faac) )
+		dvd? (media-libs/a52dec)
+		"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
+	cd ${S}
+	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+
+	# make a52bin actually compile... adds the needed external lib
+	# and makes fprintf -> av_log like it's supposed to be...
+	epatch ${FILESDIR}/gentoo-${PN}001.patch
+
+	# If MMX isn't to be built, make the libraries properly PIC
+	# Also covers bug #16281
+	if use pic || use !mmx; then
+		#ffmpeg doesn'g use libtool, so the condition for PIC code
+		#is __PIC__, not PIC.
+		sed -i -e 's/#if\(\(.*def *\)\|\(.*defined *\)\)PIC/#if\1__PIC__/' \
+			libavcodec/i386/dsputil_mmx{.c,_rnd.h} \
+			libavcodec/msmpeg4.c \
+			|| die "sed failed (__PIC__)"
+
+		#fixup library makefiles to add '-fPIC'
+		sed -i -e 's/CFLAGS=/CFLAGS=-fPIC /' \
+			libav{codec,format}/Makefile \
+			|| die "sed failed (-fPIC)"
+
+		#fixup liba52 to respect the --disable-mmx configure option
+		sed -i -e 's/#ifdef ARCH_X86/#ifdef HAVE_MMX/' \
+			libavcodec/liba52/resample.c \
+			|| die "sed failed (HAVE_MMX)"
+	fi
+}
+
+src_compile() {
+	#Note; library makefiles don't propogate flags from config.mak so
+	#use specified CFLAGS are only used in executables
+	filter-flags -fforce-addr -momit-leaf-frame-pointer
+
+	local myconf=""
+
+	#disable mmx accelerated code if not requirested, or if PIC is required
+	# as the provided asm decidedly isn't PIC.
+	if use pic || use !mmx; then
+		myconf="${myconf} --disable-mmx"
+	else
+		myconf="${myconf} --enable-mmx"
+	fi
+
+	use encode && use aac && myconf="${myconf} --enable-faac"
+
+	if use oggvorbis ; then
+		myconf="${myconf} --enable-ogg --enable-vorbis"
+	else
+		myconf="${myconf} --disable-ogg --disable-theora"
+	fi
+
+	use !alpha && myconf="${myconf} $(use_enable aac faad) $(use_enable aac faac) $(use_enable aac faadbin)"
+
+	econf \
+	$(use_enable altivec) \
+	$(use_enable debug) \
+	$(use_enable encode mp3lame) \
+	$(use_enable dvd a52) $(use_enable dvd a52bin) \
+	$(use_enable oss audio-oss) \
+	$(use_enable v4l) \
+	$(use_enable dv dv1394) \
+	$(use_enable threads pthreads) \
+	--enable-gpl \
+	--enable-shared-pp \
+	--enable-shared \
+	--enable-pp \
+	--disable-optimize \
+	${myconf} \
+	|| die "Configure failed"
+
+
+}
+
+src_install() {
+	use doc && make documentation
+	make DESTDIR=${D} \
+	prefix=${D}/usr \
+	mandir=${D}/usr/share/man \
+	infodir=${D}/usr/share/info \
+	bindir=${D}/usr/bin \
+	install installlib || die "Install Failed"
+
+	dodoc ChangeLog README INSTALL
+	dodoc doc/*
+
+	cd ${S}/libavcodec/libpostproc
+	make prefix=${D}/usr \
+		install || die "Failed to install libpostproc.a!"
+	make prefix=${D}/usr \
+		SHARED_PP="yes" \
+		install || die "Failed to install libpostproc.so!"
+	cd ${S}
+	# Some stuff like transcode can use this one.
+	dolib ${S}/libavcodec/libpostproc/libpostproc.a
+
+	preplib /usr
+}
+
+# FEATURES=maketest breakes the compile
+src_test() { :; }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1
new file mode 100644
index 000000000000..e182f6a35a7d
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r1
@@ -0,0 +1 @@
+MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308