[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=a665a5d

The following commit has been merged in the kubuntu_xenial_archive branch:
commit a665a5db045115ef12f1d177850f35727ed51b05
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Mon Jul 27 16:09:23 2015 +0000

    * Cherry pick Ubuntu patch 02-armhf-armel-use-opengles to fix a FTBFS on
       armel and armhf.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6112 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                                |  7 +++
 patches/02-armhf-armel-use-opengles.diff | 91 ++++++++++++++++++++++++++++++++
 patches/series                           |  1 +
 3 files changed, 99 insertions(+)

diff --git a/changelog b/changelog
index 62eacf0..ad3672d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+kdenlive (15.04.3-2) UNRELEASED; urgency=medium
+
+  * Cherry pick Ubuntu patch 02-armhf-armel-use-opengles to fix a FTBFS on
+    armel and armhf.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 27 Jul 2015 18:08:40 +0200
+
 kdenlive (15.04.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/patches/02-armhf-armel-use-opengles.diff b/patches/02-armhf-armel-use-opengles.diff
new file mode 100644
index 0000000..0b7c9c0
--- /dev/null
+++ b/patches/02-armhf-armel-use-opengles.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/patches/series b/patches/series
index 3d832ef..e11993e 100644
--- a/patches/series
+++ b/patches/series
@@ -1 +1,2 @@
 01-desktop-keywords.diff
+02-armhf-armel-use-opengles.diff

-- 
kdenlive packaging