[vlc-devel] commit: Compile FFmpeg on PowerPC-based machines without AltiVec support until it is fixed . ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Apr 24 16:28:57 2008 +0200| [bc9eac0a14cfa196d4e8514049f744740cb7a23d]

Compile FFmpeg on PowerPC-based machines without AltiVec support until it is fixed.

The attached patches fixed --disable-altivec for libswscale oO

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc9eac0a14cfa196d4e8514049f744740cb7a23d
---

 extras/contrib/src/Makefile                        |    3 ++
 .../contrib/src/Patches/ffmpeg-fix-noaltivec.patch |   27 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index efe2360..f894366 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -151,6 +151,8 @@ ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
+else
+FFMPEGCONF += --disable-altivec
 endif
 endif
 
@@ -1050,6 +1052,7 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_DARWIN_OS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
+	(cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
 endif
 ifdef NO_TEXT_RELOCATION
 	(cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
diff --git a/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch b/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch
new file mode 100644
index 0000000..8f79780
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-fix-noaltivec.patch
@@ -0,0 +1,27 @@
+Index: swscale.c
+===================================================================
+--- swscale.c	(revision 26515)
++++ swscale.c	(working copy)
+@@ -880,7 +880,7 @@
+ #endif
+ 
+ #ifdef ARCH_POWERPC
+-#if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL)
++#if (defined (HAVE_ALTIVEC)) && defined (CONFIG_GPL)
+ #define COMPILE_ALTIVEC
+ #endif //HAVE_ALTIVEC
+ #endif //ARCH_POWERPC
+@@ -1553,11 +1553,13 @@
+ 
+ #else
+ #ifdef ARCH_POWERPC
++#ifdef COMPILE_ALTIVEC
+     if (flags & SWS_CPU_CAPS_ALTIVEC)
+         return swScale_altivec;
+     else
+         return swScale_C;
+ #endif
++#endif
+     return swScale_C;
+ #endif /* defined(ARCH_X86) */
+ #else //RUNTIME_CPUDETECT