summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2016-03-28 19:52:10 +0200
committerMartchus2016-03-28 19:52:10 +0200
commitdabae9421ba89f01d529aa1d7f53836ac72377fb (patch)
tree04788b794209b76214f10500e33f8eca1c010694
parent3564bd5b15c3cd1825795965e2f17a52a227d60e (diff)
downloadaur-dabae9421ba89f01d529aa1d7f53836ac72377fb.tar.gz
updated to 5.6.0
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD69
-rw-r--r--a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff16
-rw-r--r--angle-fix.patch19
-rw-r--r--qt-5.1.x-win_flex-replace.patch22
-rw-r--r--qt5-add-angle-support.patch44
-rw-r--r--qt5-add-compiled-shaders-remove-dxsdk.patch1664
-rw-r--r--qt5-disable-angle-opengl-testcode.patch11
-rw-r--r--qt5-enable-rpath-for-host-tools.patch14
-rw-r--r--qt5-fix-implib-ext.patch87
-rw-r--r--qt5-fix-static-harfbuzz-detection.patch7
-rw-r--r--qt5-merge-static-and-shared-library-trees.patch48
-rw-r--r--qt5-qmake-implib-dll-a.patch33
-rw-r--r--qt5-rename-qtmain-to-qt5main.patch20
-rw-r--r--qt5-use-external-angle-library.patch113
-rw-r--r--qt5-use-win32-g++-mkspecs-profile.patch15
-rw-r--r--qtbase-1-fixes.patch223
-rw-r--r--use-external-angle-library.patch13
18 files changed, 372 insertions, 2078 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5dca4b46b87..a0bb97272ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 8 23:25:30 UTC 2016
+# Mon Mar 28 17:51:43 UTC 2016
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 5.5.1
- pkgrel = 2
+ pkgver = 5.6.0
+ pkgrel = 1
url = https://www.qt.io/
arch = i686
arch = x86_64
@@ -32,8 +32,7 @@ pkgbase = mingw-w64-qt5-base
options = !strip
options = !buildflags
options = staticlibs
- source = https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
- source = qt5-merge-static-and-shared-library-trees.patch
+ source = https://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz
source = add-angle-support.patch
source = use-external-angle-library.patch
source = qt5-workaround-pkgconfig-install-issue.patch
@@ -43,37 +42,32 @@ pkgbase = mingw-w64-qt5-base
source = qt5-enable-rpath-for-host-tools.patch
source = qt5-dont-add-resource-files-to-qmake-libs.patch
source = qt5-prevent-debug-library-names-in-pkgconfig-files.patch
- source = qt5-qmake-implib-dll-a.patch
source = qt5-fix-static-dbus-detection.patch
- source = qt5-fix-static-harfbuzz-detection.patch
source = qt5-use-win32-g++-mkspecs-profile.patch
source = qt5-use-system-zlib-in-host-libs.patch
source = fix-opengl-to-many-sections.patch
source = fix-static-psql-mysql.patch
- source = qt5-disable-angle-opengl-testcode.patch
source = qt5-fix-QSemaphore-problem.patch
- source = a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
- md5sums = 687e2b122fa2c3390b5e20a166d38038
- md5sums = f51eb2b176b10af943831d33925c1251
+ source = qtbase-1-fixes.patch
+ source = qt5-fix-implib-ext.patch
+ md5sums = d6b6cfd333c22829c6c85fc52ceed019
md5sums = bab00ccc19d888997f323c80354a7c3f
- md5sums = ec25d1ff4033383cd5d2414d8189c228
+ md5sums = 9916ded318f21afbe8388f0b9822062b
md5sums = bc99c4cc6998295d76f37ed681c20d47
md5sums = 4fe6523dd1c34398df3aa5a8763530cc
- md5sums = c4d4ca54a2e9096d2af13a266177f6d6
+ md5sums = 22be0aa7fc36c5d08b3b41f0eccf7479
md5sums = 3bd322551924543553a2bf81b4419a09
- md5sums = 15e8eaa4f0a9a9990277c79e243770be
+ md5sums = 30fa9ddf8d842b1392e8d63868940657
md5sums = 99bb9f51ec684803768f36e407baf486
md5sums = 6a6bc88f35ac8080869de39bc128ce5b
- md5sums = e793479e0b86b39ddafd328140f1a24c
md5sums = 40de3aaf7d713034e06f4eece665b1ba
- md5sums = 4149c27286f110e37893d1764d4c8a68
- md5sums = 39cdea1b39a1d993df6d01a576e8116f
+ md5sums = d0c7198115ff028188ed1759b70fd981
md5sums = a265dea62755caf38187114143999224
md5sums = 612a4dfb9f1a3898a1920c28bb999159
md5sums = d0eb81aef1a21c65813fe4ddabbc4206
- md5sums = 0076233a43e7edaaaf8c2abca2ada8df
md5sums = 87cbd116c75ced1b075bf266f2455d50
- md5sums = 1bc70e7e3ea6a0178891d984f0451b3c
+ md5sums = 62d2977e57fccf1f16d7ea6bf06d3279
+ md5sums = 207420d43e997d1d41ef9684ef7fb715
pkgname = mingw-w64-qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index c8809529613..abdace4a648 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,12 @@
# Contributor: Filip Brcic <brcha@gna.org>
# Contributor: jellysheep <max.mail@dameweb.de>
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
pkgname=mingw-w64-qt5-base
-pkgver=5.5.1
-pkgrel=2
+pkgver=5.6.0
+pkgrel=1
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
arch=(i686 x86_64)
url="https://www.qt.io/"
@@ -36,7 +39,6 @@ makedepends=(mingw-w64-gcc
options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
- "qt5-merge-static-and-shared-library-trees.patch"
"add-angle-support.patch"
"use-external-angle-library.patch"
"qt5-workaround-pkgconfig-install-issue.patch"
@@ -46,37 +48,32 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
"qt5-enable-rpath-for-host-tools.patch"
"qt5-dont-add-resource-files-to-qmake-libs.patch"
"qt5-prevent-debug-library-names-in-pkgconfig-files.patch"
- "qt5-qmake-implib-dll-a.patch"
"qt5-fix-static-dbus-detection.patch"
- "qt5-fix-static-harfbuzz-detection.patch"
"qt5-use-win32-g++-mkspecs-profile.patch"
"qt5-use-system-zlib-in-host-libs.patch"
"fix-opengl-to-many-sections.patch"
"fix-static-psql-mysql.patch"
- "qt5-disable-angle-opengl-testcode.patch"
"qt5-fix-QSemaphore-problem.patch"
- "a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff")
-md5sums=('687e2b122fa2c3390b5e20a166d38038'
- 'f51eb2b176b10af943831d33925c1251'
+ "qtbase-1-fixes.patch"
+ "qt5-fix-implib-ext.patch")
+md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'bab00ccc19d888997f323c80354a7c3f'
- 'ec25d1ff4033383cd5d2414d8189c228'
+ '9916ded318f21afbe8388f0b9822062b'
'bc99c4cc6998295d76f37ed681c20d47'
'4fe6523dd1c34398df3aa5a8763530cc'
- 'c4d4ca54a2e9096d2af13a266177f6d6'
+ '22be0aa7fc36c5d08b3b41f0eccf7479'
'3bd322551924543553a2bf81b4419a09'
- '15e8eaa4f0a9a9990277c79e243770be'
+ '30fa9ddf8d842b1392e8d63868940657'
'99bb9f51ec684803768f36e407baf486'
'6a6bc88f35ac8080869de39bc128ce5b'
- 'e793479e0b86b39ddafd328140f1a24c'
'40de3aaf7d713034e06f4eece665b1ba'
- '4149c27286f110e37893d1764d4c8a68'
- '39cdea1b39a1d993df6d01a576e8116f'
+ 'd0c7198115ff028188ed1759b70fd981'
'a265dea62755caf38187114143999224'
'612a4dfb9f1a3898a1920c28bb999159'
'd0eb81aef1a21c65813fe4ddabbc4206'
- '0076233a43e7edaaaf8c2abca2ada8df'
'87cbd116c75ced1b075bf266f2455d50'
- '1bc70e7e3ea6a0178891d984f0451b3c')
+ '62d2977e57fccf1f16d7ea6bf06d3279'
+ '207420d43e997d1d41ef9684ef7fb715')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32"
# Helper functions for the split builds
@@ -96,11 +93,8 @@ isOpenGL && conflicts+=("mingw-w64-qt5-base")
prepare() {
cd "${srcdir}/${_pkgfqn}"
- # When building Qt as static library some files have a different content
- # when compared to the static library. Merge those changes manually.
- # This patch also applies some additional changes which are required to make
- # linking against the static version of Qt work without any manual fiddling
- patch -p0 -i ../qt5-merge-static-and-shared-library-trees.patch
+ # include fixes from MXE
+ patch -p1 -b -i ../qtbase-1-fixes.patch
if ! isOpenGL; then
# Add support for Angle
@@ -130,12 +124,8 @@ prepare() {
# files for the debug build an unique file name
patch -p1 -i ../qt5-prevent-debug-library-names-in-pkgconfig-files.patch
- # Fix qmake to create implibs with .dll.a extension for MinGW
- patch -p1 -i ../qt5-qmake-implib-dll-a.patch
-
- # As of Qt 5.4.1 the detection of the static DBus and Harfbuzz libraries got broken
+ # Fix the detection of the static DBus
patch -p1 -i ../qt5-fix-static-dbus-detection.patch
- patch -p1 -i ../qt5-fix-static-harfbuzz-detection.patch
# Patch the win32-g++ mkspecs profile to match our environment
patch -p1 -i ../qt5-use-win32-g++-mkspecs-profile.patch
@@ -168,26 +158,16 @@ prepare() {
# Build host libs with system zlib. This patch cannot be upstreamed as-is
# due to the other host-libs patches.
patch -p1 -i ../qt5-use-system-zlib-in-host-libs.patch
-
- # Workaround a compatibility issue because we are using an older version of ANGLE in Fedora
- # Upgrading the mingw-angleproject package isn't possible for now because mingw-qt5-qtwebkit doesn't support the latest ANGLE yet..
- #
- # /home/erik/fedora/mingw-qt5-qtbase/qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp:376:15: error: 'EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE' was not declared in this scope
- # EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE, EGL_NONE }
- # ^
- # /home/erik/fedora/mingw-qt5-qtbase/qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp:376:53: error: 'EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE' was not declared in this scope
- # EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE, EGL_NONE }
- patch -p1 -b -i ../qt5-disable-angle-opengl-testcode.patch
- patch configure ../qt5-fix-QSemaphore-problem.patch
+ # Fix qmake to append .dll.a extension to import libs
+ patch -p1 -i ../qt5-fix-implib-ext.patch
- # QTBUG-49174 Prevent warning output when QWebView loads QNetworkRequest
- patch -p1 -b -i ../a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
+ patch configure ../qt5-fix-QSemaphore-problem.patch
isStatic && patch -p0 -i ../fix-static-psql-mysql.patch
# Make sure the Qt5 build system uses our external ANGLE library
- rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,KHR}
+ rm -rf src/3rdparty/angle include/QtANGLE/{EGL,GLES2,GLES3,KHR}
# As well as our external PCRE library and zlib
rm -rf src/3rdparty/{pcre,zlib}
@@ -248,7 +228,7 @@ build() {
-sysconfdir /usr/${_arch}/etc \
-translationdir /usr/${_arch}/share/qt/translations \
-device-option CROSS_COMPILE=${_arch}-"
-
+
# fix include directory of dbus
qt_configure_args+=" $(${_arch}-pkg-config --cflags-only-I dbus-1 --cflags)"
@@ -350,11 +330,12 @@ package() {
# remove doc
rm -rf "${pkgdir}/usr/${_arch}/share/doc"
- # And finaly, strip the binaries
+ # strip the binaries
if ! isStatic; then
+ strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*[!.pl]
strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"{,DBus}.so.${pkgver}
fi
-
+
# keeping prl files for base build since qbs seems to need them.
if isStatic; then
rm -f "${pkgdir}/usr/${_arch}/lib"{,/qt/plugins/*}/*.prl
diff --git a/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff b/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
deleted file mode 100644
index 223b6f77f04..00000000000
--- a/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
-index c1956ae..76c2f57 100644
---- a/src/network/access/qnetworkreplyhttpimpl.cpp
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
-@@ -1679,8 +1679,9 @@ void QNetworkReplyHttpImplPrivate::_q_startOperation()
- #endif
- } else {
- #ifndef QT_NO_BEARERMANAGEMENT
-- QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
-- q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
-+ if (session)
-+ QObject::connect(session.data(), SIGNAL(stateChanged(QNetworkSession::State)),
-+ q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
- #endif
- }
-
diff --git a/angle-fix.patch b/angle-fix.patch
deleted file mode 100644
index 77374d1dcc2..00000000000
--- a/angle-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src.orig/3rdparty/angle/src/compiler/glslang.y 2014-01-02 11:53:56.393615041 +0100
-+++ src/3rdparty/angle/src/compiler/glslang.y 2014-01-02 12:06:10.904972303 +0100
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
- %pure-parser
- %parse-param {TParseContext* context}
- %locations
-+%lex-param {YYLEX_PARAM}
-
- %code requires {
- #define YYLTYPE TSourceLoc
-@@ -90,7 +91,7 @@ extern void yyerror(YYLTYPE* yylloc, TPa
-
- #define YYLLOC_DEFAULT(Current, Rhs, N) \
- do { \
-- if (YYID(N)) { \
-+ if (N) { \
- (Current).first_file = YYRHSLOC(Rhs, 1).first_file; \
- (Current).first_line = YYRHSLOC(Rhs, 1).first_line; \
- (Current).last_file = YYRHSLOC(Rhs, N).last_file; \
diff --git a/qt-5.1.x-win_flex-replace.patch b/qt-5.1.x-win_flex-replace.patch
deleted file mode 100644
index 0dd6a2cf4ff..00000000000
--- a/qt-5.1.x-win_flex-replace.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- qt-stable/qtbase/src/angle/src/compiler/translator_common.pro.orig 2013-06-18 08:49:51.975288500 +0000
-+++ qt-stable/qtbase/src/angle/src/compiler/translator_common.pro 2013-06-18 08:50:06.047321000 +0000
-@@ -92,7 +92,7 @@
- $$ANGLE_DIR/src/third_party/compiler/ArrayBoundsClamper.cpp
-
- # NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin
--flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME}
-+flex.commands = $$addGnuPath(flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}_lex.cpp ${QMAKE_FILE_NAME}
- flex.output = ${QMAKE_FILE_BASE}_lex.cpp
- flex.input = FLEX_SOURCES
- flex.dependency_type = TYPE_C
---- qt-stable/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro.orig 2013-06-18 08:50:54.314442500 +0000
-+++ qt-stable/qtbase/src/angle/src/compiler/preprocessor/preprocessor.pro 2013-06-18 08:51:52.606574000 +0000
-@@ -43,7 +43,7 @@
- $$ANGLE_DIR/src/compiler/preprocessor/Token.cpp
-
- # NOTE: 'win_flex' and 'bison' can be found in qt5/gnuwin32/bin
--flex.commands = $$addGnuPath(win_flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}.cpp ${QMAKE_FILE_NAME}
-+flex.commands = $$addGnuPath(flex) --noline --nounistd --outfile=${QMAKE_FILE_BASE}.cpp ${QMAKE_FILE_NAME}
- flex.output = ${QMAKE_FILE_BASE}.cpp
- flex.input = FLEX_SOURCES
- flex.dependency_type = TYPE_C \ No newline at end of file
diff --git a/qt5-add-angle-support.patch b/qt5-add-angle-support.patch
deleted file mode 100644
index 4eb5f872b02..00000000000
--- a/qt5-add-angle-support.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig 2014-12-05 09:24:14.000000000 -0700
-+++ configure 2014-12-11 09:24:32.545799224 -0700
-@@ -4765,7 +4765,7 @@
- fi
- if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
- if compileTest x11/opengl "OpenGL"; then
-- CFG_OPENGL=desktop
-+ CFG_OPENGL=angle
- elif compileTest unix/opengles2 "OpenGL ES 2.0"; then
- CFG_OPENGL=es2
- else
-@@ -5632,6 +5632,11 @@
- QT_CONFIG="$QT_CONFIG opengles2"
- fi
-
-+if [ "$CFG_OPENGL" = "angle" ]; then
-+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES QT_OPENGL_ES_2"
-+ QT_CONFIG="$QT_CONFIG opengles2 egl angle"
-+fi
-+
- if [ "$CFG_SHARED" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG shared"
- QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared"
-@@ -6588,7 +6593,7 @@
- report_support " NIS ...................." "$CFG_NIS"
- report_support " OpenGL / OpenVG:"
- report_support " EGL .................." "$CFG_EGL"
--report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+"
-+report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" angle "ANGLE"
- report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native"
- report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy"
- if [ -n "$PKG_CONFIG" ]; then
---- src/plugins/platforms/windows/qwindowsglcontext.cpp.orig 2014-12-05 09:24:37.000000000 -0700
-+++ src/plugins/platforms/windows/qwindowsglcontext.cpp 2014-12-11 09:27:37.364281924 -0700
-@@ -45,7 +45,9 @@
- #include <algorithm>
-
- #include <wingdi.h>
-+#ifndef QT_OPENGL_ES_2
- #include <GL/gl.h>
-+#endif
-
- // #define DEBUG_GL
-
diff --git a/qt5-add-compiled-shaders-remove-dxsdk.patch b/qt5-add-compiled-shaders-remove-dxsdk.patch
deleted file mode 100644
index b211b6d13de..00000000000
--- a/qt5-add-compiled-shaders-remove-dxsdk.patch
+++ /dev/null
@@ -1,1664 +0,0 @@
---- src.orig/angle/src/common/common.pri 2014-01-07 17:51:49.359526202 +0100
-+++ src/angle/src/common/common.pri 2014-01-07 17:52:54.280100599 +0100
-@@ -6,40 +6,6 @@ INCLUDEPATH += \
-
- LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI
-
--# DirectX is included in the Windows 8 Kit, but everything else requires the DX SDK.
--win32-msvc2012|win32-msvc2013 {
-- FXC = fxc.exe
--} else {
-- DX_DIR = $$(DXSDK_DIR)
-- isEmpty(DX_DIR) {
-- error("Cannot determine DirectX SDK location. Please set DXSDK_DIR environment variable.")
-- }
--
-- DXINC_DIR = $${DX_DIR}Include
-- contains(QT_ARCH, x86_64) {
-- DXLIB_DIR = $${DX_DIR}Lib\\x64
-- } else {
-- DXLIB_DIR = $${DX_DIR}Lib\\x86
-- }
--
-- equals(QMAKE_TARGET.arch, x86_64) {
-- FXC = \"$${DX_DIR}Utilities\\bin\\x64\\fxc.exe\"
-- } else {
-- FXC = \"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\"
-- }
--
-- msvc {
-- # Unfortunately MinGW cannot use the DirectX headers from the DX SDK because d3d11shader.h uses
-- # buffer annotation macros (eg: __out, __in) which are not defined in the MinGW copy of
-- # specstrings_strict.h
-- INCLUDEPATH += $$DXINC_DIR
--
-- # Similarly we want the MinGW linker to use the import libraries shipped with the compiler
-- # instead of those from the SDK which cause a crash on startup.
-- LIBS_PRIVATE += -L\"$$DXLIB_DIR\"
-- }
--}
--
- static: DEFINES *= QT_OPENGL_ES_2_ANGLE_STATIC
-
- HEADERS += \
---- src.orig/angle/src/libGLESv2/libGLESv2.pro 2014-01-07 17:51:49.359526202 +0100
-+++ src/angle/src/libGLESv2/libGLESv2.pro 2014-01-07 17:52:42.293327835 +0100
-@@ -180,61 +180,6 @@ VERTEX_SHADERS_PASSTHROUGH = Passthrough
- VERTEX_SHADERS_CLEAR = Clear
- SHADER_DIR = $$OUT_PWD/renderer/shaders/compiled
-
--for (ps, PIXEL_SHADERS_BLIT) {
-- fxc_ps_$${ps}.commands = $$FXC /nologo /E $$ps /T ps_2_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}.h
-- fxc_ps_$${ps}.input = PS_BLIT_INPUT
-- fxc_ps_$${ps}.dependency_type = TYPE_C
-- fxc_ps_$${ps}.variable_out = HEADERS
-- fxc_ps_$${ps}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
--}
--for (ps, PIXEL_SHADERS_PASSTHROUGH) {
-- fxc_ps_$${ps}.commands = $$FXC /nologo /E PS_$$ps /T ps_4_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}11ps.h
-- fxc_ps_$${ps}.input = PASSTHROUGH_INPUT
-- fxc_ps_$${ps}.dependency_type = TYPE_C
-- fxc_ps_$${ps}.variable_out = HEADERS
-- fxc_ps_$${ps}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
--}
--for (ps, PIXEL_SHADERS_CLEAR) {
-- fxc_ps_$${ps}.commands = $$FXC /nologo /E PS_$$ps /T ps_4_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_ps_$${ps}.output = $$SHADER_DIR/$${ps}11ps.h
-- fxc_ps_$${ps}.input = CLEAR_INPUT
-- fxc_ps_$${ps}.dependency_type = TYPE_C
-- fxc_ps_$${ps}.variable_out = HEADERS
-- fxc_ps_$${ps}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_ps_$${ps}
--}
--for (vs, VERTEX_SHADERS_BLIT) {
-- fxc_vs_$${vs}.commands = $$FXC /nologo /E $$vs /T vs_2_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}.h
-- fxc_vs_$${vs}.input = VS_BLIT_INPUT
-- fxc_vs_$${vs}.dependency_type = TYPE_C
-- fxc_vs_$${vs}.variable_out = HEADERS
-- fxc_vs_$${vs}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
--}
--for (vs, VERTEX_SHADERS_PASSTHROUGH) {
-- fxc_vs_$${vs}.commands = $$FXC /nologo /E VS_$$vs /T vs_4_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}11vs.h
-- fxc_vs_$${vs}.input = PASSTHROUGH_INPUT
-- fxc_vs_$${vs}.dependency_type = TYPE_C
-- fxc_vs_$${vs}.variable_out = HEADERS
-- fxc_vs_$${vs}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
--}
--for (vs, VERTEX_SHADERS_CLEAR) {
-- fxc_vs_$${vs}.commands = $$FXC /nologo /E VS_$$vs /T vs_4_0 /Fh ${QMAKE_FILE_OUT} ${QMAKE_FILE_NAME}
-- fxc_vs_$${vs}.output = $$SHADER_DIR/$${vs}11vs.h
-- fxc_vs_$${vs}.input = CLEAR_INPUT
-- fxc_vs_$${vs}.dependency_type = TYPE_C
-- fxc_vs_$${vs}.variable_out = HEADERS
-- fxc_vs_$${vs}.CONFIG += target_predeps
-- QMAKE_EXTRA_COMPILERS += fxc_vs_$${vs}
--}
--
- load(qt_installs)
-
- khr_headers.files = $$ANGLE_DIR/include/KHR/khrplatform.h
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clear11vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clear11vs.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,131 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// POSITION 0 xyz 0 NONE float xyz
-+// COLOR 0 xyzw 1 NONE float xyzw
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float xyzw
-+// COLOR 0 xyzw 1 NONE float xyzw
-+//
-+vs_4_0
-+dcl_input v0.xyz
-+dcl_input v1.xyzw
-+dcl_output_siv o0.xyzw, position
-+dcl_output o1.xyzw
-+mov o0.xyz, v0.xyzx
-+mov o0.w, l(1.000000)
-+mov o1.xyzw, v1.xyzw
-+ret
-+// Approximately 4 instruction slots used
-+#endif
-+
-+const BYTE g_VS_Clear[] =
-+{
-+ 68, 88, 66, 67, 97, 5,
-+ 13, 163, 160, 254, 95, 127,
-+ 30, 194, 121, 144, 236, 185,
-+ 59, 29, 1, 0, 0, 0,
-+ 48, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 140, 0, 0, 0, 220, 0,
-+ 0, 0, 48, 1, 0, 0,
-+ 180, 1, 0, 0, 82, 68,
-+ 69, 70, 80, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 254, 255, 0, 1, 0, 0,
-+ 28, 0, 0, 0, 77, 105,
-+ 99, 114, 111, 115, 111, 102,
-+ 116, 32, 40, 82, 41, 32,
-+ 72, 76, 83, 76, 32, 83,
-+ 104, 97, 100, 101, 114, 32,
-+ 67, 111, 109, 112, 105, 108,
-+ 101, 114, 32, 57, 46, 51,
-+ 48, 46, 57, 50, 48, 48,
-+ 46, 49, 54, 51, 56, 52,
-+ 0, 171, 73, 83, 71, 78,
-+ 72, 0, 0, 0, 2, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 56, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 7, 7, 0, 0,
-+ 65, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 15, 15, 0, 0,
-+ 80, 79, 83, 73, 84, 73,
-+ 79, 78, 0, 67, 79, 76,
-+ 79, 82, 0, 171, 79, 83,
-+ 71, 78, 76, 0, 0, 0,
-+ 2, 0, 0, 0, 8, 0,
-+ 0, 0, 56, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 15, 0,
-+ 0, 0, 68, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 15, 0,
-+ 0, 0, 83, 86, 95, 80,
-+ 79, 83, 73, 84, 73, 79,
-+ 78, 0, 67, 79, 76, 79,
-+ 82, 0, 171, 171, 83, 72,
-+ 68, 82, 124, 0, 0, 0,
-+ 64, 0, 1, 0, 31, 0,
-+ 0, 0, 95, 0, 0, 3,
-+ 114, 16, 16, 0, 0, 0,
-+ 0, 0, 95, 0, 0, 3,
-+ 242, 16, 16, 0, 1, 0,
-+ 0, 0, 103, 0, 0, 4,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 101, 0, 0, 3, 242, 32,
-+ 16, 0, 1, 0, 0, 0,
-+ 54, 0, 0, 5, 114, 32,
-+ 16, 0, 0, 0, 0, 0,
-+ 70, 18, 16, 0, 0, 0,
-+ 0, 0, 54, 0, 0, 5,
-+ 130, 32, 16, 0, 0, 0,
-+ 0, 0, 1, 64, 0, 0,
-+ 0, 0, 128, 63, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 1, 0, 0, 0, 70, 30,
-+ 16, 0, 1, 0, 0, 0,
-+ 62, 0, 0, 1, 83, 84,
-+ 65, 84, 116, 0, 0, 0,
-+ 4, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 4, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 4, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clearmultiple11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,196 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float
-+// COLOR 0 xyzw 1 NONE float xyzw
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_TARGET 0 xyzw 0 TARGET float xyzw
-+// SV_TARGET 1 xyzw 1 TARGET float xyzw
-+// SV_TARGET 2 xyzw 2 TARGET float xyzw
-+// SV_TARGET 3 xyzw 3 TARGET float xyzw
-+// SV_TARGET 4 xyzw 4 TARGET float xyzw
-+// SV_TARGET 5 xyzw 5 TARGET float xyzw
-+// SV_TARGET 6 xyzw 6 TARGET float xyzw
-+// SV_TARGET 7 xyzw 7 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_input_ps linear v1.xyzw
-+dcl_output o0.xyzw
-+dcl_output o1.xyzw
-+dcl_output o2.xyzw
-+dcl_output o3.xyzw
-+dcl_output o4.xyzw
-+dcl_output o5.xyzw
-+dcl_output o6.xyzw
-+dcl_output o7.xyzw
-+mov o0.xyzw, v1.xyzw
-+mov o1.xyzw, v1.xyzw
-+mov o2.xyzw, v1.xyzw
-+mov o3.xyzw, v1.xyzw
-+mov o4.xyzw, v1.xyzw
-+mov o5.xyzw, v1.xyzw
-+mov o6.xyzw, v1.xyzw
-+mov o7.xyzw, v1.xyzw
-+ret
-+// Approximately 9 instruction slots used
-+#endif
-+
-+const BYTE g_PS_ClearMultiple[] =
-+{
-+ 68, 88, 66, 67, 92, 54,
-+ 120, 105, 166, 196, 132, 158,
-+ 209, 33, 185, 122, 8, 189,
-+ 145, 114, 1, 0, 0, 0,
-+ 88, 3, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 140, 0, 0, 0, 224, 0,
-+ 0, 0, 188, 1, 0, 0,
-+ 220, 2, 0, 0, 82, 68,
-+ 69, 70, 80, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 28, 0, 0, 0, 77, 105,
-+ 99, 114, 111, 115, 111, 102,
-+ 116, 32, 40, 82, 41, 32,
-+ 72, 76, 83, 76, 32, 83,
-+ 104, 97, 100, 101, 114, 32,
-+ 67, 111, 109, 112, 105, 108,
-+ 101, 114, 32, 57, 46, 51,
-+ 48, 46, 57, 50, 48, 48,
-+ 46, 49, 54, 51, 56, 52,
-+ 0, 171, 73, 83, 71, 78,
-+ 76, 0, 0, 0, 2, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 56, 0, 0, 0, 0, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 68, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 15, 15, 0, 0,
-+ 83, 86, 95, 80, 79, 83,
-+ 73, 84, 73, 79, 78, 0,
-+ 67, 79, 76, 79, 82, 0,
-+ 171, 171, 79, 83, 71, 78,
-+ 212, 0, 0, 0, 8, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 200, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 2, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 2, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 3, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 3, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 4, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 4, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 5, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 5, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 6, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 6, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 200, 0, 0, 0, 7, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 7, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 65, 82,
-+ 71, 69, 84, 0, 171, 171,
-+ 83, 72, 68, 82, 24, 1,
-+ 0, 0, 64, 0, 0, 0,
-+ 70, 0, 0, 0, 98, 16,
-+ 0, 3, 242, 16, 16, 0,
-+ 1, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 1, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 2, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 3, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 4, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 5, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 6, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 7, 0, 0, 0, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 70, 30,
-+ 16, 0, 1, 0, 0, 0,
-+ 54, 0, 0, 5, 242, 32,
-+ 16, 0, 1, 0, 0, 0,
-+ 70, 30, 16, 0, 1, 0,
-+ 0, 0, 54, 0, 0, 5,
-+ 242, 32, 16, 0, 2, 0,
-+ 0, 0, 70, 30, 16, 0,
-+ 1, 0, 0, 0, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 3, 0, 0, 0, 70, 30,
-+ 16, 0, 1, 0, 0, 0,
-+ 54, 0, 0, 5, 242, 32,
-+ 16, 0, 4, 0, 0, 0,
-+ 70, 30, 16, 0, 1, 0,
-+ 0, 0, 54, 0, 0, 5,
-+ 242, 32, 16, 0, 5, 0,
-+ 0, 0, 70, 30, 16, 0,
-+ 1, 0, 0, 0, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 6, 0, 0, 0, 70, 30,
-+ 16, 0, 1, 0, 0, 0,
-+ 54, 0, 0, 5, 242, 32,
-+ 16, 0, 7, 0, 0, 0,
-+ 70, 30, 16, 0, 1, 0,
-+ 0, 0, 62, 0, 0, 1,
-+ 83, 84, 65, 84, 116, 0,
-+ 0, 0, 9, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 9, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 9, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/clearsingle11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,110 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_Position 0 xyzw 0 POS float
-+// COLOR 0 xyzw 1 NONE float xyzw
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_Target 0 xyzw 0 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_input_ps linear v1.xyzw
-+dcl_output o0.xyzw
-+mov o0.xyzw, v1.xyzw
-+ret
-+// Approximately 2 instruction slots used
-+#endif
-+
-+const BYTE g_PS_ClearSingle[] =
-+{
-+ 68, 88, 66, 67, 13, 152,
-+ 32, 49, 222, 236, 92, 20,
-+ 188, 71, 88, 46, 163, 241,
-+ 188, 238, 1, 0, 0, 0,
-+ 208, 1, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 140, 0, 0, 0, 224, 0,
-+ 0, 0, 20, 1, 0, 0,
-+ 84, 1, 0, 0, 82, 68,
-+ 69, 70, 80, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 28, 0, 0, 0, 77, 105,
-+ 99, 114, 111, 115, 111, 102,
-+ 116, 32, 40, 82, 41, 32,
-+ 72, 76, 83, 76, 32, 83,
-+ 104, 97, 100, 101, 114, 32,
-+ 67, 111, 109, 112, 105, 108,
-+ 101, 114, 32, 57, 46, 51,
-+ 48, 46, 57, 50, 48, 48,
-+ 46, 49, 54, 51, 56, 52,
-+ 0, 171, 73, 83, 71, 78,
-+ 76, 0, 0, 0, 2, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 56, 0, 0, 0, 0, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 68, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 15, 15, 0, 0,
-+ 83, 86, 95, 80, 111, 115,
-+ 105, 116, 105, 111, 110, 0,
-+ 67, 79, 76, 79, 82, 0,
-+ 171, 171, 79, 83, 71, 78,
-+ 44, 0, 0, 0, 1, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 32, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 97, 114,
-+ 103, 101, 116, 0, 171, 171,
-+ 83, 72, 68, 82, 56, 0,
-+ 0, 0, 64, 0, 0, 0,
-+ 14, 0, 0, 0, 98, 16,
-+ 0, 3, 242, 16, 16, 0,
-+ 1, 0, 0, 0, 101, 0,
-+ 0, 3, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 70, 30,
-+ 16, 0, 1, 0, 0, 0,
-+ 62, 0, 0, 1, 83, 84,
-+ 65, 84, 116, 0, 0, 0,
-+ 2, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 2, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 2, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/componentmaskps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,79 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+///
-+// Parameters:
-+//
-+// float4 mode;
-+// sampler2D tex;
-+//
-+//
-+// Registers:
-+//
-+// Name Reg Size
-+// ------------ ----- ----
-+// mode c0 1
-+// tex s0 1
-+//
-+
-+ ps_2_0
-+ dcl t0.xy
-+ dcl_2d s0
-+ texld r0, t0, s0
-+ mul r1.xyz, r0, c0.x
-+ mad r1.w, r0.w, c0.z, c0.w
-+ mov oC0, r1
-+
-+// approximately 4 instruction slots used (1 texture, 3 arithmetic)
-+#endif
-+
-+const BYTE g_ps20_componentmaskps[] =
-+{
-+ 0, 2, 255, 255, 254, 255,
-+ 44, 0, 67, 84, 65, 66,
-+ 28, 0, 0, 0, 119, 0,
-+ 0, 0, 0, 2, 255, 255,
-+ 2, 0, 0, 0, 28, 0,
-+ 0, 0, 0, 1, 0, 0,
-+ 112, 0, 0, 0, 68, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 1, 0, 0, 0, 76, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 92, 0, 0, 0, 3, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 96, 0, 0, 0, 0, 0,
-+ 0, 0, 109, 111, 100, 101,
-+ 0, 171, 171, 171, 1, 0,
-+ 3, 0, 1, 0, 4, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 116, 101, 120, 0,
-+ 4, 0, 12, 0, 1, 0,
-+ 1, 0, 1, 0, 0, 0,
-+ 0, 0, 0, 0, 112, 115,
-+ 95, 50, 95, 48, 0, 77,
-+ 105, 99, 114, 111, 115, 111,
-+ 102, 116, 32, 40, 82, 41,
-+ 32, 72, 76, 83, 76, 32,
-+ 83, 104, 97, 100, 101, 114,
-+ 32, 67, 111, 109, 112, 105,
-+ 108, 101, 114, 32, 57, 46,
-+ 51, 48, 46, 57, 50, 48,
-+ 48, 46, 49, 54, 51, 56,
-+ 52, 0, 171, 171, 31, 0,
-+ 0, 2, 0, 0, 0, 128,
-+ 0, 0, 3, 176, 31, 0,
-+ 0, 2, 0, 0, 0, 144,
-+ 0, 8, 15, 160, 66, 0,
-+ 0, 3, 0, 0, 15, 128,
-+ 0, 0, 228, 176, 0, 8,
-+ 228, 160, 5, 0, 0, 3,
-+ 1, 0, 7, 128, 0, 0,
-+ 228, 128, 0, 0, 0, 160,
-+ 4, 0, 0, 4, 1, 0,
-+ 8, 128, 0, 0, 255, 128,
-+ 0, 0, 170, 160, 0, 0,
-+ 255, 160, 1, 0, 0, 2,
-+ 0, 8, 15, 128, 1, 0,
-+ 228, 128, 255, 255, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/flipyvs.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/flipyvs.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,67 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+///
-+// Parameters:
-+//
-+// float4 halfPixelSize;
-+//
-+//
-+// Registers:
-+//
-+// Name Reg Size
-+// ------------- ----- ----
-+// halfPixelSize c0 1
-+//
-+
-+ vs_2_0
-+ def c1, 0.5, 1, 0, 0
-+ dcl_position v0
-+ add oPos, v0, c0
-+ mad oT0, v0, c1.xxyy, c1.xxzz
-+
-+// approximately 2 instruction slots used
-+#endif
-+
-+const BYTE g_vs20_flipyvs[] =
-+{
-+ 0, 2, 254, 255, 254, 255,
-+ 36, 0, 67, 84, 65, 66,
-+ 28, 0, 0, 0, 87, 0,
-+ 0, 0, 0, 2, 254, 255,
-+ 1, 0, 0, 0, 28, 0,
-+ 0, 0, 0, 1, 0, 0,
-+ 80, 0, 0, 0, 48, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 1, 0, 0, 0, 64, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 104, 97, 108, 102, 80, 105,
-+ 120, 101, 108, 83, 105, 122,
-+ 101, 0, 171, 171, 1, 0,
-+ 3, 0, 1, 0, 4, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 118, 115, 95, 50,
-+ 95, 48, 0, 77, 105, 99,
-+ 114, 111, 115, 111, 102, 116,
-+ 32, 40, 82, 41, 32, 72,
-+ 76, 83, 76, 32, 83, 104,
-+ 97, 100, 101, 114, 32, 67,
-+ 111, 109, 112, 105, 108, 101,
-+ 114, 32, 57, 46, 51, 48,
-+ 46, 57, 50, 48, 48, 46,
-+ 49, 54, 51, 56, 52, 0,
-+ 171, 171, 81, 0, 0, 5,
-+ 1, 0, 15, 160, 0, 0,
-+ 0, 63, 0, 0, 128, 63,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 31, 0, 0, 2,
-+ 0, 0, 0, 128, 0, 0,
-+ 15, 144, 2, 0, 0, 3,
-+ 0, 0, 15, 192, 0, 0,
-+ 228, 144, 0, 0, 228, 160,
-+ 4, 0, 0, 4, 0, 0,
-+ 15, 224, 0, 0, 228, 144,
-+ 1, 0, 80, 160, 1, 0,
-+ 160, 160, 255, 255, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/luminanceps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/luminanceps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,79 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+///
-+// Parameters:
-+//
-+// float4 mode;
-+// sampler2D tex;
-+//
-+//
-+// Registers:
-+//
-+// Name Reg Size
-+// ------------ ----- ----
-+// mode c0 1
-+// tex s0 1
-+//
-+
-+ ps_2_0
-+ dcl t0.xy
-+ dcl_2d s0
-+ texld r0, t0, s0
-+ mad r1.w, r0.w, c0.x, c0.y
-+ mov r1.xyz, r0.x
-+ mov oC0, r1
-+
-+// approximately 4 instruction slots used (1 texture, 3 arithmetic)
-+#endif
-+
-+const BYTE g_ps20_luminanceps[] =
-+{
-+ 0, 2, 255, 255, 254, 255,
-+ 44, 0, 67, 84, 65, 66,
-+ 28, 0, 0, 0, 119, 0,
-+ 0, 0, 0, 2, 255, 255,
-+ 2, 0, 0, 0, 28, 0,
-+ 0, 0, 0, 1, 0, 0,
-+ 112, 0, 0, 0, 68, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 1, 0, 0, 0, 76, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 92, 0, 0, 0, 3, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 96, 0, 0, 0, 0, 0,
-+ 0, 0, 109, 111, 100, 101,
-+ 0, 171, 171, 171, 1, 0,
-+ 3, 0, 1, 0, 4, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 116, 101, 120, 0,
-+ 4, 0, 12, 0, 1, 0,
-+ 1, 0, 1, 0, 0, 0,
-+ 0, 0, 0, 0, 112, 115,
-+ 95, 50, 95, 48, 0, 77,
-+ 105, 99, 114, 111, 115, 111,
-+ 102, 116, 32, 40, 82, 41,
-+ 32, 72, 76, 83, 76, 32,
-+ 83, 104, 97, 100, 101, 114,
-+ 32, 67, 111, 109, 112, 105,
-+ 108, 101, 114, 32, 57, 46,
-+ 51, 48, 46, 57, 50, 48,
-+ 48, 46, 49, 54, 51, 56,
-+ 52, 0, 171, 171, 31, 0,
-+ 0, 2, 0, 0, 0, 128,
-+ 0, 0, 3, 176, 31, 0,
-+ 0, 2, 0, 0, 0, 144,
-+ 0, 8, 15, 160, 66, 0,
-+ 0, 3, 0, 0, 15, 128,
-+ 0, 0, 228, 176, 0, 8,
-+ 228, 160, 4, 0, 0, 4,
-+ 1, 0, 8, 128, 0, 0,
-+ 255, 128, 0, 0, 0, 160,
-+ 0, 0, 85, 160, 1, 0,
-+ 0, 2, 1, 0, 7, 128,
-+ 0, 0, 0, 128, 1, 0,
-+ 0, 2, 0, 8, 15, 128,
-+ 1, 0, 228, 128, 255, 255,
-+ 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthrough11vs.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,134 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// POSITION 0 xy 0 NONE float xy
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float xyzw
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+vs_4_0
-+dcl_input v0.xy
-+dcl_input v1.xy
-+dcl_output_siv o0.xyzw, position
-+dcl_output o1.xy
-+mov o0.xy, v0.xyxx
-+mov o0.zw, l(0,0,0,1.000000)
-+mov o1.xy, v1.xyxx
-+ret
-+// Approximately 4 instruction slots used
-+#endif
-+
-+const BYTE g_VS_Passthrough[] =
-+{
-+ 68, 88, 66, 67, 197, 214,
-+ 184, 85, 240, 94, 71, 48,
-+ 165, 34, 142, 233, 0, 135,
-+ 193, 178, 1, 0, 0, 0,
-+ 68, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 140, 0, 0, 0, 224, 0,
-+ 0, 0, 56, 1, 0, 0,
-+ 200, 1, 0, 0, 82, 68,
-+ 69, 70, 80, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 254, 255, 0, 1, 0, 0,
-+ 28, 0, 0, 0, 77, 105,
-+ 99, 114, 111, 115, 111, 102,
-+ 116, 32, 40, 82, 41, 32,
-+ 72, 76, 83, 76, 32, 83,
-+ 104, 97, 100, 101, 114, 32,
-+ 67, 111, 109, 112, 105, 108,
-+ 101, 114, 32, 57, 46, 51,
-+ 48, 46, 57, 50, 48, 48,
-+ 46, 49, 54, 51, 56, 52,
-+ 0, 171, 73, 83, 71, 78,
-+ 76, 0, 0, 0, 2, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 56, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 3, 0, 0,
-+ 65, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 3, 0, 0,
-+ 80, 79, 83, 73, 84, 73,
-+ 79, 78, 0, 84, 69, 88,
-+ 67, 79, 79, 82, 68, 0,
-+ 171, 171, 79, 83, 71, 78,
-+ 80, 0, 0, 0, 2, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 56, 0, 0, 0, 0, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 68, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 12, 0, 0,
-+ 83, 86, 95, 80, 79, 83,
-+ 73, 84, 73, 79, 78, 0,
-+ 84, 69, 88, 67, 79, 79,
-+ 82, 68, 0, 171, 171, 171,
-+ 83, 72, 68, 82, 136, 0,
-+ 0, 0, 64, 0, 1, 0,
-+ 34, 0, 0, 0, 95, 0,
-+ 0, 3, 50, 16, 16, 0,
-+ 0, 0, 0, 0, 95, 0,
-+ 0, 3, 50, 16, 16, 0,
-+ 1, 0, 0, 0, 103, 0,
-+ 0, 4, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 101, 0, 0, 3,
-+ 50, 32, 16, 0, 1, 0,
-+ 0, 0, 54, 0, 0, 5,
-+ 50, 32, 16, 0, 0, 0,
-+ 0, 0, 70, 16, 16, 0,
-+ 0, 0, 0, 0, 54, 0,
-+ 0, 8, 194, 32, 16, 0,
-+ 0, 0, 0, 0, 2, 64,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 128, 63,
-+ 54, 0, 0, 5, 50, 32,
-+ 16, 0, 1, 0, 0, 0,
-+ 70, 16, 16, 0, 1, 0,
-+ 0, 0, 62, 0, 0, 1,
-+ 83, 84, 65, 84, 116, 0,
-+ 0, 0, 4, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 4, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 4, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughlum11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,152 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+// Resource Bindings:
-+//
-+// Name Type Format Dim Slot Elements
-+// ------------------------------ ---------- ------- ----------- ---- --------
-+// Sampler sampler NA NA 0 1
-+// Texture texture float4 2d 0 1
-+//
-+//
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_TARGET 0 xyzw 0 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_sampler s0, mode_default
-+dcl_resource_texture2d (float,float,float,float) t0
-+dcl_input_ps linear v1.xy
-+dcl_output o0.xyzw
-+dcl_temps 1
-+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-+mov o0.xyz, r0.xxxx
-+mov o0.w, l(1.000000)
-+ret
-+// Approximately 4 instruction slots used
-+#endif
-+
-+const BYTE g_PS_PassthroughLum[] =
-+{
-+ 68, 88, 66, 67, 244, 9,
-+ 213, 147, 19, 249, 70, 111,
-+ 157, 92, 243, 160, 40, 144,
-+ 238, 221, 1, 0, 0, 0,
-+ 128, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 220, 0, 0, 0, 52, 1,
-+ 0, 0, 104, 1, 0, 0,
-+ 4, 2, 0, 0, 82, 68,
-+ 69, 70, 160, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 108, 0, 0, 0, 92, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 100, 0, 0, 0, 2, 0,
-+ 0, 0, 5, 0, 0, 0,
-+ 4, 0, 0, 0, 255, 255,
-+ 255, 255, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 13, 0,
-+ 0, 0, 83, 97, 109, 112,
-+ 108, 101, 114, 0, 84, 101,
-+ 120, 116, 117, 114, 101, 0,
-+ 77, 105, 99, 114, 111, 115,
-+ 111, 102, 116, 32, 40, 82,
-+ 41, 32, 72, 76, 83, 76,
-+ 32, 83, 104, 97, 100, 101,
-+ 114, 32, 67, 111, 109, 112,
-+ 105, 108, 101, 114, 32, 57,
-+ 46, 51, 48, 46, 57, 50,
-+ 48, 48, 46, 49, 54, 51,
-+ 56, 52, 0, 171, 73, 83,
-+ 71, 78, 80, 0, 0, 0,
-+ 2, 0, 0, 0, 8, 0,
-+ 0, 0, 56, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 15, 0,
-+ 0, 0, 68, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 3, 3,
-+ 0, 0, 83, 86, 95, 80,
-+ 79, 83, 73, 84, 73, 79,
-+ 78, 0, 84, 69, 88, 67,
-+ 79, 79, 82, 68, 0, 171,
-+ 171, 171, 79, 83, 71, 78,
-+ 44, 0, 0, 0, 1, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 32, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 65, 82,
-+ 71, 69, 84, 0, 171, 171,
-+ 83, 72, 68, 82, 148, 0,
-+ 0, 0, 64, 0, 0, 0,
-+ 37, 0, 0, 0, 90, 0,
-+ 0, 3, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 88, 24,
-+ 0, 4, 0, 112, 16, 0,
-+ 0, 0, 0, 0, 85, 85,
-+ 0, 0, 98, 16, 0, 3,
-+ 50, 16, 16, 0, 1, 0,
-+ 0, 0, 101, 0, 0, 3,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 104, 0, 0, 2,
-+ 1, 0, 0, 0, 69, 0,
-+ 0, 9, 242, 0, 16, 0,
-+ 0, 0, 0, 0, 70, 16,
-+ 16, 0, 1, 0, 0, 0,
-+ 70, 126, 16, 0, 0, 0,
-+ 0, 0, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 54, 0,
-+ 0, 5, 114, 32, 16, 0,
-+ 0, 0, 0, 0, 6, 0,
-+ 16, 0, 0, 0, 0, 0,
-+ 54, 0, 0, 5, 130, 32,
-+ 16, 0, 0, 0, 0, 0,
-+ 1, 64, 0, 0, 0, 0,
-+ 128, 63, 62, 0, 0, 1,
-+ 83, 84, 65, 84, 116, 0,
-+ 0, 0, 4, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughlumalpha11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,148 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+// Resource Bindings:
-+//
-+// Name Type Format Dim Slot Elements
-+// ------------------------------ ---------- ------- ----------- ---- --------
-+// Sampler sampler NA NA 0 1
-+// Texture texture float4 2d 0 1
-+//
-+//
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_TARGET 0 xyzw 0 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_sampler s0, mode_default
-+dcl_resource_texture2d (float,float,float,float) t0
-+dcl_input_ps linear v1.xy
-+dcl_output o0.xyzw
-+dcl_temps 1
-+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-+mov o0.xyzw, r0.xxxw
-+ret
-+// Approximately 3 instruction slots used
-+#endif
-+
-+const BYTE g_PS_PassthroughLumAlpha[] =
-+{
-+ 68, 88, 66, 67, 185, 14,
-+ 84, 223, 192, 42, 16, 133,
-+ 46, 100, 95, 221, 183, 97,
-+ 192, 23, 1, 0, 0, 0,
-+ 108, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 220, 0, 0, 0, 52, 1,
-+ 0, 0, 104, 1, 0, 0,
-+ 240, 1, 0, 0, 82, 68,
-+ 69, 70, 160, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 108, 0, 0, 0, 92, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 100, 0, 0, 0, 2, 0,
-+ 0, 0, 5, 0, 0, 0,
-+ 4, 0, 0, 0, 255, 255,
-+ 255, 255, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 13, 0,
-+ 0, 0, 83, 97, 109, 112,
-+ 108, 101, 114, 0, 84, 101,
-+ 120, 116, 117, 114, 101, 0,
-+ 77, 105, 99, 114, 111, 115,
-+ 111, 102, 116, 32, 40, 82,
-+ 41, 32, 72, 76, 83, 76,
-+ 32, 83, 104, 97, 100, 101,
-+ 114, 32, 67, 111, 109, 112,
-+ 105, 108, 101, 114, 32, 57,
-+ 46, 51, 48, 46, 57, 50,
-+ 48, 48, 46, 49, 54, 51,
-+ 56, 52, 0, 171, 73, 83,
-+ 71, 78, 80, 0, 0, 0,
-+ 2, 0, 0, 0, 8, 0,
-+ 0, 0, 56, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 15, 0,
-+ 0, 0, 68, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 3, 3,
-+ 0, 0, 83, 86, 95, 80,
-+ 79, 83, 73, 84, 73, 79,
-+ 78, 0, 84, 69, 88, 67,
-+ 79, 79, 82, 68, 0, 171,
-+ 171, 171, 79, 83, 71, 78,
-+ 44, 0, 0, 0, 1, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 32, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 65, 82,
-+ 71, 69, 84, 0, 171, 171,
-+ 83, 72, 68, 82, 128, 0,
-+ 0, 0, 64, 0, 0, 0,
-+ 32, 0, 0, 0, 90, 0,
-+ 0, 3, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 88, 24,
-+ 0, 4, 0, 112, 16, 0,
-+ 0, 0, 0, 0, 85, 85,
-+ 0, 0, 98, 16, 0, 3,
-+ 50, 16, 16, 0, 1, 0,
-+ 0, 0, 101, 0, 0, 3,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 104, 0, 0, 2,
-+ 1, 0, 0, 0, 69, 0,
-+ 0, 9, 242, 0, 16, 0,
-+ 0, 0, 0, 0, 70, 16,
-+ 16, 0, 1, 0, 0, 0,
-+ 70, 126, 16, 0, 0, 0,
-+ 0, 0, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 54, 0,
-+ 0, 5, 242, 32, 16, 0,
-+ 0, 0, 0, 0, 6, 12,
-+ 16, 0, 0, 0, 0, 0,
-+ 62, 0, 0, 1, 83, 84,
-+ 65, 84, 116, 0, 0, 0,
-+ 3, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 2, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 2, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,62 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+///
-+// Parameters:
-+//
-+// sampler2D tex;
-+//
-+//
-+// Registers:
-+//
-+// Name Reg Size
-+// ------------ ----- ----
-+// tex s0 1
-+//
-+
-+ ps_2_0
-+ dcl t0.xy
-+ dcl_2d s0
-+ texld r0, t0, s0
-+ mov oC0, r0
-+
-+// approximately 2 instruction slots used (1 texture, 1 arithmetic)
-+#endif
-+
-+const BYTE g_ps20_passthroughps[] =
-+{
-+ 0, 2, 255, 255, 254, 255,
-+ 33, 0, 67, 84, 65, 66,
-+ 28, 0, 0, 0, 75, 0,
-+ 0, 0, 0, 2, 255, 255,
-+ 1, 0, 0, 0, 28, 0,
-+ 0, 0, 0, 1, 0, 0,
-+ 68, 0, 0, 0, 48, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 52, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 116, 101, 120, 0, 4, 0,
-+ 12, 0, 1, 0, 1, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 112, 115, 95, 50,
-+ 95, 48, 0, 77, 105, 99,
-+ 114, 111, 115, 111, 102, 116,
-+ 32, 40, 82, 41, 32, 72,
-+ 76, 83, 76, 32, 83, 104,
-+ 97, 100, 101, 114, 32, 67,
-+ 111, 109, 112, 105, 108, 101,
-+ 114, 32, 57, 46, 51, 48,
-+ 46, 57, 50, 48, 48, 46,
-+ 49, 54, 51, 56, 52, 0,
-+ 171, 171, 31, 0, 0, 2,
-+ 0, 0, 0, 128, 0, 0,
-+ 3, 176, 31, 0, 0, 2,
-+ 0, 0, 0, 144, 0, 8,
-+ 15, 160, 66, 0, 0, 3,
-+ 0, 0, 15, 128, 0, 0,
-+ 228, 176, 0, 8, 228, 160,
-+ 1, 0, 0, 2, 0, 8,
-+ 15, 128, 0, 0, 228, 128,
-+ 255, 255, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughrgb11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,152 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+// Resource Bindings:
-+//
-+// Name Type Format Dim Slot Elements
-+// ------------------------------ ---------- ------- ----------- ---- --------
-+// Sampler sampler NA NA 0 1
-+// Texture texture float4 2d 0 1
-+//
-+//
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_TARGET 0 xyzw 0 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_sampler s0, mode_default
-+dcl_resource_texture2d (float,float,float,float) t0
-+dcl_input_ps linear v1.xy
-+dcl_output o0.xyzw
-+dcl_temps 1
-+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-+mov o0.xyz, r0.xyzx
-+mov o0.w, l(1.000000)
-+ret
-+// Approximately 4 instruction slots used
-+#endif
-+
-+const BYTE g_PS_PassthroughRGB[] =
-+{
-+ 68, 88, 66, 67, 125, 186,
-+ 250, 242, 113, 255, 59, 239,
-+ 119, 158, 237, 78, 220, 43,
-+ 160, 46, 1, 0, 0, 0,
-+ 128, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 220, 0, 0, 0, 52, 1,
-+ 0, 0, 104, 1, 0, 0,
-+ 4, 2, 0, 0, 82, 68,
-+ 69, 70, 160, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 108, 0, 0, 0, 92, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 100, 0, 0, 0, 2, 0,
-+ 0, 0, 5, 0, 0, 0,
-+ 4, 0, 0, 0, 255, 255,
-+ 255, 255, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 13, 0,
-+ 0, 0, 83, 97, 109, 112,
-+ 108, 101, 114, 0, 84, 101,
-+ 120, 116, 117, 114, 101, 0,
-+ 77, 105, 99, 114, 111, 115,
-+ 111, 102, 116, 32, 40, 82,
-+ 41, 32, 72, 76, 83, 76,
-+ 32, 83, 104, 97, 100, 101,
-+ 114, 32, 67, 111, 109, 112,
-+ 105, 108, 101, 114, 32, 57,
-+ 46, 51, 48, 46, 57, 50,
-+ 48, 48, 46, 49, 54, 51,
-+ 56, 52, 0, 171, 73, 83,
-+ 71, 78, 80, 0, 0, 0,
-+ 2, 0, 0, 0, 8, 0,
-+ 0, 0, 56, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 15, 0,
-+ 0, 0, 68, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 3, 3,
-+ 0, 0, 83, 86, 95, 80,
-+ 79, 83, 73, 84, 73, 79,
-+ 78, 0, 84, 69, 88, 67,
-+ 79, 79, 82, 68, 0, 171,
-+ 171, 171, 79, 83, 71, 78,
-+ 44, 0, 0, 0, 1, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 32, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 65, 82,
-+ 71, 69, 84, 0, 171, 171,
-+ 83, 72, 68, 82, 148, 0,
-+ 0, 0, 64, 0, 0, 0,
-+ 37, 0, 0, 0, 90, 0,
-+ 0, 3, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 88, 24,
-+ 0, 4, 0, 112, 16, 0,
-+ 0, 0, 0, 0, 85, 85,
-+ 0, 0, 98, 16, 0, 3,
-+ 50, 16, 16, 0, 1, 0,
-+ 0, 0, 101, 0, 0, 3,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 104, 0, 0, 2,
-+ 1, 0, 0, 0, 69, 0,
-+ 0, 9, 242, 0, 16, 0,
-+ 0, 0, 0, 0, 70, 16,
-+ 16, 0, 1, 0, 0, 0,
-+ 70, 126, 16, 0, 0, 0,
-+ 0, 0, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 54, 0,
-+ 0, 5, 114, 32, 16, 0,
-+ 0, 0, 0, 0, 70, 2,
-+ 16, 0, 0, 0, 0, 0,
-+ 54, 0, 0, 5, 130, 32,
-+ 16, 0, 0, 0, 0, 0,
-+ 1, 64, 0, 0, 0, 0,
-+ 128, 63, 62, 0, 0, 1,
-+ 83, 84, 65, 84, 116, 0,
-+ 0, 0, 4, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,141 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+//
-+///
-+// Resource Bindings:
-+//
-+// Name Type Format Dim Slot Elements
-+// ------------------------------ ---------- ------- ----------- ---- --------
-+// Sampler sampler NA NA 0 1
-+// Texture texture float4 2d 0 1
-+//
-+//
-+//
-+// Input signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_POSITION 0 xyzw 0 POS float
-+// TEXCOORD 0 xy 1 NONE float xy
-+//
-+//
-+// Output signature:
-+//
-+// Name Index Mask Register SysValue Format Used
-+// -------------------- ----- ------ -------- -------- ------- ------
-+// SV_TARGET 0 xyzw 0 TARGET float xyzw
-+//
-+ps_4_0
-+dcl_sampler s0, mode_default
-+dcl_resource_texture2d (float,float,float,float) t0
-+dcl_input_ps linear v1.xy
-+dcl_output o0.xyzw
-+sample o0.xyzw, v1.xyxx, t0.xyzw, s0
-+ret
-+// Approximately 2 instruction slots used
-+#endif
-+
-+const BYTE g_PS_PassthroughRGBA[] =
-+{
-+ 68, 88, 66, 67, 151, 152,
-+ 8, 102, 174, 135, 76, 57,
-+ 100, 146, 59, 74, 205, 35,
-+ 206, 21, 1, 0, 0, 0,
-+ 80, 2, 0, 0, 5, 0,
-+ 0, 0, 52, 0, 0, 0,
-+ 220, 0, 0, 0, 52, 1,
-+ 0, 0, 104, 1, 0, 0,
-+ 212, 1, 0, 0, 82, 68,
-+ 69, 70, 160, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 28, 0, 0, 0, 0, 4,
-+ 255, 255, 0, 1, 0, 0,
-+ 108, 0, 0, 0, 92, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 1, 0, 0, 0,
-+ 100, 0, 0, 0, 2, 0,
-+ 0, 0, 5, 0, 0, 0,
-+ 4, 0, 0, 0, 255, 255,
-+ 255, 255, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 13, 0,
-+ 0, 0, 83, 97, 109, 112,
-+ 108, 101, 114, 0, 84, 101,
-+ 120, 116, 117, 114, 101, 0,
-+ 77, 105, 99, 114, 111, 115,
-+ 111, 102, 116, 32, 40, 82,
-+ 41, 32, 72, 76, 83, 76,
-+ 32, 83, 104, 97, 100, 101,
-+ 114, 32, 67, 111, 109, 112,
-+ 105, 108, 101, 114, 32, 57,
-+ 46, 51, 48, 46, 57, 50,
-+ 48, 48, 46, 49, 54, 51,
-+ 56, 52, 0, 171, 73, 83,
-+ 71, 78, 80, 0, 0, 0,
-+ 2, 0, 0, 0, 8, 0,
-+ 0, 0, 56, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 0, 0, 0, 0, 15, 0,
-+ 0, 0, 68, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 3, 0, 0, 0,
-+ 1, 0, 0, 0, 3, 3,
-+ 0, 0, 83, 86, 95, 80,
-+ 79, 83, 73, 84, 73, 79,
-+ 78, 0, 84, 69, 88, 67,
-+ 79, 79, 82, 68, 0, 171,
-+ 171, 171, 79, 83, 71, 78,
-+ 44, 0, 0, 0, 1, 0,
-+ 0, 0, 8, 0, 0, 0,
-+ 32, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 3, 0, 0, 0, 0, 0,
-+ 0, 0, 15, 0, 0, 0,
-+ 83, 86, 95, 84, 65, 82,
-+ 71, 69, 84, 0, 171, 171,
-+ 83, 72, 68, 82, 100, 0,
-+ 0, 0, 64, 0, 0, 0,
-+ 25, 0, 0, 0, 90, 0,
-+ 0, 3, 0, 96, 16, 0,
-+ 0, 0, 0, 0, 88, 24,
-+ 0, 4, 0, 112, 16, 0,
-+ 0, 0, 0, 0, 85, 85,
-+ 0, 0, 98, 16, 0, 3,
-+ 50, 16, 16, 0, 1, 0,
-+ 0, 0, 101, 0, 0, 3,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 69, 0, 0, 9,
-+ 242, 32, 16, 0, 0, 0,
-+ 0, 0, 70, 16, 16, 0,
-+ 1, 0, 0, 0, 70, 126,
-+ 16, 0, 0, 0, 0, 0,
-+ 0, 96, 16, 0, 0, 0,
-+ 0, 0, 62, 0, 0, 1,
-+ 83, 84, 65, 84, 116, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 1, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0
-+};
---- src.orig/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/standardvs.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/3rdparty/angle/src/libGLESv2/renderer/shaders/compiled/standardvs.h 2014-01-07 18:29:31.077509230 +0100
-@@ -0,0 +1,67 @@
-+#if 0
-+//
-+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.16384
-+//
-+///
-+// Parameters:
-+//
-+// float4 halfPixelSize;
-+//
-+//
-+// Registers:
-+//
-+// Name Reg Size
-+// ------------- ----- ----
-+// halfPixelSize c0 1
-+//
-+
-+ vs_2_0
-+ def c1, 0.5, -0.5, 1, 0
-+ dcl_position v0
-+ add oPos, v0, c0
-+ mad oT0, v0, c1.xyzz, c1.xxww
-+
-+// approximately 2 instruction slots used
-+#endif
-+
-+const BYTE g_vs20_standardvs[] =
-+{
-+ 0, 2, 254, 255, 254, 255,
-+ 36, 0, 67, 84, 65, 66,
-+ 28, 0, 0, 0, 87, 0,
-+ 0, 0, 0, 2, 254, 255,
-+ 1, 0, 0, 0, 28, 0,
-+ 0, 0, 0, 1, 0, 0,
-+ 80, 0, 0, 0, 48, 0,
-+ 0, 0, 2, 0, 0, 0,
-+ 1, 0, 0, 0, 64, 0,
-+ 0, 0, 0, 0, 0, 0,
-+ 104, 97, 108, 102, 80, 105,
-+ 120, 101, 108, 83, 105, 122,
-+ 101, 0, 171, 171, 1, 0,
-+ 3, 0, 1, 0, 4, 0,
-+ 1, 0, 0, 0, 0, 0,
-+ 0, 0, 118, 115, 95, 50,
-+ 95, 48, 0, 77, 105, 99,
-+ 114, 111, 115, 111, 102, 116,
-+ 32, 40, 82, 41, 32, 72,
-+ 76, 83, 76, 32, 83, 104,
-+ 97, 100, 101, 114, 32, 67,
-+ 111, 109, 112, 105, 108, 101,
-+ 114, 32, 57, 46, 51, 48,
-+ 46, 57, 50, 48, 48, 46,
-+ 49, 54, 51, 56, 52, 0,
-+ 171, 171, 81, 0, 0, 5,
-+ 1, 0, 15, 160, 0, 0,
-+ 0, 63, 0, 0, 0, 191,
-+ 0, 0, 128, 63, 0, 0,
-+ 0, 0, 31, 0, 0, 2,
-+ 0, 0, 0, 128, 0, 0,
-+ 15, 144, 2, 0, 0, 3,
-+ 0, 0, 15, 192, 0, 0,
-+ 228, 144, 0, 0, 228, 160,
-+ 4, 0, 0, 4, 0, 0,
-+ 15, 224, 0, 0, 228, 144,
-+ 1, 0, 164, 160, 1, 0,
-+ 240, 160, 255, 255, 0, 0
-+};
diff --git a/qt5-disable-angle-opengl-testcode.patch b/qt5-disable-angle-opengl-testcode.patch
deleted file mode 100644
index a2bb3f65f62..00000000000
--- a/qt5-disable-angle-opengl-testcode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp.external_angle 2015-06-29 22:04:40.000000000 +0200
-+++ qtbase-opensource-src-5.5.0/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-08-05 21:37:55.922142528 +0200
-@@ -366,7 +366,7 @@
- EGLDisplay display = EGL_NO_DISPLAY;
- EGLint major = 0;
- EGLint minor = 0;
--#ifdef EGL_ANGLE_platform_angle
-+#if 0
- if (libEGL.eglGetPlatformDisplayEXT
- && (preferredType & QWindowsOpenGLTester::AngleBackendMask)) {
- const EGLint anglePlatformAttributes[][5] = {
diff --git a/qt5-enable-rpath-for-host-tools.patch b/qt5-enable-rpath-for-host-tools.patch
index 55aaf448b7d..2f2e96c7571 100644
--- a/qt5-enable-rpath-for-host-tools.patch
+++ b/qt5-enable-rpath-for-host-tools.patch
@@ -1,10 +1,18 @@
---- qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf.orig 2013-08-01 01:21:52.461910182 +0200
-+++ qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf 2013-08-01 01:22:46.777801052 +0200
+--- qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf.orig
++++ qtbase-opensource-src-5.1.0/mkspecs/features/qt_app.prf
@@ -20,6 +20,7 @@
QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
host_build: QT -= gui # no host tool will ever use gui
-+host_build: QT_CONFIG += rpath
++host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath
host_build:force_bootstrap {
!build_pass: CONFIG += release
contains(QT, core(-private)?|xml) {
+@@ -30,7 +30,6 @@
+ } else {
+ !build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release
+ target.path = $$[QT_INSTALL_BINS]
+- CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
+ }
+ INSTALLS += target
+
diff --git a/qt5-fix-implib-ext.patch b/qt5-fix-implib-ext.patch
new file mode 100644
index 00000000000..fd9167a0652
--- /dev/null
+++ b/qt5-fix-implib-ext.patch
@@ -0,0 +1,87 @@
+From f09d23b9cd22771e04f49b386e3b67df8ad108c3 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Mon, 10 Mar 2014 22:59:39 +0000
+Subject: [PATCH] win32-g++: Add QMAKE_EXTENSION_IMPORTLIB defaulting to 'a'
+
+This is to allow the MSYS2 project to set it to 'dll.a' so
+that static and shared Qt libraries can be installed into
+the same prefix without conflicting.
+
+To change it, you should pass -device-option to configure.
+
+Change-Id: I9ee49d2aef46e21f31b97611de2fc6d3070e288a
+---
+ mkspecs/features/create_cmake.prf | 5 +++--
+ qmake/generators/win32/mingw_make.cpp | 15 +++++++++++++--
+ qmake/generators/win32/mingw_make.h | 1 +
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
+index 82e2812..2d8a043 100644
+--- a/mkspecs/features/create_cmake.prf
++++ b/mkspecs/features/create_cmake.prf
+@@ -214,8 +214,9 @@ mac {
+ CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+ CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
+ } else {
+- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
+ }
+ } else {
+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
+index 6d5764f..77e910b 100644
+--- a/mkspecs/win32-g++/qmake.conf
++++ b/mkspecs/win32-g++/qmake.conf
+@@ -92,7 +92,7 @@
+ QMAKE_EXTENSION_SHLIB = dll
+ QMAKE_PREFIX_STATICLIB = lib
+ QMAKE_EXTENSION_STATICLIB = a
+-QMAKE_LIB_EXTENSIONS = a dll.a
++QMAKE_EXTENSION_IMPORTLIB = dll.a
+
+ QMAKE_LIBS =
+ QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
+diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
+index 6d5764f..77e910b 100644
+--- a/qmake/generators/win32/winmakefile.cpp
++++ b/qmake/generators/win32/winmakefile.cpp
+@@ -85,10 +85,14 @@
+ bool
+ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
+ {
+- ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
+- if (impexts.isEmpty())
+- impexts = project->values("QMAKE_EXTENSION_STATICLIB");
+- QList<QMakeLocalFileName> dirs;
++ ProStringList impexts;
++ if (project->isActiveConfig("staticlib")) {
++ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++ } else {
++ impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
++ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
++ }
++ QList<QMakeLocalFileName> dirs;
+ static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+ for (int i = 0; lflags[i]; i++) {
+ ProStringList &l = project->values(lflags[i]);
+@@ -233,9 +237,12 @@
+ if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
+ project->values("TARGET_EXT").append(".exe");
+ } else if (project->isActiveConfig("shared")) {
++ ProString impext = project->first("QMAKE_EXTENSION_IMPORTLIB");
++ if (impext.isEmpty())
++ impext = project->first("QMAKE_PREFIX_STATICLIB");
+ project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB")
+ + project->first("TARGET") + project->first("TARGET_VERSION_EXT")
+- + '.' + project->first("QMAKE_EXTENSION_STATICLIB"));
++ + '.' + impext);
+ project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
+ + project->first("QMAKE_EXTENSION_SHLIB"));
+ project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
+--
+1.9.0
+
diff --git a/qt5-fix-static-harfbuzz-detection.patch b/qt5-fix-static-harfbuzz-detection.patch
deleted file mode 100644
index fa04b3362f9..00000000000
--- a/qt5-fix-static-harfbuzz-detection.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- qtbase-opensource-src-5.4.1/config.tests/unix/harfbuzz/harfbuzz.pro.orig 2015-03-08 17:47:58.522991158 +0100
-+++ qtbase-opensource-src-5.4.1/config.tests/unix/harfbuzz/harfbuzz.pro 2015-03-08 17:48:19.491340185 +0100
-@@ -1,3 +1,3 @@
- SOURCES = harfbuzz.cpp
- CONFIG -= qt dylib
--LIBS += -lharfbuzz
-+LIBS += -lharfbuzz -lglib-2.0 -lws2_32 -lole32 -lwinmm -lshlwapi -lintl -liconv
diff --git a/qt5-merge-static-and-shared-library-trees.patch b/qt5-merge-static-and-shared-library-trees.patch
deleted file mode 100644
index 130e6400fa7..00000000000
--- a/qt5-merge-static-and-shared-library-trees.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- mkspecs/features/qt_functions.prf.orig 2012-09-05 23:30:01.612735271 +0200
-+++ mkspecs/features/qt_functions.prf 2012-09-05 23:32:40.030869399 +0200
-@@ -134,6 +134,19 @@
- }
-
- $$2 += $$LINKAGE
-+
-+ win32:CONFIG(static) {
-+ isEqual(MODULE_NAME, Qt5Core) {
-+ $$2 += $$QMAKE_LIBS_CORE
-+ } else:isEqual(MODULE_NAME, Qt5Gui) {
-+ $$2 += $$QMAKE_LIBS_GUI
-+ } else:isEqual(MODULE_NAME, Qt5Network) {
-+ $$2 += $$QMAKE_LIBS_NETWORK
-+ } else:isEqual(MODULE_NAME, Qt5OpenGL) {
-+ $$2 += $$QMAKE_LIBS_OPENGL
-+ }
-+ }
-+
- export($$2)
-
- !isEmpty(QMAKE_LSB) {
---- mkspecs/features/default_post.prf.orig 2012-09-05 23:28:56.827501401 +0200
-+++ mkspecs/features/default_post.prf 2012-09-05 23:29:31.617923080 +0200
-@@ -47,3 +50,8 @@
-
- QMAKE_INCDIR += $$QMAKE_INCDIR_POST
- QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
-+
-+win32:contains(CONFIG, static) {
-+ DEFINES += QT_STATIC
-+ QMAKE_LFLAGS += -static
-+}
---- configure.orig 2012-12-10 23:51:02.920255366 +0100
-+++ configure 2012-12-10 23:55:58.101753703 +0100
-@@ -6193,6 +6193,12 @@
- }
- QT_CONFIG += $QT_CONFIG
-
-+contains(CONFIG, static) {
-+ CONFIG -= shared
-+ QT_CONFIG += static jpeg gif
-+ QT_CONFIG -= shared
-+}
-+
- #versioning
- QT_VERSION = $QT_VERSION
- QT_MAJOR_VERSION = $QT_MAJOR_VERSION
diff --git a/qt5-qmake-implib-dll-a.patch b/qt5-qmake-implib-dll-a.patch
deleted file mode 100644
index 91ef32a1666..00000000000
--- a/qt5-qmake-implib-dll-a.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/qmake/generators/win32/mingw_make.cpp 2013-08-25 13:04:06.000000000 -0500
-+++ b/qmake/generators/win32/mingw_make.cpp 2014-01-02 01:24:31.640046700 -0600
-@@ -58,7 +58,7 @@
-
- QString MingwMakefileGenerator::getLibTarget()
- {
-- return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".a");
-+ return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".dll.a");
- }
-
- QString MingwMakefileGenerator::getManifestFileForRcFile() const
-@@ -250,7 +250,7 @@
- if(!project->first("DESTDIR").isEmpty())
- destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false);
- project->values("MINGW_IMPORT_LIB").prepend(destDir + "lib" + project->first("TARGET")
-- + project->first("TARGET_VERSION_EXT") + ".a");
-+ + project->first("TARGET_VERSION_EXT") + ".dll.a");
- project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + fileVar("MINGW_IMPORT_LIB"));
- }
-
---- a/mkspecs/features/create_cmake.prf.cmake 2013-10-22 10:49:28.000000000 +0200
-+++ b/mkspecs/features/create_cmake.prf 2013-10-23 21:38:02.959762089 +0200
-@@ -207,8 +207,8 @@
- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
- } else {
-- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
-- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.dll.a
-+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll.a
- }
- } else {
- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
diff --git a/qt5-rename-qtmain-to-qt5main.patch b/qt5-rename-qtmain-to-qt5main.patch
index 57c35da0f56..f65ad31ecaa 100644
--- a/qt5-rename-qtmain-to-qt5main.patch
+++ b/qt5-rename-qtmain-to-qt5main.patch
@@ -9,26 +9,14 @@
DESTDIR = $$QT.core.libs
CONFIG += static
---- qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf.orig 2014-04-29 18:53:49.511932034 +0200
-+++ qtbase-opensource-src-5.2.1/mkspecs/features/create_cmake.prf 2014-04-29 18:54:44.515819011 +0200
-@@ -203,8 +203,8 @@
- CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
-
- mingw {
-- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
-- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
-+ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
-
- !isEmpty(CMAKE_STATIC_TYPE) {
- CMAKE_STATIC_WINDOWS_BUILD = "true"
---- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.qtmain 2014-07-05 14:18:23.211155781 +0200
+
+--- qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf.orig 2014-07-05 14:18:23.211155781 +0200
+++ qtbase-opensource-src-5.3.1/mkspecs/features/win32/windows.prf 2014-07-05 14:18:46.045390147 +0200
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
mingw:DEFINES += QT_NEEDS_QMAIN
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
-- isEqual(entryLib, -lqtmain): {
+- isEqual(entryLib, -lqtmain) {
+ isEqual(entryLib, -lqt5main): {
!contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
QMAKE_LIBS += -L$$QT.core.libs
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch
deleted file mode 100644
index fef7949afb2..00000000000
--- a/qt5-use-external-angle-library.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-05 09:24:36.000000000 -0700
-+++ src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-11 10:19:51.599972209 -0700
-@@ -2,9 +2,9 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
- !!ELSE
--set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
- !!ENDIF
-
- _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
---- src/gui/gui.pro 2014-12-05 09:24:35.000000000 -0700
-+++ src/gui/gui.pro 2014-12-11 10:22:37.644366784 -0700
-@@ -17,12 +17,6 @@
- imageformats \
- egldeviceintegrations
-
--# This is here only because the platform plugin is no module, obviously.
--win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
-- MODULE_AUX_INCLUDES = \
-- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
--}
--
- load(qt_module)
-
- # Code coverage with TestCocoon
-@@ -33,6 +27,10 @@
-
- mac:!ios: LIBS_PRIVATE += -framework Cocoa
-
-+win32:contains(QT_CONFIG, angle) {
-+ LIBS_PRIVATE += -lGLESv2
-+}
-+
- CONFIG += simd optimize_full
-
- include(accessible/accessible.pri)
-@@ -55,13 +53,21 @@
- contains(QT_CONFIG, angle) {
- CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
- CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
-- CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
- CMAKE_ANGLE_GLES2_DLL_RELEASE = libGLESv2.dll
-- CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
- CMAKE_ANGLE_EGL_DLL_DEBUG = libEGLd.dll
-- CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
- CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2d.dll
-- CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
-+
-+ win32-g++* {
-+ CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.dll.a
-+ CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.dll.a
-+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.dll.a
-+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.dll.a
-+ } else {
-+ CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
-+ CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
-+ CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
-+ CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
-+ }
-
- CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
- } else {
---- src/opengl/opengl.pro 2014-12-05 09:24:31.000000000 -0700
-+++ src/opengl/opengl.pro 2014-12-11 10:15:45.884805707 -0700
-@@ -13,6 +13,10 @@
- contains(QT_CONFIG, opengl):CONFIG += opengl
- contains(QT_CONFIG, opengles2):CONFIG += opengles2
-
-+win32:contains(QT_CONFIG, angle) {
-+ LIBS_PRIVATE += -lGLESv2
-+}
-+
- HEADERS += qgl.h \
- qgl_p.h \
- qglcolormap.h \
---- src/plugins/platforms/windows/windows.pri 2014-12-05 09:24:37.000000000 -0700
-+++ src/plugins/platforms/windows/windows.pri 2014-12-11 10:13:45.228261276 -0700
-@@ -3,6 +3,7 @@
- !wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
-
- contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
-+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
-
- mingw: LIBS *= -luuid
- # For the dialog helpers:
---- src/src.pro 2014-12-05 09:24:31.000000000 -0700
-+++ src/src.pro 2014-12-11 10:06:14.882845813 -0700
-@@ -155,10 +155,6 @@
- SUBDIRS += src_3rdparty_harfbuzzng
- src_gui.depends += src_3rdparty_harfbuzzng
- }
-- win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
-- SUBDIRS += src_angle
-- src_gui.depends += src_angle
-- }
- contains(QT_CONFIG, freetype) {
- SUBDIRS += src_3rdparty_freetype
- src_platformsupport.depends += src_3rdparty_freetype
---- src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-05 09:24:37.000000000 -0700
-+++ src/plugins/platforms/windows/qwindowseglcontext.cpp 2014-12-11 20:07:27.099190408 -0700
-@@ -39,7 +39,7 @@
- #include <QtGui/QOpenGLContext>
-
- #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
--# include <QtANGLE/EGL/eglext.h>
-+# include <EGL/eglext.h>
- #endif
-
- QT_BEGIN_NAMESPACE
diff --git a/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-use-win32-g++-mkspecs-profile.patch
index a3499dab62c..23ca26609d8 100644
--- a/qt5-use-win32-g++-mkspecs-profile.patch
+++ b/qt5-use-win32-g++-mkspecs-profile.patch
@@ -22,8 +22,8 @@
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
-@@ -84,21 +84,26 @@
- QMAKE_EXTENSION_STATICLIB = a
+@@ -94,21 +94,26 @@
+ QMAKE_LIB_EXTENSIONS = a dll.a
QMAKE_LIBS =
-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
@@ -33,17 +33,18 @@
+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng -lharfbuzz -lglib-2.0 -lintl -lwinmm
+QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi
QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
--QMAKE_LIBS_OPENGL_ES2 = -llibEGL -llibGLESv2 -lgdi32 -luser32
--QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -ld3d9 -ldxguid -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2_DEBUG = $(QMAKE_LIBS_OPENGL_ES2)
+-QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -lgdi32 -luser32
+-QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32
QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main
-QMAKE_IDL = midl
+-QMAKE_LIB = $${CROSS_COMPILE}ar -ru
+QMAKE_IDL = $${CROSS_COMPILE}widl
- QMAKE_LIB = $${CROSS_COMPILE}ar -ru
++QMAKE_LIB = $${CROSS_COMPILE}ar -rc
QMAKE_RC = $${CROSS_COMPILE}windres
+QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool
+QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5
diff --git a/qtbase-1-fixes.patch b/qtbase-1-fixes.patch
new file mode 100644
index 00000000000..561bad3dcc7
--- /dev/null
+++ b/qtbase-1-fixes.patch
@@ -0,0 +1,223 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 6 Aug 2015 23:35:08 +0200
+Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE
+ specific)
+
+Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4
+
+diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
+index 39280de..e152b0d 100644
+--- a/src/3rdparty/freetype_dependency.pri
++++ b/src/3rdparty/freetype_dependency.pri
+@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
+ } else:contains(QT_CONFIG, system-freetype) {
+ # pull in the proper freetype2 include directory
+ include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
++ win32:shared:LIBS_PRIVATE += -lfreetype
+ }
+--
+2.5.0
+
+
+From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sat, 21 Jun 2014 13:12:49 +0200
+Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific)
+
+Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50
+
+diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
+index 32edd6e..a7f2c28 100644
+--- a/config.tests/unix/harfbuzz/harfbuzz.pro
++++ b/config.tests/unix/harfbuzz/harfbuzz.pro
+@@ -1,3 +1,4 @@
+ SOURCES = harfbuzz.cpp
+ CONFIG -= qt dylib
+-LIBS += -lharfbuzz
++CONFIG += link_pkgconfig
++PKGCONFIG += harfbuzz
+diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
+index 7443368..c24e684 100644
+--- a/src/3rdparty/harfbuzz_dependency.pri
++++ b/src/3rdparty/harfbuzz_dependency.pri
+@@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) {
+ INCLUDEPATH += $$PWD/harfbuzz-ng/include
+ LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
+ } else:contains(QT_CONFIG, system-harfbuzz) {
+- LIBS_PRIVATE += -lharfbuzz
++ CONFIG += link_pkgconfig
++ PKGCONFIG += harfbuzz
+ }
+--
+2.5.0
+
+
+From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 8 Dec 2014 14:15:12 +0100
+Subject: [PATCH 3/8] fix oci config test on windows
+
+Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922
+
+diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
+index 3ffda1d..39b6f3759 100644
+--- a/config.tests/unix/oci/oci.pro
++++ b/config.tests/unix/oci/oci.pro
+@@ -1,3 +1,3 @@
+ SOURCES = oci.cpp
+ CONFIG -= qt dylib
+-LIBS += -lclntsh
++!win32:LIBS += -lclntsh
+--
+2.5.0
+
+
+From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 6 Aug 2015 13:24:56 +0200
+Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows
+
+Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa
+
+diff --git a/configure b/configure
+index 7651e29..4a4b478 100755
+--- a/configure
++++ b/configure
+@@ -4575,7 +4575,7 @@ fi
+ [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android"
+
+ # check IPC support
+-if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
++if [ "$XPLATFORM_MINGW" = "no" ] && ! compileTest unix/ipc_sysv "ipc_sysv" ; then
+ # SYSV IPC is not supported - check POSIX IPC
+ if compileTest unix/ipc_posix "ipc_posix" ; then
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC"
+--
+2.5.0
+
+
+From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Tue, 6 Oct 2015 09:53:20 +0200
+Subject: [PATCH 5/8] fix building mysql driver under mingw
+
+Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9
+
+diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
+index 3cfb614..8b7063f 100644
+--- a/src/sql/drivers/mysql/qsql_mysql.pri
++++ b/src/sql/drivers/mysql/qsql_mysql.pri
+@@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp
+ QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
+ LIBS += $$QT_LFLAGS_MYSQL
+
+-unix {
++if (unix|mingw) {
+ isEmpty(QT_LFLAGS_MYSQL) {
+ !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
+ use_libmysqlclient_r:LIBS += -lmysqlclient_r
+--
+2.5.0
+
+
+From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Sun, 18 Oct 2015 23:11:28 +0300
+Subject: [PATCH 6/8] configure: fix log corruption with option -v
+
+This bug occurs if ./configure is called with -v on systems on
+which fd proc entries point to the files/devices they are open
+on instead of being magic nodes which would basically dup() the
+actual fds (e.g., Linux).
+
+In this case, the command "tee $tty" appends to /dev/stderr, which
+may be already opened by the parent process. This breaks the log file.
+
+Normally, the log file starts with
+
+ This is the Qt Open Source Edition.
+ ...
+
+but with `-v` flag it would start with output of awkprog and maybe
+some zero bytes. Zero bytes are observed on Debian Wheezy.
+
+ DEFAULT_INCDIRS=...
+ ...
+ ^@^@^@^@^@^@^@^@^@^@^@^@...
+ Done running configuration tests.
+ ...
+
+To fix this problem, the output of `...` is saved to a variable, and
+then eval'd and echo'd (if -v).
+
+This solution was found by Tony Theodore.
+https://github.com/mxe/mxe/issues/938#issuecomment-149770348
+
+Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
+(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36)
+
+diff --git a/configure b/configure
+index 4a4b478..a5c0fd5 100755
+--- a/configure
++++ b/configure
+@@ -3639,10 +3639,9 @@ END {
+ print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n";
+ }'
+
+-unset tty
+-[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr
+-eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`"
+-unset tty
++awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"`
++eval "$awkprog_result"
++[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result"
+
+ echo "Done running configuration tests."
+
+--
+2.5.0
+
+
+From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Wed, 26 Aug 2015 12:45:43 +0100
+Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets
+
+Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED)
+for header-only modules when building Qt5 statically.
+
+Source: https://git.io/vzWJz
+See also: https://github.com/mxe/mxe/issues/1185
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d2358ca..6b1dc95 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ endif()
+ !!ENDIF
+
++!!IF equals(TEMPLATE, aux)
++ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
++!!ELSE
+ !!IF !isEmpty(CMAKE_STATIC_TYPE)
+ add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
+ set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+ !!ELSE
+-!!IF equals(TEMPLATE, aux)
+- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
+-!!ELSE
+ add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
+ !!ENDIF
+ !!ENDIF
+--
+2.5.0
+
diff --git a/use-external-angle-library.patch b/use-external-angle-library.patch
index 8f6166252fe..214c8b8b0ad 100644
--- a/use-external-angle-library.patch
+++ b/use-external-angle-library.patch
@@ -53,18 +53,7 @@ diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro
HEADERS += qgl.h \
qgl_p.h \
-diff -U 3 -r a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
---- a/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-06-29 14:04:40.000000000 -0600
-+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp 2015-07-18 10:52:29.667410627 -0600
-@@ -39,7 +39,7 @@
- #include <QtGui/QOpenGLContext>
-
- #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
--# include <QtANGLE/EGL/eglext.h>
-+# include <EGL/eglext.h>
- #endif
-
- QT_BEGIN_NAMESPACE
+
diff -U 3 -r a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
--- a/src/plugins/platforms/windows/windows.pri 2015-06-29 14:04:40.000000000 -0600
+++ b/src/plugins/platforms/windows/windows.pri 2015-07-18 10:53:45.585348009 -0600