contribs: fixed libvpx compilation on Mac OS X

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0d40deac2bc95bf01a8daf20dee4d8b6a88d7989..0dfb3474b2e0abb9b2a7b53a8aabe10e1f952e67 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -149,6 +149,7 @@ endif
 ifdef HAVE_DARWIN_OS
 X264CONF=--host=$(HOST)
 X264CONF += --enable-pic
+FFMPEGCONF += --enable-libvpx
 ifdef HAVE_DARWIN_32
 FFMPEGCONF += --cc=gcc-4.0
 else
@@ -909,6 +910,50 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+
+# ***************************************************************************
+# libvp8
+# ***************************************************************************
+
+libvpx-$(VPX_VERSION).tar.bz2:
+       $(WGET) $(VPX_URL)
+
+vpx: libvpx-$(VPX_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+       patch -p0 < Patches/libvpx-cross.patch
+ifdef HAVE_DARWIN_OS
+       patch -p0 < Patches/libvpx-darwin.patch
+endif
+
+ifdef HAVE_WIN32
+VPX_TARGET=x86-win32-gcc
+else
+ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_64
+VPX_TARGET=x86_64-darwin9-gcc
+else
+ifdef HAVE_DARWIN_OS_ON_INTEL
+VPX_TARGET=x86-darwin9-gcc
+else
+VPX_TARGET=ppc32-darwin9-gcc
+endif
+endif
+else
+VPX_TARGET=FIXME
+endif
+endif
+
+.vpx: vpx
+       (cd $<; ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && XCC=$(CC) XNM=$(NM) XSTRIP=$(STRIP) make && make install)
+       (cd $<; cp vp8/*.h vpx_codec/*.h vpx_ports/*.h $(PREFIX)/include) # Of course, why the hell would one expect it to be listed or in make install?
+       rm $(PREFIX)/include/config.h
+       (cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
+       touch $@
+
+CLEAN_FILE += .vpx
+CLEAN_PKG += vpx
+DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
+
 # ***************************************************************************
 # lame
 # ***************************************************************************
@@ -2301,6 +2346,7 @@ endif
                --disable-ladspa \
                --disable-oss-support \
                --disable-alsa-support \
+               --disable-pulse-support \
                --disable-midishare \
                --disable-jack-support \
                --disable-coreaudio \
@@ -2320,28 +2366,24 @@ DISTCLEAN_PKG += fluidsynth-$(FLUID_VERSION).tar.gz
 # liboil
 # ***************************************************************************
 
-liboil-$(OIL_VERSION).tar.gz:
-       $(WGET) $(OIL_URL)
+orc-$(ORC_VERSION).tar.gz:
+       $(WGET) $(ORC_URL)
 
-liboil: liboil-$(OIL_VERSION).tar.gz
+orc: orc-$(ORC_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -d liboil -p1 < Patches/liboil-noshared.patch
-       patch -d liboil -p1 < Patches/liboil-win64.patch
-       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
-       (cd $@; autoreconf)
 
-.liboil: liboil
+.orc: orc
 ifdef HAVE_DARWIN_OS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)")
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2")
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX))
 endif
        (cd $<; make && make install)
        touch $@
 
-CLEAN_FILE += .liboil
-CLEAN_PKG += liboil
-DISTCLEAN_PKG += liboil-$(OIL_VERSION).tar.gz
+CLEAN_FILE += .orc
+CLEAN_PKG += orc
+DISTCLEAN_PKG += orc-$(ORC_VERSION).tar.gz
 
 # ***************************************************************************
 # Schroedinger library
@@ -2355,8 +2397,14 @@ schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
        patch -p0 < Patches/schroedinger-notests.patch
        (cd $@; autoreconf -iv)
 
-.schroedinger: schroedinger .liboil
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+ifdef HAVE_WIN32
+ORCC="wine $(PREFIX)/bin/orcc.exe"
+else
+ORCC="orcc"
+endif
+
+.schroedinger: schroedinger .orc
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --with-thread=none --disable-gtk-doc --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make ORCC=$(ORCC) && make install)
        touch $@
 
 CLEAN_FILE += .schroedinger