exported shader symbols

- required to build Qt WebKit
- see comment in PKGBUILD file for details
- updated to commit 0e49e6b by the way

5 files changed, 68 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cb4d92565e84..6f396c7ed82f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Mar  8 23:23:10 UTC 2016
+# Thu Mar 10 18:55:55 UTC 2016
 pkgbase = mingw-w64-angleproject
 	pkgdesc = ANGLE project (mingw-w64)
-	pkgver = 2.1.r5624.8047c0d
+	pkgver = 2.1.r5637.0e49e6b
 	pkgrel = 1
 	url = https://chromium.googlesource.com/angle/angle/+/master/README.md
 	arch = any
@@ -15,16 +15,18 @@ pkgbase = mingw-w64-angleproject
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = angleproject::git+https://chromium.googlesource.com/angle/angle#commit=8047c0d
+	source = angleproject::git+https://chromium.googlesource.com/angle/angle#commit=0e49e6b
 	source = additional-mingw-header::git+https://github.com/Martchus/additional-mingw-header.git#commit=7a8f394
 	source = angleproject-include-import-library-and-use-def-file.patch
 	source = libEGL_mingw32.def
 	source = libGLESv2_mingw32.def
+	source = entry_points_shader.cpp
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = e369cad08c921968714ee4edc2c6abe9bd928af41ff728634e5a7c5f096a05d2
+	sha256sums = 895c62846e6784dcc33171523a452cb474010d3fc9e7c351c27b8add4e9930ab
 	sha256sums = fb04f30b904760d32c4c0b733d0a0b44359855db1fde9e7f5ca7d0b8b1be3e56
 	sha256sums = b1fa5f9a6f88eb67c2c3d9889df040b0f858d2acfc931320dc4350efa291c927
+	sha256sums = ad347c9732f8897497aa51b8969a0e01cd8cd4ebb9a0e873a2ff47c210f1d46c
 
 pkgname = mingw-w64-angleproject
 
diff --git a/PKGBUILD b/PKGBUILD
index b09962f225b5..258737e0b131 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: jellysheep <max DOT mail AT dameweb DOT de>
 
 pkgname=mingw-w64-angleproject
-pkgver=2.1.r5624.8047c0d
+pkgver=2.1.r5637.0e49e6b
 pkgrel=1
 pkgdesc='ANGLE project (mingw-w64)'
 arch=('any')
@@ -14,16 +14,18 @@ license=('BSD')
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-gcc' 'git' 'gyp-git' 'python')
 options=('!strip' '!buildflags' 'staticlibs')
-source=('angleproject::git+https://chromium.googlesource.com/angle/angle#commit=8047c0d'
+source=('angleproject::git+https://chromium.googlesource.com/angle/angle#commit=0e49e6b'
         'additional-mingw-header::git+https://github.com/Martchus/additional-mingw-header.git#commit=7a8f394'
         'angleproject-include-import-library-and-use-def-file.patch'
         'libEGL_mingw32.def'
-        'libGLESv2_mingw32.def')
+        'libGLESv2_mingw32.def'
+        'entry_points_shader.cpp')
 sha256sums=('SKIP'
             'SKIP'
-            'e369cad08c921968714ee4edc2c6abe9bd928af41ff728634e5a7c5f096a05d2'
+            '895c62846e6784dcc33171523a452cb474010d3fc9e7c351c27b8add4e9930ab'
             'fb04f30b904760d32c4c0b733d0a0b44359855db1fde9e7f5ca7d0b8b1be3e56'
-            'b1fa5f9a6f88eb67c2c3d9889df040b0f858d2acfc931320dc4350efa291c927')
+            'b1fa5f9a6f88eb67c2c3d9889df040b0f858d2acfc931320dc4350efa291c927'
+            'ad347c9732f8897497aa51b8969a0e01cd8cd4ebb9a0e873a2ff47c210f1d46c')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 #pkgver() {
@@ -43,11 +45,16 @@ prepare() {
   # provide 32-bit versions of *.def files
   cp ../libEGL_mingw32.def src/libEGL/
   cp ../libGLESv2_mingw32.def src/libGLESv2/
+  
+  # provide a file to export symbols declared in ShaderLang.h as part of libGLESv2.dll
+  # (required to build Qt WebKit which uses shader interface)
+  cp ../entry_points_shader.cpp src/libGLESv2/
 
   # remove .git directory to prevent: No rule to make target '../build-i686-w64-mingw32/.git/index', needed by 'out/Debug/obj/gen/angle/id/commit.h'.
   rm -fr .git
 
-  # make sure an import library is created and the correct .def file is used during the build
+  # make sure an import library is created, the correct .def file is used during the build
+  # and entry_points_shader.cpp is compiled
   patch -p1 -i "${srcdir}/angleproject-include-import-library-and-use-def-file.patch"
 
   # executing .bat scripts on Linux is a no-go so make this a no-op
diff --git a/angleproject-include-import-library-and-use-def-file.patch b/angleproject-include-import-library-and-use-def-file.patch
index 342ba0b66577..24abf44850be 100644
--- a/angleproject-include-import-library-and-use-def-file.patch
+++ b/angleproject-include-import-library-and-use-def-file.patch
@@ -1,8 +1,8 @@
---- angleproject/src/libEGL.gypi.orig	2015-07-10 11:42:08.230786800 +0300
-+++ angleproject/src/libEGL.gypi	2015-07-10 11:44:01.168491900 +0300
-@@ -48,7 +48,16 @@
+--- angleproject/src/libEGL.gypi.orig   2016-03-09 22:11:16.726879140 +0100
++++ angleproject/src/libEGL.gypi        2016-03-10 00:44:46.815748629 +0100
+@@ -38,7 +38,16 @@
                  {
-                     'msvs_enable_winphone' : '1',
+                     'msvs_requires_importlibrary' : 'true',
                  }],
 +                ['TARGET=="win32"', {
 +                    'ldflags': [ '-Wl,--out-implib,libEGL.dll.a ../src/libEGL/libEGL_mingw32.def' ],
@@ -17,9 +17,37 @@
          },
      ],
  }
