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

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 6498a70ef2cbd7c44ff4c31bdea9d598d0992130
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Aug 31 14:24:47 2015 +0100

    Link with the OpenGLES libraries.
---
 debian/changelog                              |  6 ++++++
 debian/patches/kubuntu_use_gles_on_armhf.diff | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 296271b..814ef90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdenlive (4:15.08.0-0ubuntu2) wily; urgency=medium
+
+  * Link with the OpenGLES libraries.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 30 Aug 2015 18:17:57 +0200
+
 kdenlive (4:15.08.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
diff --git a/debian/patches/kubuntu_use_gles_on_armhf.diff b/debian/patches/kubuntu_use_gles_on_armhf.diff
index a67c8ea..89366cb 100644
--- a/debian/patches/kubuntu_use_gles_on_armhf.diff
+++ b/debian/patches/kubuntu_use_gles_on_armhf.diff
@@ -4,10 +4,10 @@ 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: kdenlive/src/CMakeLists.txt
+Index: b/src/CMakeLists.txt
 ===================================================================
---- kdenlive.orig/src/CMakeLists.txt
-+++ kdenlive/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)
@@ -32,10 +32,18 @@ Index: kdenlive/src/CMakeLists.txt
  
  option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
  
-Index: kdenlive/cmake/modules/FindOpenGLES.cmake
+@@ -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/cmake/modules/FindOpenGLES.cmake
++++ b/cmake/modules/FindOpenGLES.cmake
 @@ -0,0 +1,52 @@
 +# - Try to find OpenGLES
 +# Once done this will define

-- 
kdenlive packaging