commit: 70d25ca63199f98c7f5bfb6d9f54023eec9048d1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 24 14:12:10 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 24 16:11:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d25ca6
media-libs/tiff: drop 4.4.0-r1, 4.4.0-r2 Bug: https://bugs.gentoo.org/856478 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/tiff/Manifest | 2 - .../files/tiff-4.4.0-hylafaxplus-regression.patch | 34 ------- .../files/tiff-4.4.0_rc1-skip-thumbnail-test.patch | 32 ------- media-libs/tiff/tiff-4.4.0-r1.ebuild | 97 -------------------- media-libs/tiff/tiff-4.4.0-r2.ebuild | 102 --------------------- 5 files changed, 267 deletions(-) diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 1d32e5a570fc..1d5a4c20c28c 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,4 +1,2 @@ -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 DIST tiff-4.5.0.tar.xz 2320900 BLAKE2B c69801ba9d55b1ed27a92d31d8cd16937fe69299fbf5450efb4a6caa60245b72ddade110daae78f2198613640383623f76ec2265ba785375d0a85c7909b73fe9 SHA512 c6c866064c2dd5d1711c6ece7bafe5f011f5ce26c0aeaecbff79c05b5671f44150324bea95a0665cc43331883114de855ee1cd87ed733bff0f4d0814515b9f10 DIST tiff-4.5.0.tar.xz.sig 310 BLAKE2B bbe7f9600061416227276424eb220714a1375d3e295cb0c5b7f76074324c1a2698a5029dde3e734331e9caf02d8a086273ded2ab09285857dbbfe3ad83506912 SHA512 8cef09755f4efe68db69591967e495852cf63c2d8113a877a2254f536d38c60b6dc864c07089249cd8109a8408672a297ae9e59d8233687bc2796dc158ccfb32 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 deleted file mode 100644 index c640f6e1b1a7..000000000000 --- a/media-libs/tiff/files/tiff-4.4.0-hylafaxplus-regression.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 <[email protected]> -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/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch b/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch deleted file mode 100644 index 574a02dd3487..000000000000 --- a/media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.com/libtiff/libtiff/-/merge_requests/334 - -From 62a49eeb3f0c986c5fcbfc53cd3d7ef2a3fab9b3 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Sat, 21 May 2022 01:01:35 +0100 -Subject: [PATCH] test/tiffcp-thumbnail.sh: skip test if tools aren't built - -In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on -amd64/x86_64 because we only need the library to keep binary applications working. - -This causes a test failure in just tiffcp-thumbnail.sh as the 'thumbnail' -binary isn't built. Skip it if unavailable as it's only a single test. - -Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421 ---- a/test/tiffcp-thumbnail.sh -+++ b/test/tiffcp-thumbnail.sh -@@ -4,7 +4,12 @@ - # - . ${srcdir:-.}/common.sh - -+if [ ! -x "${TIFFCP}" ] || [ ! -x "${THUMBNAIL}" ] ; then -+ # https://gitlab.com/libtiff/libtiff/-/issues/421 -+ exit 77 -+fi -+ - outfile1=o-tiffcp-thumbnail-in.tif - outfile2=o-tiffcp-thumbnail-out.tif - f_test_convert "${TIFFCP} -c g3:1d" "${IMG_MINISWHITE_1C_1B}" "${outfile1}" --f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" -\ No newline at end of file -+f_test_convert "${THUMBNAIL}" "${outfile1}" "${outfile2}" -GitLab diff --git a/media-libs/tiff/tiff-4.4.0-r1.ebuild b/media-libs/tiff/tiff-4.4.0-r1.ebuild deleted file mode 100644 index 4fce57119100..000000000000 --- a/media-libs/tiff/tiff-4.4.0-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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 -) - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - 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) - ) - - append-lfs-flags - 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 - 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 -} diff --git a/media-libs/tiff/tiff-4.4.0-r2.ebuild b/media-libs/tiff/tiff-4.4.0-r2.ebuild deleted file mode 100644 index 9f2ae8c6446f..000000000000 --- a/media-libs/tiff/tiff-4.4.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 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 -}
