Don't put VPX in any default contrib

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 411e4355bc62c8d061d7c922f20c61a92720adf7..6140c1d6b07bb0cbeb9156b370372f07b7e9f4ab 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -919,20 +919,34 @@ libvpx-$(VPX_VERSION).tar.bz2:
 
 vpx: libvpx-$(VPX_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifneq ($(HOST),$(BUILD))
        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 $(PREFIX)/include) # Of course, why the hell would one expect it to be listed or in make install?
-       (cd $<; cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in 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
@@ -1063,6 +1077,7 @@ else
 ffmpeg: 
 endif
        $(SVN) co $(FFMPEG_SVN) ffmpeg
+       (cd ffmpeg; patch -p0 < ../Patches/ffmpeg-libvpx.patch;)
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
@@ -1099,9 +1114,9 @@ ifdef HAVE_WIN64
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 
 else
 ifdef HAVE_WIN32
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs
+FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --enable-dxva2 --disable-bsfs --enable-libvpx
 else
-FFMPEGCONFG += --enable-pthreads
+FFMPEGCONF += --enable-pthreads
 endif
 endif
 
@@ -1197,6 +1212,7 @@ ifdef SVN
 libdvdnav:
        $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -d libdvdnav -p0 < Patches/libdvdnav.patch
+       patch -d libdvdnav -p0 < Patches/libdvdnav-resolution.patch
        (cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: