[arch-commits] Commit in freeimage/trunk (PKGBUILD freeimage-unbundle.patch)

[Jonas Witschel]

    Date: Monday, June 6, 2022 @ 18:28:32
  Author: diabonas
Revision: 1226989

upgpkg: freeimage 3.18.0-13: update unbundling patch for libtiff 4.4.0

libtiff 4.4.0 no longer has _TIFFDataSize, so the patch needs to be updated
accordingly:
https://gitlab.com/libtiff/libtiff/-/commit/11f3f279608ae9e68f014717393197f430f9be58

Also explicitly depend on libtiff to make this direct dependency more obvious.

Modified:
  freeimage/trunk/PKGBUILD
  freeimage/trunk/freeimage-unbundle.patch

--------------------------+
 PKGBUILD                 |    6 +++---
 freeimage-unbundle.patch |   13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-06 18:00:33 UTC (rev 1226988)
+++ PKGBUILD	2022-06-06 18:28:32 UTC (rev 1226989)
@@ -6,18 +6,18 @@
 
 pkgname=freeimage
 pkgver=3.18.0
-pkgrel=12
+pkgrel=13
 pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('x86_64')
 license=('GPL' 'custom:FIPL')
 url="http://freeimage.sourceforge.net/"
-depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'jxrlib')
+depends=('libjpeg-turbo' 'openexr' 'openjpeg2' 'libwebp' 'libraw' 'libtiff' 'jxrlib')
 makedepends=('mesa' 'glu')
 source=("https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip"
         freeimage-unbundle.patch
         freeimage-libraw-0.20.patch)
 sha512sums=('9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818'
-            '8bd50232864058c407ef931b1d3981c18dc9fe5a696a4788afaaf579d0918a6e007ef699b4815a803792cd37b959aceb290ac9d47515982021b373c4df85ceae'
+            '01b37683781692acabaf87793b0d6f73cde8838b5af6f89a111df232f5209f72f63eed74955e36f6956e6bb3cd13240ef8adf67beff77fdfe0c325d568b5262b'
             '5709e4c5baac3505bf2f2498082fbf6b8614e631fec69fc629036c8d033fbe21434a198e9ae24d577dd65928fd31a0d95c584ea4349d74134f7859d4e57b8397')
 
 prepare() {

Modified: freeimage-unbundle.patch
===================================================================
--- freeimage-unbundle.patch	2022-06-06 18:00:33 UTC (rev 1226988)
+++ freeimage-unbundle.patch	2022-06-06 18:28:32 UTC (rev 1226989)
@@ -613,7 +613,7 @@
  */
 diff -rupN FreeImage/Source/Metadata/XTIFF.cpp FreeImage-new/Source/Metadata/XTIFF.cpp
 --- FreeImage/Source/Metadata/XTIFF.cpp	2015-03-03 23:07:10.000000000 +0100
-+++ FreeImage-new/Source/Metadata/XTIFF.cpp	2018-07-31 23:37:58.564953201 +0200
++++ FreeImage-new/Source/Metadata/XTIFF.cpp	2022-06-06 20:15:57.320484644 +0200
 @@ -29,13 +29,18 @@
  #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
  #endif
@@ -628,7 +628,7 @@
  
 +extern "C"
 +{
-+    int _TIFFDataSize(TIFFDataType type);
++    int TIFFFieldSetGetSize(const TIFFField* fip);
 +}
 +
  // ----------------------------------------------------------
@@ -731,6 +731,15 @@
  
  		if(skip_write_field(tif, tag_id)) {
  			// skip tags that are already handled by the LibTIFF writing process
+@@ -749,7 +746,7 @@ tiff_write_exif_tags(TIFF *tif, TagLib::
+ 				continue;
+ 			}
+ 			// type of storage may differ (e.g. rationnal array vs float array type)
+-			if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
++			if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
+ 				// skip tag or _TIFFmemcpy will fail
+ 				continue;
+ 			}
 diff -rupN FreeImage/Source/Utilities.h FreeImage-new/Source/Utilities.h
 --- FreeImage/Source/Utilities.h	2016-04-11 15:15:32.000000000 +0200
 +++ FreeImage-new/Source/Utilities.h	2018-08-01 00:16:29.826825358 +0200