diff options
Diffstat (limited to 'media-libs/tiff')
| -rw-r--r-- | media-libs/tiff/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch | 34 | ||||
| -rw-r--r-- | media-libs/tiff/tiff-4.4.0-r2.ebuild | 102 |
3 files changed, 138 insertions, 0 deletions
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 2d371951ff8d..22418a578cac 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,6 +1,8 @@ +AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190618dea150fa7868585bfe68259e637e5a98655b51b985fe3ee3b08b5ada3335ee2f887d683524a105653c16d48d90b2a23d850d69 SHA512 4232c057d472651d2532814c288399a8bdcb1c0397d860ecb994489d863c2ddf05ce8a2b014ce750b0619f50cc439979607baa2dcb2b9aa97f02c8352ec60170 AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c EBUILD tiff-4.4.0-r1.ebuild 2829 BLAKE2B 044ecbfc0d8b0e29f21e2dd1052979b7d39b37efb3d1ef7dba9c066c9a3589a7ce12f51f481daef65b75ca1ae4d5504f09922106dfd1bee26912242e02477a0d SHA512 da712144361acc856e5204966e9638a169e03ca57fb56686e4ef64ad815b245e170579f7f5c7a37c010fcb556c8d0090a6492c849b7adba0410ff5d65c3f555d +EBUILD tiff-4.4.0-r2.ebuild 2975 BLAKE2B d10587a8de682131b8699125bcdc04283febe0b69233e5241e09197e00e99cd56f7df2a8d5e97f001dc8f61da32aa9adb317c18c48378a747c64f6bca0695806 SHA512 21ca7e61228fb3a22474ba0018f1e6cdd9aa81f76c0502a47c0ecc3f7ce13f1daac06249e337c7fd0360b0d8156cc86a07df441eb74cc8cdd9adbb4c6e5ffc42 EBUILD tiff-4.4.0.ebuild 2748 BLAKE2B 15347b6b3ce18e49c06cb471a31f18b4c0488aeb1007e37c1c4b6f34b849e897c1bf224b32b883d0995bacfd2d1a3a0b85e58d9d1496b118ccd82f2b09962a5a SHA512 2f1d9c4448dc494a58c863b96d4acaac5d19f472110da666458b31773ef29658049a5f57658586d739fdfa7e67c9efa4cf3ee38027d71d517bbd19ffc86a9801 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469 diff --git a/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch b/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch new file mode 100644 index 000000000000..c640f6e1b1a7 --- /dev/null +++ b/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/883641 +https://gitlab.com/libtiff/libtiff/-/issues/489 +https://gitlab.com/libtiff/libtiff/-/commit/72de8fd00be8a583a6b16cc0b700105020d249ba + +From 72de8fd00be8a583a6b16cc0b700105020d249ba Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Tue, 29 Nov 2022 14:57:27 +0100 +Subject: [PATCH] TIFFWriteRawStrip(): restore capabilities to append data in + the current strip (fixes #489) + +This fixes a regression of libtiff 4.4.0 +--- a/libtiff/tif_write.c ++++ b/libtiff/tif_write.c +@@ -341,10 +341,13 @@ TIFFWriteRawStrip(TIFF* tif, uint32_t strip, void* data, tmsize_t cc) + return ((tmsize_t) -1); + } + +- tif->tif_curstrip = strip; ++ if (tif->tif_curstrip != strip) ++ { ++ tif->tif_curstrip = strip; + +- /* this informs TIFFAppendToStrip() we have changed or reset strip */ +- tif->tif_curoff = 0; ++ /* this informs TIFFAppendToStrip() we have changed or reset strip */ ++ tif->tif_curoff = 0; ++ } + + if (td->td_stripsperimage == 0) { + TIFFErrorExtR(tif, module,"Zero strips per image"); +-- +GitLab + + diff --git a/media-libs/tiff/tiff-4.4.0-r2.ebuild b/media-libs/tiff/tiff-4.4.0-r2.ebuild new file mode 100644 index 000000000000..6300111f9745 --- /dev/null +++ b/media-libs/tiff/tiff-4.4.0-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QA_PKGCONFIG_VERSION="$(ver_cut 1-3)" + +# Release signer can vary per version but not clear if others will be doing +# them in future, so gone with Even Rouault for now as he does other geosci +# stuff too like PROJ, GDAL. Previous release manager of TIFF was +# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying +# who made releases. +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc +inherit multilib-minimal verify-sig libtool flag-o-matic + +MY_P="${P/_rc/rc}" +DESCRIPTION="Tag Image File Format (TIFF) library" +HOMEPAGE="http://libtiff.maptools.org" +SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz" +SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)" + +LICENSE="libtiff" +SLOT="0" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd" +RESTRICT="!test? ( test )" + +# bug #483132 +REQUIRED_USE="test? ( jpeg )" + +RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] ) + jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/tiffconf.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-4.4.0_rc1-skip-thumbnail-test.patch + "${FILESDIR}"/${P}-hylafaxplus-regression.patch +) + +src_prepare() { + default + + # Added to fix cross-compilation + elibtoolize +} + +multilib_src_configure() { + append-lfs-flags + + local myeconfargs=( + --without-x + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable cxx) + $(use_enable jbig) + $(use_enable jpeg) + $(use_enable lzma) + $(use_enable static-libs static) + $(use_enable webp) + $(use_enable zlib) + $(use_enable zstd) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + # Remove components (like tools) that are irrelevant for the multilib + # build which we only want libraries for. + # TODO: upstream options to disable these properly + # https://gitlab.com/libtiff/libtiff/-/merge_requests/334 + if ! multilib_is_native_abi ; then + sed -i \ + -e 's/ tools//' \ + -e 's/ contrib//' \ + -e 's/ man//' \ + -e 's/ html//' \ + Makefile || die + fi +} + +multilib_src_test() { + if ! multilib_is_native_abi ; then + emake -C tools + fi + + emake check +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die +} |