Contrib: bump schro to 1.0.7, since 1.0.6 had many issues.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 47c4b9dac7ecd933f5567c3a2149e5347a63c46d..272d2c00e025748c3ad20c1fe79b8f7afaea0113 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1090,7 +1090,7 @@ endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 else
-       (cd $@; patch -p0 < ../Patches/ffmpeg-swscale-ppc.patch)
+       (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
@@ -1351,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
@@ -1432,7 +1429,7 @@ ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pthread && make && make install)
   endif
 else
-ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_OS_ON_INTEL
   .x264: x264 .yasm
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
@@ -2520,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)