Differential D17589 Diff 47869 kde/kdemultimedia/kdenlive/Qt-opengl-headers.patch

Changeset View

Standalone View

View Options

kde/kdemultimedia/kdenlive/Qt-opengl-headers.patch

  • This file was added.
1​From 5d87f8d5bd1749e3440f36803c568299bd66997e Mon Sep 17 00:00:00 2001
2​From: Vincent PINON <vpinon@kde.org>
vonrethUnsubmitted
Not Done

this patch was upstreamed?

vonreth: this patch was upstreamed?
3​Date: Fri, 14 Dec 2018 10:21:23 +0100
4​Subject: [PATCH] necessary OpenGL headers are provided by Qt
5​
6​---
7​ cmake/modules/FindOpenGLES.cmake | 52 --------------------------------
8​ src/CMakeLists.txt | 15 ---------
9​ 2 files changed, 67 deletions(-)
10​ delete mode 100644 cmake/modules/FindOpenGLES.cmake
11​
12​diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake
13​deleted file mode 100644
14​index 60b07e293..000000000
15​--- a/cmake/modules/FindOpenGLES.cmake
16​+++ /dev/null
17​@@ -1,52 +0,0 @@
18​-# - Try to find OpenGLES
19​-# Once done this will define
20​-#
21​-# OPENGLES_FOUND - system has OpenGLES and EGL
22​-# OPENGL_EGL_FOUND - system has EGL
23​-# OPENGLES_INCLUDE_DIR - the GLES include directory
24​-# OPENGLES_LIBRARY - the GLES library
25​-# OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
26​-# OPENGLES_EGL_LIBRARY - the EGL library
27​-# OPENGLES_LIBRARIES - all libraries needed for OpenGLES
28​-# OPENGLES_INCLUDES - all includes needed for OpenGLES
29​-
30​-FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
31​- /usr/openwin/share/include
32​- /opt/graphics/OpenGL/include /usr/X11R6/include
33​- /usr/include
34​-)
35​-
36​-FIND_LIBRARY(OPENGLES_LIBRARY
37​- NAMES GLESv2
38​- PATHS /opt/graphics/OpenGL/lib
39​- /usr/openwin/lib
40​- /usr/shlib /usr/X11R6/lib
41​- /usr/lib
42​-)
43​-
44​-FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
45​- /usr/openwin/share/include
46​- /opt/graphics/OpenGL/include /usr/X11R6/include
47​- /usr/include
48​-)
49​-
50​-FIND_LIBRARY(OPENGLES_EGL_LIBRARY
51​- NAMES EGL
52​- PATHS /usr/shlib /usr/X11R6/lib
53​- /usr/lib
54​-)
55​-
56​-SET(OPENGL_EGL_FOUND "NO")
57​-IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
58​- SET(OPENGL_EGL_FOUND "YES")
59​-ENDIF()
60​-
61​-SET(OPENGLES_FOUND "NO")
62​-IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
63​- OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
64​- SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
65​- ${OPENGLES_EGL_LIBRARY})
66​- SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
67​- SET(OPENGLES_FOUND "YES")
68​-ENDIF()
69​-
70​diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
71​index 501028be0..33a9833b0 100644
72​--- a/src/CMakeLists.txt
73​+++ b/src/CMakeLists.txt
74​@@ -1,19 +1,4 @@
75​ add_definitions(${Qt5Gui_DEFINITIONS})
76​-if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")
77​- find_package(OpenGL REQUIRED)
78​- set_package_properties(OpenGL PROPERTIES
79​- DESCRIPTION "the OpenGL library"
80​- URL ""
81​- TYPE RUNTIME
82​- PURPOSE "")
83​-else()
84​- find_package(OpenGLES REQUIRED)
85​- set_package_properties(OpenGLES PROPERTIES
86​- DESCRIPTION "the OpenGLES library"
87​- URL ""
88​- TYPE RUNTIME
89​- PURPOSE "")
90​-endif()
91​
92​ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic -Wextra")
93​ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-qual -Wcast-align -Wfloat-equal -Wpointer-arith")
94​--
95​2.19.2
96​