From af37c4d226bdbaa098727ddb44df549f78ba1e2d212bc964456206102c108ae0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 24 May 2016 22:44:32 +0000 Subject: [PATCH] Accepting request 397788 from home:1Antoine1:branches:graphics - Complete libraw-0.17.1-gcc6-compatibility.patch to fix build on ppc as well OBS-URL: https://build.opensuse.org/request/show/397788 OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=81 --- libraw-0.17.1-gcc6-compatibility.patch | 10 +++++++++- libraw.changes | 6 ++++++ libraw.spec | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libraw-0.17.1-gcc6-compatibility.patch b/libraw-0.17.1-gcc6-compatibility.patch index 8ba505e..66ba743 100644 --- a/libraw-0.17.1-gcc6-compatibility.patch +++ b/libraw-0.17.1-gcc6-compatibility.patch @@ -96,6 +96,15 @@ diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp index 56f3624..85ef98b 100644 --- a/internal/dcraw_common.cpp +++ b/internal/dcraw_common.cpp +@@ -2469,7 +2469,7 @@ void CLASS quicktake_100_load_raw() + + void CLASS kodak_radc_load_raw() + { +- static const char src[] = { ++ static const signed char src[] = { + 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, + 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, + 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, @@ -4618,30 +4618,37 @@ void CLASS lin_interpolate() */ void CLASS vng_interpolate() @@ -188,4 +197,3 @@ index dd716b1..20e043f 100644 + LIBRAW_PROGRESS_TRESERVED2 = 1<<30 }; #define LIBRAW_PROGRESS_THUMB_MASK 0x0fffffff - diff --git a/libraw.changes b/libraw.changes index ae36fa6..c18f912 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 24 20:18:14 UTC 2016 - antoine.belvire@laposte.net + +- Complete libraw-0.17.1-gcc6-compatibility.patch to fix build + on ppc as well + ------------------------------------------------------------------- Tue May 24 16:21:17 UTC 2016 - antoine.belvire@laposte.net diff --git a/libraw.spec b/libraw.spec index 04c91e1..51306b6 100644 --- a/libraw.spec +++ b/libraw.spec @@ -29,7 +29,7 @@ Url: http://www.libraw.org/ #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%tar_name-%version.tar.gz -# PATCH-FIX-UPSTREAM libraw-0.17.1-gcc6-compatibility.patch -- picked from upstream +# PATCH-FIX-UPSTREAM libraw-0.17.1-gcc6-compatibility.patch -- picked from upstream, sligthly modified for ppc Patch: libraw-0.17.1-gcc6-compatibility.patch BuildRequires: fdupes BuildRequires: gcc-c++