[vlc-commits] contribs: replaced BWToolKit with BGHUDAppKit

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Apr  6 21:44:42 2011 +0200| [6b64aa1bc1a42faabc8be7018bd7e5d86ae0a72b] | committer: Felix Paul Kühne

contribs: replaced BWToolKit with BGHUDAppKit

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

 extras/contrib/contrib.mak                    |    2 +-
 extras/contrib/src/Distributions/macosx32.mak |    2 +-
 extras/contrib/src/Distributions/macosx64.mak |    2 +-
 extras/contrib/src/contrib-src.mak            |   20 ++++++++++----------
 extras/contrib/src/packages.mak               |    8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index f171c82..5ced7c6 100644
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -99,7 +99,7 @@ package-macosx:
 		exit 1 ; \
 	fi
 	mkdir tmp
-	(cd $(PREFIX); tar cf - Sparkle bin sbin include lib share/aclocal* share/autoconf* \
+	(cd $(PREFIX); tar cf - Sparkle BGHUDAppKit bin sbin include lib share/aclocal* share/autoconf* \
 		share/automake* share/gettext* share/libtool*) | (cd tmp; tar xf -)
 	./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
 	(cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
diff --git a/extras/contrib/src/Distributions/macosx32.mak b/extras/contrib/src/Distributions/macosx32.mak
index ea94064..0033b4a 100644
--- a/extras/contrib/src/Distributions/macosx32.mak
+++ b/extras/contrib/src/Distributions/macosx32.mak
@@ -8,7 +8,7 @@ all: .freetype \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .gecko .mpcdec \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fluid .fontconfig .ncurses \
-    .schroedinger .libass .libupnp .kate .sqlite3 .BWToolKit .Sparkle
+    .schroedinger .libass .libupnp .kate .sqlite3 .BGHUDAppKit .Sparkle
 
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
diff --git a/extras/contrib/src/Distributions/macosx64.mak b/extras/contrib/src/Distributions/macosx64.mak
index b8f12a0..24a853c 100644
--- a/extras/contrib/src/Distributions/macosx64.mak
+++ b/extras/contrib/src/Distributions/macosx64.mak
@@ -8,7 +8,7 @@ all: .freetype \
     .png .jpeg .tiff .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .gecko .mpcdec \
     .dca .tag .x264 .lua .zvbi .fontconfig .ncurses \
-    .schroedinger .libass .libupnp .kate .sqlite3 .BWToolKit .Sparkle
+    .schroedinger .libass .libupnp .kate .sqlite3 .BGHUDAppKit .Sparkle
 
 # .expat don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 7838685..6e25081 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2427,22 +2427,22 @@ CLEAN_PKG += Sparkle
 DISTCLEAN_PKG += Sparkle-$(SPARKLE_VERSION).zip
 
 # ***************************************************************************
-# BWToolKit
+# BGHUDAppKit
 # ***************************************************************************
 
-BWToolkit.zip:
-	$(WGET) $(BWTOOLKIT_URL)
+BGHUDAppKit-$(BGHUDAPPKIT_VERSION).zip:
+	$(WGET) $(BGHUDAPPKIT_URL)
 
-.BWToolKit: BWToolkit.zip
+.BGHUDAppKit: BGHUDAppKit-$(BGHUDAPPKIT_VERSION).zip
 	rm -rf $@ || true
-	(mkdir BWToolKit && cd BWToolKit && unzip ../$<)
-	rm -rf $(PREFIX)/BWToolkit
-	mv BWToolkit $(PREFIX)
+	(mkdir BGHUDAppKit && cd BGHUDAppKit && unzip ../$<)
+	rm -rf $(PREFIX)/BGHUDAppKit
+	mv BGHUDAppKit $(PREFIX)
 	touch $@
 
-CLEAN_FILE += .BWToolKit
-CLEAN_PKG += BWToolKit
-DISTCLEAN_PKG += BWToolkit.zip
+CLEAN_FILE += .BGHUDAppKit
+CLEAN_PKG += BGHUDAppKit
+DISTCLEAN_PKG += BGHUDAppKit-$(BGHUDAPPKIT_VERSION).zip
 
 # ***************************************************************************
 # UPNP library
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index a6a3f14..b62b040 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -174,7 +174,7 @@ MUSE_SVN=http://svn.musepack.net/libmpc/trunk/
 #MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 QT4_VERSION=4.6.2
 QT4_URL=$(CONTRIB_VIDEOLAN)/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
-QT4_MAC_VERSION=4.7.1
+QT4_MAC_VERSION=4.7.2
 QT4_MAC_URL=http://get.qt.nokia.com/qt/source/qt-mac-opensource-$(QT4_MAC_VERSION).dmg
 ZLIB_VERSION=1.2.5
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
@@ -228,9 +228,9 @@ GSM_URL=$(CONTRIB_VIDEOLAN)/gsm-$(GSM_VERSION).tar.gz
 SPARKLE_VERSION=1.5b6-vlc
 #SPARKLE_URL=http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip
 SPARKLE_URL=$(CONTRIB_VIDEOLAN)/Sparkle-$(SPARKLE_VERSION).zip
-BWTOOLKIT_VERSION=1.2.5
-#BWTOOLKIT_URL=http://brandonwalkin.com/blog/bwtfiles/BWToolkit.zip
-BWTOOLKIT_URL=$(CONTRIB_VIDEOLAN)/BWToolkit.zip
+#BGHUDAPPKIT_URL=git://github.com/binarygod/BGHUDAppKit.git
+BGHUDAPPKIT_VERSION=0.7-10-g79a560d
+BGHUDAPPKIT_URL=$(CONTRIB_VIDEOLAN)/BGHUDAppKit-$(BGHUDAPPKIT_VERSION).zip
 XCB_VERSION=1.2
 XCB_URL=http://xcb.freedesktop.org/dist/
 XCB_UTIL_VERSION=0.2