[vlc-commits] contrib: qt4: fix jpeg enabling

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov 10 20:15:33 2011 -0500| [04974d8f9efbb07d4a11f3aa659daf8cb958960c] | committer: Rafaël Carré

contrib: qt4: fix jpeg enabling

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

 contrib/src/qt4/imageformats.patch |   14 ++++++++++++++
 contrib/src/qt4/rules.mak          |    2 +-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/contrib/src/qt4/imageformats.patch b/contrib/src/qt4/imageformats.patch
new file mode 100644
index 0000000..6e15cb7
--- /dev/null
+++ b/contrib/src/qt4/imageformats.patch
@@ -0,0 +1,14 @@
+--- qt-everywhere-opensource-src-4.7.4/src/plugins/imageformats/imageformats.pro.orig	2011-11-10 18:56:04.617315921 -0500
++++ qt-everywhere-opensource-src-4.7.4/src/plugins/imageformats/imageformats.pro	2011-11-10 18:56:39.269487754 -0500
+@@ -1,8 +1,8 @@
+ TEMPLATE = subdirs
+ 
+-!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
++!contains(QT_CONFIG, no-libjpeg):!contains(QT_CONFIG, libjpeg):SUBDIRS += jpeg
+ !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
+-!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng
++!contains(QT_CONFIG, no-libmng):!contains(QT_CONFIG, libmng):SUBDIRS += mng
+ contains(QT_CONFIG, svg):SUBDIRS += svg
+-!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff
++!contains(QT_CONFIG, no-libtiff):!contains(QT_CONFIG, libtiff):SUBDIRS += tiff
+ !contains(QT_CONFIG, no-ico):SUBDIRS += ico
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 83d8bea..7b10b84 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -21,6 +21,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(UNPACK)
 	patch -p0 < $(SRC)/qt4/cross.patch
 	patch -p0 < $(SRC)/qt4/styles.patch
+	patch -p0 < $(SRC)/qt4/imageformats.patch
 	mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
 
 XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
@@ -28,7 +29,6 @@ XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
 .qt4: qt4
 	cd $< && $(XTOOLS) ./configure -xplatform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
 	cd $< && $(MAKE) $(XTOOLS) sub-src
-	cd $</src/plugins/imageformats/jpeg && $(MAKE) $(XTOOLS) # FIXME
 	# BUILDING QT BUILD TOOLS
 ifdef HAVE_CROSS_COMPILE
 	cd $</src/tools; $(MAKE) clean; \