---- angleproject/src/libGLESv2.gypi.orig	2015-07-10 11:41:58.223787600 +0300
-+++ angleproject/src/libGLESv2.gypi	2015-07-10 11:44:36.585949800 +0300
-@@ -826,7 +826,16 @@
+ --- angleproject/src/libGLESv2.gypi.orig        2016-03-10 03:55:05.562030615 +0100
++++ angleproject/src/libGLESv2.gypi     2016-03-10 03:54:50.675783990 +0100
+@@ -515,6 +514,9 @@
+             'libGLESv2/libGLESv2.def',
+             'libGLESv2/libGLESv2.rc',
+             'libGLESv2/resource.h',
++            '../include/GLSLANG/ShaderLang.h',
++            '../include/GLSLANG/ShaderVars.h',
++            'libGLESv2/entry_points_shader.cpp'
+         ],
+         'libegl_sources':
+         [
+@@ -533,7 +535,7 @@
+             'type': 'static_library',
+             'dependencies':
+             [
+-                'translator_static',
++                'translator_lib',
+                 'commit_id',
+                 'angle_common',
+             ],
+@@ -801,7 +803,7 @@
+         {
+             'target_name': 'libGLESv2',
+             'type': '<(angle_gl_library_type)',
+-            'dependencies': [ 'libANGLE', 'angle_common' ],
++            'dependencies': [ 'translator_lib', 'libANGLE', 'angle_common' ],
+             'includes': [ '../build/common_defines.gypi', ],
+             'sources':
+             [
+@@ -821,7 +823,16 @@
                  {
                      'msvs_enable_winphone' : '1',
                  }],
diff --git a/entry_points_shader.cpp b/entry_points_shader.cpp
new file mode 100644
index 000000000000..19ec8b9093b3
--- /dev/null
+++ b/entry_points_shader.cpp
@@ -0,0 +1,11 @@
+#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 "../compiler/translator/ShaderLang.cpp"
diff --git a/libGLESv2_mingw32.def b/libGLESv2_mingw32.def
index 8a580531bbeb..7a561961a608 100644
--- a/libGLESv2_mingw32.def
+++ b/libGLESv2_mingw32.def
@@ -310,6 +310,6 @@ EXPORTS
     glGetInternalformativ@20                 @283
 
     ; ANGLE Platform Implementation
-    ANGLEPlatformCurrent            @290
-    ANGLEPlatformInitialize         @291
-    ANGLEPlatformShutdown           @292
+    ANGLEPlatformCurrent                     @290
+    ANGLEPlatformInitialize                  @291
+    ANGLEPlatformShutdown                    @292