contribs: use yasm on PPC-Darwin, too

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2f8e47b7792f887b7f1be9eb56cba95ec7c67cc3..54eef6a15f354f02d3d3decd6f5d335b59b0a7f4 100644 (file)
--- 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,6 +1089,8 @@ ifdef HAVE_BEOS
 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)
 endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
@@ -1315,7 +1320,7 @@ ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch
 else
-ifneq ($(DARWIN_COMPILER),LLVMGCC)
+ifndef HAVE_DARWIN_OS
        patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 endif
@@ -1427,7 +1432,7 @@ ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pthread && make && make install)
   endif
 else
-ifdef HAVE_DARWIN_OS_ON_INTEL
+ifdef HAVE_DARWIN_OS
   .x264: x264 .yasm
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
@@ -2208,7 +2213,11 @@ ifdef HAVE_CYGWIN
        # incorrect compile warning with cygwin compiler 3.4.4
        patch -p0 <Patches/dirac-cygwin.patch
 endif
+ifndef HAVE_DARWIN_OS
        (cd $@; aclocal -I m4 && autoconf && automake)
+else
+       (cd $@; ./bootstrap)
+endif
 
 DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder
 
@@ -2481,9 +2490,15 @@ liboil-$(OIL_VERSION).tar.gz:
 
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -d liboil -p1 < Patches/liboil-noshared.patch
 
 .liboil: liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
+ifdef HAVE_DARWIN_OS
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
+else
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
+endif
+       (cd $<; make && make install)
        touch $@
 
 CLEAN_FILE += .liboil
@@ -2502,7 +2517,7 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        patch -d schroedinger -p1 < Patches/schroedinger-1.0.6-fixes.patch
 
 .schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger