summaryrefslogtreecommitdiffstats
path: root/package/libraw
diff options
context:
space:
mode:
Diffstat (limited to 'package/libraw')
-rw-r--r--package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch39
-rw-r--r--package/libraw/libraw.mk1
2 files changed, 40 insertions, 0 deletions
diff --git a/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch b/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch
new file mode 100644
index 0000000000..24f0eb1897
--- /dev/null
+++ b/package/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch
@@ -0,0 +1,39 @@
+From 0f2507bfe30f2df10dfc38b94cdfde5594902b8e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+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 <thomas.petazzoni@free-electrons.com>
+---
+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
+
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index 03f09f96f5..7fc4709e8f 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -17,6 +17,7 @@ LIBRAW_CONF_OPTS += \
--disable-demosaic-pack-gpl3
LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
+LIBRAW_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_JASPER),y)
LIBRAW_CONF_OPTS += --enable-jasper
OpenPOWER on IntegriCloud