[Frugalware-darcs] frugalware-current: ffmpeg-20060904-1-i686

[voroskoi]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20060904204340-dd049-bf9797d009a01222bf1e5cfe1de00ace16bb917f.gz;

[ffmpeg-20060904-1-i686
voroskoi <voroskoi at frugalware.org>**20060904204340
 version bump
 removed a52dec patch
 removed dc1394 support as it doesn't work with 2.x version
 updated depends()
 some change in build()
] {
hunk ./source/multimedia/ffmpeg/ffmpeg-0.4.9-pre1-misc-fixes.patch 1
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile ffmpeg-0.4.9-pre1/libavcodec/Makefile
---- ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile	2005-06-02 09:37:57.000000000 +0000
-+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile	2005-06-02 09:46:09.000000000 +0000
-@@ -68,8 +68,9 @@
- 
- # using builtin liba52 or runtime linked liba52.so.0
- 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
-+#OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
-+#	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
-+EXTRALIBS += -la52
- endif
- endif
- 
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/a52dec.c ffmpeg-0.4.9-pre1/libavcodec/a52dec.c
---- ffmpeg-0.4.9-pre1.orig/libavcodec/a52dec.c	2005-06-02 09:37:57.000000000 +0000
-+++ ffmpeg-0.4.9-pre1/libavcodec/a52dec.c	2005-06-02 09:46:21.000000000 +0000
-@@ -23,7 +23,7 @@
-  */
- 
- #include "avcodec.h"
--#include "liba52/a52.h"
-+#include <a52dec/a52.h>
- 
- #ifdef CONFIG_A52BIN
- #include <dlfcn.h>
rmfile ./source/multimedia/ffmpeg/ffmpeg-0.4.9-pre1-misc-fixes.patch
hunk ./source/multimedia/ffmpeg/FrugalBuild 1
-# Last Modified: Tue, 09 May 2006 16:06:38 +0200
+# Last Modified: Mon, 04 Sep 2006 22:41:36 +0200
hunk ./source/multimedia/ffmpeg/FrugalBuild 6
-pkgver=20060427
-pkgrel=2
+pkgver=20060904
+pkgrel=1
hunk ./source/multimedia/ffmpeg/FrugalBuild 10
-depends=('a52dec' 'freetype2' 'lame' 'faac' 'libvorbis' 'libdc1394' 'xvidcore' 'libtheora' 'libdca' 'x264')
+depends=('a52dec' 'lame' 'faac' 'x264' 'libvorbis' 'xvidcore' 'zlib' 'libdca')
+makedepends=('freetype2' 'imlib2')
hunk ./source/multimedia/ffmpeg/FrugalBuild 15
-source=(ftp://ftp.frugalware.org/pub/frugalware/frugalware-current/source/multimedia/ffmpeg/$pkgname-$pkgver.tar.bz2 \
-	ffmpeg-0.4.9-pre1-misc-fixes.patch)
-sha1sums=('a5b64a86c80afc0e3a8887c9ab5de2476921c8d9' \
-	'8dc371bf720e2074e17b7ccfa5d0be8760e0b3fc')
+source=(ftp://ftp.frugalware.org/pub/frugalware/frugalware-current/source/multimedia/ffmpeg/$pkgname-$pkgver.tar.bz2)
+_F_cd_path=ffmpeg
+sha1sums=('04b276c58b9b816899cf37cc924f579b403e9743')
hunk ./source/multimedia/ffmpeg/FrugalBuild 21
-	Fpatch ffmpeg-0.4.9-pre1-misc-fixes.patch
-	Fmake --enable-gpl \
+	Fconf --enable-gpl \
hunk ./source/multimedia/ffmpeg/FrugalBuild 25
-		--enable-pp \
hunk ./source/multimedia/ffmpeg/FrugalBuild 27
-		--enable-a52 \
-		--enable-pthreads \
-		--enable-libogg \
-		--enable-theora \
+		--enable-faadbin \
hunk ./source/multimedia/ffmpeg/FrugalBuild 29
+		--enable-x264 \
+		--enable-a52 \
+		--enable-a52bin \
+		--enable-dts \
hunk ./source/multimedia/ffmpeg/FrugalBuild 35
-		--enable-dts \
-		--enable-x264
-	Fmakeinstall prefix=$Fdestdir/usr \
-		     bindir=$Fdestdir/usr/bin \
-		     libdir=$Fdestdir/usr/lib \
-		     mandir=$Fdestdir/usr/man \
-		     incdir=$Fdestdir/usr/include/ffmpeg \
-		     SHARED_PP="yes"
+		--enable-pp \
+		--enable-pthreads \
+		--disable-opts
+	make SHARED_PP="yes" || Fdie
+	make DESTDIR=$Fdestdir install || Fdie
hunk ./source/multimedia/ffmpeg/FrugalBuild 42
+# TODO: --enable-libgsm, --enable-dc1394
+
}