File qt5-use-external-angle-library.patch of Package mingw32-libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File qt5-use-external-angle-library.patch of Package mingw32-libqt5-qtbase (Revision 6ed7478b000e5beaf790374db1c82bae)

Currently displaying revision 6ed7478b000e5beaf790374db1c82bae , Show latest

--- src/src.pro.orig	2014-05-24 16:09:01.748409623 +0200
+++ src/src.pro	2014-05-24 16:09:06.382457710 +0200
@@ -137,10 +137,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
-    }
     SUBDIRS += src_gui src_platformsupport
     contains(QT_CONFIG, opengl(es2)?):SUBDIRS += src_openglextensions
     src_plugins.depends += src_gui src_platformsupport
--- src/gui/gui.pro.orig	2012-12-16 18:02:25.117315949 +0100
+++ src/gui/gui.pro	2012-12-16 18:01:15.778133505 +0100
@@ -15,12 +15,6 @@
     iconengines \
     imageformats
 
-# 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)
--- src/plugins/platforms/windows/windows.pri.orig	2014-05-24 15:30:11.584247983 +0200
+++ src/plugins/platforms/windows/windows.pri	2014-05-24 15:29:53.265058238 +0200
@@ -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/opengl/opengl.pro.orig	2012-12-21 19:30:29.916330288 +0100
+++ src/opengl/opengl.pro	2012-12-21 19:31:01.279878067 +0100
@@ -15,6 +15,10 @@
 contains(QT_CONFIG, opengles2):CONFIG += opengles2
 contains(QT_CONFIG, egl):CONFIG += egl
 
+win32:contains(QT_CONFIG, angle) {
+    LIBS_PRIVATE += -lGLESv2
+}
+
 HEADERS += qgl.h \
            qgl_p.h \
            qglcolormap.h \
--- src/gui/Qt5GuiConfigExtras.cmake.in.orig	2013-10-22 23:56:20.562965370 +0200
+++ src/gui/Qt5GuiConfigExtras.cmake.in	2013-10-22 23:57:16.142476851 +0200
@@ -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.orig	2013-10-23 00:12:41.084984399 +0200
+++ src/gui/gui.pro	2013-10-23 00:14:29.872985611 +0200
@@ -50,13 +50,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 {

Places

File qt5-use-external-angle-library.patch of Package mingw32-libqt5-qtbase (Revision 6ed7478b000e5beaf790374db1c82bae)

Places