From 39fcd539b9eeb7df75bccad136265b5f001d1a3c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Dec 2022 15:36:38 +0000 Subject: gentoo auto-resync : 16:12:2022 - 15:36:37 --- media-libs/Manifest.gz | Bin 68075 -> 68073 bytes media-libs/tiff-compat/Manifest | 2 +- media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild | 95 +++++++++++++++++++++ media-libs/tiff-compat/tiff-compat-4.4.0.ebuild | 92 -------------------- 4 files changed, 96 insertions(+), 93 deletions(-) create mode 100644 media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild delete mode 100644 media-libs/tiff-compat/tiff-compat-4.4.0.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 4ae7e2157946..6dc87f1ffb6f 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest index 1e60cac6ec3c..8d54dd9227a2 100644 --- a/media-libs/tiff-compat/Manifest +++ b/media-libs/tiff-compat/Manifest @@ -3,5 +3,5 @@ AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b0 AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3 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-compat-4.4.0.ebuild 2750 BLAKE2B 5245e3429faa316ce6ebf8703003d73b4be5e18e61f44ffed6823585495df58438966994ebe99cd26e9c22a2e011bf3227ff677a4500a0b6af0e82121a8b57f7 SHA512 495fb2208d1864214d8134b404fca4cab753e5e8ed6626049073e4241fd470097da5a2f8b8ad61a771f919e49c7b15ce50cb169b9d5df82d798c558a5a6d597f +EBUILD tiff-compat-4.4.0-r1.ebuild 2777 BLAKE2B b38aa790c19263981a2f52e58c25d937fe2e86237474daa98ff7d80d2cdbdcfe22d14a3a452c1f7b63e7db4bf17f0a50896a95edd80fba76ff51dfdd4b62bedd SHA512 bb011e77a18a218263f464cdf4df9984ad4a901f8179af9a4086a4d122ca2bce043902c3060447268e37aa22a6d942f1752ad2fc7346d7c4a2994b3ce2f1d63e MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469 diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild new file mode 100644 index 000000000000..442eadbf2fd5 --- /dev/null +++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild @@ -0,0 +1,95 @@ +# 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}] ) + !=media-libs/tiff-4.4* +" +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 +} diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild deleted file mode 100644 index 8efd709a9037..000000000000 --- a/media-libs/tiff-compat/tiff-compat-4.4.0.ebuild +++ /dev/null @@ -1,92 +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 (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 -} -- cgit v1.2.3