[Lunar-commits] r16748 - moonbase/trunk/video/ffmpeg

[Chad Kittel]

Author: v3rt1g0
Date: 2005-10-01 14:42:51 +0000 (Sat, 01 Oct 2005)
New Revision: 16748

Added:
   moonbase/trunk/video/ffmpeg/0.4.8-gcc3.4-magicF2W.patch
Modified:
   moonbase/trunk/video/ffmpeg/BUILD
   moonbase/trunk/video/ffmpeg/DETAILS
Log:
Added patch to allow ffmpeg (with the a52 optional depends) compile withg gcc 
3.4.4.  Once again, Thanx gentwo!

Same thing about the patch file, someone knows/cares to move it, go for it!


Added: moonbase/trunk/video/ffmpeg/0.4.8-gcc3.4-magicF2W.patch
===================================================================
--- moonbase/trunk/video/ffmpeg/0.4.8-gcc3.4-magicF2W.patch	2005-10-01 14:26:45 UTC (rev 16747)
+++ moonbase/trunk/video/ffmpeg/0.4.8-gcc3.4-magicF2W.patch	2005-10-01 14:42:51 UTC (rev 16748)
@@ -0,0 +1,18 @@
+--- libavcodec/liba52/resample_mmx.c	2004/05/01 14:38:45	1.1
++++ libavcodec/liba52/resample_mmx.c	2004/05/01 14:58:39
+@@ -7,10 +7,10 @@
+ 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
+ */
+ 
+-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
+-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 int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
+     int32_t * f = (int32_t *) _f;
+

Modified: moonbase/trunk/video/ffmpeg/BUILD
===================================================================
--- moonbase/trunk/video/ffmpeg/BUILD	2005-10-01 14:26:45 UTC (rev 16747)
+++ moonbase/trunk/video/ffmpeg/BUILD	2005-10-01 14:42:51 UTC (rev 16748)
@@ -1,9 +1,10 @@
 (
-  ./configure --prefix=/usr    \
-              --enable-gpl     \
-	      --enable-shared  \
-              $OPTS           &&
-  default_make                &&
+
+  patch_it  $SCRIPT_DIRECTORY/0.4.8-gcc3.4-magicF2W.patch  0  &&
+
+  OPTS="$OPTS  --enable-gpl  --enable-shared"
+
+  default_build  &&
   make installlib
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/video/ffmpeg/DETAILS
===================================================================
--- moonbase/trunk/video/ffmpeg/DETAILS	2005-10-01 14:26:45 UTC (rev 16747)
+++ moonbase/trunk/video/ffmpeg/DETAILS	2005-10-01 14:42:51 UTC (rev 16748)
@@ -1,9 +1,9 @@
           MODULE=ffmpeg
          VERSION=0.4.9-pre1
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL=$SFORGE_URL/$MODULE/
-     SOURCE_VFY=sha1:aad00445137520bec19e56bcb042e75a10c53bb3
-       WEB_SITE=http://ffmpeg.sourceforge.net/
+      SOURCE_URL=$SFORGE_URL/$MODULE/
+      SOURCE_VFY=sha1:aad00445137520bec19e56bcb042e75a10c53bb3
+        WEB_SITE=http://ffmpeg.sourceforge.net/
          ENTERED=20020327
          UPDATED=20050308
            SHORT="ffmpeg is an avi decoder"