[SCM] kdenlive packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.0-0ubuntu1-2-g5758f5c

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5758f5c4944ff748e8cbf91cbf6b4cd499f1e50b
Author: Harald Sitter <sitter at kde.org>
Date:   Sun Sep 6 12:53:30 2015 +0200

    kill the patch. it was upstreamed
---
 debian/patches/kubuntu_use_gles_on_armhf.diff | 99 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 100 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 89366cb..0000000
--- a/debian/patches/kubuntu_use_gles_on_armhf.diff
+++ /dev/null
@@ -1,99 +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()
- 
- option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
- 
-@@ -230,6 +245,7 @@ target_link_libraries(kdenlive
-   ${Qt5_LIBRARIES}
-   Qt5::Svg
-   ${OPENGL_LIBRARIES}
-+  ${OPENGLES_LIBRARIES}
-   ${MLT_LIBRARIES}
-   ${MLTPP_LIBRARIES}
-   ${CMAKE_DL_LIBS}
-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