Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2017-10-13 14:14:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Fri Oct 13 14:14:34 2017 rev:162 rq:532996 version:5.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2017-09-14 21:15:58.580151227 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2017-10-13 14:14:36.120148054 +0200 @@ -1,0 +2,8 @@ +Thu Sep 14 23:47:03 UTC 2017 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.w5T6nw/_old 2017-10-13 14:14:38.960023183 +0200 +++ /var/tmp/diff_new_pack.w5T6nw/_new 2017-10-13 14:14:38.960023183 +0200 @@ -24,6 +24,8 @@ 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(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5XmlPatterns) @@ -164,6 +165,10 @@ %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') ++++++ 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch ++++++ >From ebce81931d04aefea31795cb4df3f552ba6d3f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> 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 <[email protected]> --- 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
