graphics/ufraw: Patch for the newer toolchain.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2021-01-30 09:49:44 +01:00 committed by Robby Workman
parent 29f394748b
commit 5b57c6efd3
4 changed files with 92 additions and 0 deletions

View file

@ -0,0 +1,30 @@
From a9fc8b39010640fd8e931e8d635160430ade57bc Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil_mayhew@users.sourceforge.net>
Date: Fri, 5 Jul 2019 13:08:18 -0600
Subject: [PATCH 1/2] Change use of header files to follow best practices
Content-Type: text/plain; charset=utf-8
This also fixes build errors after recent changes to dependencies
---
ufraw_exiv2.cc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc
index f03011b..9a6ec86 100644
--- a/ufraw_exiv2.cc
+++ b/ufraw_exiv2.cc
@@ -15,9 +15,8 @@
#include "ufraw.h"
#ifdef HAVE_EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
+#include <iostream>
#include <sstream>
#include <cassert>
--
2.22.0

View file

@ -0,0 +1,26 @@
From b85e03dd607fb697f69eb9afb044924f046f9eb3 Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil_mayhew@users.sourceforge.net>
Date: Fri, 5 Jul 2019 13:08:35 -0600
Subject: [PATCH 2/2] Use symbolic error code
Content-Type: text/plain; charset=utf-8
---
ufraw_exiv2.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc
index 9a6ec86..5958b3d 100644
--- a/ufraw_exiv2.cc
+++ b/ufraw_exiv2.cc
@@ -66,7 +66,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
if (exifData.empty()) {
std::string error(uf->filename);
error += ": No Exif data found in the file";
- throw Exiv2::Error(1, error);
+ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
}
/* List of tag names taken from exiv2's printSummary() in actions.cpp */
--
2.22.0

View file

@ -0,0 +1,32 @@
--- a/dcraw_api.cc 2015-06-16 04:58:38.000000000 +0100
+++ b/dcraw_api.cc 2019-06-30 16:37:05.503409567 +0100
@@ -689,3 +689,3 @@
#pragma omp parallel for schedule(static) default(none) \
- shared(h,dark,rgbWB)
+ firstprivate(black,pixels) shared(h,dark,rgbWB)
#endif
@@ -702,3 +702,3 @@
#pragma omp parallel for schedule(static) default(none) \
- shared(h,dark,rgbWB)
+ firstprivate(black,pixels) shared(h,dark,rgbWB)
#endif
--- a/dcraw_indi.c 2015-06-16 04:58:38.000000000 +0100
+++ b/dcraw_indi.c 2019-06-30 17:03:59.692710441 +0100
@@ -140,2 +140,3 @@
default(none) \
+ firstprivate(iheight,iwidth,noise,threshold) \
shared(nc,image,size,noise) \
@@ -145,2 +146,3 @@
default(none) \
+ firstprivate(iheight,iwidth,noise,threshold) \
shared(nc,image,size) \
@@ -416,2 +418,3 @@
default(none) \
+ firstprivate(colors,filters,height,width) \
shared(image,code,prow,pcol,h) \
@@ -502,3 +502,4 @@
default(none) \
- shared(image,dir,diff) \
+ firstprivate(filters,height,width) \
+ shared(image,dir,diff) \
private(row,col,i,d,c,pix,guess)

View file

@ -83,6 +83,10 @@ patch -p1 < $CWD/patches/05_fix_build_due_to_unsigned_char.patch
patch -p1 < $CWD/patches/gcc7.patch
patch -p1 < $CWD/patches/CVE-2015-8366.patch
patch -p1 < $CWD/patches/no-gimp-remote.patch
# More patches suggested by Lockywolf on LQ
patch -p1 < $CWD/patches/0001-Change-use-of-header-files.patch
patch -p1 < $CWD/patches/0002-Use-symbolic-error-code.patch
patch -p1 < $CWD/patches/0003-ufraw-0.22-fix_omp_definitions.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \