[vlc-devel] commit: contribs: first step to update the mozilla SDK ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Jun 26 14:06:26 2009 +0200| [4ca174fb5a195a240cf7fb504e0a8873b3dfa66d] | committer: Felix Paul Kühne 

contribs: first step to update the mozilla SDK

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ca174fb5a195a240cf7fb504e0a8873b3dfa66d
---

 extras/contrib/src/Makefile     |   25 ++++++++++++-------------
 extras/contrib/src/packages.mak |   12 ++++++------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1d5a820..4ddbf08 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1970,18 +1970,17 @@ DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
 # glib
 # ***************************************************************************
 
-glib-$(GLIB_VERSION).tar.gz:
+glib-$(GLIB_VERSION).tar.bz2:
 	$(WGET) $(GLIB_URL)
 
-glib: glib-$(GLIB_VERSION).tar.gz
-	$(EXTRACT_GZ)
-	patch -p0 < Patches/glib.patch
+glib: glib-$(GLIB_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 .glib: glib
-	(cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install)
+	(cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install)
 	touch $@
 
-CLEAN_FILE += .glibl
+CLEAN_FILE += .glib
 CLEAN_PKG += glib
 DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
 
@@ -1989,14 +1988,14 @@ DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz
 # libIDL
 # ***************************************************************************
 
-libIDL-$(LIBIDL_VERSION).tar.gz:
+libIDL-$(LIBIDL_VERSION).tar.bz2:
 	$(WGET) $(LIBIDL_URL)
 
-libIDL: libIDL-$(LIBIDL_VERSION).tar.gz
-	$(EXTRACT_GZ)
+libIDL: libIDL-$(LIBIDL_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 .IDL: libIDL
-	(cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install )
+	(cd $<; ./configure --prefix=$(PREFIX) --host=$(HOST) && make && make install )
 	touch $@
 
 CLEAN_FILE += .IDL
@@ -2054,14 +2053,14 @@ DISTCLEAN_PKG += gecko-sdk-i586-pc-msvc-1.8b1.zip libIDL-0.6.3-win32-bin.zip gli
 # mozilla-macosx
 # ***************************************************************************
 
-mozilla-source-$(MOZILLA_VERSION).tar.bz2:
+firefox-$(MOZILLA_VERSION)-source.tar.bz2:
 	$(WGET) $(MOZILLA_URL)
 
-mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2
+mozilla: firefox-$(MOZILLA_VERSION)-source.tar.bz2
 	$(EXTRACT_BZ2)
 
 .mozilla-macosx: mozilla
-	(cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=mac --enable-standalone-modules=xpcom,plugin && make && make install)
+	(cd $<; ./configure --prefix=$(PREFIX) --enable-default-toolkit=cairo-cocoa --enable-standalone-modules=xpcom,plugin  --enable-application=xulrunner && make && make install)
 	touch $@
 
 CLEAN_FILE += .mozilla-macosx
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 16bc31a..f021dc0 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -151,16 +151,16 @@ 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=1.2.10
-GLIB_URL=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz
-LIBIDL_VERSION=0.6.8
-LIBIDL_URL=http://andrewtv.org/libIDL/libIDL-$(LIBIDL_VERSION).tar.gz
+GLIB_VERSION=2.20.0
+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=$(VIDEOLAN)/testing/contrib/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
 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=1.7.5
-MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
+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
 TWOLAME_VERSION=0.3.12
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609