Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=e86f81e
The following commit has been merged in the kubuntu_xenial_archive branch:
commit e86f81e43c0b9296287d021493d74df1ad5ba817
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date: Tue Oct 6 08:28:06 2015 +0000
* Remove patch 03-armhf-armel-use-opengles.
git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6301 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
changelog | 1 +
patches/03-armhf-armel-use-opengles.diff | 63 --------------------------------
patches/series | 1 -
3 files changed, 1 insertion(+), 64 deletions(-)
diff --git a/changelog b/changelog
index b2c901b..59a8081 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ kdenlive (15.08.1-2) UNRELEASED; urgency=medium
* Add dependency on qml-module-qtquick2.
Closes: #800625
+ * Remove patch 03-armhf-armel-use-opengles.
-- Patrick Matthäi <pmatthaei at debian.org> Tue, 06 Oct 2015 10:27:09 +0200
diff --git a/patches/03-armhf-armel-use-opengles.diff b/patches/03-armhf-armel-use-opengles.diff
deleted file mode 100644
index be23c43..0000000
--- a/patches/03-armhf-armel-use-opengles.diff
+++ /dev/null
@@ -1,63 +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>
-
-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
-+#
-+# 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 9f9f13e..a97da15 100644
--- a/patches/series
+++ b/patches/series
@@ -1,3 +1,2 @@
01-desktop-keywords.diff
02-fix-spelling-error.diff
-03-armhf-armel-use-opengles.diff
--
kdenlive packaging