Contribs: update Qt for win32 to 4.6.2

[vlc] / extras / contrib / src / packages.mak

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 74645f376bc9b7e2f6adcbf6651513d1669871df..70055284c6583062c0bd3dcba96f6b6ef79a33cd 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -90,12 +90,12 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
 LAME_VERSION=3.98.4
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.7.8
-#LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
-LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
-LIBMATROSKA_VERSION=0.8.1
-#LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+LIBEBML_VERSION=0.8.0
+LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
+#LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
+LIBMATROSKA_VERSION=0.9.0
+LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+#IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
@@ -153,16 +153,9 @@ OPENCDK_VERSION=0.6.6
 OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2
 DAAP_VERSION=0.4.0
 DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
-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=http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2/sdk/xulrunner-1.9.2.en-US.mac-i386.sdk.tar.bz2
-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
-MOZILLA_VERSION=3.0.11
-MOZILLA_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(MOZILLA_VERSION)/source/firefox-$(MOZILLA_VERSION)-source.tar.bz2
+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
 TWOLAME_VERSION=0.3.12
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
@@ -179,7 +172,7 @@ SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_I
 MUSE_VERSION=1.2.6
 MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 #MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
-QT4_VERSION=4.6.0
+QT4_VERSION=4.6.2
 QT4_URL=$(CONTRIB_VIDEOLAN)/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
 QT4_MAC_VERSION=4.5.2
 QT4_MAC_URL=http://get.qtsoftware.com/qt/source/qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
@@ -206,7 +199,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 +208,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
@@ -224,14 +217,12 @@ KATE_VERSION=0.3.0
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
 TIGER_VERSION=0.3.1
 TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
-OIL_VERSION=0.3.16
-OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz
-SCHROED_VERSION=1.0.8
-SCHROED_URL=$(CONTRIB_VIDEOLAN)/schroedinger-$(SCHROED_VERSION).tar.gz
-#SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
+ORC_VERSION=0.4.4
+ORC_URL=http://code.entropywave.com/download/orc/orc-$(ORC_VERSION).tar.gz
+SCHROED_VERSION=1.0.9
+SCHROED_URL=http://diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
 ASS_VERSION=0.9.9
 ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2
-#ASS_GIT=git://repo.or.cz/libass.git
 GSM_VERSION=1.0.12
 #GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
 GSM_URL=$(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz
@@ -251,3 +242,5 @@ PEFLAGS_URL=$(CONTRIB_VIDEOLAN)
 SQLITE_VERSION=3.6.20
 SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h
+VPX_VERSION=0.9.0
+VPX_URL=http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2