From d786a26d22c914631b4c266b2b50f22f7506267b Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Sat, 31 Dec 2016 09:27:56 +0000
Subject: [PATCH] libraw: update to 0.18.0. (soname bump)

---
 common/shlibs                                 |  4 +-
 .../patches/fix-signed_char_narrowing.patch   | 56 -------------------
 srcpkgs/libraw/template                       |  6 +-
 3 files changed, 5 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/libraw/patches/fix-signed_char_narrowing.patch

diff --git a/common/shlibs b/common/shlibs
index 23d0caf50b5..9206842b76d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -887,8 +887,8 @@ libmusicbrainz3.so.6 libmusicbrainz-3.0.3_1
 librhythmbox-core.so.10 librhythmbox-3.4.1_1
 libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1
 libgexiv2.so.2 libgexiv2-0.6.1_1
-libraw.so.15 libraw-0.17.0_1
-libraw_r.so.15 libraw-0.17.0_1
+libraw.so.16 libraw-0.18.0_1
+libraw_r.so.16 libraw-0.18.0_1
 libdjvulibre.so.21 libdjvulibre-3.5.24_1
 libgxps.so.2 libgxps-0.2.0_1
 libt1.so.5 libt1-5.1.2_1
diff --git a/srcpkgs/libraw/patches/fix-signed_char_narrowing.patch b/srcpkgs/libraw/patches/fix-signed_char_narrowing.patch
deleted file mode 100644
index eef5927f38f..00000000000
--- a/srcpkgs/libraw/patches/fix-signed_char_narrowing.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Since gcc6 is anal about narrowing the 0x8? constants would need
-to be converted to the negative (signed char) value.
-Change the 0x?? constants to characters by using `\x??' notation.
-
---- internal/dcraw_common.cpp	2016-05-14 08:55:03.000000000 +0200
-+++ internal/dcraw_common.cpp	2016-09-14 01:33:07.825912869 +0200
-@@ -4514,27 +4514,27 @@
- void CLASS vng_interpolate()
- {
-   static const signed char *cp, terms[] = {
--    -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
--    -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
--    -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
--    -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
--    -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
--    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
--    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
--    -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
--    -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
--    -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
--    -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
--    -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
--    -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
--    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
--    +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
--    +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
--    +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
--    +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
--    +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
--    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
--    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
--    +1,+0,+2,+1,0,0x10
-+    -2,-2,+0,-1,0,'\x01', -2,-2,+0,+0,1,'\x01', -2,-1,-1,+0,0,'\x01',
-+    -2,-1,+0,-1,0,'\x02', -2,-1,+0,+0,0,'\x03', -2,-1,+0,+1,1,'\x01',
-+    -2,+0,+0,-1,0,'\x06', -2,+0,+0,+0,1,'\x02', -2,+0,+0,+1,0,'\x03',
-+    -2,+1,-1,+0,0,'\x04', -2,+1,+0,-1,1,'\x04', -2,+1,+0,+0,0,'\x06',
-+    -2,+1,+0,+1,0,'\x02', -2,+2,+0,+0,1,'\x04', -2,+2,+0,+1,0,'\x04',
-+    -1,-2,-1,+0,0,'\x80', -1,-2,+0,-1,0,'\x01', -1,-2,+1,-1,0,'\x01',
-+    -1,-2,+1,+0,1,'\x01', -1,-1,-1,+1,0,'\x88', -1,-1,+1,-2,0,'\x40',
-+    -1,-1,+1,-1,0,'\x22', -1,-1,+1,+0,0,'\x33', -1,-1,+1,+1,1,'\x11',
-+    -1,+0,-1,+2,0,'\x08', -1,+0,+0,-1,0,'\x44', -1,+0,+0,+1,0,'\x11',
-+    -1,+0,+1,-2,1,'\x40', -1,+0,+1,-1,0,'\x66', -1,+0,+1,+0,1,'\x22',
-+    -1,+0,+1,+1,0,'\x33', -1,+0,+1,+2,1,'\x10', -1,+1,+1,-1,1,'\x44',
-+    -1,+1,+1,+0,0,'\x66', -1,+1,+1,+1,0,'\x22', -1,+1,+1,+2,0,'\x10',
-+    -1,+2,+0,+1,0,'\x04', -1,+2,+1,+0,1,'\x04', -1,+2,+1,+1,0,'\x04',
-+    +0,-2,+0,+0,1,'\x80', +0,-1,+0,+1,1,'\x88', +0,-1,+1,-2,0,'\x40',
-+    +0,-1,+1,+0,0,'\x11', +0,-1,+2,-2,0,'\x40', +0,-1,+2,-1,0,'\x20',
-+    +0,-1,+2,+0,0,'\x30', +0,-1,+2,+1,1,'\x10', +0,+0,+0,+2,1,'\x08',
-+    +0,+0,+2,-2,1,'\x40', +0,+0,+2,-1,0,'\x60', +0,+0,+2,+0,1,'\x20',
-+    +0,+0,+2,+1,0,'\x30', +0,+0,+2,+2,1,'\x10', +0,+1,+1,+0,0,'\x44',
-+    +0,+1,+1,+2,0,'\x10', +0,+1,+2,-1,1,'\x40', +0,+1,+2,+0,0,'\x60',
-+    +0,+1,+2,+1,0,'\x20', +0,+1,+2,+2,0,'\x10', +1,-2,+1,+0,0,'\x80',
-+    +1,-1,+1,+1,0,'\x88', +1,+0,+1,+2,0,'\x08', +1,+0,+2,-1,0,'\x40',
-+    +1,+0,+2,+1,0,'\x10'
-   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
-   ushort (*brow[5])[4], *pix;
diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template
index 66e11d62198..758bc8a3dec 100644
--- a/srcpkgs/libraw/template
+++ b/srcpkgs/libraw/template
@@ -1,7 +1,7 @@
 # Template file for 'libraw'
 pkgname=libraw
-version=0.17.2
-revision=4
+version=0.18.0
+revision=1
 wrksrc=LibRaw-${version}
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, CDDL, ${pkgname}"
 homepage="http://www.libraw.org"
 distfiles="http://www.libraw.org/data/LibRaw-${version}.tar.gz"
-checksum=92b0c42c7666eca9307e5e1f97d6fefc196cf0b7ee089e22880259a76fafd15c
+checksum=d56a0c9a0e6d1b8c8c5585346acf2cfb0554eee0f0948da66f580cd65c8c5c9b
 
 post_install() {
 	vmkdir usr/share/licenses