Contrib: Don't compile portaudio support in fluidsynth

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 54bba7dcdaada483cd5123c7e907512e4e8b44eb..81cf0c7d84390d969a5883741989410dd440bcca 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -125,7 +125,7 @@ endif
 
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
-FFMPEGCONF+= --arch=armv4l --cpu=armv4t --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+FFMPEGCONF+= --target-os=mingw32ce --arch=armv4l --cpu=armv4t --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
 endif
 
 ifdef HAVE_UCLIBC
@@ -1036,6 +1036,9 @@ endif
 ifdef HAVE_ISA_THUMB
        patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
 endif
+ifdef HAVE_WIN64
+       (cd ffmpeg/libswscale; patch -p0 < ../../Patches/ffmpeg-win64.patch;)
+endif
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1063,7 +1066,7 @@ FFMPEGCONF += \
        --disable-filters \
        --disable-network
 ifdef HAVE_WIN64
-FFMPEGCONF += --disable-bzlib --disable-decoder=dca --disable-encoder=vorbis --enable-libmp3lame --enable-w32threads --disable-dxva2 --disable-bsfs
+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
@@ -1220,9 +1223,15 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-uselocale.patch
+       patch -p0 < Patches/live-inet_ntop.patch
 ifdef HAVE_WIN64
        patch -p0 < Patches/live-win64.patch
 endif
+ifndef HAVE_WIN32
+ifndef HAVE_WINCE
+       patch -p0 < Patches/live-getaddrinfo.patch
+endif
+endif
 
 .live: live
 ifdef HAVE_WIN32
@@ -1937,11 +1946,8 @@ DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 # Gecko SDK
 # ***************************************************************************
 
-xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2:
-       $(WGET) $(GECKO_SDK_MAC_URL)
-
-gecko-sdk: xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2
-       $(EXTRACT_BZ2)
+gecko-sdk: 
+       $(SVN) co $(NPAPI_HEADERS_SVN_URL) -r $(NPAPI_HEADERS_SVN_REVISION) gecko-sdk/include
 
 .gecko: gecko-sdk
        rm -rf $(PREFIX)/gecko-sdk
@@ -2337,7 +2343,9 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
 pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
        (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
+ifdef HAVE_WIN64
        (patch -p0 < Patches/pthreads-win64.patch)
+endif
 
 .pthreads: pthreads
        (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a *.dll $(PREFIX)/lib/)
@@ -2391,6 +2399,7 @@ endif
                --disable-coreaudio \
                --disable-lash \
                --disable-ladcca \
+               --disable-portaudio-support \
                --without-readline
        cd $< && make
        cd $< && make install