[vlc-commits] commit: Contribs: syncrhonise with master (Jean-Baptiste Kempf )

Tue Apr 27 23:56:45 CEST 2010

vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 27 23:43:26 2010 +0200| [53da57c0c7f195d0ce31ac74898cbf9f827b3986] | committer: Jean-Baptiste Kempf 

Contribs: syncrhonise with master

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=53da57c0c7f195d0ce31ac74898cbf9f827b3986
---

 extras/contrib/src/Makefile     |   28 +++++++++++++++++++++-------
 extras/contrib/src/packages.mak |    8 +++++---
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 69c1329..81cf0c7 100644
--- 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
@@ -1062,11 +1065,15 @@ FFMPEGCONF += \
 	--disable-protocols \
 	--disable-filters \
 	--disable-network
+ifdef HAVE_WIN64
+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
 else
 FFMPEGCONFG += --enable-pthreads
 endif
+endif
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
@@ -1216,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
@@ -1933,11 +1946,8 @@ DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 # Gecko SDK
 # ***************************************************************************
 
-gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz:
-	$(WGET) $(GECKO_SDK_MAC_URL)
-
-gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
-	$(EXTRACT_GZ)
+gecko-sdk: 
+	$(SVN) co $(NPAPI_HEADERS_SVN_URL) -r $(NPAPI_HEADERS_SVN_REVISION) gecko-sdk/include
 
 .gecko: gecko-sdk
 	rm -rf $(PREFIX)/gecko-sdk
@@ -1948,7 +1958,7 @@ gecko-sdk: gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
 
 CLEAN_FILE += .gecko
 CLEAN_PKG += gecko-sdk
-DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+DISTCLEAN_PKG += xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2
 
 # ***************************************************************************
 # Gecko SDK win32
@@ -2333,6 +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/)
@@ -2386,6 +2399,7 @@ endif
 		--disable-coreaudio \
 		--disable-lash \
 		--disable-ladcca \
+		--disable-portaudio-support \
 		--without-readline
 	cd $< && make
 	cd $< && make install
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index da9ffbd..de2f45c 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -157,7 +157,9 @@ GLIB_VERSION=2.20.4
 GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-$(GLIB_VERSION).tar.bz2
 LIBIDL_VERSION=0.8.12
 LIBIDL_URL=http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-$(LIBIDL_VERSION).tar.bz2
-GECKO_SDK_MAC_URL=$(CONTRIB_VIDEOLAN)/gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+NPAPI_HEADERS_SVN_URL=http://npapi-headers.googlecode.com/svn/trunk/
+# NPAPI_HEADERS_SVN_REVISION can be a revision number, or just HEAD for the latest
+NPAPI_HEADERS_SVN_REVISION=3
 GECKO_SDK_WIN32_URL=http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/sdk/xulrunner-1.9.2.en-US.win32.sdk.zip
 LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/libIDL-0.6.3-win32-bin.zip
 GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
@@ -206,7 +208,7 @@ PTHREADS_VERSION=2-8-0
 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 ZVBI_VERSION=0.2.30
 ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2
-TAGLIB_VERSION=1.6.1
+TAGLIB_VERSION=1.6.3
 TAGLIB_URL=http://developer.kde.org/~wheeler/files/src/taglib-$(TAGLIB_VERSION).tar.gz
 LUA_VERSION=5.1
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
@@ -215,7 +217,7 @@ NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
 PCRE_VERSION=8.00
 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
-FLUID_VERSION=1.0.8
+FLUID_VERSION=1.0.9
 FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
 YASM_VERSION=0.7.2
 #YASM_URL=$(CONTRIB_VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz

