Fix bug #84241 (multilib and pic).

(Portage version: 2.0.51.19)

6 files changed, 339 insertions, 21 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9ba849ae9e40..0f02fb5851d6 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.56 2005/03/16 00:24:05 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.57 2005/03/18 23:28:48 chriswhite Exp $
+
+*ffmpeg-0.4.9_p20050226-r2 (19 Mar 2005)
+
+  19 Mar 2005; Chris White <chriswhite@gentoo.org>
+  +files/ffmpeg-libdir-pic.patch, files/gentoo-ffmpeg001.patch,
+  +ffmpeg-0.4.9_p20050226-r2.ebuild:
+  Fix bug #84241 (multilib and pic).
 
   16 Mar 2005; Chris White <chriswhite@gentoo.org>
   ffmpeg-0.4.9_p20050226-r1.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3438fb1afab3..101ad6eebc7b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 67e71d95a026734c5b591888bfea7297 ChangeLog 8257
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
@@ -11,6 +8,7 @@ MD5 6de19a34285effae41c6c96282642338 ffmpeg-0.4.9_p20050226-r1.ebuild 3925
 MD5 d3856e4fa892514cb368877e255f234f ffmpeg-0.4.9_p20050226.ebuild 3270
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 ee373054c968e45fb3d04d15ec41eab7 ffmpeg-0.4.9_p20050226-r2.ebuild 4222
 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
