From fdc95ef0781b6ccb07b61418fef80950d8e1a0b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Dec 2023 16:37:28 +0100 Subject: [PATCH] package/libraw: bump to version 0.21.2 Drop patch (already in version) https://github.com/LibRaw/LibRaw/blob/0.21.2/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c67de80597c830f8b8d92b469bf71457aa42c742) Signed-off-by: Peter Korsgaard --- ...shrink-flag-for-3-4-component-images.patch | 24 ------------------- package/libraw/libraw.hash | 2 +- package/libraw/libraw.mk | 5 +--- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch diff --git a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch deleted file mode 100644 index ef93e0901b..0000000000 --- a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 477e0719ffc07190c89b4f3d12d51b1292e75828 Mon Sep 17 00:00:00 2001 -From: Alex Tutubalin -Date: Sat, 14 Jan 2023 18:32:59 +0300 -Subject: [PATCH] do not set shrink flag for 3/4 component images - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/LibRaw/LibRaw/commit/477e0719ffc07190c89b4f3d12d51b1292e75828 ---- - src/preprocessing/raw2image.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp -index e65e2ad7..702cf290 100644 ---- a/src/preprocessing/raw2image.cpp -+++ b/src/preprocessing/raw2image.cpp -@@ -43,6 +43,8 @@ void LibRaw::raw2image_start() - - // adjust for half mode! - IO.shrink = -+ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image && -+ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image && - P1.filters && - (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1))); - diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index 58bb1b4753..838c598d78 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz +sha256 fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03 LibRaw-0.21.2.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index 63b50e340d..211b67f935 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.21.1 +LIBRAW_VERSION = 0.21.2 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -18,9 +18,6 @@ LIBRAW_DEPENDENCIES = host-pkgconf LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" -# 0001-do-not-set-shrink-flag-for-3-4-component-images.patch -LIBRAW_IGNORE_CVES += CVE-2023-1729 - ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper