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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit bfcfd3108c8d7276d4716557b9739e1f039380c7
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Mon Sep 21 12:00:12 2015 +0000

    - Rewrite patch 03-armhf-armel-use-opengles.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6264 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                                |  1 +
 patches/03-armhf-armel-use-opengles.diff | 41 +++-----------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/changelog b/changelog
index 0fde07c..6568100 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ kdenlive (15.08.1-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Refresh hunky patch 01-desktop-keywords.
     - Refresh hunky patch 02-fix-spelling-error.
+    - Rewrite patch 03-armhf-armel-use-opengles.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 21 Sep 2015 13:51:04 +0200
 
diff --git a/patches/03-armhf-armel-use-opengles.diff b/patches/03-armhf-armel-use-opengles.diff
index d18c6e3..be23c43 100644
--- a/patches/03-armhf-armel-use-opengles.diff
+++ b/patches/03-armhf-armel-use-opengles.diff
@@ -5,9 +5,9 @@ Origin: vendor
 Forwarded: https://bugs.kde.org/show_bug.cgi?id=350061
 Author: Philip Muskovac <yofel at kubuntu.org>
 
-diff -Naur kdenlive-15.08.0.orig/cmake/modules/FindOpenGLES.cmake kdenlive-15.08.0/cmake/modules/FindOpenGLES.cmake
---- kdenlive-15.08.0.orig/cmake/modules/FindOpenGLES.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ kdenlive-15.08.0/cmake/modules/FindOpenGLES.cmake	2015-09-02 18:37:00.032882268 +0200
+diff -Naur kdenlive-15.08.1.orig/cmake/modules/FindOpenGLES.cmake kdenlive-15.08.1/cmake/modules/FindOpenGLES.cmake
+--- kdenlive-15.08.1.orig/cmake/modules/FindOpenGLES.cmake	1970-01-01 01:00:00.000000000 +0100
++++ kdenlive-15.08.1/cmake/modules/FindOpenGLES.cmake	2015-09-21 13:58:11.555038209 +0200
 @@ -0,0 +1,52 @@
 +# - Try to find OpenGLES
 +# Once done this will define
@@ -61,38 +61,3 @@ diff -Naur kdenlive-15.08.0.orig/cmake/modules/FindOpenGLES.cmake kdenlive-15.08
 +    SET(OPENGLES_FOUND "YES")
 +ENDIF()
 +
-diff -Naur kdenlive-15.08.0.orig/src/CMakeLists.txt kdenlive-15.08.0/src/CMakeLists.txt
---- kdenlive-15.08.0.orig/src/CMakeLists.txt	2015-08-12 01:20:55.000000000 +0200
-+++ kdenlive-15.08.0/src/CMakeLists.txt	2015-09-02 18:37:00.032882268 +0200
-@@ -4,7 +4,22 @@
- 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 @@
-   ${Qt5_LIBRARIES}
-   Qt5::Svg
-   ${OPENGL_LIBRARIES}
-+  ${OPENGLES_LIBRARIES}
-   ${MLT_LIBRARIES}
-   ${MLTPP_LIBRARIES}
-   ${CMAKE_DL_LIBS}

-- 
kdenlive packaging