[SCM] kdenlive packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.2-0ubuntu1-3-g1752f2b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1752f2b8c8f0499649e939de9796ad848d8466ff
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Oct 20 09:31:16 2015 +0100

    NOCI
---
 debian/changelog                              |  6 +++
 debian/patches/kubuntu_use_gles_on_armhf.diff | 63 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 70 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2bbb395..4f3fc00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdenlive (4:15.08.2.1~really15.08.1-0ubuntu2) wily; urgency=medium
+
+  * Add back kubuntu_use_gles_on_armhf.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 20 Oct 2015 09:30:51 +0100
+
 kdenlive (4:15.08.2.1~really15.08.1-0ubuntu1) wily; urgency=medium
 
   * Revert back to 15.08.1 for https://bugs.kde.org/show_bug.cgi?id=354045
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..71b787e
--- /dev/null
+++ b/debian/patches/kubuntu_use_gles_on_armhf.diff
@@ -0,0 +1,63 @@
+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/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