contrib: Disable ffprobe in ffmpeg.

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index dc887a772cb762c32c1c12cdd85d3e0f243c05f6..2e80d5a8d1158e499da95975f98893bd9fe2ed71 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -941,9 +941,6 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 libvpx: 
        $(GIT) clone git://review.webmproject.org/libvpx.git
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/libvpx-darwin.patch
-endif
 
 ifdef HAVE_WIN32
 VPX_TARGET=x86-win32-gcc
@@ -1071,6 +1068,7 @@ FFMPEGCONF += \
        --disable-debug \
        --enable-gpl \
        --enable-postproc \
+       --disable-ffprobe \
        --disable-ffserver \
        --disable-ffmpeg \
        --disable-ffplay \
@@ -1203,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
 # ***************************************************************************
@@ -1326,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
@@ -1684,9 +1706,6 @@ else
        (cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
 endif
        (patch -p0 < Patches/libpng-makefile.patch)
-ifdef HAVE_DARWIN_OS_ON_INTEL
-       (patch -p0 < Patches/libpng-darwin-mactel.patch)
-endif
 
 .png: libpng .zlib
 ifdef HAVE_DARWIN_OS
@@ -1792,8 +1811,8 @@ libgpg-error-$(GPGERROR_VERSION).tar.bz2:
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-       patch -p 0 < Patches/libgpg-error-win32.patch
-       (cd $@; ./autogen.sh)
+#      patch -p 0 < Patches/libgpg-error-win32.patch
+#      (cd $@; ./autogen.sh)
 endif
 
 .gpg-error: libgpg-error
@@ -2123,31 +2142,6 @@ CLEAN_FILE += .expat
 CLEAN_PKG += expat
 DISTCLEAN_PKG += expat-$(EXPAT_VERSION).tar.gz
 
-# ***************************************************************************
-# CyberLink C++ UPnP library
-# ***************************************************************************
-
-clinkcc$(CLINKCC_VERSION).tar.gz:
-       $(WGET) $(CLINKCC_URL)
-
-clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz
-       tar xzf $<
-       mv $(patsubst %.tar.gz,Cyberlink,$(patsubst %.tgz,Cyberlink,$(notdir $<))) $@ || true
-       touch $@
-       patch -p0 < Patches/clinkcc.patch
-ifdef HAVE_DARWIN_OS
-       patch -p0 < Patches/clinkcc_osx.patch
-endif
-       (cd $@; ./bootstrap)
-
-.clinkcc: clinkcc
-       (cd $<;./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install )
-       touch $@
-
-CLEAN_FILE += .clinkcc
-CLEAN_PKG += clinkcc
-DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
-
 # ***************************************************************************
 # YASM assembler
 # ***************************************************************************
@@ -2413,9 +2407,19 @@ libupnp-$(UPNP_VERSION).tar.bz2:
 
 libupnp: libupnp-$(UPNP_VERSION).tar.bz2
        $(EXTRACT_BZ2)
+       patch -p0 < Patches/libupnp-mingw.patch
+ifdef HAVE_WIN32
+       patch -p0 < Patches/libupnp-win32.patch
+       patch -p0 < Patches/libupnp-configure.patch
+       cd $@; libtoolize&& autoreconf
+endif
+
+ifdef HAVE_WIN32
+LIBUPNP_ECFLAGS=-DPTW32_STATIC_LIB
+endif
 
 .libupnp: libupnp
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-samples --without-documentation --disable-webserver CFLAGS="$(CFLAGS) -O3" && make && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-samples --without-documentation --enable-static --disable-webserver CFLAGS="$(CFLAGS) -O3 -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" && make && make install)
        touch $@
 
 CLEAN_FILE += .libupnp