diff --git a/package/rene/ffmpeg/compile.patch b/package/rene/ffmpeg/compile.patch index a8866e42f..75d4d815e 100644 --- a/package/rene/ffmpeg/compile.patch +++ b/package/rene/ffmpeg/compile.patch @@ -1,11 +1,6 @@ - -Well in soem way X11 libs are missing if ffmep is compiled without -imlib2 support - maintainers could also test their stuff ... - - - Rene Rebe - ---- ffmpeg-0.4.8/Makefile 2003-09-28 17:26:39.000000000 +0200 -+++ ffmpeg-0.4.8-fixed/Makefile 2004-04-11 22:58:56.000000000 +0200 +diff -ruN ffmpeg-0.4.9-pre1/Makefile ffmpeg-0.4.9-pre1-new/Makefile +--- ffmpeg-0.4.9-pre1/Makefile 2004-07-08 13:02:04.000000000 +0200 ++++ ffmpeg-0.4.9-pre1-new/Makefile 2004-07-26 12:55:08.261050798 +0200 @@ -14,6 +14,9 @@ LDFLAGS+=-p endif @@ -13,6 +8,6 @@ imlib2 support - maintainers could also test their stuff ... +# ReneR: well the maintainer could also test his ... without imlib2 support +EXTRALIBS+=-L/usr/X11/lib -lX11 + + MANPAGE=$(SRC_PATH)/doc/ffmpeg.1 PROG=ffmpeg$(EXESUF) PROGTEST=output_example$(EXESUF) - diff --git a/package/rene/ffmpeg/ffmpeg.conf b/package/rene/ffmpeg/ffmpeg.conf index 29739bd9d..a8ae69ce1 100644 --- a/package/rene/ffmpeg/ffmpeg.conf +++ b/package/rene/ffmpeg/ffmpeg.conf @@ -23,7 +23,7 @@ # fill options the configure does not attempt to detect ... pkginstalled lame && var_append extraconfopt " " "--enable-mp3lame" pkginstalled ogg-vorbis && var_append extraconfopt " " "--enable-vorbis" -pkginstalled a52dec && var_append extraconfopt " " "--enable-a52" +pkginstalled a52dec && var_append extraconfopt " " "--enable-a52 --enable-gpl" # MMX optimizations currently don't compile (version 0.4.8) var_append confopt " " "--disable-mmx --enable-shared --enable-pp" diff --git a/package/rene/ffmpeg/ffmpeg.desc b/package/rene/ffmpeg/ffmpeg.desc index d81582b58..605db1e3f 100644 --- a/package/rene/ffmpeg/ffmpeg.desc +++ b/package/rene/ffmpeg/ffmpeg.desc @@ -35,8 +35,8 @@ [L] LGPL [S] Stable -[V] 0.4.8 +[V] 0.4.9-pre1 [P] X -?---5---9 142.600 -[D] 2888582040 ffmpeg-0.4.8.tar.gz http://dl.sourceforge.net/sourceforge/ffmpeg/ +[D] 2478774124 ffmpeg-0.4.9-pre1.tar.gz http://dl.sourceforge.net/sourceforge/ffmpeg/ diff --git a/package/rene/ffmpeg/gcc34.patch b/package/rene/ffmpeg/gcc34.patch index 181428166..0bebd6f6f 100644 --- a/package/rene/ffmpeg/gcc34.patch +++ b/package/rene/ffmpeg/gcc34.patch @@ -1,53 +1,7 @@ -add the attribute used to some variables, so gcc 3.4 does not remove them; -gcc 3.2.3 ignores the attribute. - -diff -dur ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/dsputil_mmx.c ---- ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-patch/libavcodec/i386/dsputil_mmx.c 2004-06-14 17:17:20.000000000 +0200 -@@ -29,8 +29,8 @@ - static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL; - static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL; - --static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL; --static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL; -+static const uint64_t ff_pw_20 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0014001400140014ULL; -+static const uint64_t ff_pw_3 __attribute__ ((used)) __attribute__ ((aligned(8))) = 0x0003000300030003ULL; - static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL; - static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL; - -Nur in ffmpeg-0.4.8-patch/libavcodec/i386: dsputil_mmx.c~. -diff -dur ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/motion_est_mmx.c ---- ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-patch/libavcodec/i386/motion_est_mmx.c 2004-06-14 17:13:55.000000000 +0200 -@@ -26,7 +26,7 @@ - 0x0002000200020002, - }; - --static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; -+static __attribute__ ((used)) __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL; - - static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) - { -Nur in ffmpeg-0.4.8-patch/libavcodec/i386: motion_est_mmx.c~. -diff -dur ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c ffmpeg-0.4.8-patch/libavcodec/i386/simple_idct_mmx.c ---- ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-patch/libavcodec/i386/simple_idct_mmx.c 2004-06-14 17:17:47.000000000 +0200 -@@ -45,8 +45,8 @@ - #define ROW_SHIFT 11 - #define COL_SHIFT 20 // 6 - --static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL; --static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL; -+static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL; -+static const uint64_t __attribute__ ((used)) __attribute__((aligned(8))) d40000= 0x0000000000040000ULL; - - static const int16_t __attribute__((aligned(8))) coeffs[]= { - 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0, -Nur in ffmpeg-0.4.8-patch/libavcodec/i386: simple_idct_mmx.c~. -diff -dur ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.8-patch/libavcodec/liba52/resample_mmx.c ---- ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-patch/libavcodec/liba52/resample_mmx.c 2004-06-14 16:53:43.000000000 +0200 -@@ -7,10 +7,11 @@ +diff -ruN ffmpeg-0.4.9-pre1/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.9-pre1-patch/libavcodec/liba52/resample_mmx.c +--- ffmpeg-0.4.9-pre1/libavcodec/liba52/resample_mmx.c 2003-04-16 22:03:07.000000000 +0200 ++++ ffmpeg-0.4.9-pre1-patch/libavcodec/liba52/resample_mmx.c 2004-07-21 08:35:46.066975912 +0200 +@@ -7,10 +7,10 @@ and it would mean (C / MMX2 / MMX / 3DNOW) versions */ @@ -55,27 +9,10 @@ diff -dur ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.8-patch/libav -static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -+static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+ ++static uint64_t magicF2W attribute_used __attribute__((aligned(8))) = 0x43c0000043c00000LL; ++static uint64_t wm1010 attribute_used __attribute__((aligned(8))) = 0xFFFF0000FFFF0000LL; ++static uint64_t wm0101 attribute_used __attribute__((aligned(8))) = 0x0000FFFF0000FFFFLL; ++static uint64_t wm1100 attribute_used __attribute__((aligned(8))) = 0xFFFFFFFF00000000LL; static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ int32_t * f = (int32_t *) _f; -Nur in ffmpeg-0.4.8-patch/libavcodec/liba52: resample_mmx.c~. -diff -dur ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c ffmpeg-0.4.8-patch/libavcodec/libpostproc/postprocess.c ---- ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-patch/libavcodec/libpostproc/postprocess.c 2004-06-14 17:15:07.000000000 +0200 -@@ -104,8 +104,8 @@ - //#define NUM_BLOCKS_AT_ONCE 16 //not used yet - - #ifdef ARCH_X86 --static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; --static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; -+static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w05= 0x0005000500050005LL; -+static uint64_t __attribute__ ((used)) __attribute__((aligned(8))) w20= 0x0020002000200020LL; - static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; - static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; - static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; -Nur in ffmpeg-0.4.8-patch/libavcodec/libpostproc: postprocess.c~.