From b353fa9cfc3fb5995340ce2242a1be08d3cd05ab Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: May 18 2013 16:08:12 +0000 Subject: Export symbols which are needed by mingw-qt5-qtwebkit Export various symbols from the hlsl translator static library in the libGLESv2.dll shared library as they are needed by mingw-qt5-qtwebkit. The symbols in question are marked as NONAME (hidden) --- diff --git a/angleproject-export-shader-symbols.patch b/angleproject-export-shader-symbols.patch new file mode 100644 index 0000000..da8099a --- /dev/null +++ b/angleproject-export-shader-symbols.patch @@ -0,0 +1,38 @@ +--- src/libGLESv2/libGLESv2.def.orig 2013-05-18 01:58:46.861793130 +0200 ++++ src/libGLESv2/libGLESv2.def 2013-05-18 02:02:52.124966085 +0200 +@@ -180,3 +180,16 @@ + glGetCurrentContext @147 NONAME + glGetProcAddress @148 NONAME + glBindTexImage @158 NONAME ++ ++ ; WebKit dependencies ++ ShInitBuiltInResources @200 NONAME ++ ShInitialize @201 NONAME ++ ShDestruct @202 NONAME ++ ShGetInfo @203 NONAME ++ ShGetInfoLog @204 NONAME ++ ShGetActiveAttrib @205 NONAME ++ ShGetActiveUniform @206 NONAME ++ ShGetObjectCode @207 NONAME ++ ShCompile @208 NONAME ++ ShConstructCompiler @209 NONAME ++ +--- src/libGLESv2/libGLESv2_mingw32.def.orig 2013-05-18 02:03:03.822165103 +0200 ++++ src/libGLESv2/libGLESv2_mingw32.def 2013-05-18 02:05:11.743341697 +0200 +@@ -180,3 +180,16 @@ + glGetCurrentContext @147 NONAME + glGetProcAddress@4 @148 NONAME + glBindTexImage@4 @158 NONAME ++ ++ ; WebKit dependencies ++ ShInitBuiltInResources @200 NONAME ++ ShInitialize @201 NONAME ++ ShDestruct @202 NONAME ++ ShGetInfo @203 NONAME ++ ShGetInfoLog @204 NONAME ++ ShGetActiveAttrib @205 NONAME ++ ShGetActiveUniform @206 NONAME ++ ShGetObjectCode @207 NONAME ++ ShCompile @208 NONAME ++ ShConstructCompiler @209 NONAME ++ diff --git a/mingw-angleproject.spec b/mingw-angleproject.spec index 5120d8b..e9274cf 100644 --- a/mingw-angleproject.spec +++ b/mingw-angleproject.spec @@ -6,7 +6,7 @@ Summary: Almost Native Graphics Layer Engine Name: mingw-angleproject Version: 0 -Release: 0.5.svn%{svn_revision}.%{svn_stamp}%{?dist} +Release: 0.6.svn%{svn_revision}.%{svn_stamp}%{?dist} License: BSD Group: System Environment/Libraries URL: http://code.google.com/p/angleproject/ @@ -40,6 +40,11 @@ Patch3: angleproject-fix-mingw-compatibility.patch # The long int type is incorrect for Windows 64-bit as LLP64 is used there. Patch4: angleproject-fix-typedefs-for-win64.patch +# WebKit depends on symbols which are used in the static library called translator_hlsl +# This static library is linked into the libGLESv2 shared library +# To allow building WebKit export the required symbols in the libGLESv2 shared library +Patch5: angleproject-export-shader-symbols.patch + %description ANGLE is a conformant implementation of the OpenGL ES 2.0 specification that @@ -141,6 +146,7 @@ Static version of the mingw64-angleproject library. %patch2 -p0 %patch3 -p0 %patch4 -p4 +%patch5 -p0 %build @@ -248,6 +254,11 @@ cp -Rv include/* $RPM_BUILD_ROOT%{mingw64_includedir} %changelog +* Sat May 18 2013 Erik van Pienbroek - 0-0.6.svn2215.20130517 +- Export various symbols from the hlsl translator static library in the + libGLESv2.dll shared library as they are needed by mingw-qt5-qtwebkit. + The symbols in question are marked as NONAME (hidden) + * Fri May 17 2013 Erik van Pienbroek - 0-0.5.svn2215.20130517 - Update to 20130517 snapshot (r2215)