From 7831dff1ce97c37cf16b69af7e10b95f04fa74e9f5fa0f970d514dd740b0348c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit <null@suse.de> Date: Wed, 2 Oct 2019 12:55:43 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 184.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=885c25cc5dc05d716f0b4bce64071ea9 --- digikam.changes | 5 +++++ digikam.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/digikam.changes b/digikam.changes index 15ae52f..cd4950d 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 13:07:53 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com> + +- Do not enable Faces Engine DNN for ppc64le to avoid build error + ------------------------------------------------------------------- Sun Sep 15 13:13:16 UTC 2019 - wbauer@tmo.at diff --git a/digikam.spec b/digikam.spec index 8857fa7..a8ecbe3 100644 --- a/digikam.spec +++ b/digikam.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -110,11 +110,15 @@ Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} #This pulls in QWebEngine, which is not available on ppc64 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 +%global qwebengine -DENABLE_QWEBENGINE:BOOL=ON BuildRequires: akonadi-contact-devel BuildRequires: pkgconfig(Qt5WebEngineWidgets) %else BuildRequires: pkgconfig(Qt5WebKitWidgets) %endif +%ifarch ppc64le +%global facesengine -DENABLE_FACESENGINE_DNN:BOOL=OFF +%endif %if 0%{?suse_version} < 1320 # It does not build with the default compiler (GCC 4.8) on Leap 42.x BuildRequires: gcc7-c++ @@ -183,11 +187,7 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/ export CC=gcc-7 export CXX=g++-7 %endif -%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON -DENABLE_QWEBENGINE=ON -%else -%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON -%endif +%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine} %{?facesengine} %make_jobs VERBOSE=1 %install