[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=e847a1f

The following commit has been merged in the kubuntu_xenial_archive branch:
commit e847a1f4e91181ac0ceafa3cfafd8597ef0fcff6
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Thu Aug 20 18:54:55 2015 +0000

     - Remove merged patch 02-armhf-armel-use-opengles.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6205 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                                |  1 +
 patches/02-armhf-armel-use-opengles.diff | 91 --------------------------------
 patches/series                           |  1 -
 3 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/changelog b/changelog
index 4ba4238..e2bd321 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 kdenlive (15.08.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Remove merged patch 02-armhf-armel-use-opengles.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 20 Aug 2015 20:53:11 +0200
 
diff --git a/patches/02-armhf-armel-use-opengles.diff b/patches/02-armhf-armel-use-opengles.diff
deleted file mode 100644
index 0b7c9c0..0000000
--- a/patches/02-armhf-armel-use-opengles.diff
+++ /dev/null
@@ -1,91 +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/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 e11993e..3d832ef 100644
--- a/patches/series
+++ b/patches/series
@@ -1,2 +1 @@
 01-desktop-keywords.diff
-02-armhf-armel-use-opengles.diff

-- 
kdenlive packaging