diff --git a/pkgbuilds.pro b/pkgbuilds.pro index 26e8b641..3d65268f 100644 --- a/pkgbuilds.pro +++ b/pkgbuilds.pro @@ -91,6 +91,115 @@ OTHER_FILES += \ x265/mingw-w64/PKGBUILD \ x265/mingw-w64/mingw.patch \ wxwidgets/mingw-w64/PKGBUILD \ + qt5-base/mingw-w64/PKGBUILD \ + qt5-base/mingw-w64/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff \ + qt5-base/mingw-w64/add-angle-support.patch \ + qt5-base/mingw-w64/angle-fix.patch \ + qt5-base/mingw-w64/fix-opengl-to-many-sections.patch \ + qt5-base/mingw-w64/fix-static-psql-mysql.patch \ + qt5-base/mingw-w64/qt-5.1.x-win_flex-replace.patch \ + qt5-base/mingw-w64/qt5-add-angle-support.patch \ + qt5-base/mingw-w64/qt5-add-compiled-shaders-remove-dxsdk.patch \ + qt5-base/mingw-w64/qt5-disable-angle-opengl-testcode.patch \ + qt5-base/mingw-w64/qt5-dont-add-resource-files-to-qmake-libs.patch \ + qt5-base/mingw-w64/qt5-dont-build-host-libs-static.patch \ + qt5-base/mingw-w64/qt5-enable-rpath-for-host-tools.patch \ + qt5-base/mingw-w64/qt5-fix-QSemaphore-problem.patch \ + qt5-base/mingw-w64/qt5-fix-static-dbus-detection.patch \ + qt5-base/mingw-w64/qt5-fix-static-harfbuzz-detection.patch \ + qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch \ + qt5-base/mingw-w64/qt5-prevent-debug-library-names-in-pkgconfig-files.patch \ + qt5-base/mingw-w64/qt5-qmake-implib-dll-a.patch \ + qt5-base/mingw-w64/qt5-qtbase-fix-linking-against-static-pcre.patch \ + qt5-base/mingw-w64/qt5-rename-qtmain-to-qt5main.patch \ + qt5-base/mingw-w64/qt5-use-external-angle-library.patch \ + qt5-base/mingw-w64/qt5-use-system-zlib-in-host-libs.patch \ + qt5-base/mingw-w64/qt5-use-win32-g++-mkspecs-profile.patch \ + qt5-base/mingw-w64/qt5-workaround-pkgconfig-install-issue.patch \ + qt5-base/mingw-w64/use-external-angle-library.patch \ + qt5-base/mingw-w64-opengl/PKGBUILD \ + qt5-base/mingw-w64-opengl/add-angle-support.patch \ + qt5-base/mingw-w64-opengl/angle-fix.patch \ + qt5-base/mingw-w64-opengl/fix-opengl-to-many-sections.patch \ + qt5-base/mingw-w64-opengl/fix-static-psql-mysql.patch \ + qt5-base/mingw-w64-opengl/qt-5.1.x-win_flex-replace.patch \ + qt5-base/mingw-w64-opengl/qt5-add-angle-support.patch \ + qt5-base/mingw-w64-opengl/qt5-add-compiled-shaders-remove-dxsdk.patch \ + qt5-base/mingw-w64-opengl/qt5-disable-angle-opengl-testcode.patch \ + qt5-base/mingw-w64-opengl/qt5-dont-add-resource-files-to-qmake-libs.patch \ + qt5-base/mingw-w64-opengl/qt5-dont-build-host-libs-static.patch \ + qt5-base/mingw-w64-opengl/qt5-enable-rpath-for-host-tools.patch \ + qt5-base/mingw-w64-opengl/qt5-fix-static-dbus-detection.patch \ + qt5-base/mingw-w64-opengl/qt5-fix-static-harfbuzz-detection.patch \ + qt5-base/mingw-w64-opengl/qt5-merge-static-and-shared-library-trees.patch \ + qt5-base/mingw-w64-opengl/qt5-prevent-debug-library-names-in-pkgconfig-files.patch \ + qt5-base/mingw-w64-opengl/qt5-qmake-implib-dll-a.patch \ + qt5-base/mingw-w64-opengl/qt5-qtbase-fix-linking-against-static-pcre.patch \ + qt5-base/mingw-w64-opengl/qt5-rename-qtmain-to-qt5main.patch \ + qt5-base/mingw-w64-opengl/qt5-use-external-angle-library.patch \ + qt5-base/mingw-w64-opengl/qt5-use-system-zlib-in-host-libs.patch \ + qt5-base/mingw-w64-opengl/qt5-use-win32-g++-mkspecs-profile.patch \ + qt5-base/mingw-w64-opengl/qt5-workaround-pkgconfig-install-issue.patch \ + qt5-base/mingw-w64-opengl/use-external-angle-library.patch \ + qt5-base/mingw-w64-static/PKGBUILD \ + qt5-base/mingw-w64-static/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff \ + qt5-base/mingw-w64-static/add-angle-support.patch \ + qt5-base/mingw-w64-static/angle-fix.patch \ + qt5-base/mingw-w64-static/fix-opengl-to-many-sections.patch \ + qt5-base/mingw-w64-static/fix-static-psql-mysql.patch \ + qt5-base/mingw-w64-static/qt-5.1.x-win_flex-replace.patch \ + qt5-base/mingw-w64-static/qt5-add-angle-support.patch \ + qt5-base/mingw-w64-static/qt5-add-compiled-shaders-remove-dxsdk.patch \ + qt5-base/mingw-w64-static/qt5-disable-angle-opengl-testcode.patch \ + qt5-base/mingw-w64-static/qt5-dont-add-resource-files-to-qmake-libs.patch \ + qt5-base/mingw-w64-static/qt5-dont-build-host-libs-static.patch \ + qt5-base/mingw-w64-static/qt5-enable-rpath-for-host-tools.patch \ + qt5-base/mingw-w64-static/qt5-fix-QSemaphore-problem.patch \ + qt5-base/mingw-w64-static/qt5-fix-static-dbus-detection.patch \ + qt5-base/mingw-w64-static/qt5-fix-static-harfbuzz-detection.patch \ + qt5-base/mingw-w64-static/qt5-merge-static-and-shared-library-trees.patch \ + qt5-base/mingw-w64-static/qt5-prevent-debug-library-names-in-pkgconfig-files.patch \ + qt5-base/mingw-w64-static/qt5-qmake-implib-dll-a.patch \ + qt5-base/mingw-w64-static/qt5-qtbase-fix-linking-against-static-pcre.patch \ + qt5-base/mingw-w64-static/qt5-rename-qtmain-to-qt5main.patch \ + qt5-base/mingw-w64-static/qt5-use-external-angle-library.patch \ + qt5-base/mingw-w64-static/qt5-use-system-zlib-in-host-libs.patch \ + qt5-base/mingw-w64-static/qt5-use-win32-g++-mkspecs-profile.patch \ + qt5-base/mingw-w64-static/qt5-workaround-pkgconfig-install-issue.patch \ + qt5-base/mingw-w64-static/use-external-angle-library.patch \ + qt5-3d/mingw-w64/PKGBUILD \ + qt5-activeqt/mingw-w64/PKGBUILD \ + qt5-activeqt/mingw-w64/qt5-activeqt-fix-compilation.patch \ + qt5-activeqt/mingw-w64/qtactiveqt-fix-build.patch \ + qt5-activeqt/mingw-w64/qtactiveqt-win64.patch \ + qt5-declarative/mingw-w64/PKGBUILD \ + qt5-declarative/mingw-w64/qt5-build-qmldevtools-as-shared-library.patch \ + qt5-graphicaleffects/mingw-w64/PKGBUILD \ + qt5-imageformats/mingw-w64/PKGBUILD \ + qt5-location/mingw-w64/PKGBUILD \ + qt5-multimedia/mingw-w64/PKGBUILD \ + qt5-multimedia/mingw-w64/qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch \ + qt5-multimedia/mingw-w64/qtmultimedia-dont-use-case-sensitive-headers.patch \ + qt5-quick1/mingw-w64/PKGBUILD \ + qt5-quickcontrols/mingw-w64/PKGBUILD \ + qt5-script/mingw-w64/PKGBUILD \ + qt5-sensors/mingw-w64/PKGBUILD \ + qt5-serialport/mingw-w64/PKGBUILD \ + qt5-svg/mingw-w64/PKGBUILD \ + qt5-tools/mingw-w64/PKGBUILD \ + qt5-translations/mingw-w64/PKGBUILD \ + qt5-webkit/mingw-w64/PKGBUILD \ + qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch \ + qt5-webkit/mingw-w64/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch \ + qt5-webkit/mingw-w64/qtwebkit-dont-use-bundled-angle-libraries.patch \ + qt5-webkit/mingw-w64/qtwebkit-opensource-src-5.0.1-debuginfo.patch \ + qt5-webkit/mingw-w64/revert-qt4-unicode-removal.patch \ + qt5-webkit/mingw-w64/webkit-commit-151422.patch \ + qt5-websockets/mingw-w64/PKGBUILD \ + qt5-winextras/mingw-w64/PKGBUILD \ + qt5-xmlpatterns/mingw-w64/PKGBUILD \ qt5-webchannel/mingw-w64/PKGBUILD \ qt5-webengine/mingw-w64/PKGBUILD \ qt5-webengine/mingw-w64/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch \ diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD new file mode 100644 index 00000000..e314e0f8 --- /dev/null +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qt3d +pkgname="mingw-w64-qt5-3d" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" +depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative' 'mingw-w64-qt5-quick1') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('872dfbe166154c2e0e89317ab23d2cd6') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD new file mode 100644 index 00000000..1c899858 --- /dev/null +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -0,0 +1,64 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtactiveqt +pkgname=mingw-w64-qt5-activeqt +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="ActiveX integration framework (mingw-w64)" +depends=(mingw-w64-qt5-base) +makedepends=(mingw-w64-{gcc,headers-git,crt-git,winpthreads-git} python) +options=(!strip !buildflags staticlibs) +groups=(mingw-w64-qt mingw-w64-qt5) +license=("custom, FDL, GPL3, LGPL") +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + "qt5-activeqt-fix-compilation.patch" + "qtactiveqt-fix-build.patch" + "qtactiveqt-win64.patch") +md5sums=('be5e0a79decc87d02c574348d9663e6a' + '86c63b9808b0c8c7a8c2203bee73c42b' + '7a7ba436452aa56613b3fbb15684e094' + '1264d0274586aec14f96a978b416b048') +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" + # Fix linker error: + # qaxserverbase.cpp:1769: undefined reference to `qt_sendSpontaneousEvent(QObject*, QEvent*)' + patch -p0 -i ../qt5-activeqt-fix-compilation.patch + + # Don't try to build stuff which requires windows.h with the native Linux gcc + patch -p1 -i ../qtactiveqt-fix-build.patch + + # dumpcpp and MetaObjectGenerator::readClassInfo do not handle win64 + # https://bugreports.qt.io/browse/QTBUG-46827 + patch -p1 -i ../qtactiveqt-win64.patch +} + +build() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="$pkgdir" install + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + popd + done +} diff --git a/qt5-activeqt/mingw-w64/qt5-activeqt-fix-compilation.patch b/qt5-activeqt/mingw-w64/qt5-activeqt-fix-compilation.patch new file mode 100644 index 00000000..d7e25863 --- /dev/null +++ b/qt5-activeqt/mingw-w64/qt5-activeqt-fix-compilation.patch @@ -0,0 +1,15 @@ +--- src/activeqt/control/qaxserverbase.cpp.orig 2012-09-10 22:01:40.963557678 +0200 ++++ src/activeqt/control/qaxserverbase.cpp 2012-09-10 22:05:37.913161773 +0200 +@@ -4033,12 +4033,10 @@ + } + + +-#ifdef QT_SHARED // avoid conflict with symbol in static lib + bool qt_sendSpontaneousEvent(QObject *o, QEvent *e) + { + return QCoreApplication::sendSpontaneousEvent(o, e); + } +-#endif + + /* + Tries to set the size of the control. diff --git a/qt5-activeqt/mingw-w64/qtactiveqt-fix-build.patch b/qt5-activeqt/mingw-w64/qtactiveqt-fix-build.patch new file mode 100644 index 00000000..7c10be46 --- /dev/null +++ b/qt5-activeqt/mingw-w64/qtactiveqt-fix-build.patch @@ -0,0 +1,7 @@ +--- qtactiveqt-opensource-src-5.3.0/src/tools/idc/idc.pro.orig 2014-05-26 00:05:53.258370322 +0200 ++++ qtactiveqt-opensource-src-5.3.0/src/tools/idc/idc.pro 2014-05-26 00:06:18.131627963 +0200 +@@ -1,4 +1,3 @@ +-option(host_build) + CONFIG += force_bootstrap + SOURCES = main.cpp + diff --git a/qt5-activeqt/mingw-w64/qtactiveqt-win64.patch b/qt5-activeqt/mingw-w64/qtactiveqt-win64.patch new file mode 100644 index 00000000..f2ca3d69 --- /dev/null +++ b/qt5-activeqt/mingw-w64/qtactiveqt-win64.patch @@ -0,0 +1,39 @@ +diff -rupN qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp +--- qtactiveqt-opensource-src-5.4.1/src/activeqt/container/qaxbase.cpp 2015-02-17 05:56:13.000000000 +0100 ++++ qtactiveqt-opensource-src-5.4.1-new/src/activeqt/container/qaxbase.cpp 2015-06-23 16:41:44.483979750 +0200 +@@ -2164,6 +2164,10 @@ + QStringList versions = controls.childGroups(); + foreach (const QString &version, versions) { + tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString(); ++ if(tlfile.isEmpty()) ++ { ++ tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win64/.")).toString(); ++ } + if (!tlfile.isEmpty()) + break; + } +diff -rupN qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp +--- qtactiveqt-opensource-src-5.4.1/tools/dumpcpp/main.cpp 2015-02-17 05:56:13.000000000 +0100 ++++ qtactiveqt-opensource-src-5.4.1-new/tools/dumpcpp/main.cpp 2015-06-23 16:35:53.157273425 +0200 +@@ -1515,6 +1515,10 @@ + typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString(); + if (QFile::exists(typeLib)) + break; ++ typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray(); ++ if (QFile::exists(typeLib)) { ++ break; ++ } + } + + if (!typeLib.isEmpty()) +@@ -1577,6 +1581,10 @@ + + QLatin1String("/win32/.")).toString(); + if (QFile::exists(typeLib)) + break; ++ typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray(); ++ if (QFile::exists(typeLib)) { ++ break; ++ } + } + } + diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD new file mode 100644 index 00000000..ceef588f --- /dev/null +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -0,0 +1,344 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic +# Contributor: jellysheep + +pkgname=mingw-w64-qt5-base-opengl +pkgver=5.5.1 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (mingw-w64)" +arch=(i686 x86_64) +url="http://qt-project.org" +license=("custom, FDL, GPL3, LGPL") +depends=( + mingw-w64-crt + mingw-w64-zlib + mingw-w64-libjpeg-turbo + mingw-w64-libiconv + mingw-w64-sqlite + mingw-w64-libpng + mingw-w64-openssl + mingw-w64-libdbus + mingw-w64-pcre + mingw-w64-harfbuzz + mingw-w64-glib2 +) +groups=(mingw-w64-qt mingw-w64-qt5) +optdepends=( + "mingw-w64-postgresql-libs: PostgreSQL support" + "mingw-w64-mariadb-connector-c: MySQL support" + "qtchooser" +) +makedepends=(mingw-w64-gcc + mingw-w64-postgresql-libs + mingw-w64-mariadb-connector-c + mingw-w64-pkg-config) +options=(!strip !buildflags staticlibs) +_pkgfqn="qtbase-opensource-src-${pkgver}" +source=("http://download.qt-project.org/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" + "qt5-qtbase-fix-linking-against-static-pcre.patch" + "qt5-rename-qtmain-to-qt5main.patch" + "qt5-dont-build-host-libs-static.patch" + "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") +md5sums=('252613b5a180c94d7196d10467a4f08b' + 'f51eb2b176b10af943831d33925c1251' + 'bab00ccc19d888997f323c80354a7c3f' + 'ec25d1ff4033383cd5d2414d8189c228' + 'bc99c4cc6998295d76f37ed681c20d47' + '4fe6523dd1c34398df3aa5a8763530cc' + 'c4d4ca54a2e9096d2af13a266177f6d6' + '3bd322551924543553a2bf81b4419a09' + '15e8eaa4f0a9a9990277c79e243770be' + '99bb9f51ec684803768f36e407baf486' + '6a6bc88f35ac8080869de39bc128ce5b' + 'e793479e0b86b39ddafd328140f1a24c' + '40de3aaf7d713034e06f4eece665b1ba' + '1a7921cadeb5c3db383dea068519e8d3' + '6aea7182982098de045721f51bf20fc2' + 'a265dea62755caf38187114143999224' + '612a4dfb9f1a3898a1920c28bb999159' + 'd0eb81aef1a21c65813fe4ddabbc4206' + '0076233a43e7edaaaf8c2abca2ada8df') +_architectures="x86_64-w64-mingw32 i686-w64-mingw32" + +# Helper functions for the split builds +isStatic() { + [ $pkgname = "mingw-w64-qt5-base-static" ] +} + +isOpenGL() { + [ $pkgname = "mingw-w64-qt5-base-opengl" ] +} + +isStatic && depends+=("mingw-w64-qt5-base") +! isOpenGL && depends+=("mingw-w64-angleproject") +isOpenGL && provides+=("mingw-w64-qt5-base") +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 + + if ! isOpenGL; then + # Add support for Angle + patch -p1 -i ../add-angle-support.patch + + # Make sure our external Angle package is used instead of the bundled one + patch -p1 -i ../use-external-angle-library.patch + fi + + # opengl to many sections error + isOpenGL && patch -p0 -i ../fix-opengl-to-many-sections.patch + + # Make sure the .pc files of the Qt5 modules are installed correctly + patch -p0 -i ../qt5-workaround-pkgconfig-install-issue.patch + + # Prevents resource files from being added to the LIBS parameter + # This solves an issue where the generated pkg-config files contained + # invalid Libs.private references like .obj/debug/Qt5Cored_resource_res.o + patch -p1 -i ../qt5-dont-add-resource-files-to-qmake-libs.patch + + # qmake generates the pkgconfig .pc files two times, once for the + # release build and once for the debug build (which we're not actually + # building in this package). For both generations the exact same + # pkgconfig file name is used. This causes references to the debug + # build ending up in the .pc files which are unwanted + # Prevent this from happening by giving the pkgconfig .pc + # 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 + 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 + + # The bundled pcre is built as static library by default + # As we're not using the bundled copy but our own copy + # we need to do some fiddling to fix compilation issues + # when trying to build static qmake projects + patch -p1 -i ../qt5-qtbase-fix-linking-against-static-pcre.patch + + # Make sure the qtmain (static) library doesn't conflict with the one + # provided by the mingw-qt (qt4) package. The mkspecs profile is already + # updated by patch100 to reflect this change + # https://bugzilla.redhat.com/show_bug.cgi?id=1092465 + patch -p1 -i ../qt5-rename-qtmain-to-qt5main.patch + + # Upstream always wants the host libraries to be static instead of + # shared libraries. This causes issues and is against the Fedora + # packaging guidelines so disable this 'feature' + patch -p0 -i ../qt5-dont-build-host-libs-static.patch + + # Build host tools with rpath enabled + # We have to use rpath here as the library which the + # various tools depend on (libQt5Bootstrap.so) resides + # in the folder /usr/${_arch}/lib + # We can't use the regular %%_libdir for this as we + # want to avoid conflicts with the native qt5 packages + patch -p1 -i ../qt5-enable-rpath-for-host-tools.patch + + # 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 + + 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} + + # As well as our external PCRE library and zlib + rm -rf src/3rdparty/{pcre,zlib} +} + +build() { + cd "${srcdir}/${_pkgfqn}" + + # Setup flags + export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + unset LDFLAGS + + for _arch in ${_architectures}; do + + # Phonon is disabled for now because we lack the directx headers + # The odd paths for the -hostbindir argument are on purpose + # The qtchooser tool assumes that the tools 'qmake', 'moc' and others + # are all available in the same folder with these exact file names + # To prevent conflicts with the mingw-qt (Qt4) package we have + # to put these tools in a dedicated folder + qt_configure_args="\ + -xplatform win32-g++ \ + -optimized-qmake \ + -verbose \ + -opensource \ + -confirm-license \ + -force-pkg-config \ + -force-debug-info \ + -audio-backend \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -no-fontconfig \ + -iconv \ + -openssl \ + -dbus-linked \ + -no-glib \ + -no-gtkstyle \ + -no-icu \ + -release \ + -nomake examples \ + -make tools \ + -hostprefix /usr/${_arch} \ + -hostdatadir /usr/${_arch}/lib/qt \ + -hostbindir /usr/${_arch}/lib/qt/bin \ + -prefix /usr/${_arch} \ + -bindir /usr/${_arch}/bin \ + -archdatadir /usr/${_arch}/lib/qt \ + -datadir /usr/${_arch}/share/qt \ + -docdir /usr/${_arch}/share/doc/qt \ + -examplesdir /usr/${_arch}/share/qt/examples \ + -headerdir /usr/${_arch}/include/qt \ + -libdir /usr/${_arch}/lib \ + -plugindir /usr/${_arch}/lib/qt/plugins \ + -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)" + + isOpenGL && qt_configure_args+=' -opengl desktop' + isStatic && qt_configure_args+=' -opengl no' + + unset PKG_CONFIG_PATH + + if ! isStatic; then + export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql" + fi + # Qt doesn't detect mysql correctly, so use this: + export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb" + #export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto" + # Hardcode MySQL flags into configure (really nice solution :( ) + sed -e "s|^QT_CFLAGS_MYSQL=.*$|QT_CFLAGS_MYSQL=\"${QT_CFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + sed -e "s|^QT_LFLAGS_MYSQL=.*$|QT_LFLAGS_MYSQL=\"${QT_LFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + #sed -e "s|^QT_LFLAGS_MYSQL_R=.*$|QT_LFLAGS_MYSQL_R=\"${QT_LFLAGS_MYSQL_R}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + qt_configure_args_mysql="-mysql_config /this/file/should/not/exist" + + mkdir ../build-${_arch} && pushd ../build-${_arch} + + if isStatic; then + ../${_pkgfqn}/configure -static $qt_configure_args $qt_configure_args_mysql + make + else + # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared + # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* + # libraries aren't installed at this point yet, we have to workaround this + ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql + LD_LIBRARY_PATH=`pwd`/lib make + fi + + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "$srcdir/${_pkgfqn}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + + if isStatic; then + # Drop the qtmain and Qt5Bootstrap static libraries from the static tree as + # they are already part of the main tree + rm -f "${pkgdir}/usr/${_arch}/lib/libqt5main"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5OpenGLExtensions"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5PlatformSupport"* + + # we want to keep a couple pri files not found in base + mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}" + + # Delete duplicate files that are in the base package + rm -fR "${pkgdir}/usr/${_arch}/"{include,share} + rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs,pkgconfig,cmake} + + # move pri files back + mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + else # not static => shared release + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + # Add qtchooser support + [ "${_arch}" = "i686-w64-mingw32" ] && mingwn='mingw32' || mingwn='mingw64' + mkdir -p "${pkgdir}/etc/xdg/qtchooser" + echo "/usr/${_arch}/lib/qt/bin" > "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + echo "/usr/${_arch}/lib" >> "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + + # Manually install qmake and other native tools so we don't depend anymore on + # the version of the native system Qt and also fix issues as illustrated at + # http://stackoverflow.com/questions/6592931/building-for-windows-under-linux-using-qt-creator + # Also make sure the tools can be found by CMake + mkdir -p "${pkgdir}/usr/bin" + for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do + ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-${tool}-qt5" + done + fi + + # The pkg-config files for Qt5Bootstrap aren't interesting as this particular + # library only contains native code and not cross-compiled code + rm -f "${pkgdir}/usr/${_arch}/lib/pkgconfig/Qt5Bootstrap.pc" + + # remove doc + rm -rf "${pkgdir}/usr/${_arch}/share/doc" + + # And finaly, strip the binaries + if ! isStatic; then + 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 + fi + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-base/mingw-w64-opengl/add-angle-support.patch b/qt5-base/mingw-w64-opengl/add-angle-support.patch new file mode 100644 index 00000000..8b9af40a --- /dev/null +++ b/qt5-base/mingw-w64-opengl/add-angle-support.patch @@ -0,0 +1,46 @@ +diff -U 3 -r a/configure b/configure +--- a/configure 2015-06-29 14:03:05.000000000 -0600 ++++ b/configure 2015-07-18 11:14:30.312317765 -0600 +@@ -5081,7 +5081,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 +@@ -6072,6 +6072,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" +@@ -7077,7 +7082,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 +diff -U 3 -r a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp +--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-06-29 14:04:40.000000000 -0600 ++++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-07-18 11:16:05.767172673 -0600 +@@ -45,7 +45,9 @@ + #include + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64-opengl/angle-fix.patch b/qt5-base/mingw-w64-opengl/angle-fix.patch new file mode 100644 index 00000000..77374d1d --- /dev/null +++ b/qt5-base/mingw-w64-opengl/angle-fix.patch @@ -0,0 +1,19 @@ +--- 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/qt5-base/mingw-w64-opengl/fix-opengl-to-many-sections.patch b/qt5-base/mingw-w64-opengl/fix-opengl-to-many-sections.patch new file mode 100644 index 00000000..f83fc543 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/fix-opengl-to-many-sections.patch @@ -0,0 +1,10 @@ +--- src/gui/opengl/opengl.pri.orig 2014-12-05 09:24:35.000000000 -0700 ++++ src/gui/opengl/opengl.pri 2015-02-09 10:48:48.484071754 -0700 +@@ -4,6 +4,7 @@ + contains(QT_CONFIG, opengles2):CONFIG += opengles2 + + contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { ++ QMAKE_CXXFLAGS+="-Wa,-mbig-obj" + + HEADERS += opengl/qopengl.h \ + opengl/qopengl_p.h \ diff --git a/qt5-base/mingw-w64-opengl/fix-static-psql-mysql.patch b/qt5-base/mingw-w64-opengl/fix-static-psql-mysql.patch new file mode 100644 index 00000000..3c308c57 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/fix-static-psql-mysql.patch @@ -0,0 +1,15 @@ +--- config.tests/unix/psql/psql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/psql/psql.pro 2015-03-09 21:45:44.746755052 -0600 +@@ -1,3 +1,3 @@ + SOURCES = psql.cpp + CONFIG -= qt dylib +-LIBS *= -lpq ++LIBS *= -lpq -lintl -liconv -lssl -lcrypto -lwldap32 -lshfolder -lwsock32 -lws2_32 -lsecur32 -lgdi32 + +--- config.tests/unix/mysql/mysql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/mysql/mysql.pro 2015-03-09 21:38:59.930405876 -0600 +@@ -1,3 +1,3 @@ + SOURCES = mysql.cpp + CONFIG -= qt dylib +-LIBS += -lmysqlclient ++LIBS += -lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto diff --git a/qt5-base/mingw-w64-opengl/qt-5.1.x-win_flex-replace.patch b/qt5-base/mingw-w64-opengl/qt-5.1.x-win_flex-replace.patch new file mode 100644 index 00000000..0dd6a2cf --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt-5.1.x-win_flex-replace.patch @@ -0,0 +1,22 @@ +--- 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-base/mingw-w64-opengl/qt5-add-angle-support.patch b/qt5-base/mingw-w64-opengl/qt5-add-angle-support.patch new file mode 100644 index 00000000..4eb5f872 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-add-angle-support.patch @@ -0,0 +1,44 @@ +--- 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 + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64-opengl/qt5-add-compiled-shaders-remove-dxsdk.patch b/qt5-base/mingw-w64-opengl/qt5-add-compiled-shaders-remove-dxsdk.patch new file mode 100644 index 00000000..b211b6d1 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-add-compiled-shaders-remove-dxsdk.patch @@ -0,0 +1,1664 @@ +--- 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-base/mingw-w64-opengl/qt5-disable-angle-opengl-testcode.patch b/qt5-base/mingw-w64-opengl/qt5-disable-angle-opengl-testcode.patch new file mode 100644 index 00000000..a2bb3f65 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-disable-angle-opengl-testcode.patch @@ -0,0 +1,11 @@ +--- 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-base/mingw-w64-opengl/qt5-dont-add-resource-files-to-qmake-libs.patch b/qt5-base/mingw-w64-opengl/qt5-dont-add-resource-files-to-qmake-libs.patch new file mode 100644 index 00000000..838f2467 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-dont-add-resource-files-to-qmake-libs.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp.orig 2014-01-04 21:18:07.413328813 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp 2014-01-04 21:18:55.740126515 +0100 +@@ -243,7 +243,7 @@ + + processVars(); + +- project->values("QMAKE_LIBS") += project->values("RES_FILE"); ++ project->values("OBJECTS") += project->values("RES_FILE"); + + if (project->isActiveConfig("dll")) { + QString destDir = ""; diff --git a/qt5-base/mingw-w64-opengl/qt5-enable-rpath-for-host-tools.patch b/qt5-base/mingw-w64-opengl/qt5-enable-rpath-for-host-tools.patch new file mode 100644 index 00000000..55aaf448 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-enable-rpath-for-host-tools.patch @@ -0,0 +1,10 @@ +--- 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 +@@ -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:force_bootstrap { + !build_pass: CONFIG += release + contains(QT, core(-private)?|xml) { diff --git a/qt5-base/mingw-w64-opengl/qt5-fix-static-dbus-detection.patch b/qt5-base/mingw-w64-opengl/qt5-fix-static-dbus-detection.patch new file mode 100644 index 00000000..e12f9e38 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-fix-static-dbus-detection.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp.orig 2015-03-08 17:05:21.216593135 +0100 ++++ qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp 2015-03-08 17:06:35.276826201 +0100 +@@ -31,6 +31,10 @@ + ** + ****************************************************************************/ + ++#ifdef QT_STATIC ++#define DBUS_STATIC_BUILD ++#endif ++ + #define DBUS_API_SUBJECT_TO_CHANGE + #include + diff --git a/qt5-base/mingw-w64-opengl/qt5-fix-static-harfbuzz-detection.patch b/qt5-base/mingw-w64-opengl/qt5-fix-static-harfbuzz-detection.patch new file mode 100644 index 00000000..80dc3b29 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-fix-static-harfbuzz-detection.patch @@ -0,0 +1,7 @@ +--- 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 diff --git a/qt5-base/mingw-w64-opengl/qt5-merge-static-and-shared-library-trees.patch b/qt5-base/mingw-w64-opengl/qt5-merge-static-and-shared-library-trees.patch new file mode 100644 index 00000000..130e6400 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-merge-static-and-shared-library-trees.patch @@ -0,0 +1,48 @@ +--- 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-base/mingw-w64-opengl/qt5-prevent-debug-library-names-in-pkgconfig-files.patch b/qt5-base/mingw-w64-opengl/qt5-prevent-debug-library-names-in-pkgconfig-files.patch new file mode 100644 index 00000000..7d6836d5 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-prevent-debug-library-names-in-pkgconfig-files.patch @@ -0,0 +1,12 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp.orig 2014-01-03 01:30:23.631353708 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp 2014-01-03 01:32:37.888625966 +0100 +@@ -3168,6 +3168,9 @@ + if (dot != -1) + ret = ret.left(dot); + } ++ if (project->isActiveConfig("debug")) { ++ ret += "d"; ++ } + ret += Option::pkgcfg_ext; + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); + if(!subdir.isEmpty()) { diff --git a/qt5-base/mingw-w64-opengl/qt5-qmake-implib-dll-a.patch b/qt5-base/mingw-w64-opengl/qt5-qmake-implib-dll-a.patch new file mode 100644 index 00000000..91ef32a1 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-qmake-implib-dll-a.patch @@ -0,0 +1,33 @@ +--- 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-base/mingw-w64-opengl/qt5-qtbase-fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-opengl/qt5-qtbase-fix-linking-against-static-pcre.patch new file mode 100644 index 00000000..3dd77468 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-qtbase-fix-linking-against-static-pcre.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp.orig 2013-07-11 08:23:02.687691337 +0200 ++++ qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp 2013-07-11 08:23:27.231900674 +0200 +@@ -47,6 +47,10 @@ + #include + #include + ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#endif ++ + #include + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64-opengl/qt5-rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-opengl/qt5-rename-qtmain-to-qt5main.patch new file mode 100644 index 00000000..57c35da0 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-rename-qtmain-to-qt5main.patch @@ -0,0 +1,35 @@ +--- qtbase-opensource-src-5.2.1/src/winmain/winmain.pro.orig 2014-04-29 18:51:05.206296152 +0200 ++++ qtbase-opensource-src-5.2.1/src/winmain/winmain.pro 2014-04-29 18:51:18.737512221 +0200 +@@ -2,7 +2,7 @@ + !win32:error("$$_FILE_ is intended only for Windows!") + + TEMPLATE = lib +-TARGET = qtmain ++TARGET = qt5main + 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 2014-07-05 14:18:46.045390147 +0200 +@@ -6,7 +6,7 @@ + mingw:DEFINES += QT_NEEDS_QMAIN + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { +- isEqual(entryLib, -lqtmain): { ++ isEqual(entryLib, -lqt5main): { + !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ + QMAKE_LIBS += -L$$QT.core.libs + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/qt5-base/mingw-w64-opengl/qt5-use-external-angle-library.patch b/qt5-base/mingw-w64-opengl/qt5-use-external-angle-library.patch new file mode 100644 index 00000000..551bfa3b --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-use-external-angle-library.patch @@ -0,0 +1,113 @@ +--- 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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #endif + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64-opengl/qt5-use-system-zlib-in-host-libs.patch b/qt5-base/mingw-w64-opengl/qt5-use-system-zlib-in-host-libs.patch new file mode 100644 index 00000000..a5046514 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-use-system-zlib-in-host-libs.patch @@ -0,0 +1,11 @@ +--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600 ++++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600 +@@ -145,7 +145,7 @@ + ../../corelib/io/qstandardpaths_win.cpp + } + +-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) ++if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri) + else:include(../../3rdparty/zlib_dependency.pri) + + win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 diff --git a/qt5-base/mingw-w64-opengl/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-base/mingw-w64-opengl/qt5-use-win32-g++-mkspecs-profile.patch new file mode 100644 index 00000000..2b4ce16f --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-use-win32-g++-mkspecs-profile.patch @@ -0,0 +1,57 @@ +--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200 ++++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200 +@@ -25,7 +25,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport ++QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -fno-keep-inline-dllexport + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -Wextra + QMAKE_CFLAGS_WARN_OFF = -w +@@ -67,10 +67,10 @@ + + QMAKE_LINK = $${CROSS_COMPILE}g++ + QMAKE_LINK_C = $${CROSS_COMPILE}gcc +-QMAKE_LFLAGS = ++QMAKE_LFLAGS = -g + QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads + QMAKE_LFLAGS_EXCEPTIONS_OFF = +-QMAKE_LFLAGS_RELEASE = -Wl,-s ++QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console + QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows +@@ -84,21 +84,25 @@ + QMAKE_EXTENSION_STATICLIB = a + + QMAKE_LIBS = +-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 +-QMAKE_LIBS_NETWORK = -lws2_32 ++QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16 ++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_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 +-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain ++QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main + +-QMAKE_IDL = midl ++QMAKE_IDL = $${CROSS_COMPILE}widl + QMAKE_LIB = $${CROSS_COMPILE}ar -ru + QMAKE_RC = $${CROSS_COMPILE}windres ++QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool + + QMAKE_STRIP = $${CROSS_COMPILE}strip + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy + QMAKE_NM = $${CROSS_COMPILE}nm -P ++ ++PKG_CONFIG = $${CROSS_COMPILE}pkg-config ++ + load(qt_config) diff --git a/qt5-base/mingw-w64-opengl/qt5-workaround-pkgconfig-install-issue.patch b/qt5-base/mingw-w64-opengl/qt5-workaround-pkgconfig-install-issue.patch new file mode 100644 index 00000000..46e561aa --- /dev/null +++ b/qt5-base/mingw-w64-opengl/qt5-workaround-pkgconfig-install-issue.patch @@ -0,0 +1,46 @@ +--- qmake/generators/makefile.cpp.pkgconfig 2013-01-29 20:03:12.000000000 +0100 ++++ qmake/generators/makefile.cpp 2013-03-26 19:18:07.480722316 +0100 +@@ -3102,7 +3102,7 @@ + } + + QString +-MakefileGenerator::pkgConfigFileName(bool fixify) ++MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) + { + QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); + if (ret.isEmpty()) { +@@ -3134,7 +3134,11 @@ + if(fixify) { + if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) + ret.prepend(project->first("DESTDIR").toQString()); +- ret = fileFixify(ret, FileFixifyBackwards); ++ if (onlyPrependDestdir) { ++ ret = Option::fixPathToLocalOS(ret); ++ } else { ++ ret = fileFixify(ret, FileFixifyBackwards); ++ } + } + return ret; + } +--- qmake/generators/makefile.h.orig 2013-03-26 19:17:37.624199870 +0100 ++++ qmake/generators/makefile.h 2013-03-26 19:17:56.327527157 +0100 +@@ -102,7 +102,7 @@ + virtual void writeDefaultVariables(QTextStream &t); + + QString pkgConfigPrefix() const; +- QString pkgConfigFileName(bool fixify=true); ++ QString pkgConfigFileName(bool fixify=true, bool onlyPrependDestdir = false); + QString pkgConfigFixPath(QString) const; + void writePkgConfigFile(); // for pkg-config + +--- qmake/generators/win32/winmakefile.cpp.orig 2013-03-26 19:05:13.398183953 +0100 ++++ qmake/generators/win32/winmakefile.cpp 2013-03-26 19:15:02.800490466 +0100 +@@ -822,7 +822,7 @@ + } + if(!ret.isEmpty()) + ret += "\n\t"; +- ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc); ++ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc); + if(!uninst.isEmpty()) + uninst.append("\n\t"); + uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); diff --git a/qt5-base/mingw-w64-opengl/use-external-angle-library.patch b/qt5-base/mingw-w64-opengl/use-external-angle-library.patch new file mode 100644 index 00000000..8f616625 --- /dev/null +++ b/qt5-base/mingw-w64-opengl/use-external-angle-library.patch @@ -0,0 +1,92 @@ +diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro +--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600 ++++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600 +@@ -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 +@@ -35,6 +29,10 @@ + + mac:!ios: LIBS_PRIVATE += -framework Cocoa + ++win32:contains(QT_CONFIG, angle) { ++ LIBS_PRIVATE += -lGLESv2 ++} ++ + CONFIG += simd optimize_full + + include(accessible/accessible.pri) +diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +--- a/src/gui/Qt5GuiConfigExtras.cmake.in 2015-06-29 14:04:51.000000000 -0600 ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in 2015-07-18 10:51:09.666053970 -0600 +@@ -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}) +diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro +--- a/src/opengl/opengl.pro 2015-06-29 14:04:05.000000000 -0600 ++++ b/src/opengl/opengl.pro 2015-07-18 10:46:46.588388411 -0600 +@@ -12,6 +12,9 @@ + + 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 \ +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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #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 +@@ -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: +diff -U 3 -r a/src/src.pro b/src/src.pro +--- a/src/src.pro 2015-06-29 14:05:06.000000000 -0600 ++++ b/src/src.pro 2015-07-18 10:43:01.698195194 -0600 +@@ -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 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD new file mode 100644 index 00000000..913f0cd7 --- /dev/null +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -0,0 +1,358 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic +# Contributor: jellysheep + +pkgname=mingw-w64-qt5-base-static +pkgver=5.5.1 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (mingw-w64)" +arch=(i686 x86_64) +url="http://qt-project.org" +license=("custom, FDL, GPL3, LGPL") +depends=( + mingw-w64-crt + mingw-w64-zlib + mingw-w64-libjpeg-turbo + mingw-w64-libiconv + mingw-w64-sqlite + mingw-w64-libpng + mingw-w64-openssl + mingw-w64-libdbus + mingw-w64-pcre + mingw-w64-harfbuzz + mingw-w64-glib2 +) +groups=(mingw-w64-qt mingw-w64-qt5) +optdepends=( + "mingw-w64-postgresql-libs: PostgreSQL support" + "mingw-w64-mariadb-connector-c: MySQL support" + "qtchooser" +) +makedepends=(mingw-w64-gcc + mingw-w64-postgresql-libs + mingw-w64-mariadb-connector-c + mingw-w64-pkg-config) +options=(!strip !buildflags staticlibs) +_pkgfqn="qtbase-opensource-src-${pkgver}" +source=("http://download.qt-project.org/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" + "qt5-qtbase-fix-linking-against-static-pcre.patch" + "qt5-rename-qtmain-to-qt5main.patch" + "qt5-dont-build-host-libs-static.patch" + "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' + 'bab00ccc19d888997f323c80354a7c3f' + 'ec25d1ff4033383cd5d2414d8189c228' + 'bc99c4cc6998295d76f37ed681c20d47' + '4fe6523dd1c34398df3aa5a8763530cc' + 'c4d4ca54a2e9096d2af13a266177f6d6' + '3bd322551924543553a2bf81b4419a09' + '15e8eaa4f0a9a9990277c79e243770be' + '99bb9f51ec684803768f36e407baf486' + '6a6bc88f35ac8080869de39bc128ce5b' + 'e793479e0b86b39ddafd328140f1a24c' + '40de3aaf7d713034e06f4eece665b1ba' + '4149c27286f110e37893d1764d4c8a68' + '39cdea1b39a1d993df6d01a576e8116f' + 'a265dea62755caf38187114143999224' + '612a4dfb9f1a3898a1920c28bb999159' + 'd0eb81aef1a21c65813fe4ddabbc4206' + '0076233a43e7edaaaf8c2abca2ada8df' + '87cbd116c75ced1b075bf266f2455d50' + '1bc70e7e3ea6a0178891d984f0451b3c') +_architectures="x86_64-w64-mingw32 i686-w64-mingw32" + +# Helper functions for the split builds +isStatic() { + [ $pkgname = "mingw-w64-qt5-base-static" ] +} + +isOpenGL() { + [ $pkgname = "mingw-w64-qt5-base-opengl" ] +} + +isStatic && depends+=("mingw-w64-qt5-base") +! isOpenGL && depends+=("mingw-w64-angleproject") +isOpenGL && provides+=("mingw-w64-qt5-base") +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 + + if ! isOpenGL; then + # Add support for Angle + patch -p1 -i ../add-angle-support.patch + + # Make sure our external Angle package is used instead of the bundled one + patch -p1 -i ../use-external-angle-library.patch + fi + + # opengl to many sections error + isOpenGL && patch -p0 -i ../fix-opengl-to-many-sections.patch + + # Make sure the .pc files of the Qt5 modules are installed correctly + patch -p0 -i ../qt5-workaround-pkgconfig-install-issue.patch + + # Prevents resource files from being added to the LIBS parameter + # This solves an issue where the generated pkg-config files contained + # invalid Libs.private references like .obj/debug/Qt5Cored_resource_res.o + patch -p1 -i ../qt5-dont-add-resource-files-to-qmake-libs.patch + + # qmake generates the pkgconfig .pc files two times, once for the + # release build and once for the debug build (which we're not actually + # building in this package). For both generations the exact same + # pkgconfig file name is used. This causes references to the debug + # build ending up in the .pc files which are unwanted + # Prevent this from happening by giving the pkgconfig .pc + # 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 + 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 + + # The bundled pcre is built as static library by default + # As we're not using the bundled copy but our own copy + # we need to do some fiddling to fix compilation issues + # when trying to build static qmake projects + patch -p1 -i ../qt5-qtbase-fix-linking-against-static-pcre.patch + + # Make sure the qtmain (static) library doesn't conflict with the one + # provided by the mingw-qt (qt4) package. The mkspecs profile is already + # updated by patch100 to reflect this change + # https://bugzilla.redhat.com/show_bug.cgi?id=1092465 + patch -p1 -i ../qt5-rename-qtmain-to-qt5main.patch + + # Upstream always wants the host libraries to be static instead of + # shared libraries. This causes issues and is against the Fedora + # packaging guidelines so disable this 'feature' + patch -p0 -i ../qt5-dont-build-host-libs-static.patch + + # Build host tools with rpath enabled + # We have to use rpath here as the library which the + # various tools depend on (libQt5Bootstrap.so) resides + # in the folder /usr/${_arch}/lib + # We can't use the regular %%_libdir for this as we + # want to avoid conflicts with the native qt5 packages + patch -p1 -i ../qt5-enable-rpath-for-host-tools.patch + + # 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 + + # QTBUG-49174 Prevent warning output when QWebView loads QNetworkRequest + patch -p1 -b -i ../a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff + + 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} + + # As well as our external PCRE library and zlib + rm -rf src/3rdparty/{pcre,zlib} +} + +build() { + cd "${srcdir}/${_pkgfqn}" + + # Setup flags + export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + unset LDFLAGS + + for _arch in ${_architectures}; do + + # Phonon is disabled for now because we lack the directx headers + # The odd paths for the -hostbindir argument are on purpose + # The qtchooser tool assumes that the tools 'qmake', 'moc' and others + # are all available in the same folder with these exact file names + # To prevent conflicts with the mingw-qt (Qt4) package we have + # to put these tools in a dedicated folder + qt_configure_args="\ + -xplatform win32-g++ \ + -optimized-qmake \ + -verbose \ + -opensource \ + -confirm-license \ + -force-pkg-config \ + -force-debug-info \ + -audio-backend \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -system-harfbuzz \ + -no-fontconfig \ + -iconv \ + -openssl \ + -dbus-linked \ + -no-glib \ + -no-gtkstyle \ + -no-icu \ + -release \ + -nomake examples \ + -make tools \ + -hostprefix /usr/${_arch} \ + -hostdatadir /usr/${_arch}/lib/qt \ + -hostbindir /usr/${_arch}/lib/qt/bin \ + -prefix /usr/${_arch} \ + -bindir /usr/${_arch}/bin \ + -archdatadir /usr/${_arch}/lib/qt \ + -datadir /usr/${_arch}/share/qt \ + -docdir /usr/${_arch}/share/doc/qt \ + -examplesdir /usr/${_arch}/share/qt/examples \ + -headerdir /usr/${_arch}/include/qt \ + -libdir /usr/${_arch}/lib \ + -plugindir /usr/${_arch}/lib/qt/plugins \ + -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)" + + isOpenGL && qt_configure_args+=' -opengl desktop' + isStatic && qt_configure_args+=' -opengl no' + + unset PKG_CONFIG_PATH + + if ! isStatic; then + export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql" + fi + # Qt doesn't detect mysql correctly, so use this: + export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb" + #export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto" + # Hardcode MySQL flags into configure (really nice solution :( ) + sed -e "s|^QT_CFLAGS_MYSQL=.*$|QT_CFLAGS_MYSQL=\"${QT_CFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + sed -e "s|^QT_LFLAGS_MYSQL=.*$|QT_LFLAGS_MYSQL=\"${QT_LFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + #sed -e "s|^QT_LFLAGS_MYSQL_R=.*$|QT_LFLAGS_MYSQL_R=\"${QT_LFLAGS_MYSQL_R}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + qt_configure_args_mysql="-mysql_config /this/file/should/not/exist" + + mkdir ../build-${_arch} && pushd ../build-${_arch} + + if isStatic; then + ../${_pkgfqn}/configure -static $qt_configure_args $qt_configure_args_mysql + make + else + # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared + # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* + # libraries aren't installed at this point yet, we have to workaround this + ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql + LD_LIBRARY_PATH=`pwd`/lib make + fi + + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "$srcdir/${_pkgfqn}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + + if isStatic; then + # Drop the qtmain and Qt5Bootstrap static libraries from the static tree as + # they are already part of the main tree + rm -f "${pkgdir}/usr/${_arch}/lib/libqt5main"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5OpenGLExtensions"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5PlatformSupport"* + + # Also keep various Qt5 plugins to be used in static builds + # https://bugzilla.redhat.com/show_bug.cgi?id=1257630 + mv "${pkgdir}/usr/${_arch}/lib/qt/plugins/"*/*.a "${pkgdir}/usr/${_arch}/lib/" + + # we want to keep a couple pri files not found in base + mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}" + + # Delete duplicate files that are in the base package + rm -fR "${pkgdir}/usr/${_arch}/"{include,share} + rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs,pkgconfig,cmake} + + # move pri files back + mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + else # not static => shared release + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + # Add qtchooser support + [ "${_arch}" = "i686-w64-mingw32" ] && mingwn='mingw32' || mingwn='mingw64' + mkdir -p "${pkgdir}/etc/xdg/qtchooser" + echo "/usr/${_arch}/lib/qt/bin" > "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + echo "/usr/${_arch}/lib" >> "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + + # Manually install qmake and other native tools so we don't depend anymore on + # the version of the native system Qt and also fix issues as illustrated at + # http://stackoverflow.com/questions/6592931/building-for-windows-under-linux-using-qt-creator + # Also make sure the tools can be found by CMake + mkdir -p "${pkgdir}/usr/bin" + for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do + ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-${tool}-qt5" + done + fi + + # The pkg-config files for Qt5Bootstrap aren't interesting as this particular + # library only contains native code and not cross-compiled code + rm -f "${pkgdir}/usr/${_arch}/lib/pkgconfig/Qt5Bootstrap.pc" + + # remove doc + rm -rf "${pkgdir}/usr/${_arch}/share/doc" + + # And finaly, strip the binaries + if ! isStatic; then + 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 + fi + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-base/mingw-w64-static/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff b/qt5-base/mingw-w64-static/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff new file mode 100644 index 00000000..223b6f77 --- /dev/null +++ b/qt5-base/mingw-w64-static/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff @@ -0,0 +1,16 @@ +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/qt5-base/mingw-w64-static/add-angle-support.patch b/qt5-base/mingw-w64-static/add-angle-support.patch new file mode 100644 index 00000000..8b9af40a --- /dev/null +++ b/qt5-base/mingw-w64-static/add-angle-support.patch @@ -0,0 +1,46 @@ +diff -U 3 -r a/configure b/configure +--- a/configure 2015-06-29 14:03:05.000000000 -0600 ++++ b/configure 2015-07-18 11:14:30.312317765 -0600 +@@ -5081,7 +5081,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 +@@ -6072,6 +6072,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" +@@ -7077,7 +7082,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 +diff -U 3 -r a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp +--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-06-29 14:04:40.000000000 -0600 ++++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-07-18 11:16:05.767172673 -0600 +@@ -45,7 +45,9 @@ + #include + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64-static/angle-fix.patch b/qt5-base/mingw-w64-static/angle-fix.patch new file mode 100644 index 00000000..77374d1d --- /dev/null +++ b/qt5-base/mingw-w64-static/angle-fix.patch @@ -0,0 +1,19 @@ +--- 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/qt5-base/mingw-w64-static/fix-opengl-to-many-sections.patch b/qt5-base/mingw-w64-static/fix-opengl-to-many-sections.patch new file mode 100644 index 00000000..f83fc543 --- /dev/null +++ b/qt5-base/mingw-w64-static/fix-opengl-to-many-sections.patch @@ -0,0 +1,10 @@ +--- src/gui/opengl/opengl.pri.orig 2014-12-05 09:24:35.000000000 -0700 ++++ src/gui/opengl/opengl.pri 2015-02-09 10:48:48.484071754 -0700 +@@ -4,6 +4,7 @@ + contains(QT_CONFIG, opengles2):CONFIG += opengles2 + + contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { ++ QMAKE_CXXFLAGS+="-Wa,-mbig-obj" + + HEADERS += opengl/qopengl.h \ + opengl/qopengl_p.h \ diff --git a/qt5-base/mingw-w64-static/fix-static-psql-mysql.patch b/qt5-base/mingw-w64-static/fix-static-psql-mysql.patch new file mode 100644 index 00000000..3c308c57 --- /dev/null +++ b/qt5-base/mingw-w64-static/fix-static-psql-mysql.patch @@ -0,0 +1,15 @@ +--- config.tests/unix/psql/psql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/psql/psql.pro 2015-03-09 21:45:44.746755052 -0600 +@@ -1,3 +1,3 @@ + SOURCES = psql.cpp + CONFIG -= qt dylib +-LIBS *= -lpq ++LIBS *= -lpq -lintl -liconv -lssl -lcrypto -lwldap32 -lshfolder -lwsock32 -lws2_32 -lsecur32 -lgdi32 + +--- config.tests/unix/mysql/mysql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/mysql/mysql.pro 2015-03-09 21:38:59.930405876 -0600 +@@ -1,3 +1,3 @@ + SOURCES = mysql.cpp + CONFIG -= qt dylib +-LIBS += -lmysqlclient ++LIBS += -lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto diff --git a/qt5-base/mingw-w64-static/qt-5.1.x-win_flex-replace.patch b/qt5-base/mingw-w64-static/qt-5.1.x-win_flex-replace.patch new file mode 100644 index 00000000..0dd6a2cf --- /dev/null +++ b/qt5-base/mingw-w64-static/qt-5.1.x-win_flex-replace.patch @@ -0,0 +1,22 @@ +--- 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-base/mingw-w64-static/qt5-add-angle-support.patch b/qt5-base/mingw-w64-static/qt5-add-angle-support.patch new file mode 100644 index 00000000..4eb5f872 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-add-angle-support.patch @@ -0,0 +1,44 @@ +--- 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 + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64-static/qt5-add-compiled-shaders-remove-dxsdk.patch b/qt5-base/mingw-w64-static/qt5-add-compiled-shaders-remove-dxsdk.patch new file mode 100644 index 00000000..b211b6d1 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-add-compiled-shaders-remove-dxsdk.patch @@ -0,0 +1,1664 @@ +--- 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-base/mingw-w64-static/qt5-disable-angle-opengl-testcode.patch b/qt5-base/mingw-w64-static/qt5-disable-angle-opengl-testcode.patch new file mode 100644 index 00000000..a2bb3f65 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-disable-angle-opengl-testcode.patch @@ -0,0 +1,11 @@ +--- 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-base/mingw-w64-static/qt5-dont-add-resource-files-to-qmake-libs.patch b/qt5-base/mingw-w64-static/qt5-dont-add-resource-files-to-qmake-libs.patch new file mode 100644 index 00000000..838f2467 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-dont-add-resource-files-to-qmake-libs.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp.orig 2014-01-04 21:18:07.413328813 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp 2014-01-04 21:18:55.740126515 +0100 +@@ -243,7 +243,7 @@ + + processVars(); + +- project->values("QMAKE_LIBS") += project->values("RES_FILE"); ++ project->values("OBJECTS") += project->values("RES_FILE"); + + if (project->isActiveConfig("dll")) { + QString destDir = ""; diff --git a/qt5-base/mingw-w64-static/qt5-enable-rpath-for-host-tools.patch b/qt5-base/mingw-w64-static/qt5-enable-rpath-for-host-tools.patch new file mode 100644 index 00000000..55aaf448 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-enable-rpath-for-host-tools.patch @@ -0,0 +1,10 @@ +--- 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 +@@ -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:force_bootstrap { + !build_pass: CONFIG += release + contains(QT, core(-private)?|xml) { diff --git a/qt5-base/mingw-w64-static/qt5-fix-QSemaphore-problem.patch b/qt5-base/mingw-w64-static/qt5-fix-QSemaphore-problem.patch new file mode 100644 index 00000000..c3fcea9f --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-fix-QSemaphore-problem.patch @@ -0,0 +1,9 @@ +@@ -4456,7 +4456,7 @@ + if compileTest unix/ipc_posix "ipc_posix" ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" + else +- if [ "$XPLATFORM_ANDROID" = "no" ] ; then ++ if [ "$XPLATFORM_ANDROID" = "no"] && ["$XPLATFORM_MINGW" = "no" ] ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY" + fi + fi diff --git a/qt5-base/mingw-w64-static/qt5-fix-static-dbus-detection.patch b/qt5-base/mingw-w64-static/qt5-fix-static-dbus-detection.patch new file mode 100644 index 00000000..e12f9e38 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-fix-static-dbus-detection.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp.orig 2015-03-08 17:05:21.216593135 +0100 ++++ qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp 2015-03-08 17:06:35.276826201 +0100 +@@ -31,6 +31,10 @@ + ** + ****************************************************************************/ + ++#ifdef QT_STATIC ++#define DBUS_STATIC_BUILD ++#endif ++ + #define DBUS_API_SUBJECT_TO_CHANGE + #include + diff --git a/qt5-base/mingw-w64-static/qt5-fix-static-harfbuzz-detection.patch b/qt5-base/mingw-w64-static/qt5-fix-static-harfbuzz-detection.patch new file mode 100644 index 00000000..fa04b336 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-fix-static-harfbuzz-detection.patch @@ -0,0 +1,7 @@ +--- 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-base/mingw-w64-static/qt5-merge-static-and-shared-library-trees.patch b/qt5-base/mingw-w64-static/qt5-merge-static-and-shared-library-trees.patch new file mode 100644 index 00000000..130e6400 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-merge-static-and-shared-library-trees.patch @@ -0,0 +1,48 @@ +--- 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-base/mingw-w64-static/qt5-prevent-debug-library-names-in-pkgconfig-files.patch b/qt5-base/mingw-w64-static/qt5-prevent-debug-library-names-in-pkgconfig-files.patch new file mode 100644 index 00000000..7d6836d5 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-prevent-debug-library-names-in-pkgconfig-files.patch @@ -0,0 +1,12 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp.orig 2014-01-03 01:30:23.631353708 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp 2014-01-03 01:32:37.888625966 +0100 +@@ -3168,6 +3168,9 @@ + if (dot != -1) + ret = ret.left(dot); + } ++ if (project->isActiveConfig("debug")) { ++ ret += "d"; ++ } + ret += Option::pkgcfg_ext; + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); + if(!subdir.isEmpty()) { diff --git a/qt5-base/mingw-w64-static/qt5-qmake-implib-dll-a.patch b/qt5-base/mingw-w64-static/qt5-qmake-implib-dll-a.patch new file mode 100644 index 00000000..91ef32a1 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-qmake-implib-dll-a.patch @@ -0,0 +1,33 @@ +--- 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-base/mingw-w64-static/qt5-qtbase-fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/qt5-qtbase-fix-linking-against-static-pcre.patch new file mode 100644 index 00000000..3dd77468 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-qtbase-fix-linking-against-static-pcre.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp.orig 2013-07-11 08:23:02.687691337 +0200 ++++ qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp 2013-07-11 08:23:27.231900674 +0200 +@@ -47,6 +47,10 @@ + #include + #include + ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#endif ++ + #include + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64-static/qt5-rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/qt5-rename-qtmain-to-qt5main.patch new file mode 100644 index 00000000..57c35da0 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-rename-qtmain-to-qt5main.patch @@ -0,0 +1,35 @@ +--- qtbase-opensource-src-5.2.1/src/winmain/winmain.pro.orig 2014-04-29 18:51:05.206296152 +0200 ++++ qtbase-opensource-src-5.2.1/src/winmain/winmain.pro 2014-04-29 18:51:18.737512221 +0200 +@@ -2,7 +2,7 @@ + !win32:error("$$_FILE_ is intended only for Windows!") + + TEMPLATE = lib +-TARGET = qtmain ++TARGET = qt5main + 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 2014-07-05 14:18:46.045390147 +0200 +@@ -6,7 +6,7 @@ + mingw:DEFINES += QT_NEEDS_QMAIN + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { +- isEqual(entryLib, -lqtmain): { ++ isEqual(entryLib, -lqt5main): { + !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ + QMAKE_LIBS += -L$$QT.core.libs + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/qt5-base/mingw-w64-static/qt5-use-external-angle-library.patch b/qt5-base/mingw-w64-static/qt5-use-external-angle-library.patch new file mode 100644 index 00000000..fef7949a --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-use-external-angle-library.patch @@ -0,0 +1,113 @@ +--- 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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #endif + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64-static/qt5-use-system-zlib-in-host-libs.patch b/qt5-base/mingw-w64-static/qt5-use-system-zlib-in-host-libs.patch new file mode 100644 index 00000000..a5046514 --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-use-system-zlib-in-host-libs.patch @@ -0,0 +1,11 @@ +--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600 ++++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600 +@@ -145,7 +145,7 @@ + ../../corelib/io/qstandardpaths_win.cpp + } + +-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) ++if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri) + else:include(../../3rdparty/zlib_dependency.pri) + + win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 diff --git a/qt5-base/mingw-w64-static/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-base/mingw-w64-static/qt5-use-win32-g++-mkspecs-profile.patch new file mode 100644 index 00000000..a3499dab --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-use-win32-g++-mkspecs-profile.patch @@ -0,0 +1,58 @@ +--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200 ++++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200 +@@ -25,7 +25,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport ++QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -fno-keep-inline-dllexport + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -Wextra + QMAKE_CFLAGS_WARN_OFF = -w +@@ -67,10 +67,10 @@ + + QMAKE_LINK = $${CROSS_COMPILE}g++ + QMAKE_LINK_C = $${CROSS_COMPILE}gcc +-QMAKE_LFLAGS = ++QMAKE_LFLAGS = -g + QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads + QMAKE_LFLAGS_EXCEPTIONS_OFF = +-QMAKE_LFLAGS_RELEASE = -Wl,-s ++QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console + QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows +@@ -84,21 +84,26 @@ + QMAKE_EXTENSION_STATICLIB = a + + QMAKE_LIBS = +-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 +-QMAKE_LIBS_NETWORK = -lws2_32 ++QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16 ++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_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 +-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain ++QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main + +-QMAKE_IDL = midl ++QMAKE_IDL = $${CROSS_COMPILE}widl + QMAKE_LIB = $${CROSS_COMPILE}ar -ru + QMAKE_RC = $${CROSS_COMPILE}windres ++QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool ++QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5 + + QMAKE_STRIP = $${CROSS_COMPILE}strip + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy + QMAKE_NM = $${CROSS_COMPILE}nm -P ++ ++PKG_CONFIG = $${CROSS_COMPILE}pkg-config ++ + load(qt_config) diff --git a/qt5-base/mingw-w64-static/qt5-workaround-pkgconfig-install-issue.patch b/qt5-base/mingw-w64-static/qt5-workaround-pkgconfig-install-issue.patch new file mode 100644 index 00000000..46e561aa --- /dev/null +++ b/qt5-base/mingw-w64-static/qt5-workaround-pkgconfig-install-issue.patch @@ -0,0 +1,46 @@ +--- qmake/generators/makefile.cpp.pkgconfig 2013-01-29 20:03:12.000000000 +0100 ++++ qmake/generators/makefile.cpp 2013-03-26 19:18:07.480722316 +0100 +@@ -3102,7 +3102,7 @@ + } + + QString +-MakefileGenerator::pkgConfigFileName(bool fixify) ++MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) + { + QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); + if (ret.isEmpty()) { +@@ -3134,7 +3134,11 @@ + if(fixify) { + if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) + ret.prepend(project->first("DESTDIR").toQString()); +- ret = fileFixify(ret, FileFixifyBackwards); ++ if (onlyPrependDestdir) { ++ ret = Option::fixPathToLocalOS(ret); ++ } else { ++ ret = fileFixify(ret, FileFixifyBackwards); ++ } + } + return ret; + } +--- qmake/generators/makefile.h.orig 2013-03-26 19:17:37.624199870 +0100 ++++ qmake/generators/makefile.h 2013-03-26 19:17:56.327527157 +0100 +@@ -102,7 +102,7 @@ + virtual void writeDefaultVariables(QTextStream &t); + + QString pkgConfigPrefix() const; +- QString pkgConfigFileName(bool fixify=true); ++ QString pkgConfigFileName(bool fixify=true, bool onlyPrependDestdir = false); + QString pkgConfigFixPath(QString) const; + void writePkgConfigFile(); // for pkg-config + +--- qmake/generators/win32/winmakefile.cpp.orig 2013-03-26 19:05:13.398183953 +0100 ++++ qmake/generators/win32/winmakefile.cpp 2013-03-26 19:15:02.800490466 +0100 +@@ -822,7 +822,7 @@ + } + if(!ret.isEmpty()) + ret += "\n\t"; +- ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc); ++ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc); + if(!uninst.isEmpty()) + uninst.append("\n\t"); + uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); diff --git a/qt5-base/mingw-w64-static/use-external-angle-library.patch b/qt5-base/mingw-w64-static/use-external-angle-library.patch new file mode 100644 index 00000000..8f616625 --- /dev/null +++ b/qt5-base/mingw-w64-static/use-external-angle-library.patch @@ -0,0 +1,92 @@ +diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro +--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600 ++++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600 +@@ -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 +@@ -35,6 +29,10 @@ + + mac:!ios: LIBS_PRIVATE += -framework Cocoa + ++win32:contains(QT_CONFIG, angle) { ++ LIBS_PRIVATE += -lGLESv2 ++} ++ + CONFIG += simd optimize_full + + include(accessible/accessible.pri) +diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +--- a/src/gui/Qt5GuiConfigExtras.cmake.in 2015-06-29 14:04:51.000000000 -0600 ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in 2015-07-18 10:51:09.666053970 -0600 +@@ -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}) +diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro +--- a/src/opengl/opengl.pro 2015-06-29 14:04:05.000000000 -0600 ++++ b/src/opengl/opengl.pro 2015-07-18 10:46:46.588388411 -0600 +@@ -12,6 +12,9 @@ + + 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 \ +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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #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 +@@ -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: +diff -U 3 -r a/src/src.pro b/src/src.pro +--- a/src/src.pro 2015-06-29 14:05:06.000000000 -0600 ++++ b/src/src.pro 2015-07-18 10:43:01.698195194 -0600 +@@ -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 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD new file mode 100644 index 00000000..69729feb --- /dev/null +++ b/qt5-base/mingw-w64/PKGBUILD @@ -0,0 +1,358 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic +# Contributor: jellysheep + +pkgname=mingw-w64-qt5-base +pkgver=5.5.1 +pkgrel=1 +pkgdesc="A cross-platform application and UI framework (mingw-w64)" +arch=(i686 x86_64) +url="http://qt-project.org" +license=("custom, FDL, GPL3, LGPL") +depends=( + mingw-w64-crt + mingw-w64-zlib + mingw-w64-libjpeg-turbo + mingw-w64-libiconv + mingw-w64-sqlite + mingw-w64-libpng + mingw-w64-openssl + mingw-w64-libdbus + mingw-w64-pcre + mingw-w64-harfbuzz + mingw-w64-glib2 +) +groups=(mingw-w64-qt mingw-w64-qt5) +optdepends=( + "mingw-w64-postgresql-libs: PostgreSQL support" + "mingw-w64-mariadb-connector-c: MySQL support" + "qtchooser" +) +makedepends=(mingw-w64-gcc + mingw-w64-postgresql-libs + mingw-w64-mariadb-connector-c + mingw-w64-pkg-config) +options=(!strip !buildflags staticlibs) +_pkgfqn="qtbase-opensource-src-${pkgver}" +source=("http://download.qt-project.org/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" + "qt5-qtbase-fix-linking-against-static-pcre.patch" + "qt5-rename-qtmain-to-qt5main.patch" + "qt5-dont-build-host-libs-static.patch" + "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' + 'bab00ccc19d888997f323c80354a7c3f' + 'ec25d1ff4033383cd5d2414d8189c228' + 'bc99c4cc6998295d76f37ed681c20d47' + '4fe6523dd1c34398df3aa5a8763530cc' + 'c4d4ca54a2e9096d2af13a266177f6d6' + '3bd322551924543553a2bf81b4419a09' + '15e8eaa4f0a9a9990277c79e243770be' + '99bb9f51ec684803768f36e407baf486' + '6a6bc88f35ac8080869de39bc128ce5b' + 'e793479e0b86b39ddafd328140f1a24c' + '40de3aaf7d713034e06f4eece665b1ba' + '4149c27286f110e37893d1764d4c8a68' + '39cdea1b39a1d993df6d01a576e8116f' + 'a265dea62755caf38187114143999224' + '612a4dfb9f1a3898a1920c28bb999159' + 'd0eb81aef1a21c65813fe4ddabbc4206' + '0076233a43e7edaaaf8c2abca2ada8df' + '87cbd116c75ced1b075bf266f2455d50' + '1bc70e7e3ea6a0178891d984f0451b3c') +_architectures="x86_64-w64-mingw32 i686-w64-mingw32" + +# Helper functions for the split builds +isStatic() { + [ $pkgname = "mingw-w64-qt5-base-static" ] +} + +isOpenGL() { + [ $pkgname = "mingw-w64-qt5-base-opengl" ] +} + +isStatic && depends+=("mingw-w64-qt5-base") +! isOpenGL && depends+=("mingw-w64-angleproject") +isOpenGL && provides+=("mingw-w64-qt5-base") +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 + + if ! isOpenGL; then + # Add support for Angle + patch -p1 -i ../add-angle-support.patch + + # Make sure our external Angle package is used instead of the bundled one + patch -p1 -i ../use-external-angle-library.patch + fi + + # opengl to many sections error + isOpenGL && patch -p0 -i ../fix-opengl-to-many-sections.patch + + # Make sure the .pc files of the Qt5 modules are installed correctly + patch -p0 -i ../qt5-workaround-pkgconfig-install-issue.patch + + # Prevents resource files from being added to the LIBS parameter + # This solves an issue where the generated pkg-config files contained + # invalid Libs.private references like .obj/debug/Qt5Cored_resource_res.o + patch -p1 -i ../qt5-dont-add-resource-files-to-qmake-libs.patch + + # qmake generates the pkgconfig .pc files two times, once for the + # release build and once for the debug build (which we're not actually + # building in this package). For both generations the exact same + # pkgconfig file name is used. This causes references to the debug + # build ending up in the .pc files which are unwanted + # Prevent this from happening by giving the pkgconfig .pc + # 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 + 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 + + # The bundled pcre is built as static library by default + # As we're not using the bundled copy but our own copy + # we need to do some fiddling to fix compilation issues + # when trying to build static qmake projects + patch -p1 -i ../qt5-qtbase-fix-linking-against-static-pcre.patch + + # Make sure the qtmain (static) library doesn't conflict with the one + # provided by the mingw-qt (qt4) package. The mkspecs profile is already + # updated by patch100 to reflect this change + # https://bugzilla.redhat.com/show_bug.cgi?id=1092465 + patch -p1 -i ../qt5-rename-qtmain-to-qt5main.patch + + # Upstream always wants the host libraries to be static instead of + # shared libraries. This causes issues and is against the Fedora + # packaging guidelines so disable this 'feature' + patch -p0 -i ../qt5-dont-build-host-libs-static.patch + + # Build host tools with rpath enabled + # We have to use rpath here as the library which the + # various tools depend on (libQt5Bootstrap.so) resides + # in the folder /usr/${_arch}/lib + # We can't use the regular %%_libdir for this as we + # want to avoid conflicts with the native qt5 packages + patch -p1 -i ../qt5-enable-rpath-for-host-tools.patch + + # 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 + + # QTBUG-49174 Prevent warning output when QWebView loads QNetworkRequest + patch -p1 -b -i ../a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff + + 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} + + # As well as our external PCRE library and zlib + rm -rf src/3rdparty/{pcre,zlib} +} + +build() { + cd "${srcdir}/${_pkgfqn}" + + # Setup flags + export CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + export CXXFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + unset LDFLAGS + + for _arch in ${_architectures}; do + + # Phonon is disabled for now because we lack the directx headers + # The odd paths for the -hostbindir argument are on purpose + # The qtchooser tool assumes that the tools 'qmake', 'moc' and others + # are all available in the same folder with these exact file names + # To prevent conflicts with the mingw-qt (Qt4) package we have + # to put these tools in a dedicated folder + qt_configure_args="\ + -xplatform win32-g++ \ + -optimized-qmake \ + -verbose \ + -opensource \ + -confirm-license \ + -force-pkg-config \ + -force-debug-info \ + -audio-backend \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-sqlite \ + -system-harfbuzz \ + -no-fontconfig \ + -iconv \ + -openssl \ + -dbus-linked \ + -no-glib \ + -no-gtkstyle \ + -no-icu \ + -release \ + -nomake examples \ + -make tools \ + -hostprefix /usr/${_arch} \ + -hostdatadir /usr/${_arch}/lib/qt \ + -hostbindir /usr/${_arch}/lib/qt/bin \ + -prefix /usr/${_arch} \ + -bindir /usr/${_arch}/bin \ + -archdatadir /usr/${_arch}/lib/qt \ + -datadir /usr/${_arch}/share/qt \ + -docdir /usr/${_arch}/share/doc/qt \ + -examplesdir /usr/${_arch}/share/qt/examples \ + -headerdir /usr/${_arch}/include/qt \ + -libdir /usr/${_arch}/lib \ + -plugindir /usr/${_arch}/lib/qt/plugins \ + -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)" + + isOpenGL && qt_configure_args+=' -opengl desktop' + isStatic && qt_configure_args+=' -opengl no' + + unset PKG_CONFIG_PATH + + if ! isStatic; then + export QT_LFLAGS_MYSQL="-L/usr/${_arch}/lib -lmysql" + fi + # Qt doesn't detect mysql correctly, so use this: + export QT_CFLAGS_MYSQL="-I/usr/${_arch}/include/mariadb" + #export QT_LFLAGS_MYSQL_R="-lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto" + # Hardcode MySQL flags into configure (really nice solution :( ) + sed -e "s|^QT_CFLAGS_MYSQL=.*$|QT_CFLAGS_MYSQL=\"${QT_CFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + sed -e "s|^QT_LFLAGS_MYSQL=.*$|QT_LFLAGS_MYSQL=\"${QT_LFLAGS_MYSQL}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + #sed -e "s|^QT_LFLAGS_MYSQL_R=.*$|QT_LFLAGS_MYSQL_R=\"${QT_LFLAGS_MYSQL_R}\"|g" -i "${srcdir}/${_pkgfqn}/configure" + qt_configure_args_mysql="-mysql_config /this/file/should/not/exist" + + mkdir ../build-${_arch} && pushd ../build-${_arch} + + if isStatic; then + ../${_pkgfqn}/configure -static $qt_configure_args $qt_configure_args_mysql + make + else + # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared + # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* + # libraries aren't installed at this point yet, we have to workaround this + ../${_pkgfqn}/configure -shared $qt_configure_args $qt_configure_args_mysql + LD_LIBRARY_PATH=`pwd`/lib make + fi + + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "$srcdir/${_pkgfqn}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + + if isStatic; then + # Drop the qtmain and Qt5Bootstrap static libraries from the static tree as + # they are already part of the main tree + rm -f "${pkgdir}/usr/${_arch}/lib/libqt5main"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5Bootstrap"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5OpenGLExtensions"* + rm -f "${pkgdir}/usr/${_arch}/lib/libQt5PlatformSupport"* + + # Also keep various Qt5 plugins to be used in static builds + # https://bugzilla.redhat.com/show_bug.cgi?id=1257630 + mv "${pkgdir}/usr/${_arch}/lib/qt/plugins/"*/*.a "${pkgdir}/usr/${_arch}/lib/" + + # we want to keep a couple pri files not found in base + mv "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules/qt_plugin_"*.pri "${pkgdir}/usr/${_arch}" + + # Delete duplicate files that are in the base package + rm -fR "${pkgdir}/usr/${_arch}/"{include,share} + rm -fR "${pkgdir}/usr/${_arch}/lib/"{qt/bin,qt/mkspecs,pkgconfig,cmake} + + # move pri files back + mkdir -p "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + mv "${pkgdir}/usr/${_arch}/"*.pri "${pkgdir}/usr/${_arch}/lib/qt/mkspecs/modules" + else # not static => shared release + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + # Add qtchooser support + [ "${_arch}" = "i686-w64-mingw32" ] && mingwn='mingw32' || mingwn='mingw64' + mkdir -p "${pkgdir}/etc/xdg/qtchooser" + echo "/usr/${_arch}/lib/qt/bin" > "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + echo "/usr/${_arch}/lib" >> "${pkgdir}/etc/xdg/qtchooser/$mingwn-qt5.conf" + + # Manually install qmake and other native tools so we don't depend anymore on + # the version of the native system Qt and also fix issues as illustrated at + # http://stackoverflow.com/questions/6592931/building-for-windows-under-linux-using-qt-creator + # Also make sure the tools can be found by CMake + mkdir -p "${pkgdir}/usr/bin" + for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do + ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-${tool}-qt5" + done + fi + + # The pkg-config files for Qt5Bootstrap aren't interesting as this particular + # library only contains native code and not cross-compiled code + rm -f "${pkgdir}/usr/${_arch}/lib/pkgconfig/Qt5Bootstrap.pc" + + # remove doc + rm -rf "${pkgdir}/usr/${_arch}/share/doc" + + # And finaly, strip the binaries + if ! isStatic; then + 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 + fi + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-base/mingw-w64/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff b/qt5-base/mingw-w64/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff new file mode 100644 index 00000000..223b6f77 --- /dev/null +++ b/qt5-base/mingw-w64/a91c40868bbdc1b2d2dd3b5f8b47aae9e8589a81.diff @@ -0,0 +1,16 @@ +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/qt5-base/mingw-w64/add-angle-support.patch b/qt5-base/mingw-w64/add-angle-support.patch new file mode 100644 index 00000000..8b9af40a --- /dev/null +++ b/qt5-base/mingw-w64/add-angle-support.patch @@ -0,0 +1,46 @@ +diff -U 3 -r a/configure b/configure +--- a/configure 2015-06-29 14:03:05.000000000 -0600 ++++ b/configure 2015-07-18 11:14:30.312317765 -0600 +@@ -5081,7 +5081,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 +@@ -6072,6 +6072,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" +@@ -7077,7 +7082,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 +diff -U 3 -r a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp +--- a/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-06-29 14:04:40.000000000 -0600 ++++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-07-18 11:16:05.767172673 -0600 +@@ -45,7 +45,9 @@ + #include + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64/angle-fix.patch b/qt5-base/mingw-w64/angle-fix.patch new file mode 100644 index 00000000..77374d1d --- /dev/null +++ b/qt5-base/mingw-w64/angle-fix.patch @@ -0,0 +1,19 @@ +--- 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/qt5-base/mingw-w64/fix-opengl-to-many-sections.patch b/qt5-base/mingw-w64/fix-opengl-to-many-sections.patch new file mode 100644 index 00000000..f83fc543 --- /dev/null +++ b/qt5-base/mingw-w64/fix-opengl-to-many-sections.patch @@ -0,0 +1,10 @@ +--- src/gui/opengl/opengl.pri.orig 2014-12-05 09:24:35.000000000 -0700 ++++ src/gui/opengl/opengl.pri 2015-02-09 10:48:48.484071754 -0700 +@@ -4,6 +4,7 @@ + contains(QT_CONFIG, opengles2):CONFIG += opengles2 + + contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { ++ QMAKE_CXXFLAGS+="-Wa,-mbig-obj" + + HEADERS += opengl/qopengl.h \ + opengl/qopengl_p.h \ diff --git a/qt5-base/mingw-w64/fix-static-psql-mysql.patch b/qt5-base/mingw-w64/fix-static-psql-mysql.patch new file mode 100644 index 00000000..3c308c57 --- /dev/null +++ b/qt5-base/mingw-w64/fix-static-psql-mysql.patch @@ -0,0 +1,15 @@ +--- config.tests/unix/psql/psql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/psql/psql.pro 2015-03-09 21:45:44.746755052 -0600 +@@ -1,3 +1,3 @@ + SOURCES = psql.cpp + CONFIG -= qt dylib +-LIBS *= -lpq ++LIBS *= -lpq -lintl -liconv -lssl -lcrypto -lwldap32 -lshfolder -lwsock32 -lws2_32 -lsecur32 -lgdi32 + +--- config.tests/unix/mysql/mysql.pro.orig 2015-02-16 21:56:55.000000000 -0700 ++++ config.tests/unix/mysql/mysql.pro 2015-03-09 21:38:59.930405876 -0600 +@@ -1,3 +1,3 @@ + SOURCES = mysql.cpp + CONFIG -= qt dylib +-LIBS += -lmysqlclient ++LIBS += -lmariadbclient -lws2_32 -lpthread -lz -lm -lssl -lcrypto diff --git a/qt5-base/mingw-w64/qt-5.1.x-win_flex-replace.patch b/qt5-base/mingw-w64/qt-5.1.x-win_flex-replace.patch new file mode 100644 index 00000000..0dd6a2cf --- /dev/null +++ b/qt5-base/mingw-w64/qt-5.1.x-win_flex-replace.patch @@ -0,0 +1,22 @@ +--- 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-base/mingw-w64/qt5-add-angle-support.patch b/qt5-base/mingw-w64/qt5-add-angle-support.patch new file mode 100644 index 00000000..4eb5f872 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-add-angle-support.patch @@ -0,0 +1,44 @@ +--- 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 + + #include ++#ifndef QT_OPENGL_ES_2 + #include ++#endif + + // #define DEBUG_GL + diff --git a/qt5-base/mingw-w64/qt5-add-compiled-shaders-remove-dxsdk.patch b/qt5-base/mingw-w64/qt5-add-compiled-shaders-remove-dxsdk.patch new file mode 100644 index 00000000..b211b6d1 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-add-compiled-shaders-remove-dxsdk.patch @@ -0,0 +1,1664 @@ +--- 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-base/mingw-w64/qt5-disable-angle-opengl-testcode.patch b/qt5-base/mingw-w64/qt5-disable-angle-opengl-testcode.patch new file mode 100644 index 00000000..a2bb3f65 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-disable-angle-opengl-testcode.patch @@ -0,0 +1,11 @@ +--- 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-base/mingw-w64/qt5-dont-add-resource-files-to-qmake-libs.patch b/qt5-base/mingw-w64/qt5-dont-add-resource-files-to-qmake-libs.patch new file mode 100644 index 00000000..838f2467 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-dont-add-resource-files-to-qmake-libs.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp.orig 2014-01-04 21:18:07.413328813 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/win32/mingw_make.cpp 2014-01-04 21:18:55.740126515 +0100 +@@ -243,7 +243,7 @@ + + processVars(); + +- project->values("QMAKE_LIBS") += project->values("RES_FILE"); ++ project->values("OBJECTS") += project->values("RES_FILE"); + + if (project->isActiveConfig("dll")) { + QString destDir = ""; diff --git a/qt5-base/mingw-w64/qt5-enable-rpath-for-host-tools.patch b/qt5-base/mingw-w64/qt5-enable-rpath-for-host-tools.patch new file mode 100644 index 00000000..55aaf448 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-enable-rpath-for-host-tools.patch @@ -0,0 +1,10 @@ +--- 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 +@@ -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:force_bootstrap { + !build_pass: CONFIG += release + contains(QT, core(-private)?|xml) { diff --git a/qt5-base/mingw-w64/qt5-fix-QSemaphore-problem.patch b/qt5-base/mingw-w64/qt5-fix-QSemaphore-problem.patch new file mode 100644 index 00000000..c3fcea9f --- /dev/null +++ b/qt5-base/mingw-w64/qt5-fix-QSemaphore-problem.patch @@ -0,0 +1,9 @@ +@@ -4456,7 +4456,7 @@ + if compileTest unix/ipc_posix "ipc_posix" ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" + else +- if [ "$XPLATFORM_ANDROID" = "no" ] ; then ++ if [ "$XPLATFORM_ANDROID" = "no"] && ["$XPLATFORM_MINGW" = "no" ] ; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY" + fi + fi diff --git a/qt5-base/mingw-w64/qt5-fix-static-dbus-detection.patch b/qt5-base/mingw-w64/qt5-fix-static-dbus-detection.patch new file mode 100644 index 00000000..e12f9e38 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-fix-static-dbus-detection.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp.orig 2015-03-08 17:05:21.216593135 +0100 ++++ qtbase-opensource-src-5.4.1/config.tests/unix/dbus/dbus.cpp 2015-03-08 17:06:35.276826201 +0100 +@@ -31,6 +31,10 @@ + ** + ****************************************************************************/ + ++#ifdef QT_STATIC ++#define DBUS_STATIC_BUILD ++#endif ++ + #define DBUS_API_SUBJECT_TO_CHANGE + #include + diff --git a/qt5-base/mingw-w64/qt5-fix-static-harfbuzz-detection.patch b/qt5-base/mingw-w64/qt5-fix-static-harfbuzz-detection.patch new file mode 100644 index 00000000..fa04b336 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-fix-static-harfbuzz-detection.patch @@ -0,0 +1,7 @@ +--- 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-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch b/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch new file mode 100644 index 00000000..130e6400 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-merge-static-and-shared-library-trees.patch @@ -0,0 +1,48 @@ +--- 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-base/mingw-w64/qt5-prevent-debug-library-names-in-pkgconfig-files.patch b/qt5-base/mingw-w64/qt5-prevent-debug-library-names-in-pkgconfig-files.patch new file mode 100644 index 00000000..7d6836d5 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-prevent-debug-library-names-in-pkgconfig-files.patch @@ -0,0 +1,12 @@ +--- qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp.orig 2014-01-03 01:30:23.631353708 +0100 ++++ qtbase-opensource-src-5.2.0/qmake/generators/makefile.cpp 2014-01-03 01:32:37.888625966 +0100 +@@ -3168,6 +3168,9 @@ + if (dot != -1) + ret = ret.left(dot); + } ++ if (project->isActiveConfig("debug")) { ++ ret += "d"; ++ } + ret += Option::pkgcfg_ext; + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); + if(!subdir.isEmpty()) { diff --git a/qt5-base/mingw-w64/qt5-qmake-implib-dll-a.patch b/qt5-base/mingw-w64/qt5-qmake-implib-dll-a.patch new file mode 100644 index 00000000..91ef32a1 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-qmake-implib-dll-a.patch @@ -0,0 +1,33 @@ +--- 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-base/mingw-w64/qt5-qtbase-fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/qt5-qtbase-fix-linking-against-static-pcre.patch new file mode 100644 index 00000000..3dd77468 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-qtbase-fix-linking-against-static-pcre.patch @@ -0,0 +1,13 @@ +--- qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp.orig 2013-07-11 08:23:02.687691337 +0200 ++++ qtbase-opensource-src-5.1.0/src/corelib/tools/qregularexpression.cpp 2013-07-11 08:23:27.231900674 +0200 +@@ -47,6 +47,10 @@ + #include + #include + ++#ifdef QT_STATIC ++#define PCRE_STATIC ++#endif ++ + #include + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64/qt5-rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/qt5-rename-qtmain-to-qt5main.patch new file mode 100644 index 00000000..57c35da0 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-rename-qtmain-to-qt5main.patch @@ -0,0 +1,35 @@ +--- qtbase-opensource-src-5.2.1/src/winmain/winmain.pro.orig 2014-04-29 18:51:05.206296152 +0200 ++++ qtbase-opensource-src-5.2.1/src/winmain/winmain.pro 2014-04-29 18:51:18.737512221 +0200 +@@ -2,7 +2,7 @@ + !win32:error("$$_FILE_ is intended only for Windows!") + + TEMPLATE = lib +-TARGET = qtmain ++TARGET = qt5main + 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 2014-07-05 14:18:46.045390147 +0200 +@@ -6,7 +6,7 @@ + mingw:DEFINES += QT_NEEDS_QMAIN + + qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { +- isEqual(entryLib, -lqtmain): { ++ isEqual(entryLib, -lqt5main): { + !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ + QMAKE_LIBS += -L$$QT.core.libs + CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/qt5-base/mingw-w64/qt5-use-external-angle-library.patch b/qt5-base/mingw-w64/qt5-use-external-angle-library.patch new file mode 100644 index 00000000..fef7949a --- /dev/null +++ b/qt5-base/mingw-w64/qt5-use-external-angle-library.patch @@ -0,0 +1,113 @@ +--- 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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #endif + + QT_BEGIN_NAMESPACE diff --git a/qt5-base/mingw-w64/qt5-use-system-zlib-in-host-libs.patch b/qt5-base/mingw-w64/qt5-use-system-zlib-in-host-libs.patch new file mode 100644 index 00000000..a5046514 --- /dev/null +++ b/qt5-base/mingw-w64/qt5-use-system-zlib-in-host-libs.patch @@ -0,0 +1,11 @@ +--- a/src/tools/bootstrap/bootstrap.pro 2014-01-01 13:22:42.367935800 -0600 ++++ b/src/tools/bootstrap/bootstrap.pro 2014-01-02 23:38:20.707687700 -0600 +@@ -145,7 +145,7 @@ + ../../corelib/io/qstandardpaths_win.cpp + } + +-if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) ++if(contains(QT_CONFIG, zlib)):include(../../3rdparty/zlib.pri) + else:include(../../3rdparty/zlib_dependency.pri) + + win32:LIBS += -luser32 -lole32 -ladvapi32 -lshell32 diff --git a/qt5-base/mingw-w64/qt5-use-win32-g++-mkspecs-profile.patch b/qt5-base/mingw-w64/qt5-use-win32-g++-mkspecs-profile.patch new file mode 100644 index 00000000..a3499dab --- /dev/null +++ b/qt5-base/mingw-w64/qt5-use-win32-g++-mkspecs-profile.patch @@ -0,0 +1,58 @@ +--- qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf.orig 2015-06-29 22:05:10.000000000 +0200 ++++ qtbase-opensource-src-5.5.0/mkspecs/win32-g++/qmake.conf 2015-08-05 19:53:33.349194327 +0200 +@@ -25,7 +25,7 @@ + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport ++QMAKE_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -fno-keep-inline-dllexport + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -Wextra + QMAKE_CFLAGS_WARN_OFF = -w +@@ -67,10 +67,10 @@ + + QMAKE_LINK = $${CROSS_COMPILE}g++ + QMAKE_LINK_C = $${CROSS_COMPILE}gcc +-QMAKE_LFLAGS = ++QMAKE_LFLAGS = -g + QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads + QMAKE_LFLAGS_EXCEPTIONS_OFF = +-QMAKE_LFLAGS_RELEASE = -Wl,-s ++QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console + QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows +@@ -84,21 +84,26 @@ + QMAKE_EXTENSION_STATICLIB = a + + QMAKE_LIBS = +-QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +-QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 +-QMAKE_LIBS_NETWORK = -lws2_32 ++QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16 ++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_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 +-QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain ++QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqt5main + +-QMAKE_IDL = midl ++QMAKE_IDL = $${CROSS_COMPILE}widl + QMAKE_LIB = $${CROSS_COMPILE}ar -ru + QMAKE_RC = $${CROSS_COMPILE}windres ++QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool ++QMAKE_LRELEASE = $${CROSS_COMPILE}lrelease-qt5 + + QMAKE_STRIP = $${CROSS_COMPILE}strip + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy + QMAKE_NM = $${CROSS_COMPILE}nm -P ++ ++PKG_CONFIG = $${CROSS_COMPILE}pkg-config ++ + load(qt_config) diff --git a/qt5-base/mingw-w64/qt5-workaround-pkgconfig-install-issue.patch b/qt5-base/mingw-w64/qt5-workaround-pkgconfig-install-issue.patch new file mode 100644 index 00000000..46e561aa --- /dev/null +++ b/qt5-base/mingw-w64/qt5-workaround-pkgconfig-install-issue.patch @@ -0,0 +1,46 @@ +--- qmake/generators/makefile.cpp.pkgconfig 2013-01-29 20:03:12.000000000 +0100 ++++ qmake/generators/makefile.cpp 2013-03-26 19:18:07.480722316 +0100 +@@ -3102,7 +3102,7 @@ + } + + QString +-MakefileGenerator::pkgConfigFileName(bool fixify) ++MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) + { + QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); + if (ret.isEmpty()) { +@@ -3134,7 +3134,11 @@ + if(fixify) { + if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) + ret.prepend(project->first("DESTDIR").toQString()); +- ret = fileFixify(ret, FileFixifyBackwards); ++ if (onlyPrependDestdir) { ++ ret = Option::fixPathToLocalOS(ret); ++ } else { ++ ret = fileFixify(ret, FileFixifyBackwards); ++ } + } + return ret; + } +--- qmake/generators/makefile.h.orig 2013-03-26 19:17:37.624199870 +0100 ++++ qmake/generators/makefile.h 2013-03-26 19:17:56.327527157 +0100 +@@ -102,7 +102,7 @@ + virtual void writeDefaultVariables(QTextStream &t); + + QString pkgConfigPrefix() const; +- QString pkgConfigFileName(bool fixify=true); ++ QString pkgConfigFileName(bool fixify=true, bool onlyPrependDestdir = false); + QString pkgConfigFixPath(QString) const; + void writePkgConfigFile(); // for pkg-config + +--- qmake/generators/win32/winmakefile.cpp.orig 2013-03-26 19:05:13.398183953 +0100 ++++ qmake/generators/win32/winmakefile.cpp 2013-03-26 19:15:02.800490466 +0100 +@@ -822,7 +822,7 @@ + } + if(!ret.isEmpty()) + ret += "\n\t"; +- ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true), dst_pc); ++ ret += installMetaFile(ProKey("QMAKE_PKGCONFIG_INSTALL_REPLACE"), pkgConfigFileName(true, true), dst_pc); + if(!uninst.isEmpty()) + uninst.append("\n\t"); + uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); diff --git a/qt5-base/mingw-w64/use-external-angle-library.patch b/qt5-base/mingw-w64/use-external-angle-library.patch new file mode 100644 index 00000000..8f616625 --- /dev/null +++ b/qt5-base/mingw-w64/use-external-angle-library.patch @@ -0,0 +1,92 @@ +diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro +--- a/src/gui/gui.pro 2015-06-29 14:04:55.000000000 -0600 ++++ b/src/gui/gui.pro 2015-07-18 10:50:02.228227482 -0600 +@@ -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 +@@ -35,6 +29,10 @@ + + mac:!ios: LIBS_PRIVATE += -framework Cocoa + ++win32:contains(QT_CONFIG, angle) { ++ LIBS_PRIVATE += -lGLESv2 ++} ++ + CONFIG += simd optimize_full + + include(accessible/accessible.pri) +diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +--- a/src/gui/Qt5GuiConfigExtras.cmake.in 2015-06-29 14:04:51.000000000 -0600 ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in 2015-07-18 10:51:09.666053970 -0600 +@@ -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}) +diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro +--- a/src/opengl/opengl.pro 2015-06-29 14:04:05.000000000 -0600 ++++ b/src/opengl/opengl.pro 2015-07-18 10:46:46.588388411 -0600 +@@ -12,6 +12,9 @@ + + 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 \ +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 + + #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +-# include ++# include + #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 +@@ -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: +diff -U 3 -r a/src/src.pro b/src/src.pro +--- a/src/src.pro 2015-06-29 14:05:06.000000000 -0600 ++++ b/src/src.pro 2015-07-18 10:43:01.698195194 -0600 +@@ -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 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD new file mode 100755 index 00000000..d056cdb5 --- /dev/null +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Martchus +# Contributor: Filip Brcic + +_qt_module=qtdeclarative +pkgname=mingw-w64-qt5-declarative +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="Classes for QML and JavaScript languages (mingw-w64)" +depends=(mingw-w64-qt5-base) +makedepends=(mingw-w64-gcc python) +options=(!strip !buildflags staticlibs) +groups=(mingw-w64-qt mingw-w64-qt5) +license=("custom, FDL, GPL3, LGPL") +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + "qt5-build-qmldevtools-as-shared-library.patch") +md5sums=('b7997c9d8df4ea60945229883f9ce8ed' + '6c445ba7713b69d90f52bb2242303853') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" + patch -p1 -i "${srcdir}"/qt5-build-qmldevtools-as-shared-library.patch +} + +build() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + + # Something is messed up with Qt5Bootstrap + make qmake_all + find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 /usr/lib/libm.so -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \; + find . -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 /usr/lib/libm.so -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \; + find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5QmlDevTools|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5QmlDevTools|g" {} \; + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="$pkgdir" install + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/Qt5QmlDevTools.pc" + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + popd + done +} diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD new file mode 100644 index 00000000..0b844f93 --- /dev/null +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtgraphicaleffects +pkgname="mingw-w64-qt5-graphicaleffects" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" +depends=('mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-$pkgver" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('2fb95cecb2ab0542cb0b5847c65600c3') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + popd + done +} diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD new file mode 100644 index 00000000..d3d061b8 --- /dev/null +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtimageformats +pkgname="mingw-w64-qt5-imageformats" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('f935b629184200b155a3048ee67c81ab') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/qt/plugins/imageformats/"*.dll + + popd + done +} diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD new file mode 100644 index 00000000..9b858cc7 --- /dev/null +++ b/qt5-location/mingw-w64/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtlocation +pkgname=mingw-w64-qt5-location +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="Provides access to position, satellite and area monitoring classes (mingw-w64)" +depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) +makedepends=(mingw-w64-gcc mingw-w64-qt5-quick1) +options=(!strip !buildflags staticlibs) +groups=(mingw-w64-qt mingw-w64-qt5) +license=("custom, FDL, GPL3, LGPL") +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('9e0c0ad76f520ba89da730b8ff601cc2') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + popd + done +} diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD new file mode 100644 index 00000000..6a9d8be1 --- /dev/null +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Martchus + +_qt_module=qtmultimedia +pkgname=mingw-w64-qt5-multimedia +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="Classes for audio, video, radio and camera functionality (mingw-w64)" +depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) +makedepends=(mingw-w64-gcc) +options=(!strip !buildflags staticlibs) +groups=(mingw-w64-qt mingw-w64-qt5) +license=("custom, FDL, GPL3, LGPL") +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + "qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch" + "qtmultimedia-dont-use-case-sensitive-headers.patch") +md5sums=('244baff13a02ebc697e5b5e2290088d0' + 'c21ff895212a17dc0a748aeadb67601d' + '7ecd5ee2735440472fae4b7d7a32879e') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" + # Some files #include + # This is a C header which also #include's stdio.h which adds a #define vsnprintf + # This #define vsnprint conflicts with QtCore/qstring.h so reorder the includes + # a bit to prevent this situation + patch -p0 -i ../qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch + + # MinGW headers are case sensitive under Linux + patch -p1 -i ../qtmultimedia-dont-use-case-sensitive-headers.patch +} + +build() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro -Wall + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + popd + done +} diff --git a/qt5-multimedia/mingw-w64/qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch b/qt5-multimedia/mingw-w64/qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch new file mode 100644 index 00000000..d63cf8c1 --- /dev/null +++ b/qt5-multimedia/mingw-w64/qt5-qtmultimedia-mingw-w64-vsnprintf-workaround.patch @@ -0,0 +1,30 @@ +--- src/multimedia/video/qvideosurfaceformat.h.orig 2013-07-14 01:14:41.813669200 +0200 ++++ src/multimedia/video/qvideosurfaceformat.h 2013-07-14 01:14:58.463944255 +0200 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + #include + +--- src/plugins/directshow/player/directshowmediatypelist.h.orig 2013-07-14 01:16:07.098077974 +0200 ++++ src/plugins/directshow/player/directshowmediatypelist.h 2013-07-14 01:16:28.175426132 +0200 +@@ -43,6 +43,7 @@ + #define DIRECTSHOWMEDIATYPELIST_H + + #include ++#include + + #include + +--- src/plugins/directshow/player/directshowglobal.h.orig 2013-07-14 01:13:12.324190974 +0200 ++++ src/plugins/directshow/player/directshowglobal.h 2013-07-14 01:13:25.434407537 +0200 +@@ -43,6 +43,7 @@ + #define DIRECTSHOWGLOBAL_H + + #include ++#include + + #include + diff --git a/qt5-multimedia/mingw-w64/qtmultimedia-dont-use-case-sensitive-headers.patch b/qt5-multimedia/mingw-w64/qtmultimedia-dont-use-case-sensitive-headers.patch new file mode 100644 index 00000000..06cbb379 --- /dev/null +++ b/qt5-multimedia/mingw-w64/qtmultimedia-dont-use-case-sensitive-headers.patch @@ -0,0 +1,22 @@ +--- qtmultimedia-opensource-src-5.2.0-rc1/config.tests/wshellitem/main.cpp.orig 2013-11-21 11:29:48.845013461 +0100 ++++ qtmultimedia-opensource-src-5.2.0-rc1/config.tests/wshellitem/main.cpp 2013-11-21 11:29:55.980132333 +0100 +@@ -39,7 +39,7 @@ + ** + ****************************************************************************/ + +-#include ++#include + + int main(int, char**) + { +--- qtmultimedia-opensource-src-5.2.0-rc1/src/plugins/directshow/player/directshowmetadatacontrol.cpp.orig 2013-11-21 11:34:00.866215162 +0100 ++++ qtmultimedia-opensource-src-5.2.0-rc1/src/plugins/directshow/player/directshowmetadatacontrol.cpp 2013-11-21 11:34:11.361390182 +0100 +@@ -57,7 +57,7 @@ + #endif + + #ifndef QT_NO_SHELLITEM +-#include ++#include + #include + #include + diff --git a/qt5-quick1/mingw-w64/PKGBUILD b/qt5-quick1/mingw-w64/PKGBUILD new file mode 100644 index 00000000..f21ff5e7 --- /dev/null +++ b/qt5-quick1/mingw-w64/PKGBUILD @@ -0,0 +1,62 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtquick1 +pkgname="mingw-w64-qt5-quick1" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Qt Declarative is provided for Qt 4 compatibility (mingw-w64)" +depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-script' 'mingw-w64-qt5-tools') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('46a61a405844cbe88a754127422f6b6d') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + # Prevent file conflict with mingw-qt4 + mv "${pkgdir}/usr/${_arch}/bin/qmlviewer.exe" "${pkgdir}/usr/${_arch}/bin/qmlviewer-qt5.exe" + + ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/qt/plugins/"*/*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/qt/imports/Qt/labs/"*/*.dll + + popd + done + + # .prl files aren't interesting for us + find ${pkgdir} -name "*.prl" -delete +} diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD new file mode 100644 index 00000000..a09e2971 --- /dev/null +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtquickcontrols +pkgname="mingw-w64-qt5-quickcontrols" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" +depends=('mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('LGPL') +url="http://qt-project.org/wiki/QtSerialPort" +_pkgfqn="${_qt_module}-opensource-src-$pkgver" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('01ace647bda006b61200f61ebe6ef93b') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + popd + + find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \; + done +} diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD new file mode 100644 index 00000000..bbf9179c --- /dev/null +++ b/qt5-script/mingw-w64/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtscript +pkgname="mingw-w64-qt5-script" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('7abbe43ec935004a9312387b4aa6b07f') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD new file mode 100644 index 00000000..79e4f19a --- /dev/null +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qtsensors +pkgname=mingw-w64-qt5-sensors +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" +depends=(mingw-w64-qt5-base mingw-w64-qt5-declarative) +makedepends=(mingw-w64-gcc) +options=(!strip !buildflags staticlibs) +license=("custom, FDL, GPL3, LGPL") +groups=(mingw-w64-qt mingw-w64-qt5) +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('25250d66b0f21d41711dbf8648fe21e6') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + pushd build-${_arch} + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + popd + done +} diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD new file mode 100644 index 00000000..cd918379 --- /dev/null +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtserialport +pkgname="mingw-w64-qt5-serialport" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('LGPL') +url="http://qt-project.org/wiki/QtSerialPort" +_pkgfqn="${_qt_module}-opensource-src-$pkgver" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/$pkgver/submodules/qtserialport-opensource-src-$pkgver.tar.xz") +md5sums=('1065424ad9be54f7635a9a50f35bc187') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + # don't build examples or tests. + sed -i 's/ examples tests//' qtserialport.pro + + for _arch in ${_architectures}; do + mkdir -p build-${_arch}/include/QtSerialPort && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + + #mkdir -p static-${_arch}/include/QtSerialPort && pushd static-${_arch} + #${_arch}-qmake-qt5 ../${_qt_module}.pro CONFIG+=static + #make + #popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + popd + + #pushd static-${_arch} + #make INSTALL_ROOT="${pkgdir}" install + #popd + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + #${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*t.a + done + + # .prl files aren't interesting for us + find ${pkgdir} -name "*.prl" -delete +} diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD new file mode 100644 index 00000000..41a30d75 --- /dev/null +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtsvg +pkgname="mingw-w64-qt5-svg" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('505fb8ba483818e53f759edbf735456e') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/"{bin,lib/qt/plugins/*}/*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD new file mode 100755 index 00000000..db52fdfe --- /dev/null +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -0,0 +1,75 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qttools +pkgname="mingw-w64-qt5-tools" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('535ff9df9d83e9bde08ee3913b751d07') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + + # Something is messed up with Qt5Bootstrap + make qmake_all + + find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \; + find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5QmlDevTools|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5QmlDevTools|g" {} \; + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + # Make sure the executables don't conflict with their mingw-qt4 counterpart + for fn in "${pkgdir}/usr/${_arch}/bin/"*.exe ; do + fn_new=$(echo $fn | sed s/'.exe$'/'-qt5.exe'/) + mv $fn $fn_new + done + + # Symlink lrelease to /usr/bin + mkdir -p "${pkgdir}/usr/bin" + for tool in lconvert lupdate lrelease; do + ln -s ../${_arch}/lib/qt/bin/${tool} "${pkgdir}/usr/bin/${_arch}-$tool-qt5" + done + + ${_arch}-strip --strip-all "${pkgdir}/usr/${_arch}/bin/"*.exe + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find ${pkgdir} -name "*.prl" -delete +} diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD new file mode 100644 index 00000000..12bfad06 --- /dev/null +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Martchus +# Contributor: ant32 +# Contributor: Filip Brcic + +_qt_module=qttranslations +pkgname="mingw-w64-qt5-translations" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-tools') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('1f89d53fe759db123b4b6d9de9d9e8c9') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + popd + done +} diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD new file mode 100644 index 00000000..ac39b0eb --- /dev/null +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Martchus + +_qt_module=qtwebchannel +pkgname=mingw-w64-qt5-webchannel +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' +depends=('mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=(mingw-w64-qt mingw-w64-qt5) +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('f2e15d52c1b7732c2afbfb7e843091cf') +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" +} + +build() { + unset PKG_CONFIG_PATH + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}/${_pkgfqn}/build-${_arch}" + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-webengine/mingw-w64-git/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch b/qt5-webengine/mingw-w64-git/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch new file mode 100644 index 00000000..0ee3e6be --- /dev/null +++ b/qt5-webengine/mingw-w64-git/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch @@ -0,0 +1,12 @@ +diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf +--- qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 14:34:22.019269600 +0100 ++++ qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 15:34:44.547516900 +0100 +@@ -14,7 +14,7 @@ + + linux-g++*:!isGCCVersionSupported(): return(false) + !isPythonVersionSupported(): return(false) +- linux-g++*|win32-msvc2013|macx-clang: return(true) ++ linux-g++*|win32-*|macx-clang: return(true) + boot2qt: return(true) + + skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") diff --git a/qt5-webengine/mingw-w64-git/PKGBUILD b/qt5-webengine/mingw-w64-git/PKGBUILD new file mode 100644 index 00000000..27fb5541 --- /dev/null +++ b/qt5-webengine/mingw-w64-git/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer: Martchus + +# DOES NOT WORK YET (mingw-64 currently not supported by Qt WebEngine) + +_qt_module=qtwebengine +pkgname=mingw-w64-qt5-webengine-git +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64, git version)' +depends=('mingw-w64-qt5-webchannel' 'mingw-w64-qt5-location') +makedepends=('mingw-w64-gcc' 'git' 'python2' 'gperf' 'ruby' 'mingw-w64-pkg-config') +provides=(${pkgname%-git}) +conflicts=(${pkgname%-git}) +options=('!strip' '!buildflags' 'staticlibs') +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=(mingw-w64-qt mingw-w64-qt5) +source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) +md5sums=('SKIP') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +pkgver() { + cd "${srcdir}/${_qt_module}" + echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +} + +prepare() { + cd "${srcdir}/${_qt_module}" + + # use python2 for Python 2.x + find . -name '*.py' -exec sed -i \ + 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + + + # in qtwebengine there are still a lot of relative calls which need a workaround + mkdir "${srcdir}"/python2-path + ln -s /usr/bin/python2 "${srcdir}"/python2-path/python +} + +build() { + unset PKG_CONFIG_PATH + # python2 workaround + export PATH="${srcdir}/python2-path:$PATH" + cd "${srcdir}/${_qt_module}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}/${_qt_module}/build-${_arch}" + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-webengine/mingw-w64/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch b/qt5-webengine/mingw-w64/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch new file mode 100644 index 00000000..0ee3e6be --- /dev/null +++ b/qt5-webengine/mingw-w64/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch @@ -0,0 +1,12 @@ +diff -urN qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf +--- qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 14:34:22.019269600 +0100 ++++ qt-everywhere-opensource-src-5.5.0/qtwebengine/tools/qmake/mkspecs/features/functions.prf 2015-08-26 15:34:44.547516900 +0100 +@@ -14,7 +14,7 @@ + + linux-g++*:!isGCCVersionSupported(): return(false) + !isPythonVersionSupported(): return(false) +- linux-g++*|win32-msvc2013|macx-clang: return(true) ++ linux-g++*|win32-*|macx-clang: return(true) + boot2qt: return(true) + + skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD new file mode 100644 index 00000000..851bf875 --- /dev/null +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -0,0 +1,64 @@ +# Maintainer: Martchus + +# DOES NOT WORK YET (mingw-64 currently not supported by Qt WebEngine) + +_qt_module=qtwebengine +pkgname=mingw-w64-qt5-webengine +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' +depends=('mingw-w64-qt5-webchannel' 'mingw-w64-qt5-location') +makedepends=('mingw-w64-gcc' 'git' 'python2' 'gperf' 'ruby' 'mingw-w64-pkg-config') +options=('!strip' '!buildflags' 'staticlibs') +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=(mingw-w64-qt mingw-w64-qt5) +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + '0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch') +md5sums=('2a548bde706e8639cdec2cbe31d85545' + '27e0f474f66f05f3911c71621b24636d') +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" + + # allow building webengine with mingw-w64 + patch -p2 -i ${srcdir}/0044-qt-5.4.0-win32-g++-enable-qtwebengine-build.patch + + # use python2 for Python 2.x + find . -name '*.py' -exec sed -i \ + 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + + + # in qtwebengine there are still a lot of relative calls which need a workaround + mkdir "${srcdir}"/python2-path + ln -s /usr/bin/python2 "${srcdir}"/python2-path/python +} + +build() { + unset PKG_CONFIG_PATH + # python2 workaround + export PATH="${srcdir}/python2-path:$PATH" + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}/${_pkgfqn}/build-${_arch}" + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD new file mode 100644 index 00000000..4c4c6e83 --- /dev/null +++ b/qt5-webkit/mingw-w64/PKGBUILD @@ -0,0 +1,123 @@ +# Maintainer: ant32 +# Contributor: Filip Brcic + +_qt_module=qtwebkit +pkgname=mingw-w64-qt5-webkit +pkgver=5.5.1 +pkgrel=1 +arch=(any) +pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)" +depends=('mingw-w64-qt5-base' + 'mingw-w64-qt5-declarative' + 'mingw-w64-qt5-sensors' + 'mingw-w64-qt5-location' + 'mingw-w64-qt5-multimedia' + 'mingw-w64-angleproject' + 'mingw-w64-fontconfig' + 'mingw-w64-libpng' + 'mingw-w64-libjpeg-turbo' + 'mingw-w64-libxslt' + 'mingw-w64-zlib' + 'mingw-w64-icu' + 'mingw-w64-sqlite' + 'mingw-w64-libwebp') +makedepends=('mingw-w64-gcc' 'python' 'gperf' 'ruby' 'mingw-w64-pkg-config') +options=('!strip' '!buildflags' 'staticlibs') +license=("custom, FDL, GPL3, LGPL") +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=(mingw-w64-qt mingw-w64-qt5) +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + 'qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch' + 'qtwebkit-dont-use-bundled-angle-libraries.patch' + 'qt5-qtwebkit-dont-depend-on-icu.patch' + 'revert-qt4-unicode-removal.patch' + 'qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch' + 'qtwebkit-opensource-src-5.0.1-debuginfo.patch' + 'webkit-commit-151422.patch' + 'qt5-qtwebkit-fix-compatibility-with-latest-angle.patch') +md5sums=('681328edb539b8fa3a273b38c90b3e31' + 'ac574de962545d6a9e975b4db63c3e09' + 'f452210683386f9c28f04d7dea0ecfc7' + '069f86d834bcecb7fe0937b7539d28af' + '4e374836f26853b4d82be0e87aa584a5' + '8b60ddebf01ee04a0e1180e98cdd3d52' + '6aba6468efafb64943887079e258b799' + 'c36fe581e0f3b61cef19415782b257ca' + '2ef87f4b6588e92a925f42c3b9595379') +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +prepare() { + cd "${srcdir}/${_pkgfqn}" + + # The ICU libraries used for cross-compilation are named exactly the same as their native Linux counterpart + #patch -p0 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch + + # By default the build system assumes that pkg-config isn't used for the win32 target + # However, we're using it in the Fedora MinGW toolchain so make sure it is used automatically + patch -p0 -b -i ../qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch + + # Make sure the bundled copy of the ANGLE library isn't used + patch -p1 -b -i ../qtwebkit-dont-use-bundled-angle-libraries.patch + + # qtwebkit depends on qtbase with ICU support. + # As ICU support in qtbase also introduces over 20MB of additional dependency + # bloat (and the qtbase libraries itself are only 13MB) the decision was made + # to build qtbase without ICU support. + # Make sure qtwebkit doesn't depend on a qtbase with ICU support any more + patch -p1 -b -i ../qt5-qtwebkit-dont-depend-on-icu.patch + + # Undo the removal of the old Qt4 based unicode support + # as we want to use it instead of the bloated ICU + patch -p1 -R -b -i ../revert-qt4-unicode-removal.patch + + # WebKit svn commit 136242 implemented a split into QtWebKit and QtWebKitWidgets + # Due to this change a static library named WebKit1.a is created first. + # After this a shared library is created named Qt5WebKit.dll which contains + # the contents of this static library and some other object files. + # However, various symbols in the static library are expected to be exported + # in the Qt5WebKit.dll shared library. As static libraries normally don't care + # about exported symbols (everything is exported after all) the decoration + # attribute Q_DECL_EXPORT won't be set. + # This results in undefined references when trying to link the QtWebKitWidgets + # shared library (which depends on various symbols which aren't exported properly + # in the Qt5WebKit.dll shared library) + patch -p0 -b -i ../qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch + + # smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit + patch -p1 -b -i ../qtwebkit-opensource-src-5.0.1-debuginfo.patch + + # Revert commit 151422 to fix a build failure which happens because we're not using ICU + patch -p1 -R -b -i ../webkit-commit-151422.patch + + # Fix compatibility issue when using the latest ANGLE + patch -p1 -b -i ../qt5-qtwebkit-fix-compatibility-with-latest-angle.patch + + # Make sure the bundled copy of the ANGLE libraries isn't used + rm -rf Source/ThirdParty/ANGLE +} + +build() { + unset PKG_CONFIG_PATH + cd "${srcdir}/${_pkgfqn}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 QMAKE_CXXFLAGS+=-Wno-c++0x-compat ../WebKit.pro + make + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}/${_pkgfqn}/build-${_arch}" + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch new file mode 100644 index 00000000..1226704b --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-dont-depend-on-icu.patch @@ -0,0 +1,267 @@ +--- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf.orig 2013-01-04 18:56:36.785550268 +0100 ++++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf 2013-01-04 18:58:20.047373664 +0100 +@@ -115,9 +115,9 @@ + } + + # Sanity checks that would prevent us from building the whole project altogether. +- !android:!mac:!config_icu { +- addReasonForSkippingBuild("ICU is required.") +- } ++# !android:!mac:!config_icu { ++# addReasonForSkippingBuild("ICU is required.") ++# } + production_build:blackberry|qnx { + addReasonForSkippingBuild("Build not supported on BB10/QNX yet.") + } +--- qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h.orig 2013-01-04 19:28:53.735934784 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h 2013-01-04 19:28:13.856641177 +0100 +@@ -580,9 +580,13 @@ + # define WTF_USE_WCHAR_UNICODE 1 + #endif + ++#if OS(WINDOWS) && PLATFORM(QT) ++#define WTF_USE_QT4_UNICODE 1 ++#else + #if !USE(WCHAR_UNICODE) + #define WTF_USE_ICU_UNICODE 1 + #endif ++#endif + + #if PLATFORM(MAC) && !PLATFORM(IOS) + #if CPU(X86_64) +--- qtwebkit-opensource-src-5.0.0/Source/WebCore/platform/text/TextAllInOne.cpp.orig 2013-01-04 21:55:38.574265749 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WebCore/platform/text/TextAllInOne.cpp 2013-01-04 20:51:54.156245445 +0100 +@@ -27,7 +27,11 @@ + + #include "TextBoundaries.cpp" + #include "TextBreakIterator.cpp" ++#if USE(QT4_UNICODE) ++#include "TextBreakIteratorQt.cpp" ++#else + #include "TextBreakIteratorICU.cpp" ++#endif + #include "TextCodec.cpp" + #include "TextCodecICU.cpp" + #include "TextCodecLatin1.cpp" +@@ -35,6 +39,10 @@ + #include "TextCodecUTF8.cpp" + #include "TextCodecUserDefined.cpp" + #include "TextEncoding.cpp" ++#if USE(QT4_UNICODE) ++#include "TextEncodingDetectorNone.cpp" ++#else + #include "TextEncodingDetectorICU.cpp" ++#endif + #include "TextEncodingRegistry.cpp" + #include "TextStream.cpp" +--- /dev/null 2012-12-26 00:21:52.105366365 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WebCore/platform/text/TextBreakIteratorQt.cpp 2012-05-31 00:58:54.000000000 +0200 +@@ -0,0 +1,175 @@ ++/* ++ * Copyright (C) 2006 Lars Knoll ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public License ++ * along with this library; see the file COPYING.LIB. If not, write to ++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ */ ++ ++#include "config.h" ++#include "TextBreakIterator.h" ++ ++#include ++#include ++#include ++#include ++ ++// #define DEBUG_TEXT_ITERATORS ++#ifdef DEBUG_TEXT_ITERATORS ++#define DEBUG qDebug ++#else ++#define DEBUG if (1) {} else qDebug ++#endif ++ ++using namespace WTF; ++using namespace std; ++ ++namespace WebCore { ++ ++ class TextBreakIterator : public QTextBoundaryFinder { ++ public: ++ TextBreakIterator(QTextBoundaryFinder::BoundaryType type, const QString& string) ++ : QTextBoundaryFinder(type, string) ++ { } ++ TextBreakIterator() ++ : QTextBoundaryFinder() ++ { } ++ }; ++ ++ TextBreakIterator* setUpIterator(TextBreakIterator& iterator, QTextBoundaryFinder::BoundaryType type, const UChar* characters, int length) ++ { ++ if (!characters || !length) ++ return 0; ++ ++ if (iterator.isValid() && type == iterator.type() && iterator.string() == QString::fromRawData(reinterpret_cast(characters), length)) { ++ iterator.toStart(); ++ return &iterator; ++ } ++ ++ iterator = TextBreakIterator(type, QString(reinterpret_cast(characters), length)); ++ return &iterator; ++ } ++ ++ TextBreakIterator* wordBreakIterator(const UChar* string, int length) ++ { ++ static TextBreakIterator staticWordBreakIterator; ++ return setUpIterator(staticWordBreakIterator, QTextBoundaryFinder::Word, string, length); ++ } ++ ++ static TextBreakIterator* nonSharedCharacterBreakIterator; ++ ++ NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(const UChar* buffer, int length) ++ { ++ m_iterator = nonSharedCharacterBreakIterator; ++ bool createdIterator = m_iterator && weakCompareAndSwap(reinterpret_cast(&nonSharedCharacterBreakIterator), m_iterator, 0); ++ if (!createdIterator) ++ m_iterator = new TextBreakIterator(); ++ if (!setUpIterator(*m_iterator, QTextBoundaryFinder::Grapheme, buffer, length)) { ++ delete m_iterator; ++ m_iterator = 0; ++ } ++ } ++ ++ NonSharedCharacterBreakIterator::~NonSharedCharacterBreakIterator() ++ { ++ if (!weakCompareAndSwap(reinterpret_cast(&nonSharedCharacterBreakIterator), 0, m_iterator)) ++ delete m_iterator; ++ } ++ ++ TextBreakIterator* cursorMovementIterator(const UChar* string, int length) ++ { ++ static TextBreakIterator staticCursorMovementIterator; ++ return setUpIterator(staticCursorMovementIterator, QTextBoundaryFinder::Grapheme, string, length); ++ } ++ ++ static TextBreakIterator* staticLineBreakIterator; ++ ++ TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&) ++ { ++ TextBreakIterator* lineBreakIterator = 0; ++ if (staticLineBreakIterator) { ++ setUpIterator(*staticLineBreakIterator, QTextBoundaryFinder::Line, string, length); ++ std::swap(staticLineBreakIterator, lineBreakIterator); ++ } ++ ++ if (!lineBreakIterator && string && length) ++ lineBreakIterator = new TextBreakIterator(QTextBoundaryFinder::Line, QString(reinterpret_cast(string), length)); ++ ++ return lineBreakIterator; ++ } ++ ++ void releaseLineBreakIterator(TextBreakIterator* iterator) ++ { ++ ASSERT(iterator); ++ ++ if (!staticLineBreakIterator) ++ staticLineBreakIterator = iterator; ++ else ++ delete iterator; ++ } ++ ++ TextBreakIterator* sentenceBreakIterator(const UChar* string, int length) ++ { ++ static TextBreakIterator staticSentenceBreakIterator; ++ return setUpIterator(staticSentenceBreakIterator, QTextBoundaryFinder::Sentence, string, length); ++ ++ } ++ ++ int textBreakFirst(TextBreakIterator* bi) ++ { ++ bi->toStart(); ++ DEBUG() << "textBreakFirst" << bi->position(); ++ return bi->position(); ++ } ++ ++ int textBreakNext(TextBreakIterator* bi) ++ { ++ int pos = bi->toNextBoundary(); ++ DEBUG() << "textBreakNext" << pos; ++ return pos; ++ } ++ ++ int textBreakPreceding(TextBreakIterator* bi, int pos) ++ { ++ bi->setPosition(pos); ++ int newpos = bi->toPreviousBoundary(); ++ DEBUG() << "textBreakPreceding" << pos << newpos; ++ return newpos; ++ } ++ ++ int textBreakFollowing(TextBreakIterator* bi, int pos) ++ { ++ bi->setPosition(pos); ++ int newpos = bi->toNextBoundary(); ++ DEBUG() << "textBreakFollowing" << pos << newpos; ++ return newpos; ++ } ++ ++ int textBreakCurrent(TextBreakIterator* bi) ++ { ++ return bi->position(); ++ } ++ ++ bool isTextBreak(TextBreakIterator*, int) ++ { ++ return true; ++ } ++ ++ bool isWordTextBreak(TextBreakIterator*) ++ { ++ return true; ++ } ++ ++} +--- a/Source/WebCore/platform/ThreadGlobalData.cpp ++++ b/Source/WebCore/platform/ThreadGlobalData.cpp +@@ -37,6 +37,8 @@ + + #if USE(ICU_UNICODE) + #include "TextCodecICU.h" ++#elif USE(QT4_UNICODE) ++#include "qt/TextCodecQt.h" + #endif + + #if PLATFORM(MAC) +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/platform/text/TextBreakIteratorQt.cpp.orig 2013-12-04 00:08:41.281004481 +0100 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/platform/text/TextBreakIteratorQt.cpp 2013-12-04 00:07:52.878531508 +0100 +@@ -96,7 +96,7 @@ + + static TextBreakIterator* staticLineBreakIterator; + +- TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&) ++ TextBreakIterator* acquireLineBreakIterator(const UChar* string, int length, const AtomicString&, const UChar* priorContext, unsigned priorContextLength) + { + TextBreakIterator* lineBreakIterator = 0; + if (staticLineBreakIterator) { +--- qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf.orig 2014-12-29 23:30:47.372582743 +0100 ++++ qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf 2014-12-29 23:31:08.021797817 +0100 +@@ -142,7 +142,7 @@ + # IndexedDB requires leveldb + enable?(indexed_database): WEBKIT_CONFIG += use_leveldb + +- !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode ++# !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode + + export(WEBKIT_CONFIG) + export(CONFIGURE_WARNINGS) diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch new file mode 100644 index 00000000..82355fca --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch @@ -0,0 +1,12 @@ +--- Tools/qmake/mkspecs/features/win32/default_pre.prf.orig 2012-11-12 21:19:24.500379251 +0100 ++++ Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-11-12 21:19:50.901564454 +0100 +@@ -4,6 +4,9 @@ + # See 'Tools/qmake/README' for an overview of the build system + # ------------------------------------------------------------------- + ++# Make sure we process the PKGCONFIG variable if applicable ++CONFIG += link_pkgconfig ++ + load(default_pre) + + debug: CONFIG += use_all_in_one_files diff --git a/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch b/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch new file mode 100644 index 00000000..2a12fca2 --- /dev/null +++ b/qt5-webkit/mingw-w64/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch @@ -0,0 +1,135 @@ +--- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h.orig 2014-12-29 22:48:34.532357391 +0100 ++++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2014-12-29 23:01:26.254334924 +0100 +@@ -34,14 +34,15 @@ + #elif PLATFORM(WIN) + #include "GLSLANG/ShaderLang.h" + #else +-#include "ShaderLang.h" ++#include "GLSLANG/ShaderLang.h" ++#include "angle_gl.h" + #endif + + namespace WebCore { + + enum ANGLEShaderType { +- SHADER_TYPE_VERTEX = SH_VERTEX_SHADER, +- SHADER_TYPE_FRAGMENT = SH_FRAGMENT_SHADER, ++ SHADER_TYPE_VERTEX = GL_VERTEX_SHADER, ++ SHADER_TYPE_FRAGMENT = GL_FRAGMENT_SHADER, + }; + + enum ANGLEShaderSymbolType { +@@ -53,17 +54,17 @@ + ANGLEShaderSymbolType symbolType; + String name; + String mappedName; +- ShDataType dataType; ++ sh::GLenum dataType; + int size; + bool isArray; + + bool isSampler() const + { + return symbolType == SHADER_SYMBOL_TYPE_UNIFORM +- && (dataType == SH_SAMPLER_2D +- || dataType == SH_SAMPLER_CUBE +- || dataType == SH_SAMPLER_2D_RECT_ARB +- || dataType == SH_SAMPLER_EXTERNAL_OES); ++ && (dataType == GL_SAMPLER_2D ++ || dataType == GL_SAMPLER_CUBE ++ || dataType == GL_SAMPLER_2D_RECT_ARB ++ || dataType == GL_SAMPLER_EXTERNAL_OES); + } + }; + +--- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp.orig 2014-12-29 23:37:30.636783007 +0100 ++++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2014-12-30 12:00:39.524299653 +0100 +@@ -42,7 +42,7 @@ + inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo) + { + ANGLEGetInfoType value = 0; +- ShGetInfo(compiler, shaderInfo, &value); ++ ShGetInfo(compiler, (ShShaderInfo) shaderInfo, &value); + return value; + } + +@@ -51,11 +51,11 @@ + ShShaderInfo symbolMaxNameLengthType; + + switch (symbolType) { +- case SH_ACTIVE_ATTRIBUTES: +- symbolMaxNameLengthType = SH_ACTIVE_ATTRIBUTE_MAX_LENGTH; ++ case GL_ACTIVE_ATTRIBUTES: ++ symbolMaxNameLengthType = (ShShaderInfo) GL_ACTIVE_ATTRIBUTE_MAX_LENGTH; + break; +- case SH_ACTIVE_UNIFORMS: +- symbolMaxNameLengthType = SH_ACTIVE_UNIFORM_MAX_LENGTH; ++ case GL_ACTIVE_UNIFORMS: ++ symbolMaxNameLengthType = (ShShaderInfo) GL_ACTIVE_UNIFORM_MAX_LENGTH; + break; + default: + ASSERT_NOT_REACHED(); +@@ -79,14 +79,16 @@ + for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) { + ANGLEShaderSymbol symbol; + ANGLEGetInfoType nameLength = 0; ++ ShPrecisionType precision = SH_PRECISION_UNDEFINED; ++ int staticUse = 0; + switch (symbolType) { +- case SH_ACTIVE_ATTRIBUTES: ++ case GL_ACTIVE_ATTRIBUTES: + symbol.symbolType = SHADER_SYMBOL_TYPE_ATTRIBUTE; +- ShGetActiveAttrib(compiler, i, &nameLength, &symbol.size, &symbol.dataType, nameBuffer.data(), mappedNameBuffer.data()); ++ ShGetVariableInfo(compiler, SH_ACTIVE_ATTRIBUTES, i, &nameLength, &symbol.size, &symbol.dataType, &precision, &staticUse, nameBuffer.data(), mappedNameBuffer.data()); + break; +- case SH_ACTIVE_UNIFORMS: ++ case GL_ACTIVE_UNIFORMS: + symbol.symbolType = SHADER_SYMBOL_TYPE_UNIFORM; +- ShGetActiveUniform(compiler, i, &nameLength, &symbol.size, &symbol.dataType, nameBuffer.data(), mappedNameBuffer.data()); ++ ShGetVariableInfo(compiler, SH_ACTIVE_UNIFORMS, i, &nameLength, &symbol.size, &symbol.dataType, &precision, &staticUse, nameBuffer.data(), mappedNameBuffer.data()); + break; + default: + ASSERT_NOT_REACHED(); +@@ -170,8 +172,8 @@ + bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector& symbols, int extraCompileOptions) + { + if (!builtCompilers) { +- m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources); +- m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, m_shaderSpec, m_shaderOutput, &m_resources); ++ m_fragmentCompiler = ShConstructCompiler(GL_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources); ++ m_vertexCompiler = ShConstructCompiler(GL_VERTEX_SHADER, m_shaderSpec, m_shaderOutput, &m_resources); + if (!m_fragmentCompiler || !m_vertexCompiler) { + cleanupCompilers(); + return false; +@@ -189,7 +191,7 @@ + + const char* const shaderSourceStrings[] = { shaderSource }; + +- bool validateSuccess = ShCompile(compiler, shaderSourceStrings, 1, SH_OBJECT_CODE | SH_ATTRIBUTES_UNIFORMS | extraCompileOptions); ++ bool validateSuccess = ShCompile(compiler, shaderSourceStrings, 1, SH_OBJECT_CODE | SH_VARIABLES | extraCompileOptions); + if (!validateSuccess) { + int logSize = getValidationResultValue(compiler, SH_INFO_LOG_LENGTH); + if (logSize > 1) { +@@ -211,9 +213,9 @@ + translatedShaderSource = translationBuffer.get(); + } + +- if (!getSymbolInfo(compiler, SH_ACTIVE_ATTRIBUTES, symbols)) ++ if (!getSymbolInfo(compiler, (ShShaderInfo) GL_ACTIVE_ATTRIBUTES, symbols)) + return false; +- if (!getSymbolInfo(compiler, SH_ACTIVE_UNIFORMS, symbols)) ++ if (!getSymbolInfo(compiler, (ShShaderInfo) GL_ACTIVE_UNIFORMS, symbols)) + return false; + + return true; +--- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp.orig 2014-12-30 12:11:43.450097601 +0100 ++++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2014-12-30 12:13:46.812361166 +0100 +@@ -172,7 +172,7 @@ + + String translatedShaderSource; + String shaderInfoLog; +- int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS; ++ int extraCompileOptions = SH_CLAMP_INDIRECT_ARRAY_BOUNDS; + + if (m_requiresBuiltInFunctionEmulation) + extraCompileOptions |= SH_EMULATE_BUILT_IN_FUNCTIONS; diff --git a/qt5-webkit/mingw-w64/qtwebkit-dont-use-bundled-angle-libraries.patch b/qt5-webkit/mingw-w64/qtwebkit-dont-use-bundled-angle-libraries.patch new file mode 100644 index 00000000..27431326 --- /dev/null +++ b/qt5-webkit/mingw-w64/qtwebkit-dont-use-bundled-angle-libraries.patch @@ -0,0 +1,94 @@ +--- qtwebkit-opensource-src-5.0.0/WebKit.pro.orig 2013-01-04 01:50:18.373246956 +0100 ++++ qtwebkit-opensource-src-5.0.0/WebKit.pro 2013-01-04 01:50:23.777286725 +0100 +@@ -18,12 +18,6 @@ + JavaScriptCore.makefile = Makefile.JavaScriptCore + SUBDIRS += JavaScriptCore + +-use?(3D_GRAPHICS) { +- ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro +- ANGLE.makefile = Makefile.ANGLE +- SUBDIRS += ANGLE +-} +- + use?(leveldb):!use?(system_leveldb) { + leveldb.file = Source/ThirdParty/leveldb/leveldb.pro + leveldb.makefile = Makefile.leveldb +--- qtwebkit-opensource-src-5.0.0/Source/WebCore/Target.pri.orig 2013-01-04 01:58:25.145960916 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WebCore/Target.pri 2013-01-04 01:58:53.245166218 +0100 +@@ -4194,7 +4194,7 @@ + platform/graphics/texmap/coordinated/CoordinatedTile.cpp \ + platform/graphics/texmap/coordinated/UpdateAtlas.cpp + +- INCLUDEPATH += $$PWD/platform/graphics/gpu ++ INCLUDEPATH += $$PWD/platform/graphics/gpu /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG + + contains(QT_CONFIG, opengl) { + contains(QT_CONFIG, opengles2) { +--- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/modules/angle.prf.orig 2013-01-04 02:25:16.357429590 +0100 ++++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/modules/angle.prf 2013-01-04 02:25:29.383533741 +0100 +@@ -4,6 +4,3 @@ + # See 'Tools/qmake/README' for an overview of the build system + # ------------------------------------------------------------------- + +-WEBKIT.angle.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE +- +-include($${WEBKIT.angle.root_source_dir}/ANGLE.pri) +--- qtwebkit-opensource-src-5.0.0/Source/WebKit/WebKit1.pro.orig 2013-01-04 13:58:41.258048080 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WebKit/WebKit1.pro 2013-01-04 13:59:23.135351974 +0100 +@@ -96,7 +96,10 @@ + INCLUDEPATH += \ + $$PWD/qt/WebCoreSupport + +-use?(3D_GRAPHICS): WEBKIT += angle ++use?(3D_GRAPHICS) { ++ WEBKIT += angle ++ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG ++} + + have?(qtpositioning):enable?(GEOLOCATION) { + HEADERS += \ +--- qtwebkit-opensource-src-5.0.0/Source/WebKit2/Target.pri.orig 2013-01-04 14:01:39.267381271 +0100 ++++ qtwebkit-opensource-src-5.0.0/Source/WebKit2/Target.pri 2013-01-04 14:02:01.414542791 +0100 +@@ -942,7 +942,10 @@ + + have?(qtpositioning):enable?(GEOLOCATION): QT += positioning + +-use?(3D_GRAPHICS): WEBKIT += angle ++use?(3D_GRAPHICS) { ++ WEBKIT += angle ++ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG ++} + + use?(PLUGIN_BACKEND_XLIB) { + DEFINES += XP_UNIX +--- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/webkit_modules.prf.orig 2013-01-04 14:37:56.650662923 +0100 ++++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/webkit_modules.prf 2013-01-04 14:38:20.063847512 +0100 +@@ -7,7 +7,7 @@ + + # Reorder libraries so that the link and include order is correct, + # and make sure the case matches the original case. +-libraries = WebKit1 WebKit2 WebCore ANGLE leveldb JavaScriptCore WTF ++libraries = WebKit1 WebKit2 WebCore leveldb JavaScriptCore WTF + for(library, libraries) { + contains(WEBKIT, $$lower($$library)) { + WEBKIT -= $$lower($$library) +--- qtwebkit-opensource-src-5.0.2/Source/api.pri.orig 2013-05-18 01:36:18.524909031 +0200 ++++ qtwebkit-opensource-src-5.0.2/Source/api.pri 2013-05-18 02:14:48.609146344 +0200 +@@ -24,7 +24,6 @@ + } + build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri + +-use?(3D_GRAPHICS): WEBKIT += angle + use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb + + MODULE = webkit +--- qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.orig 2013-05-18 01:50:16.481110868 +0200 ++++ qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri 2013-05-18 02:19:24.941843621 +0200 +@@ -209,6 +209,7 @@ + CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { + LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { ++ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG + LIBS += $$QMAKE_LIBS_OPENGL_ES2 + } + } else { diff --git a/qt5-webkit/mingw-w64/qtwebkit-opensource-src-5.0.1-debuginfo.patch b/qt5-webkit/mingw-w64/qtwebkit-opensource-src-5.0.1-debuginfo.patch new file mode 100644 index 00000000..d4124181 --- /dev/null +++ b/qt5-webkit/mingw-w64/qtwebkit-opensource-src-5.0.1-debuginfo.patch @@ -0,0 +1,88 @@ +diff -up qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-01-29 13:03:49.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-23 13:54:22.578460045 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS -= -g ++# QMAKE_CXXFLAGS += -g1 ++#} ++ + JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR} + + INCLUDEPATH += \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo 2013-01-29 13:03:41.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri 2013-02-23 13:57:16.984279672 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore + ++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1") ++ QMAKE_CXXFLAGS -= -g ++ QMAKE_CXXFLAGS += -g1 ++} ++ + QT *= network sql core-private gui-private + + WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR} +@@ -302,6 +308,7 @@ + unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections + unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF ++win32:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory -Wl,--reduce-memory-overheads + + enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 + +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo 2013-01-29 13:03:39.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ + + WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS -= -g ++# QMAKE_CXXFLAGS += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR \ + $$SOURCE_DIR/Platform \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo 2013-01-29 13:03:54.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS -= -g ++# QMAKE_CXXFLAGS += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR/qt/Api \ + $$SOURCE_DIR/qt/WebCoreSupport \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri +--- qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo 2013-01-29 13:03:38.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri 2013-02-23 13:56:23.584947256 -0600 +@@ -8,6 +8,12 @@ + # All external modules should include WTF headers by prefixing with "wtf" (#include ). + INCLUDEPATH += $$PWD + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WTF workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS -= -g ++# QMAKE_CXXFLAGS += -g1 ++#} ++ + mac { + # Mac OS does ship libicu but not the associated header files. + # Therefore WebKit provides adequate header files. diff --git a/qt5-webkit/mingw-w64/revert-qt4-unicode-removal.patch b/qt5-webkit/mingw-w64/revert-qt4-unicode-removal.patch new file mode 100644 index 00000000..fc45b6b5 --- /dev/null +++ b/qt5-webkit/mingw-w64/revert-qt4-unicode-removal.patch @@ -0,0 +1,808 @@ +From 92b3cd3b0d01ca2f03e184cb16b75b31ab9a3ee6 Mon Sep 17 00:00:00 2001 +From: hausmann@webkit.org +Date: Wed, 30 Jan 2013 12:27:34 +0000 +Subject: [PATCH] [Qt] Remove QT4_UNICODE related code paths + https://bugs.webkit.org/show_bug.cgi?id=108316 + +Reviewed by Kenneth Rohde Christiansen. + +Source/WebCore: + +Get rid of QT4_UNICODE and any related code paths. The Qt port +requires Qt5 and ICU these days. This also allows for the removal +of TextCodecQt. + +* Target.pri: +* platform/KURL.cpp: +(WebCore::appendEncodedHostname): +* platform/graphics/SurrogatePairAwareTextIterator.cpp: +(WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks): +* platform/text/TextEncoding.cpp: +(WebCore::TextEncoding::encode): +* platform/text/TextEncodingRegistry.cpp: +(WebCore::extendTextCodecMaps): +* platform/text/qt/TextCodecQt.cpp: Removed. +* platform/text/qt/TextCodecQt.h: Removed. + +Source/WebKit/blackberry: + +* WebCoreSupport/AboutDataUseFeatures.in: The feature macro has been removed. + +Source/WTF: + +Get rid of QT4_UNICODE and any related code paths. The Qt port +requires Qt5 and ICU these days. + +* WTF.gypi: +* WTF.pro: +* wtf/unicode/Unicode.h: +* wtf/unicode/qt4/UnicodeQt4.h: Removed. + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@141255 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WTF/ChangeLog | 15 + + Source/WTF/WTF.gypi | 1 - + Source/WTF/WTF.pro | 1 - + Source/WTF/wtf/unicode/Unicode.h | 4 +- + Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 377 -------------------- + Source/WebCore/ChangeLog | 23 ++ + Source/WebCore/Target.pri | 2 - + Source/WebCore/platform/KURL.cpp | 5 - + .../graphics/SurrogatePairAwareTextIterator.cpp | 5 - + Source/WebCore/platform/text/TextEncoding.cpp | 6 - + .../WebCore/platform/text/TextEncodingRegistry.cpp | 8 - + Source/WebCore/platform/text/qt/TextCodecQt.cpp | 160 --------- + Source/WebCore/platform/text/qt/TextCodecQt.h | 54 --- + Source/WebKit/blackberry/ChangeLog | 9 + + .../WebCoreSupport/AboutDataUseFeatures.in | 1 - + 15 files changed, 48 insertions(+), 623 deletions(-) + delete mode 100644 Source/WTF/wtf/unicode/qt4/UnicodeQt4.h + delete mode 100644 Source/WebCore/platform/text/qt/TextCodecQt.cpp + delete mode 100644 Source/WebCore/platform/text/qt/TextCodecQt.h + +diff --git a/Source/WTF/WTF.pro b/Source/WTF/WTF.pro +index c929c68..727d78b 100644 +--- a/Source/WTF/WTF.pro ++++ b/Source/WTF/WTF.pro +@@ -178,7 +178,6 @@ HEADERS += \ + unicode/CharacterNames.h \ + unicode/Collator.h \ + unicode/icu/UnicodeIcu.h \ +- unicode/qt4/UnicodeQt4.h \ + unicode/ScriptCodesFromICU.h \ + unicode/Unicode.h \ + unicode/UnicodeMacrosFromICU.h \ +diff --git a/Source/WTF/wtf/unicode/Unicode.h b/Source/WTF/wtf/unicode/Unicode.h +index 9260211..11fee6b 100644 +--- a/Source/WTF/wtf/unicode/Unicode.h ++++ b/Source/WTF/wtf/unicode/Unicode.h +@@ -30,8 +30,6 @@ + + #if USE(ICU_UNICODE) + #include +-#elif USE(QT4_UNICODE) +-#include "qt4/UnicodeQt4.h" + #elif USE(WCHAR_UNICODE) + #include + #else +diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h +deleted file mode 100644 +index a2d1ad4..0000000 +--- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h ++++ /dev/null +@@ -1,377 +0,0 @@ +-/* +- * Copyright (C) 2006 George Staikos +- * Copyright (C) 2006 Alexey Proskuryakov +- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public License +- * along with this library; see the file COPYING.LIB. If not, write to +- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301, USA. +- * +- */ +- +-#ifndef WTF_UNICODE_QT4_H +-#define WTF_UNICODE_QT4_H +- +-#include +-#include +- +-#include +-#include +- +-#include +- +-#include +-#if USE(ICU_UNICODE) +-#include +-#endif +- +-QT_BEGIN_NAMESPACE +-namespace QUnicodeTables { +- struct Properties { +- ushort category : 8; +- ushort line_break_class : 8; +- ushort direction : 8; +- ushort combiningClass :8; +- ushort joining : 2; +- signed short digitValue : 6; /* 5 needed */ +- ushort unicodeVersion : 4; +- ushort lowerCaseSpecial : 1; +- ushort upperCaseSpecial : 1; +- ushort titleCaseSpecial : 1; +- ushort caseFoldSpecial : 1; /* currently unused */ +- signed short mirrorDiff : 16; +- signed short lowerCaseDiff : 16; +- signed short upperCaseDiff : 16; +- signed short titleCaseDiff : 16; +- signed short caseFoldDiff : 16; +- }; +- Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4); +- Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2); +-} +-QT_END_NAMESPACE +- +-// ugly hack to make UChar compatible with JSChar in API/JSStringRef.h +-#if defined(Q_OS_WIN) || (COMPILER(RVCT) && !OS(LINUX)) +-typedef wchar_t UChar; +-#else +-typedef uint16_t UChar; +-#endif +- +-#if !USE(ICU_UNICODE) +-typedef uint32_t UChar32; +-#endif +- +-namespace WTF { +-namespace Unicode { +- +-enum Direction { +- LeftToRight = QChar::DirL, +- RightToLeft = QChar::DirR, +- EuropeanNumber = QChar::DirEN, +- EuropeanNumberSeparator = QChar::DirES, +- EuropeanNumberTerminator = QChar::DirET, +- ArabicNumber = QChar::DirAN, +- CommonNumberSeparator = QChar::DirCS, +- BlockSeparator = QChar::DirB, +- SegmentSeparator = QChar::DirS, +- WhiteSpaceNeutral = QChar::DirWS, +- OtherNeutral = QChar::DirON, +- LeftToRightEmbedding = QChar::DirLRE, +- LeftToRightOverride = QChar::DirLRO, +- RightToLeftArabic = QChar::DirAL, +- RightToLeftEmbedding = QChar::DirRLE, +- RightToLeftOverride = QChar::DirRLO, +- PopDirectionalFormat = QChar::DirPDF, +- NonSpacingMark = QChar::DirNSM, +- BoundaryNeutral = QChar::DirBN +-}; +- +-enum DecompositionType { +- DecompositionNone = QChar::NoDecomposition, +- DecompositionCanonical = QChar::Canonical, +- DecompositionCompat = QChar::Compat, +- DecompositionCircle = QChar::Circle, +- DecompositionFinal = QChar::Final, +- DecompositionFont = QChar::Font, +- DecompositionFraction = QChar::Fraction, +- DecompositionInitial = QChar::Initial, +- DecompositionIsolated = QChar::Isolated, +- DecompositionMedial = QChar::Medial, +- DecompositionNarrow = QChar::Narrow, +- DecompositionNoBreak = QChar::NoBreak, +- DecompositionSmall = QChar::Small, +- DecompositionSquare = QChar::Square, +- DecompositionSub = QChar::Sub, +- DecompositionSuper = QChar::Super, +- DecompositionVertical = QChar::Vertical, +- DecompositionWide = QChar::Wide +-}; +- +-enum CharCategory { +- NoCategory = 0, +- Mark_NonSpacing = U_MASK(QChar::Mark_NonSpacing), +- Mark_SpacingCombining = U_MASK(QChar::Mark_SpacingCombining), +- Mark_Enclosing = U_MASK(QChar::Mark_Enclosing), +- Number_DecimalDigit = U_MASK(QChar::Number_DecimalDigit), +- Number_Letter = U_MASK(QChar::Number_Letter), +- Number_Other = U_MASK(QChar::Number_Other), +- Separator_Space = U_MASK(QChar::Separator_Space), +- Separator_Line = U_MASK(QChar::Separator_Line), +- Separator_Paragraph = U_MASK(QChar::Separator_Paragraph), +- Other_Control = U_MASK(QChar::Other_Control), +- Other_Format = U_MASK(QChar::Other_Format), +- Other_Surrogate = U_MASK(QChar::Other_Surrogate), +- Other_PrivateUse = U_MASK(QChar::Other_PrivateUse), +- Other_NotAssigned = U_MASK(QChar::Other_NotAssigned), +- Letter_Uppercase = U_MASK(QChar::Letter_Uppercase), +- Letter_Lowercase = U_MASK(QChar::Letter_Lowercase), +- Letter_Titlecase = U_MASK(QChar::Letter_Titlecase), +- Letter_Modifier = U_MASK(QChar::Letter_Modifier), +- Letter_Other = U_MASK(QChar::Letter_Other), +- Punctuation_Connector = U_MASK(QChar::Punctuation_Connector), +- Punctuation_Dash = U_MASK(QChar::Punctuation_Dash), +- Punctuation_Open = U_MASK(QChar::Punctuation_Open), +- Punctuation_Close = U_MASK(QChar::Punctuation_Close), +- Punctuation_InitialQuote = U_MASK(QChar::Punctuation_InitialQuote), +- Punctuation_FinalQuote = U_MASK(QChar::Punctuation_FinalQuote), +- Punctuation_Other = U_MASK(QChar::Punctuation_Other), +- Symbol_Math = U_MASK(QChar::Symbol_Math), +- Symbol_Currency = U_MASK(QChar::Symbol_Currency), +- Symbol_Modifier = U_MASK(QChar::Symbol_Modifier), +- Symbol_Other = U_MASK(QChar::Symbol_Other) +-}; +- +- +-// FIXME: handle surrogates correctly in all methods +- +-inline UChar32 toLower(UChar32 ch) +-{ +- return QChar::toLower(uint32_t(ch)); +-} +- +-inline int toLower(UChar* result, int resultLength, const UChar* src, int srcLength, bool* error) +-{ +- const UChar *e = src + srcLength; +- const UChar *s = src; +- UChar *r = result; +- uint rindex = 0; +- +- // this avoids one out of bounds check in the loop +- if (s < e && QChar(*s).isLowSurrogate()) { +- if (r) +- r[rindex] = *s++; +- ++rindex; +- } +- +- int needed = 0; +- while (s < e && (rindex < uint(resultLength) || !r)) { +- uint c = *s; +- if (QChar(c).isLowSurrogate() && QChar(*(s - 1)).isHighSurrogate()) +- c = QChar::surrogateToUcs4(*(s - 1), c); +- const QUnicodeTables::Properties *prop = QUnicodeTables::properties(c); +- if (prop->lowerCaseSpecial) { +- QString qstring; +- if (c < 0x10000) { +- qstring += QChar(c); +- } else { +- qstring += QChar(*(s-1)); +- qstring += QChar(*s); +- } +- qstring = qstring.toLower(); +- for (int i = 0; i < qstring.length(); ++i) { +- if (rindex >= uint(resultLength)) { +- needed += qstring.length() - i; +- break; +- } +- if (r) +- r[rindex] = qstring.at(i).unicode(); +- ++rindex; +- } +- } else { +- if (r) +- r[rindex] = *s + prop->lowerCaseDiff; +- ++rindex; +- } +- ++s; +- } +- if (s < e) +- needed += e - s; +- *error = (needed != 0); +- if (rindex < uint(resultLength)) +- r[rindex] = 0; +- return rindex + needed; +-} +- +-inline UChar32 toUpper(UChar32 c) +-{ +- return QChar::toUpper(uint32_t(c)); +-} +- +-inline int toUpper(UChar* result, int resultLength, const UChar* src, int srcLength, bool* error) +-{ +- const UChar *e = src + srcLength; +- const UChar *s = src; +- UChar *r = result; +- int rindex = 0; +- +- // this avoids one out of bounds check in the loop +- if (s < e && QChar(*s).isLowSurrogate()) { +- if (r) +- r[rindex] = *s++; +- ++rindex; +- } +- +- int needed = 0; +- while (s < e && (rindex < resultLength || !r)) { +- uint c = *s; +- if (QChar(c).isLowSurrogate() && QChar(*(s - 1)).isHighSurrogate()) +- c = QChar::surrogateToUcs4(*(s - 1), c); +- const QUnicodeTables::Properties *prop = QUnicodeTables::properties(c); +- if (prop->upperCaseSpecial) { +- QString qstring; +- if (c < 0x10000) { +- qstring += QChar(c); +- } else { +- qstring += QChar(*(s-1)); +- qstring += QChar(*s); +- } +- qstring = qstring.toUpper(); +- for (int i = 0; i < qstring.length(); ++i) { +- if (rindex >= resultLength) { +- needed += qstring.length() - i; +- break; +- } +- if (r) +- r[rindex] = qstring.at(i).unicode(); +- ++rindex; +- } +- } else { +- if (r) +- r[rindex] = *s + prop->upperCaseDiff; +- ++rindex; +- } +- ++s; +- } +- if (s < e) +- needed += e - s; +- *error = (needed != 0); +- if (rindex < resultLength) +- r[rindex] = 0; +- return rindex + needed; +-} +- +-inline int toTitleCase(UChar32 c) +-{ +- return QChar::toTitleCase(uint32_t(c)); +-} +- +-inline UChar32 foldCase(UChar32 c) +-{ +- return QChar::toCaseFolded(uint32_t(c)); +-} +- +-inline int foldCase(UChar* result, int resultLength, const UChar* src, int srcLength, bool* error) +-{ +- // FIXME: handle special casing. Easiest with some low level API in Qt +- *error = false; +- if (resultLength < srcLength) { +- *error = true; +- return srcLength; +- } +- for (int i = 0; i < srcLength; ++i) +- result[i] = QChar::toCaseFolded(ushort(src[i])); +- return srcLength; +-} +- +-inline bool isArabicChar(UChar32 c) +-{ +- return c >= 0x0600 && c <= 0x06FF; +-} +- +-inline bool isPrintableChar(UChar32 c) +-{ +- const uint test = U_MASK(QChar::Other_Control) | +- U_MASK(QChar::Other_NotAssigned); +- return !(U_MASK(QChar::category(uint32_t(c))) & test); +-} +- +-inline bool isSeparatorSpace(UChar32 c) +-{ +- return QChar::category(uint32_t(c)) == QChar::Separator_Space; +-} +- +-inline bool isPunct(UChar32 c) +-{ +- const uint test = U_MASK(QChar::Punctuation_Connector) | +- U_MASK(QChar::Punctuation_Dash) | +- U_MASK(QChar::Punctuation_Open) | +- U_MASK(QChar::Punctuation_Close) | +- U_MASK(QChar::Punctuation_InitialQuote) | +- U_MASK(QChar::Punctuation_FinalQuote) | +- U_MASK(QChar::Punctuation_Other); +- return U_MASK(QChar::category(uint32_t(c))) & test; +-} +- +-inline bool isLower(UChar32 c) +-{ +- return QChar::category(uint32_t(c)) == QChar::Letter_Lowercase; +-} +- +-inline bool hasLineBreakingPropertyComplexContext(UChar32) +-{ +- // FIXME: Implement this to return whether the character has line breaking property SA (Complex Context). +- return false; +-} +- +-inline UChar32 mirroredChar(UChar32 c) +-{ +- return QChar::mirroredChar(uint32_t(c)); +-} +- +-inline uint8_t combiningClass(UChar32 c) +-{ +- return QChar::combiningClass(uint32_t(c)); +-} +- +-inline DecompositionType decompositionType(UChar32 c) +-{ +- return (DecompositionType)QChar::decompositionTag(c); +-} +- +-inline int umemcasecmp(const UChar* a, const UChar* b, int len) +-{ +- // handle surrogates correctly +- for (int i = 0; i < len; ++i) { +- uint c1 = QChar::toCaseFolded(ushort(a[i])); +- uint c2 = QChar::toCaseFolded(ushort(b[i])); +- if (c1 != c2) +- return c1 - c2; +- } +- return 0; +-} +- +-inline Direction direction(UChar32 c) +-{ +- return (Direction)QChar::direction(uint32_t(c)); +-} +- +-inline CharCategory category(UChar32 c) +-{ +- return (CharCategory) U_MASK(QChar::category(uint32_t(c))); +-} +- +-} // namespace Unicode +-} // namespace WTF +- +-#endif // WTF_UNICODE_QT4_H +diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri +index 44f02b6..0e3cd5f 100644 +--- a/Source/WebCore/Target.pri ++++ b/Source/WebCore/Target.pri +@@ -2357,7 +2357,6 @@ HEADERS += \ + platform/text/DecodeEscapeSequences.h \ + platform/text/Hyphenation.h \ + platform/text/QuotedPrintable.h \ +- platform/text/qt/TextCodecQt.h \ + platform/text/RegularExpression.h \ + platform/text/SegmentedString.h \ + platform/text/TextBoundaries.h \ +@@ -2927,7 +2926,6 @@ SOURCES += \ + platform/qt/TemporaryLinkStubsQt.cpp \ + platform/text/qt/TextBoundariesQt.cpp \ + platform/text/qt/TextBreakIteratorInternalICUQt.cpp \ +- platform/text/qt/TextCodecQt.cpp \ + platform/qt/WidgetQt.cpp + + use?(LIBXML2) { +diff --git a/Source/WebCore/platform/KURL.cpp b/Source/WebCore/platform/KURL.cpp +index a1e0114..01a408c 100644 +--- a/Source/WebCore/platform/KURL.cpp ++++ b/Source/WebCore/platform/KURL.cpp +@@ -40,8 +40,6 @@ + + #if USE(ICU_UNICODE) + #include +-#elif USE(QT4_UNICODE) +-#include + #endif + + // FIXME: This file makes too much use of the + operator on String. +@@ -1498,9 +1496,6 @@ + hostnameBufferLength, UIDNA_ALLOW_UNASSIGNED, 0, &error); + if (error == U_ZERO_ERROR) + buffer.append(hostnameBuffer, numCharactersConverted); +-#elif USE(QT4_UNICODE) +- QByteArray result = QUrl::toAce(String(str, strLen)); +- buffer.append(result.constData(), result.length()); + #endif + } + +diff --git a/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp b/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp +index 11da4b9..e7eb43b 100644 +--- a/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp ++++ b/Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp +@@ -90,11 +90,6 @@ UChar32 SurrogatePairAwareTextIterator::normalizeVoicingMarks() + int32_t resultLength = unorm_normalize(m_characters, 2, UNORM_NFC, UNORM_UNICODE_3_2, &normalizedCharacters[0], 2, &uStatus); + if (resultLength == 1 && !uStatus) + return normalizedCharacters[0]; +-#elif USE(QT4_UNICODE) +- QString tmp(reinterpret_cast(m_characters), 2); +- QString res = tmp.normalized(QString::NormalizationForm_C, QChar::Unicode_3_2); +- if (res.length() == 1) +- return res.at(0).unicode(); + #endif + } + +diff --git a/Source/WebCore/platform/text/TextEncoding.cpp b/Source/WebCore/platform/text/TextEncoding.cpp +index f28cd67..6c9a24d 100644 +--- a/Source/WebCore/platform/text/TextEncoding.cpp ++++ b/Source/WebCore/platform/text/TextEncoding.cpp +@@ -37,8 +37,6 @@ + + #if USE(ICU_UNICODE) + #include +-#elif USE(QT4_UNICODE) +-#include + #endif + + namespace WebCore { +@@ -103,10 +101,6 @@ + sourceLength = normalizedLength; + } + return newTextCodec(*this)->encode(source, sourceLength, handling); +-#elif USE(QT4_UNICODE) +- QString str(reinterpret_cast(characters), length); +- str = str.normalized(QString::NormalizationForm_C); +- return newTextCodec(*this)->encode(reinterpret_cast(str.utf16()), str.length(), handling); + #elif OS(WINDOWS) && USE(WCHAR_UNICODE) + // normalization will be done by Windows CE API + OwnPtr textCodec = newTextCodec(*this); +diff --git a/Source/WebCore/platform/text/TextEncodingRegistry.cpp b/Source/WebCore/platform/text/TextEncodingRegistry.cpp +index 2790227..1d12202 100644 +--- a/Source/WebCore/platform/text/TextEncodingRegistry.cpp ++++ b/Source/WebCore/platform/text/TextEncodingRegistry.cpp +@@ -42,9 +42,6 @@ + #if USE(ICU_UNICODE) + #include "TextCodecICU.h" + #endif +-#if USE(QT4_UNICODE) +-#include "qt/TextCodecQt.h" +-#endif + #if PLATFORM(MAC) + #include "TextCodecMac.h" + #endif +@@ -296,11 +293,6 @@ static void extendTextCodecMaps() + TextCodecICU::registerCodecs(addToTextCodecMap); + #endif + +-#if USE(QT4_UNICODE) +- TextCodecQt::registerEncodingNames(addToTextEncodingNameMap); +- TextCodecQt::registerCodecs(addToTextCodecMap); +-#endif +- + #if PLATFORM(MAC) + TextCodecMac::registerEncodingNames(addToTextEncodingNameMap); + TextCodecMac::registerCodecs(addToTextCodecMap); +diff --git a/Source/WebCore/platform/text/qt/TextCodecQt.cpp b/Source/WebCore/platform/text/qt/TextCodecQt.cpp +deleted file mode 100644 +index 6a36e1a..0000000 +--- a/Source/WebCore/platform/text/qt/TextCodecQt.cpp ++++ /dev/null +@@ -1,160 +0,0 @@ +-/* +- * Copyright (C) 2006 Lars Knoll +- * Copyright (C) 2008 Holger Hans Peter Freyther +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR +- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "config.h" +-#if USE(QT4_UNICODE) +-#include "TextCodecQt.h" +- +-#include +-#include +-#include +- +-namespace WebCore { +- +-static QSet *unique_names = 0; +- +-static const char *getAtomicName(const QByteArray &name) +-{ +- if (!unique_names) +- unique_names = new QSet; +- +- unique_names->insert(name); +- return unique_names->find(name)->constData(); +-} +- +-void TextCodecQt::registerEncodingNames(EncodingNameRegistrar registrar) +-{ +- QList mibs = QTextCodec::availableMibs(); +- +- for (int i = 0; i < mibs.size(); ++i) { +- QTextCodec *c = QTextCodec::codecForMib(mibs.at(i)); +- const char *name = getAtomicName(c->name()); +- registrar(name, name); +- QList aliases = c->aliases(); +- for (int i = 0; i < aliases.size(); ++i) { +- const char *a = getAtomicName(aliases.at(i)); +- registrar(a, name); +- } +- } +-} +- +-static PassOwnPtr newTextCodecQt(const TextEncoding& encoding, const void*) +-{ +- return adoptPtr(new TextCodecQt(encoding)); +-} +- +-void TextCodecQt::registerCodecs(TextCodecRegistrar registrar) +-{ +- QList mibs = QTextCodec::availableMibs(); +- +- for (int i = 0; i < mibs.size(); ++i) { +- QTextCodec *c = QTextCodec::codecForMib(mibs.at(i)); +- const char *name = getAtomicName(c->name()); +- registrar(name, newTextCodecQt, 0); +- } +-} +- +-TextCodecQt::TextCodecQt(const TextEncoding& encoding) +- : m_encoding(encoding) +-{ +- m_codec = QTextCodec::codecForName(m_encoding.name()); +-} +- +-TextCodecQt::~TextCodecQt() +-{ +-} +- +- +-String TextCodecQt::decode(const char* bytes, size_t length, bool flush, bool /*stopOnError*/, bool& sawError) +-{ +- // We chop input buffer to smaller buffers to avoid excessive memory consumption +- // when the input buffer is big. This helps reduce peak memory consumption in +- // mobile devices where system RAM is limited. +- static const int MaxInputChunkSize = 1024 * 1024; +- const char* buf = bytes; +- const char* end = buf + length; +- String unicode(""); // a non-null string is expected +- +- while (buf < end) { +- int size = end - buf; +- size = qMin(size, MaxInputChunkSize); +- QString decoded = m_codec->toUnicode(buf, size, &m_state); +- unicode.append(reinterpret_cast_ptr(decoded.unicode()), decoded.length()); +- buf += size; +- } +- +- sawError = m_state.invalidChars != 0; +- +- if (flush) { +- m_state.flags = QTextCodec::DefaultConversion; +- m_state.remainingChars = 0; +- m_state.invalidChars = 0; +- } +- +- return unicode; +-} +- +-CString TextCodecQt::encode(const UChar* characters, size_t length, UnencodableHandling handling) +-{ +- QTextCodec::ConverterState state; +- state.flags = QTextCodec::ConversionFlags(QTextCodec::ConvertInvalidToNull | QTextCodec::IgnoreHeader); +- +- if (!length) +- return ""; +- +- QByteArray ba = m_codec->fromUnicode(reinterpret_cast(characters), length, &state); +- +- // If some characters are unencodable, escape them as specified by handling +- // We append one valid encoded chunk to a QByteArray at a time. When we encounter an unencodable chunk we +- // escape it with getUnencodableReplacement, append it, then move to the next chunk. +- if (state.invalidChars) { +- state.invalidChars = 0; +- state.remainingChars = 0; +- int len = 0; +- ba.clear(); +- for (size_t pos = 0; pos < length; ++pos) { +- QByteArray tba = m_codec->fromUnicode(reinterpret_cast(characters), ++len, &state); +- if (state.remainingChars) +- continue; +- if (state.invalidChars) { +- UnencodableReplacementArray replacement; +- getUnencodableReplacement(characters[0], handling, replacement); +- tba.replace('\0', replacement); +- state.invalidChars = 0; +- } +- ba.append(tba); +- characters += len; +- len = 0; +- state.remainingChars = 0; +- } +- } +- +- return CString(ba.constData(), ba.length()); +-} +- +- +-} // namespace WebCore +-#endif +diff --git a/Source/WebCore/platform/text/qt/TextCodecQt.h b/Source/WebCore/platform/text/qt/TextCodecQt.h +deleted file mode 100644 +index f28f0bb..0000000 +--- a/Source/WebCore/platform/text/qt/TextCodecQt.h ++++ /dev/null +@@ -1,54 +0,0 @@ +-/* +- * Copyright (C) 2006 Lars Knoll +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR +- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#ifndef TextCodecQt_h +-#define TextCodecQt_h +- +-#include "TextCodec.h" +-#include "TextEncoding.h" +-#include +- +-namespace WebCore { +- +- class TextCodecQt : public TextCodec { +- public: +- static void registerEncodingNames(EncodingNameRegistrar); +- static void registerCodecs(TextCodecRegistrar); +- +- TextCodecQt(const TextEncoding&); +- virtual ~TextCodecQt(); +- +- virtual String decode(const char*, size_t length, bool flush, bool stopOnError, bool& sawError); +- virtual CString encode(const UChar*, size_t length, UnencodableHandling); +- +- private: +- TextEncoding m_encoding; +- QTextCodec *m_codec; +- QTextCodec::ConverterState m_state; +- }; +- +-} // namespace WebCore +- +-#endif // TextCodecICU_h +-- +1.7.1 + diff --git a/qt5-webkit/mingw-w64/webkit-commit-151422.patch b/qt5-webkit/mingw-w64/webkit-commit-151422.patch new file mode 100644 index 00000000..5656f615 --- /dev/null +++ b/qt5-webkit/mingw-w64/webkit-commit-151422.patch @@ -0,0 +1,46 @@ +Index: trunk/Source/WebCore/rendering/RenderText.cpp +=================================================================== +--- trunk/Source/WebCore/rendering/RenderText.cpp (revision 151327) ++++ trunk/Source/WebCore/rendering/RenderText.cpp (revision 151422) +@@ -101,5 +101,5 @@ + + unsigned length = string->length(); +- const UChar* characters = string->characters(); ++ const StringImpl& stringImpl = *string->impl(); + + if (length >= numeric_limits::max()) +@@ -110,8 +110,8 @@ + for (unsigned i = 1; i < length + 1; i++) { + // Replace   with a real space since ICU no longer treats   as a word separator. +- if (characters[i - 1] == noBreakSpace) ++ if (stringImpl[i - 1] == noBreakSpace) + stringWithPrevious[i] = ' '; + else +- stringWithPrevious[i] = characters[i - 1]; ++ stringWithPrevious[i] = stringImpl[i - 1]; + } + +@@ -120,5 +120,6 @@ + return; + +- StringBuffer data(length); ++ StringBuilder result; ++ result.reserveCapacity(length); + + int32_t endOfWord; +@@ -126,10 +127,10 @@ + for (endOfWord = textBreakNext(boundary); endOfWord != TextBreakDone; startOfWord = endOfWord, endOfWord = textBreakNext(boundary)) { + if (startOfWord) // Ignore first char of previous string +- data[startOfWord - 1] = characters[startOfWord - 1] == noBreakSpace ? noBreakSpace : toTitleCase(stringWithPrevious[startOfWord]); ++ result.append(stringImpl[startOfWord - 1] == noBreakSpace ? noBreakSpace : toTitleCase(stringWithPrevious[startOfWord])); + for (int i = startOfWord + 1; i < endOfWord; i++) +- data[i - 1] = characters[i - 1]; +- } +- +- *string = String::adopt(data); ++ result.append(stringImpl[i - 1]); ++ } ++ ++ *string = result.toString(); + } + diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD new file mode 100644 index 00000000..ab86c151 --- /dev/null +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtwebsockets +pkgname="mingw-w64-qt5-websockets" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('cd4083945b76b075bc67dcc38e411d04') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll + ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-webview/default/PKGBUILD b/qt5-webview/default/PKGBUILD new file mode 100644 index 00000000..c0fd0c9c --- /dev/null +++ b/qt5-webview/default/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Martchus + +_qt_module=qtwebview +pkgname=qt5-webview +pkgver=5.5.1 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Provides a way to display web content in an application by using native APIs' +depends=('qt5-quick1' 'qt5-quickcontrols' 'qt5-webengine') +makedepends=('git') +provides=(${pkgname%-git}) +conflicts=(${pkgname%-git}) +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=('qt5') +source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#tag=v$pkgver) +md5sums=('SKIP') + +prepare() { + cd "${srcdir}/${_qt_module}" +} + +build() { + cd "${srcdir}/${_qt_module}" + qmake-qt5 ${_qt_module}.pro -recursive + make +} + +package() { + cd "${srcdir}/${_qt_module}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/qt5-webview/git/PKGBUILD b/qt5-webview/git/PKGBUILD new file mode 100644 index 00000000..63bf9119 --- /dev/null +++ b/qt5-webview/git/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Martchus + +_qt_module=qtwebview +pkgname=qt5-webview-git +pkgver=107.ea82d77 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Provides a way to display web content in an application by using native APIs (git version)' +depends=('qt5-quick1' 'qt5-quickcontrols' 'qt5-webengine') +makedepends=('git') +provides=(${pkgname%-git}) +conflicts=(${pkgname%-git}) +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=('qt5') +source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) +md5sums=('SKIP') + +pkgver() { + cd "${srcdir}/${_qt_module}" + echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +} + +prepare() { + cd "${srcdir}/${_qt_module}" +} + +build() { + cd "${srcdir}/${_qt_module}" + qmake-qt5 ${_qt_module}.pro -recursive + make +} + +package() { + cd "${srcdir}/${_qt_module}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/qt5-webview/mingw-w64-git/PKGBUILD b/qt5-webview/mingw-w64-git/PKGBUILD new file mode 100644 index 00000000..000bd890 --- /dev/null +++ b/qt5-webview/mingw-w64-git/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Martchus + +# DOES NOT WORK YET + +_qt_module=qtwebview +pkgname=mingw-w64-qt5-webview-git +pkgver=107.ea82d77 +pkgrel=1 +arch=('any') +pkgdesc='Provides a way to display web content in an application by using native APIs (mingw-w64, git version)' +depends=('mingw-w64-qt5-declarative' 'mingw-w64-qt5-quickcontrols' 'mingw-w64-qtwebengine') +makedepends=('mingw-w64-gcc' 'git') +provides=(${pkgname%-git}) +conflicts=(${pkgname%-git}) +options=('!strip' '!buildflags' 'staticlibs') +license=('custom' 'FDL' 'GPL3' 'LGPL') +url="http://qt-project.org" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +groups=(mingw-w64-qt mingw-w64-qt5) +source=(${_qt_module}::git://code.qt.io/qt/${_qt_module}.git#branch=dev) +md5sums=('SKIP') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +pkgver() { + cd "${srcdir}/${pkgname}" + echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +} + +prepare() { + cd "${srcdir}/${_qt_module}" +} + +build() { + cd "${srcdir}/${_qt_module}" + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + ${_arch}-qmake-qt5 ../${_qt_module}.pro -recursive + make + popd + done +} + +package() { + for _arch in ${_architectures}; do + cd "${srcdir}/${_qt_module}/build-${_arch}" + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm + find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \; + find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g + done +} diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD new file mode 100644 index 00000000..2705fc39 --- /dev/null +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtwinextras +pkgname="mingw-w64-qt5-winextras" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" +depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('7bfdeb968681e75108dd1c661b6f42c1') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +} diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD new file mode 100644 index 00000000..962fd191 --- /dev/null +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Martchus +# Contributor: ant32 + +_qt_module=qtxmlpatterns +pkgname="mingw-w64-qt5-xmlpatterns" +pkgver=5.5.1 +pkgrel=1 +arch=('any') +pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" +depends=('mingw-w64-qt5-base') +makedepends=('mingw-w64-gcc') +options=('!strip' '!buildflags' 'staticlibs') +license=('GPL3' 'LGPL') +url="http://qt-project.org/" +_pkgfqn="${_qt_module}-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +md5sums=('17b9ee5031262b5b875ce0e1045e6bdc') + +_architectures="i686-w64-mingw32 x86_64-w64-mingw32" + +build() +{ + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + mkdir -p build-${_arch} && pushd build-${_arch} + + ${_arch}-qmake-qt5 ../${_qt_module}.pro + make + + popd + done +} + +package() { + cd "${srcdir}/${_pkgfqn}" + + for _arch in ${_architectures}; do + pushd build-${_arch} + + make INSTALL_ROOT="${pkgdir}" install + + # The .dll's are installed in both bindir and libdir + # One copy of the .dll's is sufficient + rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll + + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll + ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.dll.a + + popd + done + + # .prl files aren't interesting for us + find "${pkgdir}" -name "*.prl" -delete +}