Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6c7faff59bd3ffaac6ef8996e0fee13aa8910e0
commit e6c7faff59bd3ffaac6ef8996e0fee13aa8910e0 Author: voroskoi <[EMAIL PROTECTED]> Date: Mon Apr 28 02:16:47 2008 +0200 ffmpeg-20080427-1-x86_64 version bump diff --git a/source/xmultimedia/ffmpeg/FrugalBuild b/source/xmultimedia/ffmpeg/FrugalBuild index 8c83273..7ceffd0 100644 --- a/source/xmultimedia/ffmpeg/FrugalBuild +++ b/source/xmultimedia/ffmpeg/FrugalBuild @@ -1,53 +1,49 @@ -# Compiling Time: 0.71 SBU +# Compiling Time: 2.17 SBU # Maintainer: voroskoi <[EMAIL PROTECTED]> pkgname=ffmpeg -pkgver=20070422 -pkgrel=3 -pkgdesc="FFMpeg is a complete and free Internet live audio and vide broadcasting solution for Linux/Unix" +pkgver=20080427 +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=('a52dec' 'lame' 'faac' 'x264>=20070421' 'libvorbis' 'xvidcore' 'zlib' 'sdl' 'libtheora' 'libdca>=0.0.5' 'faad2' 'imlib2' 'amrnb' 'amrwb') +depends=('a52dec' 'lame' 'faac' 'x264>=20080426' 'libvorbis' 'xvidcore' 'zlib' 'sdl' 'libtheora' 'libdca>=0.0.5' 'faad2' 'imlib2' 'amrnb' 'amrwb' 'libdc1394') +depends=('a52dec' 'amrnb' 'amrwb' 'faac' 'lame' 'libtheora' 'libvorbis' 'x264>=20080426' 'xvidcore' 'libdc1394' 'imlib2' 'sdl' 'faad2') makedepends=('freetype2') groups=('xmultimedia') archs=('i686' 'x86_64') up2date=$pkgver -source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2 \ - libdca.patch hack-C++_macro.patch ffmpeg-0.4.9_p20070330-asmpic.patch) -_F_cd_path="$pkgname" +source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('d3e42f4e307f5ed83ed877421b8f16f9c74c046b') -build() -{ +# TODO: --enable-libgsm + +build() { + unset MAKEFLAGS Fpatchall - export CFLAGS="$CFLAGS -fno-strict-aliasing" Fconf \ --enable-gpl \ + --enable-nonfree \ + --enable-swscale \ --enable-libmp3lame \ - --enable-libogg \ --enable-libvorbis \ --enable-libtheora \ --enable-libfaac \ --enable-libfaad \ --enable-libfaadbin \ - --enable-xvid \ - --enable-x264 \ + --enable-libx264 \ + --enable-libxvid \ --enable-liba52 \ --enable-liba52bin \ - --enable-libdts \ + --enable-libdc1394 \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-libamr_nb \ + --enable-libamr_wb \ --enable-shared \ --disable-static \ - --enable-pp \ - --enable-pthreads \ - --disable-opts \ - --enable-amr_nb \ - --enable-amr_wb + --enable-pthreads make SHARED_PP="yes" || Fdie make DESTDIR=$Fdestdir install || Fdie } -# TODO: --enable-libgsm, --enable-dc1394 - -sha1sums=('333fc628ed6c62516a8ba5e465c82873f537e833' \ - 'ea838ccb1ac73f52b30d86283b6a746b8eda6ffd' \ - '05aee0b5b7afcc9fbbb966f753b0366972da9d8c' \ - '1a60ea4599324bb29be2de818ee126804203b060') # optimization OK diff --git a/source/xmultimedia/ffmpeg/ffmpeg-0.4.9_p20070330-asmpic.patch b/source/xmultimedia/ffmpeg/ffmpeg-0.4.9_p20070330-asmpic.patch deleted file mode 100644 index 0cf16c3..0000000 --- a/source/xmultimedia/ffmpeg/ffmpeg-0.4.9_p20070330-asmpic.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: ffmpeg/libavcodec/cabac.h -=================================================================== ---- ffmpeg.orig/libavcodec/cabac.h -+++ ffmpeg/libavcodec/cabac.h -@@ -376,7 +376,7 @@ static int av_always_inline get_cabac_in - #define BYTE "16" - #define BYTEEND "20" - #endif --#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) -+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__)) - int bit; - - #ifndef BRANCHLESS_CABAC_DECODER -@@ -680,7 +680,7 @@ static av_always_inline int get_cabac_by - - //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!) - //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard) --#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) -+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__)) - static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){ - void *end= significant_coeff_ctx_base + max_coeff - 1; - int minusstart= -(int)significant_coeff_ctx_base; -Index: ffmpeg/libavcodec/h264.c -=================================================================== ---- ffmpeg.orig/libavcodec/h264.c -+++ ffmpeg/libavcodec/h264.c -@@ -6111,7 +6111,7 @@ static int decode_cabac_residual( H264Co - index[coeff_count++] = last;\ - } - const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; --#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) -+#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) && !(defined(PIC) && defined(__GNUC__)) - coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, sig_off); - } else { - coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index); diff --git a/source/xmultimedia/ffmpeg/hack-C++_macro.patch b/source/xmultimedia/ffmpeg/hack-C++_macro.patch deleted file mode 100644 index 6bc4e39..0000000 --- a/source/xmultimedia/ffmpeg/hack-C++_macro.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: libavutil/common.h -=================================================================== ---- libavutil/common.h (revision 8304) -+++ libavutil/common.h (working copy) -@@ -26,6 +26,12 @@ - #ifndef COMMON_H - #define COMMON_H - -+#ifdef __cplusplus -+#ifndef __STDC_CONSTANT_MACROS -+#define __STDC_CONSTANT_MACROS -+#endif -+#endif -+ - #include <inttypes.h> - - #ifdef HAVE_AV_CONFIG_H diff --git a/source/xmultimedia/ffmpeg/libdca.patch b/source/xmultimedia/ffmpeg/libdca.patch deleted file mode 100644 index eadad22..0000000 --- a/source/xmultimedia/ffmpeg/libdca.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ffmpeg/configure ffmpeg-p/configure ---- ffmpeg/configure 2007-04-22 14:34:15.000000000 +0200 -+++ ffmpeg-p/configure 2007-04-22 23:06:08.000000000 +0200 -@@ -1583,7 +1583,7 @@ - enabled amr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm - enabled amr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm - enabled liba52 && require liba52 a52dec/a52.h a52_init -la52 --enabled libdts && require libdts dts.h dts_init -ldts -lm -+enabled libdts && require libdts dts.h dca_init $(pkg-config --libs libdts) -lm - enabled libgsm && require libgsm gsm.h gsm_create -lgsm - enabled libmp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm - enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
