X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=0dfb3474b2e0abb9b2a7b53a8aabe10e1f952e67;hb=ab99dcdf9e787d31b9bd4ff70b09d82f43060188;hp=8243ff53187b991f2019679f6eea31608ba1e6f6;hpb=13acaa7e01519d2c8f8e6743e297611b14add161;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8243ff5318..0dfb3474b2 100644
--- 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
@@ -920,12 +921,27 @@ libvpx-$(VPX_VERSION).tar.bz2:
 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)