#2 Fix building with OpenMP 4.0 and exiv2 0.27
Opened 2 months ago by asn. Modified 2 months ago
rpms/ asn/darktable master  into  master

Fix building with OpenMP 4.0 and exiv2 0.27
Andreas Schneider • 2 months ago  
The added file is too large to be shown here, see it at: Fix-OpenMP-4_0-issues-with-GCC9.patch

@@ -0,0 +1,27 @@ 

+ From c5e131d33f1148a37e7ea0226670ecac188acbce Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>

+ Date: Mon, 15 Jul 2019 22:55:08 +0200

+ Subject: [PATCH] Fix build with exiv2 0.27

+ 

+ Use exiv2.hpp as recommended by upstream

+ ---

+  tools/basecurve/exif-wrapper.cpp | 3 +--

+  1 file changed, 1 insertion(+), 2 deletions(-)

+ 

+ diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp

+ index 7255072..4281e1d 100644

+ --- a/tools/basecurve/exif-wrapper.cpp

+ +++ b/tools/basecurve/exif-wrapper.cpp

+ @@ -16,8 +16,7 @@

+      along with darktable.  If not, see <http://www.gnu.org/licenses/>.

+  */

+  

+ -#include <exiv2/exif.hpp>

+ -#include <exiv2/image.hpp>

+ +#include <exiv2/exiv2.hpp>

+  

+  #include <cstdio>

+  #include <cassert>

+ -- 

+ 2.22.0

+ 

file modified
+8 -5

@@ -8,6 +8,9 @@ 

  URL: http://www.darktable.org/

  Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/darktable-%{version}.tar.xz

  

+ Patch0: Fix-OpenMP-4_0-issues-with-GCC9.patch

+ Patch1: Fix-build-with-exiv2-0.27.patch

+ 

  BuildRequires: cairo-devel

  BuildRequires: clang >= 3.9

  %if 0%{?el7}

@@ -114,8 +117,7 @@ 

  from the darktable package.

  

  %prep

- echo directory: %{name}-%{version}

- %setup -q -n 'darktable-%{version}'

+ %autosetup -p1

  

  # Remove bundled OpenCL headers.

  rm -rf src/external/CL

@@ -157,9 +159,6 @@ 

          -DBUILD_NOISE_TOOLS=ON \

          -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \

          -DRAWSPEED_ENABLE_LTO=ON \

- %if 0%{?fedora} >= 30

-         -DUSE_OPENMP=OFF \

- %endif

          %ifarch ppc64le

          -DUSE_OPENCL=OFF \

          %endif

@@ -210,6 +209,10 @@ 

  %{_libexecdir}/darktable/tools/subr.sh

  

  %changelog

+ * Tue Jul 16 2019 Andreas Schneider <asn@redhat.com> - 2.6.2-2

+ - resolves: #1728682 - Fix building with OpenMP 4.0 and GCC9

+ - Fix building with exiv2 0.27

+ 

  * Tue Apr 23 2019 Germano Massullo <germano.massullo@gmail.com> - 2.6.2-1

  - 2.6.2 release

  - Renamed imagemagick to ImageMagick

Fix building with OpenMP 4.0 and exiv2 0.27

aarch64 and ppc64le builds are failing in CI, after this commit.

Could you please link to the build logs?

Look at the right side of this web page. "simple-koji-ci"