[vlc-commits] contrib: qt4: Reduce win32 binsize

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Nov 10 20:43:03 2011 -0500| [ce54c03b69d1add3ae8cce1121be8406bfc28a9e] | committer: Rafaël Carré

contrib: qt4: Reduce win32 binsize

Some config options do not apply to win32 builds (e.g. QT_NO_ICONV)

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

 contrib/src/qt4/QtCore.pc.in |    2 +-
 contrib/src/qt4/QtGui.pc.in  |    2 +-
 contrib/src/qt4/cross.patch  |   19 +++++++++++++++++++
 contrib/src/qt4/rules.mak    |    3 ---
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/contrib/src/qt4/QtCore.pc.in b/contrib/src/qt4/QtCore.pc.in
index df717770..9b26c30 100644
--- a/contrib/src/qt4/QtCore.pc.in
+++ b/contrib/src/qt4/QtCore.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include/qt4/QtCore
 Name: Qtcore
 Description: Qtcore Library
 Version: @@VERSION@@
-Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lQtCore -lqcncodecs -lqjpcodecs -lqkrcodecs -lqtwcodecs -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -ladvapi32 -lgdi32 -limm32 -lwsock32
+Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lQtCore -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -ladvapi32 -lgdi32 -limm32 -lwsock32
 Cflags:  -I${prefix}/include/qt4 -I${includedir} -DQT_NODLL
diff --git a/contrib/src/qt4/QtGui.pc.in b/contrib/src/qt4/QtGui.pc.in
index d46603b..c8740f6 100644
--- a/contrib/src/qt4/QtGui.pc.in
+++ b/contrib/src/qt4/QtGui.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include/qt4/QtGui
 Name: Qtgui
 Description: Qtgui Library
 Version: @@VERSION@@
-Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lqjpeg -lqtaccessiblewidgets -lQtGui -lQtCore -lqcncodecs -lqjpcodecs -lqkrcodecs -lqtwcodecs -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lgdi32 -limm32 -lwsock32
+Libs: -Wl,--subsystem,windows -mwindows -L${libdir} -lqjpeg -lqtaccessiblewidgets -lQtGui -lQtCore -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lgdi32 -limm32 -lwsock32
 Cflags: -I${prefix}/include/qt4 -I${includedir} -DQT_NODLL
diff --git a/contrib/src/qt4/cross.patch b/contrib/src/qt4/cross.patch
index f2f97ae..bbbd7e7 100644
--- a/contrib/src/qt4/cross.patch
+++ b/contrib/src/qt4/cross.patch
@@ -42,3 +42,22 @@
 +QMAKE_STRIP		= $(XSTRIP)
  QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
  load(qt_config)
+--- qt-everywhere-opensource-src-4.7.4/configure.orig	2011-11-10 18:48:29.351058392 -0500
++++ qt-everywhere-opensource-src-4.7.4/configure	2011-11-10 18:50:40.971711056 -0500
+@@ -7767,6 +7767,7 @@
+ fi
+ 
+ # X11/Unix/Mac only configs
++if [ "$XPLATFORM_MINGW" != "yes" ]; then
+ [ "$CFG_CUPS" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
+ [ "$CFG_ICONV" = "no" ]      && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
+ [ "$CFG_GLIB" != "yes" ]     && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
+@@ -7807,6 +7808,8 @@
+ [ "$CFG_COREWLAN" = "no" ]       && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
+ [ "$CFG_ICD" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD"
+ 
++fi
++
+ # sort QCONFIG_FLAGS for neatness if we can
+ [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
+ QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 7b10b84..79f3fa5 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -45,9 +45,6 @@ endif
 	# INSTALLING PLUGINS
 	install -D -- $</plugins/imageformats/libqjpeg.a "$(PREFIX)/lib/libqjpeg.a"
 	install -D -- $</plugins/accessible/libqtaccessiblewidgets.a "$(PREFIX)/lib/libqtaccessiblewidgets.a"
-	for codec in cn jp kr tw; \
-		do install -D -- $</plugins/codecs/libq$${codec}codecs.a "$(PREFIX)/lib/libq$${codec}codecs.a"; \
-	done
 	# INSTALLING HEADERS
 	for h in corelib gui xml network; \
 		do find . -type f -name '*.h' -exec install -D -- "{}" "$(PREFIX)/include/qt4/src/$${h}/{}" \; ; \