diff --git a/testing/libdng/APKBUILD b/testing/libdng/APKBUILD index 839e9caeb15..08495cddc3b 100644 --- a/testing/libdng/APKBUILD +++ b/testing/libdng/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: Martijn Braam pkgname=libdng pkgver=0.1.1 -pkgrel=0 +pkgrel=1 pkgdesc="Interface library between libtiff and the world to make sure the output is valid DNG" url="https://gitlab.com/megapixels-org/libdng" -# loongarch64: check_dng fail -arch="all !s390x !loongarch64" # Libtiff does weird things on s390x +arch="all !s390x" # Libtiff does weird things on s390x license="MIT" -source="https://gitlab.com/megapixels-org/libdng/-/archive/$pkgver/libdng-$pkgver.tar.gz" +source="https://gitlab.com/megapixels-org/libdng/-/archive/$pkgver/libdng-$pkgver.tar.gz + libtiff.patch + " makedepends="cmake linux-headers meson tiff-dev scdoc" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" @@ -34,4 +35,5 @@ utils() { sha512sums=" e8f8f0d78ff89fc50e2fde1787d528946c171b43b1056eecd645904f93ac57e52a516361667628a1457783169703649a7aebd496c054cd38751f9de21e84be1d libdng-0.1.1.tar.gz +eff305e2d67a4074a3f4e7ccb7b3285ca4445bca68c6f829c7a884654a35bc959bef1f20ee8580aa01de9d2cedf1405ab5e90fa416122bd44365a70e187d2ed1 libtiff.patch " diff --git a/testing/libdng/libtiff.patch b/testing/libdng/libtiff.patch new file mode 100644 index 00000000000..98dfdacd32b --- /dev/null +++ b/testing/libdng/libtiff.patch @@ -0,0 +1,25 @@ +From 9c7b18e7ff687a8c69704dc6fc8e7689e2532060 Mon Sep 17 00:00:00 2001 +From: Martijn Braam +Date: Sun, 28 Apr 2024 00:05:51 +0200 +Subject: [PATCH] Fix CFARepeatPattern for newer libtiff versions + +--- + src/libdng.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libdng.c b/src/libdng.c +index 6b0cd4f..317dd85 100644 +--- a/src/libdng.c ++++ b/src/libdng.c +@@ -375,7 +375,7 @@ libdng_write_with_thumbnail(libdng_info *dng, const char *path, unsigned int wid + TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); + TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); +-#if (TIFFLIB_VERSION > 20230000) ++#if (TIFFLIB_VERSION > 20230000 && TIFFLIB_VERSION < 20240321) + TIFFSetField(tif, DNGTAG_CFAREPEATPATTERNDIM, 2, dng->bayer_pattern_dimensions); + #else + TIFFSetField(tif, DNGTAG_CFAREPEATPATTERNDIM, dng->bayer_pattern_dimensions); +-- +GitLab +