[Frugalware-darcs] frugalware-current: ffmpeg-20050806-1-x86_64
Christian Hamar alias krix
krics at linuxforum.hu
Tue Aug 9 12:51:12 CEST 2005
Tue Aug 9 12:16:47 CEST 2005 Christian Hamar alias krix <krics at linuxforum.hu>
* ffmpeg-20050806-1-x86_64
* Version bump to snapshot
* md5sum -> sha1sum
* Added some options. Reworked old style build
* Fixed depends()
* Removed two unneccesarry patch (gcc4 and fpic patch)
* That's all folks :)
diff -rN -u old-frugalware-current-3/source/multimedia/ffmpeg/ffmpeg-fpic.patch new-frugalware-current/source/multimedia/ffmpeg/ffmpeg-fpic.patch
--- old-frugalware-current-3/source/multimedia/ffmpeg/ffmpeg-fpic.patch 2005-08-09 12:50:11.000000000 +0200
+++ new-frugalware-current/source/multimedia/ffmpeg/ffmpeg-fpic.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-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 2004-06-18 13:11:15.000000000 +0000
-+++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2005-06-02 09:53:48.000000000 +0000
-@@ -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= common.o utils.o mem.o allcodecs.o \
- mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavformat/Makefile ffmpeg-0.4.9-pre1/libavformat/Makefile
---- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2004-04-24 15:16:23.000000000 +0000
-+++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2005-06-02 09:53:57.000000000 +0000
-@@ -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 -rN -u old-frugalware-current-3/source/multimedia/ffmpeg/ffmpeg-gcc4.patch new-frugalware-current/source/multimedia/ffmpeg/ffmpeg-gcc4.patch
--- old-frugalware-current-3/source/multimedia/ffmpeg/ffmpeg-gcc4.patch 2005-08-09 12:50:11.000000000 +0200
+++ new-frugalware-current/source/multimedia/ffmpeg/ffmpeg-gcc4.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/ac3.h ffmpeg-0.4.9-pre1/libavcodec/ac3.h
---- ffmpeg-0.4.9-pre1.orig/libavcodec/ac3.h 2005-08-07 20:09:52.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/ac3.h 2005-08-07 20:10:09.000000000 +0200
-@@ -43,6 +43,7 @@
- int cplfleak, cplsleak;
- } AC3BitAllocParameters;
-
-+#if 0
- extern const uint16_t ac3_freqs[3];
- extern const uint16_t ac3_bitratetab[19];
- extern const int16_t ac3_window[256];
-@@ -52,6 +53,7 @@
- extern const uint16_t dbkneetab[4];
- extern const uint16_t floortab[8];
- extern const uint16_t fgaintab[8];
-+#endif
-
- void ac3_common_init(void);
- void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
---- ffmpeg-0.4.9-pre1.orig/libavcodec/avcodec.h 2005-08-07 20:09:52.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h 2005-08-07 20:09:59.000000000 +0200
-@@ -1657,6 +1657,13 @@
- #define FF_OPT_MAX_DEPTH 10
- } AVOption;
-
-+#ifdef HAVE_MMX
-+extern const struct AVOption avoptions_common[3 + 5];
-+#else
-+extern const struct AVOption avoptions_common[3];
-+#endif
-+extern const struct AVOption avoptions_workaround_bug[11];
-+
- /**
- * Parse option(s) and sets fields in passed structure
- * @param strct structure where the parsed results will be written
-diff -Naur ffmpeg-0.4.9-pre1.orig/libavcodec/common.h ffmpeg-0.4.9-pre1/libavcodec/common.h
---- ffmpeg-0.4.9-pre1.orig/libavcodec/common.h 2005-08-07 20:09:52.000000000 +0200
-+++ ffmpeg-0.4.9-pre1/libavcodec/common.h 2005-08-07 20:09:59.000000000 +0200
-@@ -62,14 +62,6 @@
- #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
- #define AVOPTION_END() AVOPTION_SUB(NULL)
-
--struct AVOption;
--#ifdef HAVE_MMX
--extern const struct AVOption avoptions_common[3 + 5];
--#else
--extern const struct AVOption avoptions_common[3];
--#endif
--extern const struct AVOption avoptions_workaround_bug[11];
--
- #endif /* HAVE_AV_CONFIG_H */
-
- /* Suppress restrict if it was not defined in config.h. */
diff -rN -u old-frugalware-current-3/source/multimedia/ffmpeg/FrugalBuild new-frugalware-current/source/multimedia/ffmpeg/FrugalBuild
--- old-frugalware-current-3/source/multimedia/ffmpeg/FrugalBuild 2005-08-09 12:50:11.000000000 +0200
+++ new-frugalware-current/source/multimedia/ffmpeg/FrugalBuild 2005-08-09 12:11:05.000000000 +0200
@@ -1,65 +1,55 @@
-# Last Modified: Sun, 07 Aug 2005 20:30:02 +0200
+# Last Modified: Tue, 09 Aug 2005 12:09:02 +0200
# Compiling Time: ~1 SBU
# Maintainer: voroskoi <voroskoi at freemail.hu>
pkgname=ffmpeg
-pkgver=0.4.9_pre1
-origver=`echo $pkgver |sed 's/_/-/'`
-pkgrel=4
+pkgver=20050806
+pkgrel=1
pkgdesc="FFMpeg is a complete and free Internet live audio and vide broadcasting solution for Linux/Unix"
url="http://ffmpeg.sourceforge.net/"
-depends=('sdl' 'a52dec' 'freetype2' 'lame' 'faac' 'imlib2' 'libvorbis' 'libdc1394')
+depends=('sdl' 'a52dec' 'freetype2' 'lame' 'faac' 'imlib2' 'libvorbis' 'libdc1394' \
+ 'xvidcore' 'libtheora')
groups=('multimedia')
archs=('i686' 'x86_64')
-up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=16082 |grep ffmpeg.*tar |sed -n -e 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;1 p'"
-source=(http://heanet.dl.sourceforge.net/sourceforge/ffmpeg/$pkgname-$origver.tar.gz \
- ffmpeg-0.4.9-pre1-misc-fixes.patch ffmpeg-fpic.patch \
- ffmpeg-gcc4.patch ffmpeg-config.patch)
-sha1sums=('aad00445137520bec19e56bcb042e75a10c53bb3' \
- '01558bef688fc72587911805eda350742d5c2fb0' \
- 'fe5e3f3d6ba7401f847e79fcf920eff4fb5ea8d4' \
- 'b962d239f22f5817a6f476daf83f986632eee220' \
- '2d55fb081b7b9e3be5912da36b8eda463ebab85a')
+#up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=16082 |grep ffmpeg.*tar |sed -n -e 's/.*g-\(.*\)\.t.*/\1/;s/-/_/;1 p'"
+source=(http://www2.mplayerhq.hu/MPlayer/cvs/`echo $pkgname | sed 's/ffm/FFM/'`-$pkgver.tar.bz2 \
+ ffmpeg-0.4.9-pre1-misc-fixes.patch ffmpeg-config.patch)
+sha1sums=('fa758c9bf6c59eb8a42e30c35b4d16d0c0aedc5d' \
+ '01558bef688fc72587911805eda350742d5c2fb0' \
+ '2d55fb081b7b9e3be5912da36b8eda463ebab85a')
build() {
- cd $startdir/src/$pkgname-$origver
- mkdir -p $startdir/pkg/usr/bin
- Fpatch ffmpeg-0.4.9-pre1-misc-fixes.patch || return 1
- [ "$CARCH" == "x86_64" ] && Fpatch ffmpeg-fpic.patch
- Fpatch ffmpeg-gcc4.patch
- Fpatch ffmpeg-config.patch
- Fsed "@VERSION@" "$pkgver" ffmpeg-config.in
-
- # ffmpeg itself:
- ./configure \
- --prefix=/usr \
- --enable-gpl \
- --enable-mp3lame \
- --enable-vorbis \
- --enable-pp \
- --enable-faac \
- --enable-faad \
- --enable-a52 \
- --enable-shared \
- --enable-pthreads
- make || return 1
- make prefix=$startdir/pkg/usr bindir=$startdir/pkg/usr/bin mandir=$startdir/pkg/usr/man install
- Fexerel ffmpeg-config.in /usr/bin/ffmpeg-config || return 1
- Ffilerel ffmpeg-config.1 /usr/man/man1/ffmpeg-config.1 || return 1
-
- (chmod +x $Fdestdir/usr/bin/ffmpeg-config)
-
- # libpostproc
- cd $startdir/src/$pkgname-$origver/libavcodec/libpostproc
- # libpostproc.a:
- make || return 1
- make prefix=$startdir/pkg/usr install || return 1
-
- # libpostproc.so:
- make SHARED_PP="yes" || return 1
- make prefix=$startdir/pkg/usr \
- SHARED_PP="yes" \
- install || return 1
+ Fcd `echo $pkgname | sed 's/ffm/FFM/'`-$pkgver
+ Fmkdir usr/bin
+ Fpatch ffmpeg-0.4.9-pre1-misc-fixes.patch
+ Fpatch ffmpeg-config.patch
+ Fsed "@VERSION@" "$pkgver" ffmpeg-config.in
+
+ Fmake --enable-gpl \
+ --enable-mp3lame \
+ --enable-vorbis \
+ --enable-pp \
+ --enable-faac \
+ --enable-faad \
+ --enable-a52 \
+ --enable-shared \
+ --enable-pthreads \
+ --enable-libogg \
+ --enable-theora \
+ --enable-xvid \
+ --enable-a52 \
+ --enable-shared-pp \
+ --enable-shared
+
+ Fmakeinstall prefix=$Fdestdir/usr \
+ bindir=$Fdestdir/usr/bin \
+ libdir=$Fdestdir/usr/lib \
+ mandir=$Fdestdir/usr/man\
+ SHARED_PP="yes"
+ Fexerel ffmpeg-config.in /usr/bin/ffmpeg-config || return 1
+ Ffilerel ffmpeg-config.1 /usr/share/man/man1/ffmpeg-config.1 || return 1
+
+ (chmod +x $Fdestdir/usr/bin/ffmpeg-config)
}
# vim: ft=sh
More information about the Frugalware-darcs
mailing list