Accepting request 532996 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/532996
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=162

0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch

@@ -0,0 +1,35 @@
+From ebce81931d04aefea31795cb4df3f552ba6d3f38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 20 Aug 2017 16:49:50 +0200
+Subject: [PATCH] Disable detection of OpenGL (for GLES platforms)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On embedded platforms, Qt5 is typically build using GLES. Unfortunately,
+the OpenGL code in the presentation module uses the old desktop OpenGL
+immediate mode style and thus fails to compile on GLES platforms.
+
+Workaround for bug kde#383715
+
+Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
+---
+ core/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index cd482ea..bc3772b 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -278,7 +278,7 @@ find_package(Marble)
+ find_package(PkgConfig)
+ find_package(Jasper)
+ find_package(Eigen3)                               # For Refocus tool.
+-find_package(OpenGL)                               # For Presentation tool.
++# find_package(OpenGL)                               # For Presentation tool.
+ 
+ # For Monitor Profiles management with LCMS
+ find_package(X11)
+-- 
+2.14.0
+

digikam.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 14 23:47:03 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+- Add 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
+  Disable OpenGL detection on embedded platforms (e.g. ARM)
+  Currently digikam depends on Desktop GL and fails to build when
+  using a Qt5OpenGL build with GLES, see kde#383715
+
 -------------------------------------------------------------------
 Tue Sep 12 12:29:53 UTC 2017 - wbauer@tmo.at
 

digikam.spec

@@ -24,6 +24,8 @@ License:        GPL-2.0+
 Group:          Productivity/Graphics/Viewers
 Url:            http://www.digikam.org/
 Source0:        http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch -- The OpenGL slideshow depends on Desktop GL, see kde#383715
+Patch0:         0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
 #This pulls in QWebEngine, which is not available on ppc64
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
@@ -82,7 +84,6 @@ BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5Sql)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5WebKitWidgets)
 BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
@@ -164,6 +165,10 @@ The main digikam libraries that are being shared between showfoto and digikam
 
 %prep
 %setup -q -n %{name}-%{version}
+%ifarch %arm aarch64
+# Disable OpenGL slideshow on embedded platforms
+%patch0 -p1
+%endif
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')