Contribs: force gnu99 for FFmpeg and fix compilation

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 76508aa31f3d36d239d9c3f2dd6b8518ff510631..dc887a772cb762c32c1c12cdd85d3e0f243c05f6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -884,6 +884,53 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+# ***************************************************************************
+# libebml
+# ***************************************************************************
+
+libebml-$(LIBEBML_VERSION).tar.bz2:
+       $(WGET) $(LIBEBML_URL)
+
+libebml: libebml-$(LIBEBML_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.ebml: libebml
+ifdef HAVE_WIN32
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
+else
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+       $(RANLIB) $(PREFIX)/lib/libebml.a
+endif
+       touch $@
+
+CLEAN_FILE += .ebml
+CLEAN_PKG += libebml
+DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
+
+# ***************************************************************************
+# libmatroska
+# ***************************************************************************
+
+libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
+       $(WGET) $(LIBMATROSKA_URL)
+
+libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.matroska: libmatroska .ebml
+ifdef HAVE_WIN32
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
+else
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+       $(RANLIB) $(PREFIX)/lib/libmatroska.a
+endif
+       touch $@
+
+
+CLEAN_FILE += .matroska
+CLEAN_PKG += libmatroska
+DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+
 
 # ***************************************************************************
 # libvp8
@@ -946,52 +993,6 @@ CLEAN_FILE += .lame
 CLEAN_PKG += lame
 DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
 
-# ***************************************************************************
-# libebml
-# ***************************************************************************
-
-libebml-$(LIBEBML_VERSION).tar.bz2:
-       $(WGET) $(LIBEBML_URL)
-
-libebml: libebml-$(LIBEBML_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-
-.ebml: libebml
-ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
-else
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
-       $(RANLIB) $(PREFIX)/lib/libebml.a
-endif
-       touch $@
-
-CLEAN_FILE += .ebml
-CLEAN_PKG += libebml
-DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
-
-# ***************************************************************************
-# libmatroska
-# ***************************************************************************
-
-libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
-       $(WGET) $(LIBMATROSKA_URL)
-
-libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-
-.matroska: libmatroska .ebml
-ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
-else
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
-       $(RANLIB) $(PREFIX)/lib/libmatroska.a
-endif
-       touch $@
-
-
-CLEAN_FILE += .matroska
-CLEAN_PKG += libmatroska
-DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 # ***************************************************************************
 # libamrnb
@@ -1039,7 +1040,7 @@ ifdef SVN
 ifdef HAVE_WIN32
 ffmpeg: .dshow_headers
 else
-ffmpeg: 
+ffmpeg:
 endif
        $(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
@@ -1053,6 +1054,9 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef HAVE_WIN32
+       sed -i "s/std=c99/std=gnu99/" ffmpeg/configure
+endif
 else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        echo "ffmpeg snapshot is too old, you MUST use subversion !"
@@ -1072,7 +1076,7 @@ FFMPEGCONF += \
        --disable-ffplay \
        --disable-devices \
        --disable-protocols \
-       --disable-filters \
+       --disable-avfilter \
        --disable-network
 ifdef HAVE_WIN64
 FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs 
@@ -1082,6 +1086,7 @@ FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --e
 else
 FFMPEGCONF += --enable-pthreads
 endif
+FFMPEG_CFLAGS += --std=gnu99
 endif
 
 ifdef HAVE_WINCE
@@ -1097,7 +1102,7 @@ else
 endif
 endif
 endif
-       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1143,15 +1148,6 @@ CLEAN_FILE += .dvdcss
 CLEAN_PKG += libdvdcss
 DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 
-# ***************************************************************************
-# dummy dvdread to trigger the INSTALL_NAME script
-# ***************************************************************************
-# .dvdread: .dvdnav
-#      $(INSTALL_NAME)
-#      touch $@
-#
-# CLEAN_FILE += .dvdread
-
 # ***************************************************************************
 # libdvdread: We use dvdnav's dvdread
 # ***************************************************************************
@@ -1211,10 +1207,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 # libdvbpsi
 # ***************************************************************************
 
-libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz:
+libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz:
        $(WGET) $(LIBDVBPSI_URL)
 
-libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
+libdvbpsi: libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
@@ -1224,7 +1220,7 @@ libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 
 CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
-DISTCLEAN_PKG += libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
+DISTCLEAN_PKG += libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
 
 # ***************************************************************************
 # live
@@ -1326,18 +1322,13 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/libcaca-static.patch
 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
 
 .caca: libcaca
-ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-win32 --disable-x11 --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
-else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && make && make install)
-endif
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
        touch $@
 
 CLEAN_FILE += .caca
@@ -1425,10 +1416,6 @@ libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
        $(EXTRACT_GZ)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libmodplug-win32.patch
-       (cd $@; autoreconf -ivf )
-endif
 
 .mod: libmodplug
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
@@ -1804,6 +1791,10 @@ 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)
+endif
 
 .gpg-error: libgpg-error
 ifdef HAVE_DARWIN_OS_ON_INTEL
@@ -2481,15 +2472,15 @@ DISTCLEAN_PKG += glew-$(GLEW_VERSION)-src.tgz
 # ***************************************************************************
 # projectM
 # ***************************************************************************
-libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
+projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz:
        $(WGET) $(LIBPROJECTM_URL)
 
-libprojectM: libprojectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
+libprojectM: projectM-$(LIBPROJECTM_VERSION)-Source.tar.gz
        rm -rf $@ || true
        gunzip -c $< | tar xf - --exclude='[*?:<>\|]'
        mv projectM-$(LIBPROJECTM_VERSION)-Source $@ || true
        patch -p0 < Patches/libprojectM-win32.patch
-       cd $@; rm CMakeCache.txt
+       -cd $@; rm CMakeCache.txt
 
 .libprojectM: libprojectM .glew
        (cd $<; $(HOSTCC) CPPFLAGS="$(CPPFLAGS)" cmake . -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF -DDISABLE_NATIVE_PRESETS:BOOL=ON -DUSE_FTGL:BOOL=OFF -DINCLUDE-PROJECTM-PULSEAUDIO:BOOL=OFF -DINCLUDE-PROJECTM-QT:BOOL=OFF -DBUILD_PROJECTM_STATIC:BOOL=ON -DCMAKE_INSTALL_PREFIX=$(PREFIX) && make install)