Contribs: fix installation of live555

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6fe11a8de47e23658ae217a00b8b7c8d768f7f39..66f12aac042fb85006e1e12455af0bffa6976253 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-darwin-ppc-mdynamic.patch) 
 endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
@@ -1284,6 +1289,7 @@ else
 endif
 endif
 endif
+       mkdir -p $(PREFIX)/lib $(PREFIX)/include
        cp $</groupsock/libgroupsock.a $(PREFIX)/lib
        cp $</liveMedia/libliveMedia.a $(PREFIX)/lib
        cp $</UsageEnvironment/libUsageEnvironment.a $(PREFIX)/lib
@@ -1315,7 +1321,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
@@ -1346,9 +1352,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
@@ -2204,12 +2207,15 @@ dirac-$(DIRAC_VERSION).tar.gz:
 
 dirac: dirac-$(DIRAC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p1 -d dirac <Patches/dirac-cross.patch
 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
 
@@ -2485,7 +2491,18 @@ liboil: liboil-$(OIL_VERSION).tar.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
+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
+       (cd $<; make && make install)
        touch $@
 
 CLEAN_FILE += .liboil
@@ -2503,7 +2520,7 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .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