Fix exporting shader symbols for Qt WebKit

Binary compatibility for Qt WebKit is broken, though
(due to _Z9ShCompilePvPKPKcji/_Z9ShCompilePvPKPKcjy)

6 files changed, 61 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 525013674b85..a491a3b9b4f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Nov  6 19:11:07 UTC 2016
+# Sun Nov  6 20:57:14 UTC 2016
 pkgbase = mingw-w64-angleproject
 	pkgdesc = ANGLE project (mingw-w64)
 	pkgver = 2.1.r6289.f097e23
@@ -33,10 +33,10 @@ pkgbase = mingw-w64-angleproject
 	sha256sums = e79008c38c429937985812e525c71292bd612f6a3844abb328d2837fd69ce763
 	sha256sums = 08e47bb775a032a470f9fc995f1a06721b0431c30c2b7a79ca083ea06d0a9622
 	sha256sums = d7a0c9de5c91aa9d5364fa453240309d30c0a17ea85dde979c85b836916ae11e
-	sha256sums = b85618a22d25ced858ff47a6b4102c0d48b89470484add48063ccfe242169555
-	sha256sums = da091bbe30f96038026713941ce47c7aaf2bb8767150bd941ec95878cde7c4a2
-	sha256sums = 8da56bffa5e718d987306794fd9087a8a92a49e79203857ca81d383c9d5462c8
-	sha256sums = 0a513ee36b9b452ff7c2ba3a37539efe3d5b65992969c95e07afccdf7545f0ee
+	sha256sums = 50db99bc4f7fc8d68fc1ae5d5826f1938714b9f5a06d62ece718a02d1b0d4a2d
+	sha256sums = 7dc50ef89e3af1b99d41ba25e1ad7acb62a0abd4008a23b298aa3c224751934a
+	sha256sums = 66852b4499763955f27906599567a0a4712218d5e739feb550a8a13eaa2d43f0
+	sha256sums = 521251e4ffd280f4344de1ece6393820b57517c457dbb695a673d865d71b5ed2
 
 pkgname = mingw-w64-angleproject
 
diff --git a/0005-Export-shader-API-via-libGLESv2.dll.patch b/0005-Export-shader-API-via-libGLESv2.dll.patch
index 7a11ee2f0bf9..d578e22cb56b 100644
--- a/0005-Export-shader-API-via-libGLESv2.dll.patch
+++ b/0005-Export-shader-API-via-libGLESv2.dll.patch
@@ -1,26 +1,58 @@
-From 76ef75af85db31e33fa573336a18058238639f9c Mon Sep 17 00:00:00 2001
+From ccff4861fa86aa66aedc680f65c00aa0b190e7a9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 23:07:03 +0200
 Subject: [PATCH 5/8] Export shader API via libGLESv2.dll
 
 Required by Qt WebKit
 ---
- src/libGLESv2.gypi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/compiler/translator/ShaderLang.cpp | 11 +++++++++++
+ src/compiler/translator/ShaderVars.cpp | 11 +++++++++++
+ 2 files changed, 22 insertions(+)
 
-diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
-index 1267cc2..17375c9 100644
---- a/src/libGLESv2.gypi
-+++ b/src/libGLESv2.gypi
-@@ -1036,7 +1036,7 @@
-         {
-             'target_name': 'libGLESv2',
-             'type': '<(angle_gl_library_type)',
--            'dependencies': [ 'libANGLE', 'angle_common' ],
-+            'dependencies': [ 'translator', 'libANGLE', 'angle_common' ],
-             'includes': [ '../build/common_defines.gypi', ],
-             'sources':
-             [
+diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
+index 37b1114..c9397b4 100644
+--- a/src/compiler/translator/ShaderLang.cpp
++++ b/src/compiler/translator/ShaderLang.cpp
+@@ -9,6 +9,17 @@
+ // as defined in ShaderLang.h
+ //
+ 
++// ensure this gets exported
++#ifndef COMPONENT_BUILD
++#define COMPONENT_BUILD
++#endif
++#ifdef ANGLE_TRANSLATOR_STATIC
++#undef ANGLE_TRANSLATOR_STATIC
++#endif
++#ifndef ANGLE_TRANSLATOR_IMPLEMENTATION
++#define ANGLE_TRANSLATOR_IMPLEMENTATION
++#endif
++
+ #include "GLSLANG/ShaderLang.h"
+ 
+ #include "compiler/translator/Compiler.h"
+diff --git a/src/compiler/translator/ShaderVars.cpp b/src/compiler/translator/ShaderVars.cpp
+index 8e217f1..a4d451c 100644
+--- a/src/compiler/translator/ShaderVars.cpp
++++ b/src/compiler/translator/ShaderVars.cpp
+@@ -7,6 +7,17 @@
+ //  Methods for GL variable types (varyings, uniforms, etc)
+ //
+ 
++// ensure this gets exported
++#ifndef COMPONENT_BUILD
++#define COMPONENT_BUILD
++#endif
++#ifdef ANGLE_TRANSLATOR_STATIC
++#undef ANGLE_TRANSLATOR_STATIC
++#endif
++#ifndef ANGLE_TRANSLATOR_IMPLEMENTATION
++#define ANGLE_TRANSLATOR_IMPLEMENTATION
++#endif
++
+ #include <GLSLANG/ShaderLang.h>
+ 
+ #include "common/debug.h"
 -- 
 2.10.2
 
diff --git a/0006-Make-GLintptr-and-GLsizeiptr-match-those-from-Qt-5.patch b/0006-Make-GLintptr-and-GLsizeiptr-match-those-from-Qt-5.patch
index 74d6810345f7..fd5a45b7967c 100644
--- a/0006-Make-GLintptr-and-GLsizeiptr-match-those-from-Qt-5.patch
+++ b/0006-Make-GLintptr-and-GLsizeiptr-match-those-from-Qt-5.patch
@@ -1,4 +1,4 @@
-From af3962f3143069029c367c9da70cb94987c3fafb Mon Sep 17 00:00:00 2001
+From b8ed09b39d8ce1d846a48bafc15490277bbedb2f Mon Sep 17 00:00:00 2001
 From: Jose Santiago <jsantiago@haivision.com>
 Date: Thu, 3 Nov 2016 09:38:19 -0500
 Subject: [PATCH 6/8] Make GLintptr and GLsizeiptr match those from Qt 5
diff --git a/0007-Remove-copy_scripts-target.patch b/0007-Remove-copy_scripts-target.patch
index 49fda15d1204..ea555c7a6de8 100644
--- a/0007-Remove-copy_scripts-target.patch
+++ b/0007-Remove-copy_scripts-target.patch
@@ -1,4 +1,4 @@
-From 6344194952f53a8c59997badf56d143da57893f2 Mon Sep 17 00:00:00 2001
+From 1ea025fac01f94d61d254309418ef470c36cbd4c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 6 Nov 2016 17:57:18 +0100
 Subject: [PATCH 7/8] Remove copy_scripts target
@@ -131,7 +131,7 @@ index 578f0f3..083c760 100644
      ] # conditions
  }
 diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
-index 17375c9..2a88286 100644
+index 1267cc2..56c3e99 100644
 --- a/src/libGLESv2.gypi
 +++ b/src/libGLESv2.gypi
 @@ -1020,13 +1020,6 @@
diff --git a/0008-Fix-generation-of-commit_id.h.patch b/0008-Fix-generation-of-commit_id.h.patch
index aff640927d6d..f35bb94eabda 100644
--- a/0008-Fix-generation-of-commit_id.h.patch
+++ b/0008-Fix-generation-of-commit_id.h.patch
@@ -1,4 +1,4 @@
-From 0eccfb59664cfc9285ca893bca9e0b053c86fdcd Mon Sep 17 00:00:00 2001
+From 0232cb7cec579dae6ecb8d1b4c7d7d66b3771adf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 6 Nov 2016 18:46:15 +0100
 Subject: [PATCH 8/8] Fix generation of commit_id.h
diff --git a/PKGBUILD b/PKGBUILD
index 7a729ec25761..d995eca28e9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,10 +33,10 @@ sha256sums=('SKIP'
             'e79008c38c429937985812e525c71292bd612f6a3844abb328d2837fd69ce763'
             '08e47bb775a032a470f9fc995f1a06721b0431c30c2b7a79ca083ea06d0a9622'
             'd7a0c9de5c91aa9d5364fa453240309d30c0a17ea85dde979c85b836916ae11e'
-            'b85618a22d25ced858ff47a6b4102c0d48b89470484add48063ccfe242169555'
-            'da091bbe30f96038026713941ce47c7aaf2bb8767150bd941ec95878cde7c4a2'
-            '8da56bffa5e718d987306794fd9087a8a92a49e79203857ca81d383c9d5462c8'
-            '0a513ee36b9b452ff7c2ba3a37539efe3d5b65992969c95e07afccdf7545f0ee')
+            '50db99bc4f7fc8d68fc1ae5d5826f1938714b9f5a06d62ece718a02d1b0d4a2d'
+            '7dc50ef89e3af1b99d41ba25e1ad7acb62a0abd4008a23b298aa3c224751934a'
+            '66852b4499763955f27906599567a0a4712218d5e739feb550a8a13eaa2d43f0'
+            '521251e4ffd280f4344de1ece6393820b57517c457dbb695a673d865d71b5ed2')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 #pkgver() {
@@ -62,9 +62,6 @@ prepare() {
 
   # Execute bootstrap scripts
   python2 scripts/bootstrap.py
-  # Set cache dir manually, though
-  #gclient config --name change2dot --unmanaged --cache-dir /tmp/gclient \
-  #    'https://chromium.googlesource.com/angle/angle.git'
   gclient sync --deps=all
 
   # Apply patches; further descriptions can be found in patch files itself