X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=272d2c00e025748c3ad20c1fe79b8f7afaea0113;hb=487e5becc186ab7a683eda5c74b5bfceb412eadf;hp=7915aabb6cb9d3f41b472b71102060b26ba4ef6e;hpb=214c93b4fa077dc94411d30f753317ca3bc9b57f;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7915aabb6c..272d2c00e0 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -148,6 +148,9 @@ ifdef HAVE_DARWIN_OS
 X264CONF += --enable-pic
 FFMPEGCONF += --cc=$(CC)
 FFMPEGCONF += --arch=$(ARCH)
+ifdef HAVE_DARWIN_10
+FFMPEGCONF += --cpu=core2
+endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
@@ -1086,9 +1089,8 @@ ifdef HAVE_BEOS
 endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
-endif
-ifdef HAVE_DARWIN_OS
-	(cd $@; patch -p0 < ../Patches/ffmpeg-swscale.patch)
+else
+	(cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
@@ -1349,9 +1351,6 @@ ifdef HAVE_DARWIN_OS
 	#remove me at next libcaca upgrade
 	patch -p0 < Patches/caca_driver_cocoa.diff
 	patch -p0 < Patches/caca_macosx.diff
-ifndef HAVE_DARWIN_OS_ON_INTEL
-	patch -p0 < Patches/caca-osx-ppc.patch
-endif
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
@@ -2492,7 +2491,13 @@ liboil: liboil-$(OIL_VERSION).tar.gz
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
+else
+	patch -p0 < Patches/liboil-ppc.patch
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -force_cpusubtype_ALL")
+	patch -p0 < Patches/liboil-ppc-hack.patch
+endif
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
 endif
@@ -2512,7 +2517,6 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
 
 schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -d schroedinger -p1 < Patches/schroedinger-1.0.6-fixes.patch
 
 .schroedinger: schroedinger .liboil
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)