Simple update to the latest stable version. All consumer build fine on
amd64. I did a quick runtime test with nomacs which a CR2 file from
sthen@. No issues, no seg faults.
OK?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libraw/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile 12 Jul 2019 20:47:02 -0000 1.42
+++ Makefile 25 Aug 2019 16:19:10 -0000
@@ -2,13 +2,12 @@
COMMENT = library for reading RAW files
-DISTNAME = LibRaw-0.18.13
-REVISION = 1
+DISTNAME = LibRaw-0.19.5
PKGNAME = ${DISTNAME:L}
CATEGORIES = graphics
-SHARED_LIBS += raw 3.2 # 15.0
-SHARED_LIBS += raw_r 3.2 # 15.0
+SHARED_LIBS += raw 4.0 # 15.0
+SHARED_LIBS += raw_r 4.0 # 15.0
HOMEPAGE = https://www.libraw.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/libraw/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 1 Jul 2018 11:44:15 -0000 1.15
+++ distinfo 25 Aug 2019 16:19:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (LibRaw-0.18.13.tar.gz) = yx+dDR+ryJZ9UB2VwF0rU9l6K5FzRcZlU7GrvqBnV8o=
-SIZE (LibRaw-0.18.13.tar.gz) = 1287631
+SHA256 (LibRaw-0.19.5.tar.gz) = QKJi18xxcCcRoPrsEGEY7gBPhshswigoHRLRbaA+AvU=
+SIZE (LibRaw-0.19.5.tar.gz) = 1303806
Index: patches/patch-internal_dcraw_common_cpp
===================================================================
RCS file: /cvs/ports/graphics/libraw/patches/patch-internal_dcraw_common_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-internal_dcraw_common_cpp
--- patches/patch-internal_dcraw_common_cpp 27 Mar 2019 23:29:06 -0000
1.3
+++ patches/patch-internal_dcraw_common_cpp 25 Aug 2019 16:19:10 -0000
@@ -5,28 +5,21 @@ OpenBSD has its own strnlen and strcases
Index: internal/dcraw_common.cpp
--- internal/dcraw_common.cpp.orig
+++ internal/dcraw_common.cpp
-@@ -51,6 +51,7 @@ int CLASS fcol (int row, int col)
- if (filters == 9) return xtrans[(row+6) % 6][(col+6) % 6];
- return FC(row,col);
+@@ -46,7 +46,7 @@ int CLASS fcol(int row, int col)
+ return FC(row, col);
}
-+#if !defined(__OpenBSD__)
+
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) || !defined(__OpenBSD__)
static size_t local_strnlen(const char *s, size_t n)
{
const char *p = (const char *)memchr(s, 0, n);
-@@ -58,6 +59,7 @@ static size_t local_strnlen(const char *s, size_t n)
- }
- /* add OS X version check here ?? */
- #define strnlen(a,b) local_strnlen(a,b)
-+#endif
-
- #ifdef LIBRAW_LIBRARY_BUILD
- static int stread(char *buf, size_t len, LibRaw_abstract_datastream *fp)
-@@ -74,7 +76,7 @@ static int stread(char *buf, size_t len, LibRaw_abstra
- #define stmread(buf,maxlen,fp) stread(buf,MIN(maxlen,sizeof(buf)),fp)
+@@ -130,7 +130,7 @@ static int stread(char *buf, size_t len, LibRaw_abstra
+ #define stmread(buf, maxlen, fp) stread(buf, MIN(maxlen, sizeof(buf)), fp)
#endif
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(__OpenBSD__)
- char *my_memmem (char *haystack, size_t haystacklen,
- char *needle, size_t needlelen)
+-#if !defined(__GLIBC__) && !defined(__FreeBSD__)
++#if !defined(__GLIBC__) && (!defined(__FreeBSD__) || !defined(__OpenBSD__))
+ char *my_memmem(char *haystack, size_t haystacklen, char *needle, size_t
needlelen)
{
+ char *c;
Index: patches/patch-internal_libraw_x3f_cpp
===================================================================
RCS file: patches/patch-internal_libraw_x3f_cpp
diff -N patches/patch-internal_libraw_x3f_cpp
--- patches/patch-internal_libraw_x3f_cpp 27 Mar 2019 23:29:06 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-internal_libraw_x3f_cpp,v 1.7 2019/03/27 23:29:06 ajacoutot
Exp $
-
-fix non-constant-expression cannot be narrowed from type 'int' to 'int16_t'
-(aka 'short') with clang6
-
-Index: internal/libraw_x3f.cpp
---- internal/libraw_x3f.cpp.orig
-+++ internal/libraw_x3f.cpp
-@@ -1398,7 +1398,9 @@ static void huffman_decode_row(x3f_info_t *I,
- x3f_image_data_t *ID = &DEH->data_subsection.image_data;
- x3f_huffman_t *HUF = ID->huffman;
-
-- int16_t c[3] = {offset,offset,offset};
-+ int16_t off16 = static_cast<int16_t>(offset);
-+
-+ int16_t c[3] = {off16, off16, off16};
- int col;
- bit_state_t BS;
-
