Update LibRaw to 0.21.0

This commit is contained in:
rsadowski 2023-01-07 20:21:38 +00:00
parent 384437b68d
commit 95c01decb0
5 changed files with 42 additions and 7 deletions

View File

@ -1,11 +1,11 @@
COMMENT = library for reading RAW files
DISTNAME = LibRaw-0.20.2
DISTNAME = LibRaw-0.21.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = graphics
SHARED_LIBS += raw 4.1 # 15.0
SHARED_LIBS += raw_r 4.1 # 15.0
SHARED_LIBS += raw 5.0 # 23.0
SHARED_LIBS += raw_r 5.0 # 23.0
HOMEPAGE = https://www.libraw.org/

View File

@ -1,2 +1,2 @@
SHA256 (LibRaw-0.20.2.tar.gz) = 3BtIbCADQ1czBD5OBSc0dzJuUcPqVUxoZKTq+v8QBKY=
SIZE (LibRaw-0.20.2.tar.gz) = 1432141
SHA256 (LibRaw-0.21.0.tar.gz) = h0ezToU0zC3X74ySxDZBSzV4kE/Uv5uH6mDxeqmfsL0=
SIZE (LibRaw-0.21.0.tar.gz) = 1638463

View File

@ -3,10 +3,11 @@ Do not hardcode -lstdc++ (symbol mismatch with libc++abi and libestdc++).
Index: libraw.pc.in
--- libraw.pc.in.orig
+++ libraw.pc.in
@@ -7,5 +7,5 @@ Name: libraw
@@ -7,6 +7,6 @@ Name: libraw
Description: Raw image decoder library (non-thread-safe)
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw@PC_OPENMP@
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}

View File

@ -3,10 +3,11 @@ Do not hardcode -lstdc++ (symbol mismatch with libc++abi and libestdc++).
Index: libraw_r.pc.in
--- libraw_r.pc.in.orig
+++ libraw_r.pc.in
@@ -7,5 +7,5 @@ Name: libraw
@@ -7,6 +7,6 @@ Name: libraw
Description: Raw image decoder library (thread-safe)
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
Libs.private: @PACKAGE_LIBS_PRIVATE@
Cflags: -I${includedir}/libraw -I${includedir}

View File

@ -0,0 +1,33 @@
Index: src/decoders/fp_dng.cpp
--- src/decoders/fp_dng.cpp.orig
+++ src/decoders/fp_dng.cpp
@@ -556,7 +556,7 @@ _forceinline
#else
inline
#endif
-void swap24(uchar *data, int len)
+void _swap24(uchar *data, int len)
{
for (int i = 0; i < len - 2; i += 3)
{
@@ -572,7 +572,7 @@ _forceinline
#else
inline
#endif
-void swap32(uchar *data, int len)
+void _swap32(uchar *data, int len)
{
unsigned *d = (unsigned*)data;
for (int i = 0; i < len / 4; i++)
@@ -646,9 +646,9 @@ void LibRaw::uncompressed_fp_dng_load_raw()
if (bytesps == 2 && difford)
libraw_swab(dst, fullrowbytes);
else if (bytesps == 3 && (libraw_internal_data.unpacker_data.order == 0x4949)) // II-16bit
- swap24(dst, fullrowbytes);
+ _swap24(dst, fullrowbytes);
if (bytesps == 4 && difford)
- swap32(dst, fullrowbytes);
+ _swap32(dst, fullrowbytes);
float lmax = expandFloats(
dst,