From: Jean-Baptiste Kempf Date: Sat, 10 Apr 2010 14:06:51 +0000 (+0200) Subject: Contribs: use XulRunner 1.9.2 on Win32 X-Git-Tag: 1.1.0-pre1~60 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=b625106beb97c5dcbb5ed65c38df0a4aca4a78a9 Contribs: use XulRunner 1.9.2 on Win32 --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 652513600d..69c1329073 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1954,7 +1954,7 @@ DISTCLEAN_PKG += gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz # Gecko SDK win32 # *************************************************************************** -gecko-sdk-i586-pc-msvc-1.8b1.zip: +xulrunner-1.9.2.en-US.win32.sdk.zip: $(WGET) $(GECKO_SDK_WIN32_URL) libIDL-0.6.3-win32-bin.zip: @@ -1963,10 +1963,10 @@ libIDL-0.6.3-win32-bin.zip: glib-19990228.zip: $(WGET) $(GLIB_WIN32_BIN_URL) -.gecko-win32: gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip - unzip gecko-sdk-i586-pc-msvc-1.8b1.zip +.gecko-win32: xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip + unzip xulrunner-1.9.2.en-US.win32.sdk.zip rm -rf $(PREFIX)/gecko-sdk - mv gecko-sdk $(PREFIX) + mv xulrunner-sdk $(PREFIX)/gecko-sdk unzip -j libIDL-0.6.3-win32-bin.zip libIDL-0.6.3-win32-bin/libIDL-0.6.dll -d $(PREFIX)/gecko-sdk/bin unzip glib-19990228.zip glib-1.2.dll -d $(PREFIX)/gecko-sdk/bin chmod a+x $(PREFIX)/gecko-sdk/bin/* @@ -1974,7 +1974,7 @@ glib-19990228.zip: CLEAN_FILE += .gecko-win32 CLEAN_PKG += gecko-sdk-win32 -DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip +DISTCLEAN_PKG += xulrunner-1.9.2.en-US.win32.sdk.zip libIDL-0.6.3-win32-bin.zip glib-19990228.zip # *************************************************************************** # mozilla-macosx diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index f788ee1001..f45d27b90b 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -158,7 +158,7 @@ GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-$(GLIB_VERSION).t 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 -GECKO_SDK_WIN32_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.8b1/gecko-sdk-i586-pc-msvc-1.8b1.zip +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