diff --git a/libtiff/trunk/PKGBUILD b/libtiff/trunk/PKGBUILD index c5d587b7e..681a3198b 100644 --- a/libtiff/trunk/PKGBUILD +++ b/libtiff/trunk/PKGBUILD @@ -3,13 +3,13 @@ pkgname=libtiff pkgver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='Library for manipulation of TIFF images' url='http://www.simplesystems.org/libtiff/' arch=('x86_64') license=('custom') depends=('glibc' 'libjpeg' 'libjpeg.so' 'zlib' 'xz' 'zstd') -makedepends=('freeglut' 'glu' 'mesa' 'jbigkit') +makedepends=('freeglut' 'git' 'glu' 'mesa' 'jbigkit') optdepends=('freeglut: for using tiffgt') provides=('libtiff.so' 'libtiffxx.so') source=(https://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz{,.sig} @@ -22,6 +22,10 @@ source=(https://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz{,.sig} https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65.patch https://gitlab.com/libtiff/libtiff/-/commit/32ea0722ee.patch https://gitlab.com/libtiff/libtiff/-/commit/88d79a45a3.patch + https://gitlab.com/libtiff/libtiff/-/commit/87881e0936.patch + https://gitlab.com/libtiff/libtiff/-/commit/7db4f2b622.patch + https://gitlab.com/libtiff/libtiff/-/commit/b55cfc746a.patch + https://gitlab.com/libtiff/libtiff/-/commit/97574866cb.patch ) sha256sums=('0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8' 'SKIP' @@ -33,7 +37,11 @@ sha256sums=('0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8' '64370070a3ec9cf2a57e9c25fb06661574b8acd2230793683764cd0cfcca8279' '893b24ec06648a1256aee244660f0092b6ab6b84113476636d6a745340f11aa5' 'dd4fd5133bc84467c4302d701795907d25e2abbc7b7f4b3a7f4f1519fa7bfcf4' - 'f4c04649a553b6d0fe56fa9fea39050528231b07667c75482e8993e5f218b426') + 'f4c04649a553b6d0fe56fa9fea39050528231b07667c75482e8993e5f218b426' + '5076e7a47ff37c444be0fb549d32d785c9f56907db7bd66afeaf5d031378a8e1' + 'ca8f16d4598c9a6630ffd9e8ef7fedc7a469903cc791cde70d5e7accb170c446' + '6248be772da0a04c4c74d072ae57dfc8f6bed9c5df07292af3c961eb6358b37c' + '88f490ebe2223dae8bc57c5ff1112e68d5c3a97b434b3cc2f5b4284b2bbf6d8a') b2sums=('433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92' 'SKIP' 'ab24c990be26f7f0cddf9f1d7fd3e61c11bc9ac4d77a9f750de0c0068fd58c644f8ff06a891bf12cc5d1f289b153a693f89d22fc1ee1b5842d58f377137d3b36' @@ -44,7 +52,11 @@ b2sums=('433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4 '376211eb4bf87eb3bdd713e8076e3f9ddd30fe96abb8c140bbc0008fd07fa43ff99d04250e55cdf9f7b4eae6f92d440a744d3ee7f14af7595458bb1d0dca7ecb' 'a9286bc1e2db2fa0c47e63f53437ee365b798593703d6a43c5751fbf0a8f6df3d7a59afb611444d6efe72affb4749abf0779af07314d13d8b9ee51233a36bba2' '9a46b4d46b0423646a9b8fac983bf87a8ce6404d2f093fce1d6e586876c753575dbeb150a8b0a547a442269b802514dc6a7d414fba6807fb88c5a4b26850009c' - '2b83469df641a169dee426195a467efef9d86458c19fa79f8fba6b574303721b2b5227c66839f8a5e35f9f76c26f65f4ff364d8c881586544e5041839fe19aa5') + '2b83469df641a169dee426195a467efef9d86458c19fa79f8fba6b574303721b2b5227c66839f8a5e35f9f76c26f65f4ff364d8c881586544e5041839fe19aa5' + 'e86647f7c90bd94ebd7e0517e4cc10f80b3b2ed66e7abfe2a1409f8dd566bb9a79a4e7f1c82f23f86aba40171226f659f475a41b4e4b749f16052ac28605e39c' + '82cb580f71cf39dbee9b32d590ac9fe49ee0191afbd556db611d685b8da4a18575ebb63db98b53ebbfecced159cbad465b970adb2e9b01626dfc72ea3548d4da' + '9fb65ee5b7d5d6c818c7d139021c6490817e7d1728dbad8ea529bc5dcd5a8bc814d9ef0e2fbde5d945184495667ba30023208db3ccbb4520622cb69371cc83e0' + '8af47515a2567c5b96263a30e18edfd17f7a27a7e0aec736d6eb40781836b7714129be32af6c911df2cf1d1cc99175b988861a4a2e821425e708a704ee278c17') validpgpkeys=('EBDFDB21B020EE8FD151A88DE301047DE1198975' # Bob Friesenhahn 'B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D') # Even Rouault @@ -57,7 +69,8 @@ prepare() { src="${src##*/}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." - patch -Np1 < "../$src" + # avoid "git binary diffs are not supported" error with patch command + git apply "../$src" done }