diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/tiff/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/tiff/files/tiff-4.4.0_rc1-skip-thumbnail-test.patch | 32 | ||||
| -rw-r--r-- | media-libs/tiff/tiff-4.4.0_rc1.ebuild | 91 |
3 files changed, 125 insertions, 0 deletions
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 45849b27483d..a5238360727a 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1 +1,3 @@ DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493 +DIST tiff-4.4.0rc1.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9 +DIST tiff-4.4.0rc1.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c 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 new file mode 100644 index 000000000000..574a02dd3487 --- /dev/null +++ b/media-libs/tiff/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 <sam@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/tiff-4.4.0_rc1.ebuild b/media-libs/tiff/tiff-4.4.0_rc1.ebuild new file mode 100644 index 000000000000..c0f7bb48982e --- /dev/null +++ b/media-libs/tiff/tiff-4.4.0_rc1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 + +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 +) + +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) + ) + + 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 +} |