contrib: Disable ffprobe in ffmpeg.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 61d5ee7aa662dba4cb79bf34225a8ebbc3928b51..2e80d5a8d1158e499da95975f98893bd9fe2ed71 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1068,6 +1068,7 @@ FFMPEGCONF += \
        --disable-debug \
        --enable-gpl \
        --enable-postproc \
+       --disable-ffprobe \
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-ffplay \
@@ -1200,6 +1201,22 @@ CLEAN_FILE += .dvdnav
 CLEAN_PKG += libdvdnav
 DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
+# ***************************************************************************
+# libbluray
+# ***************************************************************************
+
+libbluray:
+       $(GIT) clone git://git.videolan.org/libbluray.git
+
+.libbluray: libbluray
+       (cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .libbluray
+CLEAN_PKG += libbluray
+
+
 # ***************************************************************************
 # libdvbpsi
 # ***************************************************************************
@@ -1323,9 +1340,17 @@ ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
        (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libcaca-win32-static.patch
+endif
+
 
 .caca: libcaca
+ifdef HAVE_DARWIN_OS
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx --disable-x11 && cd caca && make && make install)
+else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
+endif
        touch $@
 
 CLEAN_FILE += .caca