[vlc-commits] contrib: bump qt4 to 4.8.5

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jul  2 18:56:02 2013 +0200| [cc96cb85099aa781d485d27620a1de927f0fffbf] | committer: Rafaël Carré

contrib: bump qt4 to 4.8.5

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

 contrib/src/qt4/SHA512SUMS  |    2 +-
 contrib/src/qt4/cross.patch |   44 -------------------------------------------
 contrib/src/qt4/rules.mak   |   14 ++++++--------
 3 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/contrib/src/qt4/SHA512SUMS b/contrib/src/qt4/SHA512SUMS
index fd7e7d7..1b8ed83 100644
--- a/contrib/src/qt4/SHA512SUMS
+++ b/contrib/src/qt4/SHA512SUMS
@@ -1 +1 @@
-42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62  qt-4.8.2.tar.gz
+47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb  qt-4.8.5.tar.gz
diff --git a/contrib/src/qt4/cross.patch b/contrib/src/qt4/cross.patch
index 3d0a453..2afe85b 100644
--- a/contrib/src/qt4/cross.patch
+++ b/contrib/src/qt4/cross.patch
@@ -1,47 +1,3 @@
---- qt4/mkspecs/win32-g++/qmake.conf.orig    2011-09-28 14:32:02.709958498 -0400
-+++ qt4/mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
-@@ -14,7 +14,7 @@
- QMAKE_EXT_OBJ           = .o
- QMAKE_EXT_RES           = _res.o
- 
--QMAKE_CC		= gcc
-+QMAKE_CC		= $(XCC)
- QMAKE_LEX		= flex
- QMAKE_LEXFLAGS		=
- QMAKE_YACC		= byacc
-@@ -27,7 +27,7 @@
- QMAKE_CFLAGS_DEBUG	= -g
- QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
- 
--QMAKE_CXX		= g++
-+QMAKE_CXX		= $(XCXX)
- QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-@@ -50,8 +50,8 @@
- QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
- QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
- 
--QMAKE_LINK		= g++
--QMAKE_LINK_C		= gcc
-+QMAKE_LINK		= $(XCXX)
-+QMAKE_LINK_C		= $(XCC)
- QMAKE_LFLAGS		=
- QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
- QMAKE_LFLAGS_EXCEPTIONS_OFF =
-@@ -100,10 +100,10 @@
- QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
- 
- QMAKE_IDL		= midl
--QMAKE_LIB		= ar -ru
-+QMAKE_LIB		= $(XAR) -ru
- QMAKE_RC		= windres
- QMAKE_ZIP		= zip -r -9
- 
--QMAKE_STRIP		= strip
-+QMAKE_STRIP		= $(XSTRIP)
- QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
- load(qt_config)
 --- qt4/configure.orig	2011-11-10 18:48:29.351058392 -0500
 +++ qt4/configure	2011-11-10 18:50:40.971711056 -0500
 @@ -8255,11 +8255,13 @@
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 8c32718..1c5ff9e 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -1,7 +1,7 @@
 # qt4
 
-QT4_VERSION = 4.8.2
-QT4_URL := http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$(QT4_VERSION).tar.gz
+QT4_VERSION = 4.8.5
+QT4_URL := http://download.qt-project.org/official_releases/qt/4.8/$(QT4_VERSION)/qt-everywhere-opensource-src-$(QT4_VERSION).tar.gz
 
 ifdef HAVE_MACOSX
 #PKGS += qt4
@@ -28,18 +28,16 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(APPLY) $(SRC)/qt4/imageformats.patch
 	$(MOVE)
 
-XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
-
 ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
 ifdef HAVE_WIN32
-QT_PLATFORM := -xplatform win32-g++
+QT_PLATFORM := -xplatform win32-g++ -device-option CROSS_COMPILE=$(HOST)-
 endif
 
 .qt4: qt4
-	cd $< && $(XTOOLS) ./configure $(QT_PLATFORM) -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 $< && ./configure $(QT_PLATFORM) -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) sub-src
 	# BUILDING QT BUILD TOOLS
 ifdef HAVE_CROSS_COMPILE
 	cd $</src/tools; $(MAKE) clean; \
@@ -47,7 +45,7 @@ ifdef HAVE_CROSS_COMPILE
 			do (cd $$i; ../../../bin/qmake); \
 		done; \
 		../../../bin/qmake; \
-		$(MAKE) $(XTOOLS)
+		$(MAKE)
 endif
 	# INSTALLING LIBRARIES
 	for lib in QtGui QtCore QtNetwork QtXml; \