[SCM] kdenlive packaging branch, kubuntu_stable, updated. ubuntu/4%15.08.1-0ubuntu1-4-g718fc81

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_stable branch:
commit 718fc8132647e01bb1432c847350ab9b006d140e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Sep 23 13:36:55 2015 +0100

    remove upstreamed patch
---
 debian/patches/kubuntu_use_gles_on_armhf.diff | 63 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 64 deletions(-)

diff --git a/debian/patches/kubuntu_use_gles_on_armhf.diff b/debian/patches/kubuntu_use_gles_on_armhf.diff
deleted file mode 100644
index 71b787e..0000000
--- a/debian/patches/kubuntu_use_gles_on_armhf.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 10d07bc..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_use_gles_on_armhf.diff

-- 
kdenlive packaging