@@ -22,11 +20,6 @@ MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCN3TKFdQwWVoAgN4RApezAKC8O8FqJJ/fFqXKlrKH4szsofyz3gCg7Q2w
-4UvvUktb842PzU76cscugXA=
-=qRDa
------END PGP SIGNATURE-----
+MD5 affec1e5021654852b0a7f260c0209b2 files/gentoo-ffmpeg001.patch 1050
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
new file mode 100644
index 000000000000..7eb0be16176b
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
@@ -0,0 +1,146 @@
+# 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-r2.ebuild,v 1.1 2005/03/18 23:28:48 chriswhite Exp $
+
+inherit eutils flag-o-matic gcc multilib
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+MY_P=${P/_/-}
+S=${WORKDIR}
+S_BASE=${WORKDIR}/${MY_P}
+S_STATIC=${S_BASE}-static
+S_SHARED=${S_BASE}-shared
+
+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 xvid"
+
+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-0.7.4-r4)
+		xvid? (media-libs/xvid)
+		"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S_BASE}
+
+	# for some reason it tries to #include <X11/Xlib.h>, but doesn't use it
+	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
+
+	#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 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)"
+
+	epatch ${FILESDIR}/${PN}-libdir-pic.patch
+
+	cd ${S}
+	cp -R ${S_BASE} ${S_STATIC}
+	mv ${S_BASE} ${S_SHARED}
+}
+
+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 has_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)"
+
+	myconf="${myconf}
+		$(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) \
+		$(use_enable xvid) \
+		--enable-gpl \
+		--enable-pp \
+		--disable-optimize"
+
+	cd ${S_STATIC}
+	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
+	emake || die
+
+	cd ${S_SHARED}
+	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
+	emake || die
+}
+
+src_install() {
+	for d in ${S_STATIC} ${S_SHARED}; do
+		cd ${d}
+
+		use doc && make documentation
+		make DESTDIR=${D} \
+			prefix=${D}/usr \
+			libdir=${D}/usr/$(get_libdir) \
+			mandir=${D}/usr/share/man \
+			infodir=${D}/usr/share/info \
+			bindir=${D}/usr/bin \
+			install installlib || die "Install Failed"
+	done
+
+	cd ${S_SHARED}
+	dodoc ChangeLog README INSTALL
+	dodoc doc/*
+
+	cd ${S_STATIC}/libavcodec/libpostproc
+	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
+		install || die "Failed to install libpostproc.a!"
+
+	cd ${S_SHARED}/libavcodec/libpostproc
+	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) \
+		SHARED_PP="yes" \
+		install || die "Failed to install libpostproc.so!"
+
+	# Some stuff like transcode can use this one.
+	dolib ${S_STATIC}/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-r2 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r2
new file mode 100644
index 000000000000..e182f6a35a7d
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_p20050226-r2
@@ -0,0 +1 @@
+MD5 d4c0a6fb7339f7809424f525fe94570e ffmpeg-0.4.9-p20050226.tbz2 1501308
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch b/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
new file mode 100644
index 000000000000..7a0e42d55139
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
@@ -0,0 +1,169 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.164
+diff -u -b -B -u -r1.164 configure
+--- configure	9 Mar 2005 03:04:55 -0000	1.164
++++ configure	15 Mar 2005 23:40:10 -0000
+@@ -13,6 +13,7 @@
+ echo "Standard options:"
+ echo "  --help                   print this message"
+ echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
++echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
+ echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
+ echo "  --enable-mp3lame         enable mp3 encoding via libmp3lame [default=no]"
+ echo "  --enable-ogg             enable ogg support via libogg [default=no]"
+@@ -91,6 +92,7 @@
+ 
+ # default parameters
+ prefix="/usr/local"
++libdir=""
+ mandir=""
+ bindir=""
+ cross_prefix=""
+@@ -376,6 +378,8 @@
+   case "$opt" in
+   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
+   ;;
++  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
++  ;;
+   --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
+   ;;
+   --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
+@@ -1062,6 +1066,10 @@
+ bindir="${prefix}/bin"
+ fi
+ 
++if test x"$libdir" = x""; then
++libdir="${prefix}/lib"
++fi
++
+ if test x"$mandir" = x""; then
+ mandir="${prefix}/man"
+ fi
+@@ -1138,6 +1146,7 @@
+ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
+ 
+ echo "prefix=$prefix" >> config.mak
++echo "libdir=$libdir" >> config.mak
+ echo "bindir=$bindir" >> config.mak
+ echo "mandir=$mandir" >> config.mak
+ echo "MAKE=$make" >> config.mak
+Index: libavcodec/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
+retrieving revision 1.177
+diff -u -b -B -u -r1.177 Makefile
+--- libavcodec/Makefile	9 Mar 2005 19:46:31 -0000	1.177
++++ libavcodec/Makefile	15 Mar 2005 23:40:10 -0000
+@@ -302,9 +302,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
++	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
+ 	ldconfig || true
+ endif
+ ifeq ($(CONFIG_PP),yes)
+@@ -315,7 +315,7 @@
+ endif
+ 
+ installlib: all install-headers
+-	install -m 644 $(LIB) "$(prefix)/lib"
++	install -m 644 $(LIB) "$(libdir)"
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+Index: libavcodec/libpostproc/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
+retrieving revision 1.19
+diff -u -b -B -u -r1.19 Makefile
+--- libavcodec/libpostproc/Makefile	4 Feb 2005 03:29:50 -0000	1.19
++++ libavcodec/libpostproc/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -54,9 +54,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+        install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
++	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
+ 	ldconfig || true
+ endif
+ endif
+Index: libavformat/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
+retrieving revision 1.84
+diff -u -b -B -u -r1.84 Makefile
+--- libavformat/Makefile	15 Mar 2005 12:37:39 -0000	1.84
++++ libavformat/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -108,9 +108,9 @@
+ ifeq ($(CONFIG_WIN32),yes)
+ 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
+ else
+-	install -d $(prefix)/lib
+-	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+-	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
++	install -d $(libdir)
++	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
++	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
+ 	ldconfig || true
+ endif
+ else
+@@ -118,7 +118,7 @@
+ endif
+ 
+ installlib: all install-headers
+-	install -m 644 $(LIB) "$(prefix)/lib"
++	install -m 644 $(LIB) "$(libdir)"
+ 
+ install-headers:
+ 	mkdir -p "$(prefix)/include/ffmpeg"
+Index: vhook/Makefile
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
+retrieving revision 1.19
+diff -u -b -B -u -r1.19 Makefile
+--- vhook/Makefile	25 Feb 2005 22:22:20 -0000	1.19
++++ vhook/Makefile	15 Mar 2005 23:40:11 -0000
+@@ -26,8 +26,8 @@
+ 	$(CC) -MM $(CFLAGS) $^ 1>.depend
+ 
+ install:
+-	install -d "$(prefix)/lib/vhook"
+-	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
++	install -d "$(libdir)/vhook"
++	install -m 755 $(HOOKS) "$(libdir)/vhook"
+ 
+ imlib2.so: imlib2.o
+ 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
+--- libavcodec/Makefile.orig	2005-03-18 06:10:21.000000000 +0900
++++ libavcodec/Makefile	2005-03-18 06:17:04.000000000 +0900
+@@ -7,7 +7,7 @@
+ VPATH=$(SRC_PATH)/libavcodec
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) $(PIC) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= bitstream.o utils.o mem.o allcodecs.o \
+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+--- libavformat/Makefile.orig	2005-02-25 00:18:02.000000000 +0900
++++ libavformat/Makefile	2005-03-18 06:17:22.000000000 +0900
+@@ -6,7 +6,7 @@
+ 
+ VPATH=$(SRC_PATH)/libavformat
+ 
+-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) $(PIC) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+ 
+ OBJS= utils.o cutils.o os_support.o allformats.o
+ PPOBJS=
diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
index 0cf09dd5470b..dc654ae04373 100644
--- a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
+++ b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
@@ -1,14 +1,16 @@
---- libavcodec/Makefile.old	2005-02-28 10:26:08.306815960 +0900
-+++ libavcodec/Makefile	2005-02-28 10:26:42.517615128 +0900
-@@ -75,6 +75,8 @@
- ifneq ($(CONFIG_A52BIN),yes)
- OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
- 	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
-+else
-+EXTRALIBS += -la52
- endif
+--- Makefile.old	2005-02-24 10:18:02.000000000 -0500
++++ Makefile		2005-03-18 17:48:45.000000000 -0500
+@@ -73,6 +73,10 @@
+ EXTRALIBS+=-ldc1394_control -lraw1394
  endif
  
++ifeq ($(CONFIG_A52BIN),yes)
++EXTRALIBS+=-la52
++endif
++
+ ifeq ($(BUILD_VHOOK),yes)
+ VHOOK=videohook
+ INSTALLVHOOK=install-vhook
 --- libavcodec/a52dec.c.old	2005-02-28 10:23:54.002233360 +0900
 +++ libavcodec/a52dec.c	2005-02-28 10:35:36.910375080 +0900
 @@ -73,7 +73,7 @@