File qtwebkit-dont-use-bundled-angle-libraries.patch.in of Package mingw64-libqt5-qtwebkit

Overview Repositories Revisions Requests Users Attributes Meta

File qtwebkit-dont-use-bundled-angle-libraries.patch.in of Package mingw64-libqt5-qtwebkit (Revision aab0e0790a52992f1b0b36c1f21c1441)

Currently displaying revision aab0e0790a52992f1b0b36c1f21c1441 , Show latest

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index b9167d1..7b56489 100644
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -4194,7 +4194,7 @@ use?(3D_GRAPHICS) {
         platform/graphics/texmap/coordinated/CoordinatedTile.cpp \
         platform/graphics/texmap/coordinated/UpdateAtlas.cpp
 
-    INCLUDEPATH += $$PWD/platform/graphics/gpu
+    INCLUDEPATH += $$PWD/platform/graphics/gpu /usr/x86_64-w64-mingw32/sys-root/mingw/include/GLSLANG
 
     contains(QT_CONFIG, opengl) {
         contains(QT_CONFIG, opengles2) {
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index 2a4dd3d..ffb0a89 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -209,6 +209,7 @@ use?(3D_GRAPHICS) {
                 CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
                     LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
                 } else {
+                    INCLUDEPATH += CROSS_INCLUDE_DIR/GLSLANG
                     LIBS += $$QMAKE_LIBS_OPENGL_ES2
                 }
             } else {
diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri
index a9179d9..ac020a4 100644
--- a/Source/WebKit2/Target.pri
+++ b/Source/WebKit2/Target.pri
@@ -949,7 +949,10 @@ enable?(TOUCH_EVENTS) {
 
 have?(qtpositioning):enable?(GEOLOCATION): QT += positioning
 
-use?(3D_GRAPHICS): WEBKIT += angle
+use?(3D_GRAPHICS) {
+    WEBKIT += angle
+    INCLUDEPATH += CROSS_INCLUDE_DIR/GLSLANG
+}
 
 use?(PLUGIN_BACKEND_XLIB) {
     DEFINES += XP_UNIX
diff --git a/Source/api.pri b/Source/api.pri
index e0a09e8..eef5106 100644
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -24,7 +24,6 @@ build?(webkit1): {
 }
 build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
 
-use?(3D_GRAPHICS): WEBKIT += angle
 use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb
 
 MODULE = webkit
diff --git a/Tools/qmake/mkspecs/features/webkit_modules.prf b/Tools/qmake/mkspecs/features/webkit_modules.prf
index 005a1bd..efb4203 100644
--- a/Tools/qmake/mkspecs/features/webkit_modules.prf
+++ b/Tools/qmake/mkspecs/features/webkit_modules.prf
@@ -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)
diff --git a/Tools/qmake/mkspecs/modules/angle.prf b/Tools/qmake/mkspecs/modules/angle.prf
index 18631a7..2007471 100644
--- a/Tools/qmake/mkspecs/modules/angle.prf
+++ b/Tools/qmake/mkspecs/modules/angle.prf
@@ -3,7 +3,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)
diff --git a/WebKit.pro b/WebKit.pro
index 11b59e5..e9709a2 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -18,12 +18,6 @@ JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
 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

Places

File qtwebkit-dont-use-bundled-angle-libraries.patch.in of Package mingw64-libqt5-qtwebkit (Revision aab0e0790a52992f1b0b36c1f21c1441)

Places