removes qt4 from extras/contrib/src

extras/contrib/src/Makefile

@@ -177,7 +177,7 @@ else
 	.FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .wxwidgets .qt4 .dirac \
+	.dvdnav .dvbpsi .wxwidgets .dirac \
 	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
 #	.SDL_image  .daap .cddb .cdio .vcdimager .portaudio 
   else
@@ -1336,25 +1336,6 @@ CLEAN_FILE += .wxwidgets
 CLEAN_PKG += wxwidgets
 DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 
-# ***************************************************************************
-# qt4 (win32 binary)
-# ***************************************************************************
-
-qt4-$(QT4_VERSION)-win32-bin.tar.gz:
-	$(WGET) $(QT4_URL)
-
-qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
-	$(EXTRACT_GZ)
-
-
-.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;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin)
-	touch $@
-
-CLEAN_FILE += .qt4
-CLEAN_PKG += qt4
-DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz
-
 # ***************************************************************************
 # zlib
 # ***************************************************************************

extras/contrib/src/packages.mak

@@ -150,8 +150,6 @@ MUSE_VERSION=1.2.2
 MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 WXWIDGETS_VERSION=2.6.3
 WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
-QT4_VERSION=4.2.0-tp1
-QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.gz
 ZLIB_VERSION=1.2.3
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
 XML_VERSION=2.6.26