Extensive patches against pre1 to work on ppc-macos

Package-Manager: portage-2.0.51.21

5 files changed, 341 insertions, 8 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1801683bb4fc..911ce18a6398 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.74 2005/05/02 09:39:38 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.75 2005/05/04 01:13:37 j4rg0n Exp $
+
+*ffmpeg-0.4.9_pre1-r1 (04 May 2005)
+
+  04 May 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/ffmpeg-osx.patch,
+  +ffmpeg-0.4.9_pre1-r1.ebuild:
+  Re-added the pre1 ebuild since there are extensive patches made against it
+  that do not yet work with upstream's CVS. We're working on the latter, but
+  I'm not going to hold up ffmpeg any longer.
 
   02 May 2005; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20050226-r5.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index cf943afb9f45..a89de8b66426 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,13 +1,16 @@
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
+MD5 b5fe59f15edd297717cd96a00bd49486 ChangeLog 12160
 MD5 68e2b1e11184721e20a5b5d24ff9ba15 ffmpeg-0.4.9_p20050226-r5.ebuild 4460
+MD5 d363b93324e315e8230dacdec1b650f9 ffmpeg-0.4.9_pre1-r1.ebuild 4050
+MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 912d6d17440a836812ac0fd4cd93d23b ffmpeg-0.4.9_p20050226-r3.ebuild 4383
-MD5 f1af0728ed109e845a5cc7947f063241 ChangeLog 11817
+MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
+MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
+MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
 MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
+MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
+MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
 MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
-MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
-MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
new file mode 100644
index 000000000000..fbf378c888ec
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
@@ -0,0 +1,127 @@
+# 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_pre1-r1.ebuild,v 1.1 2005/05/04 01:13:37 j4rg0n Exp $
+
+inherit eutils flag-o-matic gcc
+
+# TODO: --enablea52bin breaks compile
+
+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}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa ~ppc-macos"
+IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
+
+DEPEND="encode? ( >=media-sound/lame-3.92 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
+	doc? ( >=app-text/texi2html-1.64 )
+	aac? ( >=media-libs/faad2-1.1
+	       !alpha? ( >=media-libs/faac-1.23 ) )
+	dvd? ( >=media-libs/a52dec-0.7.4 )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	imlib? ( >=media-libs/imlib2-1.0.6 )
+	truetype? ( >=media-libs/freetype-2.1.2 )
+	!<media-video/mplayer-1.0_pre3-r1"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
+	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+
+	if use ppc-macos; then
+		sed -i s:SLIBSUF=".so":SLIBSUF=".dylib": configure
+		epatch ${FILESDIR}/${PN}-osx.patch
+		sed -i -e 's:\$<:\$< -L../libavcodec -lavcodec -L../libavformat -lavformat:g' vhook/Makefile
+		use oggvorbis && sed -i -e 's:ifeq ($(CPU),Darwin):ifeq ($(CPU),Darwin)\
+	LDFLAGS+=-logg:' libavformat/Makefile
+	fi
+
+	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
+		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
+	fi
+}
+
+src_compile() {
+	filter-flags -fforce-addr -fPIC
+	# fixes bug #16281
+	use alpha && append-flags -fPIC
+	use amd64 && append-flags -fPIC
+	use hppa && append-flags -fPIC
+	use ppc && append-flags -fPIC
+	use ppc-macos && append-flags -fno-common
+
+	local myconf
+	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
+	myconf="${myconf} --disable-opts --enable-pp --enable-gpl"
+	use mmx || myconf="${myconf} --disable-mmx"
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use oggvorbis && myconf="${myconf} --enable-vorbis"
+	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
+	if ! use alpha; then
+	    use aac && myconf="${myconf} --enable-faac"
+	fi
+	use dvd && myconf="${myconf} --enable-a52"
+	use static || myconf="${myconf} --enable-shared"
+	use sdl || myconf="${myconf} --disable-ffplay"
+	use debug || myconf="${myconf} --disable-debug"
+	use altivec || myconf="${myconf} --disable-altivec"
+
+# Using --enable-a52bin breaks the compile
+	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
+
+	./configure ${myconf} \
+		--prefix=/usr || die "./configure failed."
+	make || die "make failed."
+	use doc && make -C doc all
+
+	filter-flags -momit-leaf-frame-pointer
+	# fixes bug #45576
+	./configure ${myconf} \
+		--prefix=/usr || die "./configure failed."
+	# Build libpostproc
+	cd ${S}/libavcodec/libpostproc
+	make || die "Failed to build libpostproc.a!"
+	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	dodoc COPYING CREDITS Changelog INSTALL README
+	docinto doc
+	dodoc doc/TODO doc/*.html doc/*.texi
+	insinto /etc
+	doins doc/ffserver.conf
+
+	# Install libpostproc ...
+	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_pre1-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1-r1
new file mode 100644
index 000000000000..21e5cc684690
--- /dev/null
+++ b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1-r1
@@ -0,0 +1 @@
+MD5 ea5587e3c66d50b1503b82ac4179c303 ffmpeg-0.4.9-pre1.tar.gz 1611332
diff --git a/media-video/ffmpeg/files/ffmpeg-osx.patch b/media-video/ffmpeg/files/ffmpeg-osx.patch
new file mode 100644
index 000000000000..8125f4fd6d42
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-osx.patch
@@ -0,0 +1,194 @@
+diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/configure ./configure
+--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/configure	Mon Jul  5 14:06:16 2004
++++ ./configure	Sun Mar 20 23:48:10 2005
+@@ -240,7 +240,7 @@
+ make="gmake"
+ ;;
+ Darwin)
+-cc="cc"
++cc="gcc"
+ v4l="no"
+ audio_oss="no"
+ dv1394="no"
+@@ -249,7 +249,8 @@
+ extralibs=""
+ darwin="yes"
+ strip="strip -x"
+-LDFLAGS="-Wl,-d"
++LDFLAGS="-Wl,-dynamic"
++SLIBSUF=".dylib"
+ FFSLDFLAGS=-Wl,-bind_at_load
+ ;;
+ MINGW32*)
+diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/Makefile ./libavcodec/Makefile
+--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/Makefile	Fri Jun 18 09:11:15 2004
++++ ./libavcodec/Makefile	Sun Mar 20 23:48:10 2005
+@@ -217,7 +217,7 @@
+ dep:	depend
+ 
+ clean: $(CLEANAMR)
+-	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \
++	rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.dylib *.so i386/*.o i386/*~ \
+ 	   armv4l/*.o armv4l/*~ \
+ 	   mlib/*.o mlib/*~ \
+ 	   alpha/*.o alpha/*~ \
+@@ -269,8 +269,8 @@
+ 	install -s -m 755 $(SLIB) "$(prefix)"
+ else
+ 	install -d $(prefix)/lib
+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
++	install -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION)$(SLIBSUF)
++	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavcodec$(SLIBSUF)
+ 	ldconfig || true
+ endif
+ else
+diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile ./libavcodec/libpostproc/Makefile
+--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavcodec/libpostproc/Makefile	Sun May 11 07:26:35 2003
++++ ./libavcodec/libpostproc/Makefile	Sun Mar 20 23:48:11 2005
+@@ -2,7 +2,11 @@
+ include ../../config.mak
+ 
+ ifeq ($(SHARED_PP),yes)
+-SPPLIB = libpostproc.so
++ifeq ($(CONFIG_DARWIN),yes)
++	SPPLIB = libpostproc
++else
++	SPPLIB = libpostproc.so
++endif
+ SPPVERSION = 0.0.1
+ endif
+ PPLIB = libpostproc.a
+@@ -23,10 +27,10 @@
+ all:    $(SWSLIB) $(PPLIB) $(SPPLIB)
+ 
+ clean:
+-	rm -f *.o *.a *~ *.so
++	rm -f *.o *.a *~ *.so *.dylib
+ 
+ distclean:
+-	rm -f Makefile.bak *.o *.a *~ *.so .depend
++	rm -f Makefile.bak *.o *.a *~ *.so *.dylib .depend
+ 
+ dep:    depend
+ 
+@@ -38,8 +42,13 @@
+ 	$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $<
+ 
+ $(SPPLIB): $(SPPOBJS)
+-	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
+-	-o $(SPPLIB) $(SPPOBJS)
++ifeq ($(CONFIG_DARWIN),yes)
++	$(CC) -dynamiclib -Wl,-install_name,$(SPPLIB).0.dylib \
++	-o $(SPPLIB).dylib $(SPPOBJS)
++else
++	$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
++	-o $(SPPLIB) $(SPPOBJS)
++endif
+ endif
+ 
+ $(PPLIB): $(PPOBJS)
+@@ -50,8 +59,13 @@
+ install: all
+ ifeq ($(SHARED_PP),yes)
+ 	install -d $(prefix)/lib
+-	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
+-	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
++ifeq ($(CONFIG_DARWIN),yes)
++	install -m 755 $(SPPLIB).dylib $(prefix)/lib/$(SPPLIB).$(SPPVERSION).dylib
++	ln -sf $(SPPLIB).$(SPPVERSION).dylib $(prefix)/lib/$(SPPLIB).dylib
++else
++	install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
++	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
++endif
+ 	ldconfig || true
+ 	mkdir -p $(prefix)/include/postproc
+ 	install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavformat/Makefile ./libavformat/Makefile
+--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/libavformat/Makefile	Sat Apr 24 11:16:23 2004
++++ ./libavformat/Makefile	Sun Mar 20 23:48:11 2005
+@@ -18,6 +18,11 @@
+       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
+       sierravmd.o matroska.o
+ 
++CPU = $(shell uname)
++ifeq ($(CPU),Darwin)
++	OBJS+=../libavcodec/libavcodec.dylib
++endif
++
+ ifeq ($(CONFIG_RISKY),yes)
+ OBJS+= asf.o
+ OBJS+= asf-enc.o
+@@ -93,7 +98,7 @@
+ 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
+ 	-lib /machine:i386 /def:$(@:.dll=.def)
+ else
+-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
++	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS)
+ endif
+ 
+ depend: $(SRCS)
+@@ -105,8 +110,8 @@
+ 	install -s -m 755 $(SLIB) "$(prefix)"
+ else
+ 	install -d $(prefix)/lib
+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+-	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
++	install -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION)$(SLIBSUF)
++	ln -sf libavformat-$(VERSION)$(SLIBSUF) $(prefix)/lib/libavformat$(SLIBSUF)
+ 	ldconfig || true
+ endif
+ else
+diff -Naur ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/vhook/Makefile ./vhook/Makefile
+--- ../../../ffmpeg-0.4.9_pre1_old/work/ffmpeg/vhook/Makefile	Thu Jul  8 07:02:04 2004
++++ ./vhook/Makefile	Sun Mar 20 23:48:11 2005
+@@ -5,22 +5,22 @@
+ CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H
+
+ ifeq ($(CONFIG_DARWIN),yes)
+-SHFLAGS+=-flat_namespace -undefined suppress
++SHFLAGS=-bundle -avoid-version -undefined define_a_way 
+ endif
+-HOOKS=null.so fish.so ppm.so
++HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF)
+ 
+ ifeq ($(HAVE_IMLIB2),yes)
+-    HOOKS += imlib2.so
++    HOOKS += imlib2$(SLIBSUF)
+ endif    
+ 
+ ifeq ($(HAVE_FREETYPE2),yes)
+-    HOOKS += drawtext.so
++    HOOKS += drawtext$(SLIBSUF)
+     CFLAGS += `freetype-config --cflags`
+ endif    
+ 
+ all: $(HOOKS) 
+ 
+-SRCS := $(HOOKS:.so=.c)
++SRCS := $(HOOKS:$(SLIBSUF)=.c)
+ 
+ depend: $(SRCS)
+ 	$(CC) -MM $(CFLAGS) $^ 1>.depend
+@@ -29,17 +29,17 @@
+ 	install -d "$(prefix)/lib/vhook"
+ 	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
+ 
+-imlib2.so: imlib2.o
++imlib2$(SLIBSUF): imlib2.o
+ 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
+ 
+-drawtext.so: drawtext.o
++drawtext$(SLIBSUF): drawtext.o
+ 	$(CC) -g -o $@ $(SHFLAGS) $< `freetype-config --libs`
+ 
+-%.so: %.o
++%$(SLIBSUF): %.o
+ 	$(CC) -g -o $@ $(SHFLAGS) $<
+ 
+ clean:
+-	rm -f *.o *.d .depend *.so *~
++	rm -f *.o *.d .depend *$(SLIBSUF) *~
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend