From 87d294da3699458c37143c861fba6d256bedac6ef7fe17d55015a2d2b2b1eb9f Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 13 Nov 2015 16:31:18 +0000
Subject: [PATCH] - Update to new upstream release 0.17.0

OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=73
---
 LibRaw-0.16.2.tar.gz |  3 ---
 LibRaw-0.17.0.tar.gz |  3 +++
 libraw.changes       | 26 ++++++++++++++++++++++++++
 libraw.spec          |  5 ++++-
 retval.diff          | 26 ++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 4 deletions(-)
 delete mode 100644 LibRaw-0.16.2.tar.gz
 create mode 100644 LibRaw-0.17.0.tar.gz
 create mode 100644 retval.diff

diff --git a/LibRaw-0.16.2.tar.gz b/LibRaw-0.16.2.tar.gz
deleted file mode 100644
index 47e482b..0000000
--- a/LibRaw-0.16.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187
-size 1476575
diff --git a/LibRaw-0.17.0.tar.gz b/LibRaw-0.17.0.tar.gz
new file mode 100644
index 0000000..8a40378
--- /dev/null
+++ b/LibRaw-0.17.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e643c20945d548aac1eaa1f5573bf74050e0f49ec6a53a6843dc2a2cfb647310
+size 1468635
diff --git a/libraw.changes b/libraw.changes
index e918847..b8f428a 100644
--- a/libraw.changes
+++ b/libraw.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Nov 13 16:27:05 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 0.17.0
+* Fixed dcraw.c ljpeg_start possibly buffer overrun
+* C API extension to support 3DLut Creator
+* More metadata parsing/extraction: XMP packet extracted (if
+  exists), DNG Color information parsed, GPS data (partially)
+  parsed, EXIF/Makernotes parsed for used optics (for both RAW
+  files and DNG converted by Adobe convertor). 
+* Exif/Makernotes parser callback (called for each processed tag)
+* Sony ARW2.3 decoder: params.sony_arw2_hack removed, decoded data
+  are always in 0...17k range (note the difference with dcraw!);
+  Additional processing options for Sony lossy compression techincal
+  analysis. 
+* Dcraw 9.26 imported (but some changes not approved because Libraw
+  does it better) with some exceptions: no Pentax K3-II frame
+  selection code; and no built-in JPEG decompressor.
+* Many improvements in data decoding/processing: Correct decoding
+  of black level values from metadata for many formats, LibRaw does
+  not rely on hardcoded black levels.
+* 224 camera models added to supported camera list. Some of them are
+  new (released since LibRaw 0.16 come out), some was supported
+  before, but missed from the list.
+* Fujifilm F700/S20Pro second frame support 
+
 -------------------------------------------------------------------
 Sat Jun  6 19:09:45 UTC 2015 - jengelh@inai.de
 
diff --git a/libraw.spec b/libraw.spec
index 630113a..f60b1a1 100644
--- a/libraw.spec
+++ b/libraw.spec
@@ -20,7 +20,7 @@
 
 Name:           libraw
 %define lname	libraw10
-Version:        0.16.2
+Version:        0.17.0
 Release:        0
 Summary:        Library for reading RAW files obtained from digital photo cameras
 License:        CDDL-1.0 or LGPL-2.1
@@ -29,6 +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
+Patch1:         retval.diff
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libjasper-devel
@@ -95,6 +96,7 @@ against LibRaw. LibRaw does not provide dynamic libraries.
 
 %prep
 %setup -qn %tar_name-%version
+%patch -P 1 -p1
 
 %build
 export CXXFLAGS="%optflags -fPIC"
@@ -103,6 +105,7 @@ export CXXFLAGS="%optflags -fPIC"
 make %{?_smp_mflags}
 
 %install
+find doc -type f -name "*.html" -exec chmod a-x "{}" "+"
 mv doc manual
 # The source tree has these with execute permissions for some reason
 chmod -x Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf
diff --git a/retval.diff b/retval.diff
new file mode 100644
index 0000000..a75fd14
--- /dev/null
+++ b/retval.diff
@@ -0,0 +1,26 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2015-11-13 17:24:03.127632735 +0100
+
+rpmlint says:
+I: Program returns random data in a function
+E: libraw no-return-in-nonvoid-function internal/dcraw_common.cpp:1710
+gcc:
+internal/dcraw_common.cpp: In member function 'int LibRaw::phase_one_correct()':
+internal/dcraw_common.cpp:1710:1: warning: control reaches end of non-void function [-Wreturn-type]
+
+---
+ internal/dcraw_common.cpp |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: LibRaw-0.17.0/internal/dcraw_common.cpp
+===================================================================
+--- LibRaw-0.17.0.orig/internal/dcraw_common.cpp
++++ LibRaw-0.17.0/internal/dcraw_common.cpp
+@@ -1707,6 +1707,7 @@ int CLASS phase_one_correct()
+ 	  return LIBRAW_CANCELLED_BY_CALLBACK;
+   }
+ #endif
++  return 0;
+ }
+ 
+ void CLASS phase_one_load_raw()