Contrib: upnp/win32, remove strerror use, and other small hacks...

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 70189766004101cc94e12e7a73fd319a45605037..e7f16b776ae96b61f8014a8e5a06e8f6f52b1097 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
@@ -1040,7 +1037,7 @@ ifdef SVN
 ifdef HAVE_WIN32
 ffmpeg: .dshow_headers
 else
-ffmpeg: 
+ffmpeg:
 endif
        $(SVN) co $(FFMPEG_SVN) ffmpeg
 ifdef HAVE_ISA_THUMB
@@ -1054,6 +1051,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 !"
@@ -1073,7 +1073,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 
@@ -1083,6 +1083,7 @@ FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --e
 else
 FFMPEGCONF += --enable-pthreads
 endif
+FFMPEG_CFLAGS += --std=gnu99
 endif
 
 ifdef HAVE_WINCE
@@ -1098,7 +1099,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
@@ -1680,9 +1681,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
@@ -1788,8 +1786,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
@@ -2409,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
@@ -2468,15 +2476,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)