[SCM] kdenlive packaging branch, kubuntu_wily_archive, updated. 9ae655ea9a08bdaa781a63f2df56cf930d47045c
Philip Muškovac
yofel-guest at moszumanska.debian.org
Wed Jul 15 22:10:41 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=9ae655e
The following commit has been merged in the kubuntu_wily_archive branch:
commit 9ae655ea9a08bdaa781a63f2df56cf930d47045c
Author: Philip Muškovac <yofel at gmx.net>
Date: Thu Jul 9 20:44:52 2015 +0200
Fix build on armhf by adding kubuntu_use_gles_on_armhf.diff
- Add FindOpenGLES.cmake
- Only look for OpenGL if QtOpenGL is built against it, otherwise use
OpenGLES
---
debian/changelog | 9 +++
debian/patches/kubuntu_use_gles_on_armhf.diff | 91 +++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 101 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 3bd8bb9..1de5b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdenlive (4:15.04.2-0ubuntu2) wily; urgency=medium
+
+ * Fix build on armhf by adding kubuntu_use_gles_on_armhf.diff:
+ - Add FindOpenGLES.cmake
+ - Only look for OpenGL if QtOpenGL is built against it, otherwise use
+ OpenGLES
+
+ -- Philip Muškovac <yofel at kubuntu.org> Thu, 09 Jul 2015 20:11:44 +0200
+
kdenlive (4:15.04.2-0ubuntu1) wily; urgency=medium
* Fix watch file
diff --git a/debian/patches/kubuntu_use_gles_on_armhf.diff b/debian/patches/kubuntu_use_gles_on_armhf.diff
new file mode 100644
index 0000000..0b7c9c0
--- /dev/null
+++ b/debian/patches/kubuntu_use_gles_on_armhf.diff
@@ -0,0 +1,91 @@
+Description: Fix building on armhf
+ On armhf QtOpengl is built against OpenGLES, so check whether it's
+ build against OpenGL, and use OpenGLES if not.
+Origin: vendor
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=350061
+Author: Philip Muskovac <yofel at kubuntu.org>
+Index: b/src/CMakeLists.txt
+===================================================================
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,7 +4,22 @@ set(QT_USE_QTSCRIPT 1)
+ set(QT_USE_QTSVG 1)
+ set(QT_USE_QTXML 1)
+
+-find_package(OpenGL REQUIRED)
++add_definitions(${Qt5Gui_DEFINITIONS})
++if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")
++ find_package(OpenGL REQUIRED)
++ set_package_properties(OpenGL PROPERTIES
++ DESCRIPTION "the OpenGL library"
++ URL ""
++ TYPE RUNTIME
++ PURPOSE "")
++else()
++ find_package(OpenGLES REQUIRED)
++ set_package_properties(OpenGLES PROPERTIES
++ DESCRIPTION "the OpenGLES library"
++ URL ""
++ TYPE RUNTIME
++ PURPOSE "")
++endif()
+ if(APPLE)
+ find_package(SDL REQUIRED)
+ endif(APPLE)
+Index: b/cmake/modules/FindOpenGLES.cmake
+===================================================================
+--- /dev/null
++++ b/cmake/modules/FindOpenGLES.cmake
+@@ -0,0 +1,52 @@
++# - Try to find OpenGLES
++# Once done this will define
++#
++# OPENGLES_FOUND - system has OpenGLES and EGL
++# OPENGL_EGL_FOUND - system has EGL
++# OPENGLES_INCLUDE_DIR - the GLES include directory
++# OPENGLES_LIBRARY - the GLES library
++# OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
++# OPENGLES_EGL_LIBRARY - the EGL library
++# OPENGLES_LIBRARIES - all libraries needed for OpenGLES
++# OPENGLES_INCLUDES - all includes needed for OpenGLES
++
++FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
++ /usr/openwin/share/include
++ /opt/graphics/OpenGL/include /usr/X11R6/include
++ /usr/include
++)
++
++FIND_LIBRARY(OPENGLES_LIBRARY
++ NAMES GLESv2
++ PATHS /opt/graphics/OpenGL/lib
++ /usr/openwin/lib
++ /usr/shlib /usr/X11R6/lib
++ /usr/lib
++)
++
++FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
++ /usr/openwin/share/include
++ /opt/graphics/OpenGL/include /usr/X11R6/include
++ /usr/include
++)
++
++FIND_LIBRARY(OPENGLES_EGL_LIBRARY
++ NAMES EGL
++ PATHS /usr/shlib /usr/X11R6/lib
++ /usr/lib
++)
++
++SET(OPENGL_EGL_FOUND "NO")
++IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
++ SET(OPENGL_EGL_FOUND "YES")
++ENDIF()
++
++SET(OPENGLES_FOUND "NO")
++IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
++ OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
++ SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
++ ${OPENGLES_EGL_LIBRARY})
++ SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
++ SET(OPENGLES_FOUND "YES")
++ENDIF()
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10d07bc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_use_gles_on_armhf.diff
--
kdenlive packaging
More information about the pkg-kde-commits
mailing list