commit: 0254404a0a72667564019c642a12ef29c7e14be4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 16 03:33:47 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 16 03:33:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0254404a
media-libs/tiff-compat: new package, add 4.4.0 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/tiff-compat/Manifest | 2 + .../files/tiff-4.4.0-hylafaxplus-regression.patch | 34 ++++++++ .../files/tiff-4.4.0_rc1-skip-thumbnail-test.patch | 32 ++++++++ .../tiff-4.5.0_rc1-skip-tools-tests-multilib.patch | 52 ++++++++++++ media-libs/tiff-compat/metadata.xml | 17 ++++ media-libs/tiff-compat/tiff-compat-4.4.0.ebuild | 92 ++++++++++++++++++++++ 6 files changed, 229 insertions(+) diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest new file mode 100644 index 000000000000..acd45d9a7287 --- /dev/null +++ b/media-libs/tiff-compat/Manifest @@ -0,0 +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 diff --git a/media-libs/tiff-compat/files/tiff-4.4.0-hylafaxplus-regression.patch b/media-libs/tiff-compat/files/tiff-4.4.0-hylafaxplus-regression.patch new file mode 100644 index 000000000000..c640f6e1b1a7 --- /dev/null +++ b/media-libs/tiff-compat/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.roua...@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-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch b/media-libs/tiff-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch new file mode 100644 index 000000000000..574a02dd3487 --- /dev/null +++ b/media-libs/tiff-compat/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch @@ -0,0 +1,32 @@ +https://gitlab.com/libtiff/libtiff/-/merge_requests/334 + +From 62a49eeb3f0c986c5fcbfc53cd3d7ef2a3fab9b3 Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +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-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch b/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch new file mode 100644 index 000000000000..831afd287226 --- /dev/null +++ b/media-libs/tiff-compat/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch @@ -0,0 +1,52 @@ +https://gitlab.com/libtiff/libtiff/-/merge_requests/334 + +From e7605b93b12c2bf3c864910c23ac976045b5a05a Mon Sep 17 00:00:00 2001 +From: Sam James <s...@gentoo.org> +Date: Sat, 21 May 2022 01:01:35 +0100 +Subject: [PATCH 1/2] test (autotools): skip script tests 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 e.g. tiffcp-thumbnail.sh as the 'thumbnail' +binary isn't built. Skip it if unavailable. + +Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -55,13 +55,14 @@ XFAIL_TESTS = + CLEANFILES = test_packbits.tif o-* + + if HAVE_JPEG ++if TIFF_TOOLS + JPEG_DEPENDENT_CHECK_PROG=raw_decode + JPEG_DEPENDENT_TESTSCRIPTS=\ + tiff2rgba-quad-tile.jpg.sh \ + tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \ + tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \ + tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh +- ++endif + else + JPEG_DEPENDENT_CHECK_PROG= + JPEG_DEPENDENT_TESTSCRIPTS= +@@ -76,6 +77,7 @@ check_PROGRAMS = \ + endif + + # Test scripts to execute ++if TIFF_TOOLS + TESTSCRIPTS = \ + ppm2tiff_pbm.sh \ + ppm2tiff_pgm.sh \ +@@ -156,6 +158,9 @@ TESTSCRIPTS = \ + testfax4.sh \ + testdeflatelaststripextradata.sh \ + $(JPEG_DEPENDENT_TESTSCRIPTS) ++else ++TESTSCRIPTS= ++endif + + # This list should contain the references files + # from the 'refs' subdirectory +-- +GitLab diff --git a/media-libs/tiff-compat/metadata.xml b/media-libs/tiff-compat/metadata.xml new file mode 100644 index 000000000000..34a785d9586c --- /dev/null +++ b/media-libs/tiff-compat/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>co...@gentoo.org</email> + <name>Gentoo Codec Project</name> + </maintainer> + <longdescription> + TIFF image library and tools, mostly for scanner and fax + support, but also used by GIS and other imaging tools. + </longdescription> + <upstream> + <remote-id type="gitlab">libtiff/libtiff</remote-id> + <remote-id type="cpe">cpe:/a:libtiff:libtiff</remote-id> + <remote-id type="cpe">cpe:/a:libtiff_project:libtiff</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild new file mode 100644 index 000000000000..8efd709a9037 --- /dev/null +++ b/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild @@ -0,0 +1,92 @@ +# 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 (compat package for libtiff.so.4)" +HOMEPAGE="http://libtiff.maptools.org"; +SRC_URI="https://download.osgeo.org/libtiff/${MY_P/-compat}.tar.xz"; +SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P/-compat}.tar.xz.sig )" +S="${WORKDIR}/${PN/-compat}-$(ver_cut 1-3)" + +LICENSE="libtiff" +SLOT="4" +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 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 )" + +# Easier to keep this even though we remove the headers to avoid +# triggering multilib header check +MULTILIB_WRAPPED_HEADERS=( + /usr/include/tiffconf.h +) + +PATCHES=( + "${FILESDIR}"/${PN/-compat}-4.4.0_rc1-skip-thumbnail-test.patch + "${FILESDIR}"/${P/-compat}-hylafaxplus-regression.patch +) + +src_prepare() { + default + + # Added to fix cross-compilation + elibtoolize +} + +multilib_src_configure() { + append-lfs-flags + + local myeconfargs=( + --without-x + $(use_enable cxx) + $(use_enable jbig) + $(use_enable jpeg) + $(use_enable lzma) + $(use_enable webp) + $(use_enable zlib) + $(use_enable zstd) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + sed -i \ + -e 's/ tools//' \ + -e 's/ contrib//' \ + -e 's/ man//' \ + -e 's/ html//' \ + Makefile || die +} + +multilib_src_install_all() { + rm -r "${ED}"/usr/include || die + rm -r "${ED}"/usr/share || die + rm -r "${ED}"/usr/lib*/pkgconfig || die + rm -r "${ED}"/usr/lib*/*.so || die + + find "${ED}" -type f -name '*.la' -delete || die +}
