ffmpeg.diff

ffmpeg.diff (text/plain), 6.44 KB, created by Rene Wagner on 2003-01-01 16:06:54 UTC

diff -urN /usr/portage/media-video/ffmpeg/ChangeLog ./ChangeLog
--- /usr/portage/media-video/ffmpeg/ChangeLog	2002-12-14 20:38:32.000000000 +0100
+++ ./ChangeLog	2003-01-01 23:00:21.000000000 +0100
@@ -2,6 +2,14 @@
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
 # $Header: /home/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.8 2002/12/14 19:38:32 method Exp $
 
+*ffmpeg-0.4.6 (DD MMM YYYY)
+
+  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> ffmpeg-0.4.6.ebuild, files/ffmpeg-0.4.6-Makefiles.diff :
+  New version. Now the complete ffmpeg package is installed (including 
+  libavcodec). Updated description to reflect those changes.
+  Updated ebuild and Makefiles-patch submitted by Rene Wagner <[e-mail]>.
+  Fixes #13048.
+
 *ffmpeg-0.4.5.20021212 (13 Dec 2002)
 
   14 Dec 2002; Joshua Brindle <[e-mail]> ffmpeg-0.4.5.20021212.ebuild :
diff -urN /usr/portage/media-video/ffmpeg/ffmpeg-0.4.6.ebuild ./ffmpeg-0.4.6.ebuild
--- /usr/portage/media-video/ffmpeg/ffmpeg-0.4.6.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ ./ffmpeg-0.4.6.ebuild	2003-01-01 22:45:57.000000000 +0100
@@ -0,0 +1,57 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /home/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.5.20021212.ebuild,v 1.3 2002/12/14 19:38:32 method Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+SRC_URI="mirror://sourceforge/ffmpeg/${P}.tar.gz"
+HOMEPAGE="http://ffmpeg.sourceforge.net/"
+
+IUSE="mmx encode oggvorbis doc"
+
+inherit flag-o-matic
+filter-flags -fforce-addr
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc "
+
+DEPEND="x86? ( dev-lang/nasm )
+		encode? ( >=media-sound/lame-3.92 )
+		oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
+		doc? ( >=app-text/texi2html-1.64 )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S}
+
+	# ffmpeg doesn't use autoconf (etc.), so...
+	patch -p0 < ${FILESDIR}/${P}-Makefiles.diff || die \
+		"Patch #1 failed."
+}
+
+src_compile() {
+	local myconf
+
+	use x86 && use mmx || myconf="--disable-mmx"
+	use encode && myconf="${myconf} --enable-mp3lame"
+	use oggvorbis && myconf="${myconf} --enable-vorbis"
+
+	./configure ${myconf} \
+		--prefix=/usr \
+		--enable-shared || die "./configure failed."
+	make || die "make failed"
+	use doc && make -C doc all || die "make all in ./doc failed."
+}
+
+src_install() {
+	einstall || die "Installation failed."
+	dosym /usr/bin/ffmpeg /usr/bin/ffplay
+	dosym /usr/lib/libavcodec-${P/${PN}-/}.so /usr/lib/libavcodec.so
+
+	dodoc COPYING CREDITS Changelog INSTALL README
+	docinto doc
+	dodoc doc/TODO doc/*.html doc/*.texi
+	insinto /etc
+	doins doc/ffserver.conf
+}
diff -urN /usr/portage/media-video/ffmpeg/files/ffmpeg-0.4.6-Makefiles.diff ./files/ffmpeg-0.4.6-Makefiles.diff
--- /usr/portage/media-video/ffmpeg/files/ffmpeg-0.4.6-Makefiles.diff	1970-01-01 01:00:00.000000000 +0100
+++ ./files/ffmpeg-0.4.6-Makefiles.diff	2002-12-29 09:17:46.000000000 +0100
@@ -0,0 +1,93 @@
+diff -urN ../ffmpeg-0.4.6.orig/Makefile ./Makefile
+--- ../ffmpeg-0.4.6.orig/Makefile	2002-12-27 15:35:45.000000000 +0100
++++ ./Makefile	2002-12-29 09:15:33.000000000 +0100
+@@ -78,20 +78,16 @@
+ 	$(MAKE) -C vhook all
+ 
+ install: all $(INSTALLVHOOK)
+-	$(MAKE) -C libavcodec install
+-	install -d $(prefix)/bin
+-	install -s -m 755 $(PROG) $(prefix)/bin
+-	ln -sf ffmpeg $(prefix)/bin/ffplay 
++	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) install
++	install -d $(DESTDIR)$(prefix)/bin
++	install -s -m 755 $(PROG) $(DESTDIR)$(prefix)/bin 
+ 
+-install-vhook: $(prefix)/lib/vhook
+-	$(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
+-
+-$(prefix)/lib/vhook:
+-	install -d $@
++install-vhook:
++	$(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
+ 
+ installlib:
+-	$(MAKE) -C libavcodec installlib
+-	$(MAKE) -C libavformat installlib
++	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
++	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib
+ 
+ dep:	depend
+ 
+diff -urN ../ffmpeg-0.4.6.orig/libavcodec/Makefile ./libavcodec/Makefile
+--- ../ffmpeg-0.4.6.orig/libavcodec/Makefile	2002-12-27 15:35:45.000000000 +0100
++++ ./libavcodec/Makefile	2002-12-29 09:17:08.000000000 +0100
+@@ -179,20 +179,18 @@
+ 
+ install: all
+ ifeq ($(BUILD_SHARED),yes)
+-	install -d $(prefix)/lib
+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
+-	ldconfig || true
+-	mkdir -p $(prefix)/include/ffmpeg
+-	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
+-	install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
++	install -d $(DESTDIR)$(prefix)/lib
++	install -s -m 755 $(SLIB) $(DESTDIR)$(prefix)/lib/libavcodec-$(VERSION).so
++	install -d $(DESTDIR)$(prefix)/include/ffmpeg
++	install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
++	install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
+ endif
+ 
+ installlib: all
+-	install -m 644 $(LIB) $(prefix)/lib
+-	mkdir -p $(prefix)/include/ffmpeg
++	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
++	install -d $(DESTDIR)$(prefix)/include/ffmpeg
+ 	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
+-                $(prefix)/include/ffmpeg
++                $(DESTDIR)$(prefix)/include/ffmpeg
+ 
+ #
+ # include dependency files if they exist
+diff -urN ../ffmpeg-0.4.6.orig/libavformat/Makefile ./libavformat/Makefile
+--- ../ffmpeg-0.4.6.orig/libavformat/Makefile	2002-12-27 15:35:47.000000000 +0100
++++ ./libavformat/Makefile	2002-12-29 07:54:08.000000000 +0100
+@@ -54,12 +54,12 @@
+ 	$(RANLIB) $@
+ 
+ installlib: all
+-	install -m 644 $(LIB) $(prefix)/lib
+-	mkdir -p $(prefix)/include/ffmpeg
++	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
++	install -d $(DESTDIR)$(prefix)/include/ffmpeg
+ 	install -m 644 $(SRC_PATH)/libav/avformat.h $(SRC_PATH)/libav/avio.h \
+                 $(SRC_PATH)/libav/rtp.h $(SRC_PATH)/libav/rtsp.h \
+                 $(SRC_PATH)/libav/rtspcodes.h \
+-                $(prefix)/include/ffmpeg
++                $(DESTDIR)$(prefix)/include/ffmpeg
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) -c -o $@ $< 
+diff -urN ../ffmpeg-0.4.6.orig/vhook/Makefile ./vhook/Makefile
+--- ../ffmpeg-0.4.6.orig/vhook/Makefile	2002-12-27 15:35:47.000000000 +0100
++++ ./vhook/Makefile	2002-12-29 08:25:17.000000000 +0100
+@@ -16,6 +16,7 @@
+ all: $(HOOKS) 
+ 
+ install:
++	install -d $(INSTDIR)
+ 	install -s -m 755 $(HOOKS) $(INSTDIR)
+ 
+ imlib2.so: imlib2.o