From 42845858bd0e0617d339e7aca03a949989ceb1c0 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Feb 16 2019 08:20:33 +0000 Subject: Backport patch to fix build with GCC9 See https://github.com/Beep6581/RawTherapee/issues/5177 --- diff --git a/RT_5.5_fixGCC9build.patch b/RT_5.5_fixGCC9build.patch new file mode 100644 index 0000000..6c49871 --- /dev/null +++ b/RT_5.5_fixGCC9build.patch @@ -0,0 +1,31 @@ +# see https://github.com/Beep6581/RawTherapee/issues/5177 +diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc +index 617feb3b4..7339981e5 100644 +--- a/rtengine/demosaic_algos.cc ++++ b/rtengine/demosaic_algos.cc +@@ -388,7 +388,7 @@ void RawImageSource::jdl_interpolate_omp() // from "Lassus" + } + + #ifdef _OPENMP +- #pragma omp parallel default(none) shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i) ++ #pragma omp parallel shared(image,width,height,u,w,v,y,x,z,dif,chr) private(row,col,f,g,indx,c,d,i) + #endif + { + #ifdef _OPENMP +@@ -1159,7 +1159,7 @@ void RawImageSource::igv_interpolate(int winw, int winh) + } + + #ifdef _OPENMP +- #pragma omp parallel default(none) shared(rgb,vdif,hdif,chr) ++ #pragma omp parallel shared(rgb,vdif,hdif,chr) + #endif + { + __m128 ngv, egv, wgv, sgv, nvv, evv, wvv, svv, nwgv, negv, swgv, segv, nwvv, nevv, swvv, sevv, tempv, temp1v, temp2v, temp3v, temp4v, temp5v, temp6v, temp7v, temp8v; +@@ -1548,7 +1548,7 @@ void RawImageSource::igv_interpolate(int winw, int winh) + } + + #ifdef _OPENMP +- #pragma omp parallel default(none) shared(rgb,vdif,hdif,chr) ++ #pragma omp parallel shared(rgb,vdif,hdif,chr) + #endif + { diff --git a/rawtherapee.spec b/rawtherapee.spec index 0676407..587c2e6 100644 --- a/rawtherapee.spec +++ b/rawtherapee.spec @@ -1,12 +1,16 @@ Name: rawtherapee Version: 5.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw image processing software License: GPLv3 and MIT and IJG URL: http://www.rawtherapee.com/ Source0: http://rawtherapee.com/shared/source/%{name}-%{version}.tar.xz +# Backported patch to fix build with GCC9 +# See https://github.com/Beep6581/RawTherapee/issues/5177 +Patch100: RT_5.5_fixGCC9build.patch + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -89,6 +93,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Feb 16 2019 Mattia Verga - 5.5-3 +- Backport patch to fix build with GCC9 + * Sat Feb 02 2019 Fedora Release Engineering - 5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild