gentoo auto-resync : 11:02:2025 - 00:12:37next

4 files changed, 153 insertions, 3 deletions

diff --git a/media-libs/tiff-compat/Manifest b/media-libs/tiff-compat/Manifest
index b2d28c22045d..8811d3f0643a 100644
--- a/media-libs/tiff-compat/Manifest
+++ b/media-libs/tiff-compat/Manifest
@@ -1,6 +1,8 @@
+AUX tiff-4.4.0-C23.patch 1341 BLAKE2B 8175f5a80a45ed0474e1f7286c40b01d5f8b47831595332f61a5364f26158a1b6b1ce98ad7675eea0be6340a2d087f09eb5b55adfec2a002e94bb1187ffad97d SHA512 1575377cdf17cf730227d01ea97f352015bf42c7763a8ad3a79140c811c5f3379b5bc7a7a6fabe76b3002565b5eee6c2353f92d6b9b08d683ce32c304696662d
 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-compat-4.4.0-r1.ebuild 2714 BLAKE2B 83d436239f08b9e424c952aaef8d6d11052ba899c73923cec628cce2291f2dd903f709521fb5cdb96710c36ce49b370712f12e4c48b7d6f03317fd908f6d276b SHA512 0325559b884c415cdab04c39cfe3c41d94f741621b7bf72d8bbb96697be87fb7451f18374089c5d3d0c00a4530058b64677ecb5a6d100f30e71f5673585eb3ee
+EBUILD tiff-compat-4.4.0-r1.ebuild 2714 BLAKE2B 092f0d906fe36eb06e82e834a7a302891ecebd003e89439497ead9cbd061a2117c257e7b086e48822a9cec94300ca04f28ca0d502ac31227d44e1e098e56ed61 SHA512 4ce032256f6bc7e88289d47cb98fbac1c711bfcacf762f130b0b543164d023152066b41378601f9e5e7eb6ce6a614792efc1a9d069239ce0228ebbcb27827c6e
+EBUILD tiff-compat-4.4.0-r2.ebuild 2772 BLAKE2B 42e3fa105f7972db5038338c205fd51175fdaa18a03a515555fc1843420b45451ca4ca79d13a744c6726e9d8d8d0de6c5dc6104ef1cd79276c12d3fabe04b6c2 SHA512 742fb7b6a7405897c0360b123a4fcd05990350ccabee08d4bd5c10e1939a09177f569a141b459f927e408612d6af9eae60a499ccbb1614f0f4215cbad682e436
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff-compat/files/tiff-4.4.0-C23.patch b/media-libs/tiff-compat/files/tiff-4.4.0-C23.patch
new file mode 100644
index 000000000000..81e5740c8215
--- /dev/null
+++ b/media-libs/tiff-compat/files/tiff-4.4.0-C23.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/910693
+Fix implicit declarations by regenerating configure,
+Fix config header templates, manually define _GNU_SOURCE  when
+correct header was not cooperating
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_LANG(C)
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ dnl Compute the canonical host (run-time) system type variable
+ AC_CANONICAL_HOST
+--- a/libtiff/tif_config.h.in
++++ b/libtiff/tif_config.h.in
+@@ -139,6 +139,11 @@
+ /* Support zstd compression */
+ #undef ZSTD_SUPPORT
+ 
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++
+ /* Enable large inode numbers on Mac OS X 10.5.  */
+ #ifndef _DARWIN_USE_64_BIT_INODE
+ # define _DARWIN_USE_64_BIT_INODE 1
+--- a/libtiff/tiffconf.h.in
++++ b/libtiff/tiffconf.h.in
+@@ -90,6 +90,11 @@
+ /* Support Deflate compression */
+ #undef ZIP_SUPPORT
+ 
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++
+ /* Support libdeflate enhanced compression */
+ #undef LIBDEFLATE_SUPPORT
+ 
+--- a/libtiff/mkg3states.c
++++ b/libtiff/mkg3states.c
+@@ -27,6 +27,7 @@
+  * in Frank Cringle's viewfax program;
+  *      Copyright (C) 1990, 1995  Frank D. Cringle.
+  */
++#define _GNU_SOURCE 1
+ #include "tif_config.h"
+ #include "libport.h"
+ 
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
index 432e66e9c98e..28b15239b12b 100644
--- a/media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild
+++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,13 +32,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( jpeg )"
 
 RDEPEND="
+	!=media-libs/tiff-4.4*
 	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 )"
diff --git a/media-libs/tiff-compat/tiff-compat-4.4.0-r2.ebuild b/media-libs/tiff-compat/tiff-compat-4.4.0-r2.ebuild
new file mode 100644
index 000000000000..81c17cfbb269
--- /dev/null
+++ b/media-libs/tiff-compat/tiff-compat-4.4.0-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2025 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=/usr/share/openpgp-keys/rouault.asc
+inherit multilib-minimal verify-sig flag-o-matic autotools
+
+MY_P="${P/_rc/rc}"
+DESCRIPTION="Tag Image File Format (TIFF) library (compat package for libtiff.so.5)"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="+cxx jbig jpeg lzma test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+# bug #483132
+REQUIRED_USE="test? ( jpeg )"
+
+RDEPEND="
+	!=media-libs/tiff-4.4*
+	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
+	"${FILESDIR}"/${P/-compat}-C23.patch
+)
+
+src_prepare() {
+	default
+
+	# Added to fix cross-compilation and bug #910693
+	eautoreconf
+}
+
+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
+}