[vlc-devel] commit: contrib: try to work around issue with ffmpeg ppc. ( Derk-Jan Hartman )

[git version control]

vlc | branch: 0.9-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Fri Apr  3 17:58:19 2009 +0200| [e2fc4e71976a969217fe1754456970f8a1fe6726] | committer: Derk-Jan Hartman 

contrib: try to work around issue with ffmpeg ppc.

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

 extras/contrib/src/Makefile                     |    5 ++++-
 extras/contrib/src/Patches/ffmpeg-swscale.patch |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0fbe067..3b7d84c 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1058,7 +1058,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 
 ifdef SVN
 ffmpeg:
-	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 18254
+	$(SVN) co $(FFMPEG_SVN) ffmpeg -r 18328
 ifeq ($(HOST),i586-pc-beos)
 	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -1068,6 +1068,9 @@ endif
 ifdef HAVE_BEOS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
+ifdef HAVE_DARWIN_OS
+        (cd $@; patch -p0 < ../Patches/ffmpeg-swscale.patch)
+endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 endif
diff --git a/extras/contrib/src/Patches/ffmpeg-swscale.patch b/extras/contrib/src/Patches/ffmpeg-swscale.patch
new file mode 100644
index 0000000..6e7a294
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-swscale.patch
@@ -0,0 +1,23 @@
+--- ffmpeg/libswscale/swscale.c	(revision 29136)
++++ ffmpeg/libswscale/swscale.c	(working copy)
+ -1101,8 +1101,7 @@
+ #endif
+ 
+ #if ARCH_PPC
+-#if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
+-#undef COMPILE_C
++#if HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)
+ #define COMPILE_ALTIVEC
+ #endif
+ #endif //ARCH_PPC
+ -1778,8 +1777,8 @@
+ 
+ static SwsFunc getSwsFunc(int flags){
+ 
+-#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL
+-#if ARCH_X86
++#if defined(RUNTIME_CPUDETECT)
++#if ARCH_X86 && CONFIG_GPL
+     // ordered per speed fastest first
+     if (flags & SWS_CPU_CAPS_MMX2)
+         return swScale_MMX2;