libraw: bump to version 0.18.11

deleted file mode 100644
index 0f0eee1a64..0000000000
@@ -1,29 +0,0 @@
-From 1f9c2ebc9c65e8ce7fdbece55d578cf00c6c4b46 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <[email protected]>
-Date: Sat, 30 Jan 2016 17:06:04 +0100
-Subject: [PATCH 1/1] Remove paths which break cross-compilation
-
-Patch sent upstream: https://github.com/LibRaw/LibRaw/pull/57
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9bb07b2..78064d9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,9 +16,6 @@ AC_SUBST(LIBTOOL_DEPS)
- 
- # Config files to generate
- 
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--
- AC_CONFIG_FILES([
- 	Makefile
- 	libraw.pc
--- 
-2.7.0.rc3
-

deleted file mode 100644
index 24f0eb1897..0000000000
@@ -1,39 +0,0 @@
-From 0f2507bfe30f2df10dfc38b94cdfde5594902b8e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Fri, 12 Feb 2016 10:00:12 +0100
-Subject: [PATCH] libraw_x3f.cpp: remove Byte order mark
-
-The U+FEFF character, which is a Byte order mark, at the beginning of
-libraw_x3f.cpp, prevents gcc 4.3.x from building this file:
-
-src/../internal/libraw_x3f.cpp:1: error: stray '\357' in program
-src/../internal/libraw_x3f.cpp:1: error: stray '\273' in program
-src/../internal/libraw_x3f.cpp:1: error: stray '\277' in program
-
-Support in gcc for the Byte order mark has been added in gcc
-4.4.x. Since anyway this Byte order mark is not useful, we simply
-remove it.
-
-See https://en.wikipedia.org/wiki/Byte_order_mark for more details.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
-Submitted upstream at:
-https://github.com/LibRaw/LibRaw/pull/61
-
- internal/libraw_x3f.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/internal/libraw_x3f.cpp b/internal/libraw_x3f.cpp
-index dbf28c1..67047ab 100644
---- a/internal/libraw_x3f.cpp
-+++ b/internal/libraw_x3f.cpp
-@@ -1,4 +1,4 @@
--???/* Library for accessing X3F Files 
-+/* Library for accessing X3F Files 
- ----------------------------------------------------------------
- BSD-style License
- ----------------------------------------------------------------
--- 
-2.6.4
-

348 lines not on this page · raw message

index 29794252f1..c546b1bee5 100644
@@ -1,3 +1,5 @@
 # Locally calculated
-sha256	e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1	LibRaw-0.17.1.tar.gz
-sha256	3c09bc4d70268e78798696c5ea3a8cc65fe4e161811d5321fc3ef2ca012d8fd1	0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823
+sha256	7cf724a40a0d8915869498f51062a952167e4f5bae2b6920542c9e0e079a471d	LibRaw-0.18.11.tar.gz
+sha256	eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449	LICENSE.LGPL
+sha256	0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f	LICENSE.CDDL
+sha256	7fe7564c5d48c5d353d7c1966dcddada3791586a4c2eedbc68ad56e96955e75d	README

index 589ff891be..4ff7462647 100644
@@ -4,22 +4,17 @@
 #
 ################################################################################
 
-LIBRAW_VERSION = 0.17.1
+LIBRAW_VERSION = 0.18.11
 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
 LIBRAW_SITE = http://www.libraw.org/data
-LIBRAW_PATCH = \
-	https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823
-
 LIBRAW_INSTALL_STAGING = YES
-# we patch configure.ac
-LIBRAW_AUTORECONF = YES
 LIBRAW_CONF_OPTS += \
 	--disable-examples \
 	--disable-openmp \
 	--disable-demosaic-pack-gpl2 \
 	--disable-demosaic-pack-gpl3
-LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 or LibRaw Software License 27032010
-LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
+LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0
+LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README
 LIBRAW_DEPENDENCIES = host-pkgconf
 LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
 LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)"