[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Thu Feb 18 19:31:20 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=d57681e
The following commit has been merged in the kubuntu_xenial_archive branch:
commit d57681eec5b162150a8efb2e3fda9484270a3fc8
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date: Wed Sep 2 16:39:09 2015 +0000
* Add again patch 03-armhf-armel-use-opengles, it was not merged.
git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6238 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
changelog | 1 +
patches/03-armhf-armel-use-opengles.diff | 98 ++++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 100 insertions(+)
diff --git a/changelog b/changelog
index 3c296e5..2e92de5 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ kdenlive (15.08.0-2) UNRELEASED; urgency=medium
* Add dependency on kinit. Without it the file browser will not work.
Closes: #797684
+ * Add again patch 03-armhf-armel-use-opengles, it was not merged.
-- Patrick Matthäi <pmatthaei at debian.org> Tue, 01 Sep 2015 11:04:04 +0200
diff --git a/patches/03-armhf-armel-use-opengles.diff b/patches/03-armhf-armel-use-opengles.diff
new file mode 100644
index 0000000..d18c6e3
--- /dev/null
+++ b/patches/03-armhf-armel-use-opengles.diff
@@ -0,0 +1,98 @@
+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>
+
+diff -Naur kdenlive-15.08.0.orig/cmake/modules/FindOpenGLES.cmake kdenlive-15.08.0/cmake/modules/FindOpenGLES.cmake
+--- kdenlive-15.08.0.orig/cmake/modules/FindOpenGLES.cmake 1970-01-01 01:00:00.000000000 +0100
++++ kdenlive-15.08.0/cmake/modules/FindOpenGLES.cmake 2015-09-02 18:37:00.032882268 +0200
+@@ -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 -Naur kdenlive-15.08.0.orig/src/CMakeLists.txt kdenlive-15.08.0/src/CMakeLists.txt
+--- kdenlive-15.08.0.orig/src/CMakeLists.txt 2015-08-12 01:20:55.000000000 +0200
++++ kdenlive-15.08.0/src/CMakeLists.txt 2015-09-02 18:37:00.032882268 +0200
+@@ -4,7 +4,22 @@
+ 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()
+
+ option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
+
+@@ -230,6 +245,7 @@
+ ${Qt5_LIBRARIES}
+ Qt5::Svg
+ ${OPENGL_LIBRARIES}
++ ${OPENGLES_LIBRARIES}
+ ${MLT_LIBRARIES}
+ ${MLTPP_LIBRARIES}
+ ${CMAKE_DL_LIBS}
diff --git a/patches/series b/patches/series
index a97da15..9f9f13e 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1,3 @@
01-desktop-keywords.diff
02-fix-spelling-error.diff
+03-armhf-armel-use-opengles.diff
--
kdenlive packaging
More information about the pkg-kde-commits
mailing list