[vlc-commits] contrib: qt4: fix for mingw-w64

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Aug 16 21:26:19 2013 +0200| [1ec819681644642c2e0f110351343e7e3a3fc2bc] | committer: Jean-Baptiste Kempf

contrib: qt4: fix for mingw-w64

(cherry picked from commit a01f4017731731460a3ee6d488db80f177a3a587)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/qt4/rules.mak   |    1 +
 contrib/src/qt4/win64.patch |   11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index 1c5ff9e..843ed9b 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -26,6 +26,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(APPLY) $(SRC)/qt4/styles.patch
 	$(APPLY) $(SRC)/qt4/chroot.patch
 	$(APPLY) $(SRC)/qt4/imageformats.patch
+	$(APPLY) $(SRC)/qt4/win64.patch
 	$(MOVE)
 
 ifdef HAVE_MACOSX
diff --git a/contrib/src/qt4/win64.patch b/contrib/src/qt4/win64.patch
new file mode 100644
index 0000000..1d6a124
--- /dev/null
+++ b/contrib/src/qt4/win64.patch
@@ -0,0 +1,11 @@
+--- qt4/src/corelib/tools/qsimd.cpp.orig	2013-08-16 21:25:28.069333245 +0200
++++ qt4/src/corelib/tools/qsimd.cpp	2013-08-16 21:25:35.061332951 +0200
+@@ -47,7 +47,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if defined(Q_OS_WIN64) && !defined(Q_CC_GNU)
++#if defined(Q_OS_WIN64)
+ #include <intrin.h>
+ #endif
+