cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update LibRaw to 0.19.5

Browse Source
This commit is contained in:
rsadowski 2019-09-05 16:20:25 +00:00
parent a8d8838b00
commit 1587e57fd6
4 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/libraw/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.42 2019/07/12 20:47:02 sthen Exp $
# $OpenBSD: Makefile,v 1.43 2019/09/05 16:20:25 rsadowski Exp $
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/

4
graphics/libraw/distinfo
View File

@ -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

31
graphics/libraw/patches/patch-internal_dcraw_common_cpp
View File

@ -1,32 +1,25 @@
$OpenBSD: patch-internal_dcraw_common_cpp,v 1.3 2019/03/27 23:29:06 ajacoutot Exp $
$OpenBSD: patch-internal_dcraw_common_cpp,v 1.4 2019/09/05 16:20:25 rsadowski Exp $
OpenBSD has its own strnlen and strcasestr.
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;

19
graphics/libraw/patches/patch-internal_libraw_x3f_cpp
View File

@ -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;