Contribs : Use Qt 4.3.4snapshot on windows. Compiled with -O3 and patched with the...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 36e6ec2d96b51fb66c92c5948b06a4803c66d2a6..f83a6dbcada3b463139a69864d4d5e870382b5b4 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1444,11 +1444,11 @@ DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 # qt4 (win32 binary)
 # ***************************************************************************
 
-qt4-$(QT4_VERSION)-win32-bin.tar.gz:
+qt4-$(QT4_VERSION)-win32-bin.tar.bz2:
        $(WGET) $(QT4_URL)
 
-qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
-       $(EXTRACT_GZ)
+qt4: qt4-$(QT4_VERSION)-win32-bin.tar.bz2
+       $(EXTRACT_BZ2)
 
 .qt4: qt4
        (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib)
@@ -2250,6 +2250,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 CLEAN_FILE += .pthreads
 CLEAN_PKG += pthreads
 DISTCLEAN_PKG += pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+
 # ***************************************************************************
 # ncurses library (with wide chars support)
 # ***************************************************************************
@@ -2268,6 +2269,25 @@ CLEAN_FILE += .ncurses
 CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
+# ***************************************************************************
+# asa library (ASS/SSA support)
+# ***************************************************************************
+
+asa.git.tar.gz:
+       $(WGET) "http://git.spaceboyz.net/asa.git/?p=asa.git;a=snapshot;" -O asa.git.tar.gz
+
+asa: asa.git.tar.gz
+       $(EXTRACT_GZ)
+
+.asa: asa
+       (cd $<; ./bootstrap; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .asa
+CLEAN_PKG += asa
+DISTCLEAN_PKG += asa.git.tar.gz
+
+#
 # ***************************************************************************
 # Some cleaning
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 3c69a492e5bc2691e285f6c22df828b960bbc227..70d1efeae8f852cf2a316e6c0f6d23c81abac8cd 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -172,8 +172,8 @@ MUSE_VERSION=1.2.6
 MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 WXWIDGETS_VERSION=2.6.4
 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
-QT4_VERSION=4.3.3
-QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.gz
+QT4_VERSION=4.3.4
+QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
 QT4_MAC_URL=ftp://ftp.trolltech.com/qt/source/qt-mac-opensource-src-$(QT4_VERSION).tar.gz
 QT4T_VERSION=4.3.2
 QT4T_URL=ftp://ftp.trolltech.com/pub/qt/source/qt-win-opensource-$(QT4T_VERSION)-mingw.exe