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

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 2d4a309113b0820b2062c93a19051a8648c91360
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Sep 23 13:32:44 2015 +0100

    update patch
---
 debian/patches/kubuntu_use_gles_on_armhf.diff | 36 ---------------------------
 1 file changed, 36 deletions(-)

diff --git a/debian/patches/kubuntu_use_gles_on_armhf.diff b/debian/patches/kubuntu_use_gles_on_armhf.diff
index 89366cb..71b787e 100644
--- a/debian/patches/kubuntu_use_gles_on_armhf.diff
+++ b/debian/patches/kubuntu_use_gles_on_armhf.diff
@@ -4,42 +4,6 @@ Description: Fix building on armhf
 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

-- 
kdenlive packaging