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

20 files changed, 619 insertions, 57 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8413b5711a46..8124c29686e9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/blib/Manifest b/media-libs/blib/Manifest
index ed2a660b7d01..c8af7c9236c1 100644
--- a/media-libs/blib/Manifest
+++ b/media-libs/blib/Manifest
@@ -1,4 +1,6 @@
+AUX blib-1.1.7-C23.patch 3303 BLAKE2B 0560814f9d4f1836c3a975cbd59e30d38c38e152574303223d4d0645878aa777ce479d319d3b7b3d910b24afd5c3fc5e1c8cb663fc17d08500c4b39b4b09fbb8 SHA512 41984f232797e5bd4b844ae01083b5bff98cc6c1900ab515188b540ffb3dab951e85cde374d8758cb774b17ee83268348abe229476bd47fbff5ecd58920d91d8
 AUX blib-1.1.7-deprecated.patch 409 BLAKE2B 8fd46eae8511441442f1da04e38b27dc63f03f485bb8610667cb162e29fdba51996de58ec8046e227c48e90e2ef6785edaeb7dfbea55338f7b10639194d33ed9 SHA512 7b1e845db80ff2071d4e20ed40b5f5349978a9e8a5f68fa09ca51a69dc596e4752c838092fc24bf8226da95acb1f34477a3ff5d4ac2bb2844e83bd7cc6e229f3
 DIST blib-1.1.7.tar.gz 570809 BLAKE2B 4b6c6738dd67a81b09ff0a280d3522d8cd41046b6eebe0ff4d6bf78df49fa3aa20382e0b02b3ee17c8c536fe34445a85a80433a39a87c2f0f650612fcd37914a SHA512 060fe2ff453c1dd073ff6105217618157da54416243b0f086a4f1324028b2fc222f6f732de1914d0e2e82df3565801b68d1ff49df4e6b89cd409bad73eb01ad6
 EBUILD blib-1.1.7-r3.ebuild 1078 BLAKE2B 71275b3dafd020a5bb627c5148677871e8fe2be567dc063a3278bf4a3ffd22a6655cddd3f3e1b58f1a00926094086386606aedb12d01b9063e0194cd678a0293 SHA512 27161f6947681f4ade56d37d891367dbb8b51a90c501b1e3ae69b4b3d61f63c4df513127583468712d4a5593ea29b98464a2cf5959fa5bf08cf1bed68f8e293a
+EBUILD blib-1.1.7-r4.ebuild 1176 BLAKE2B 8d59d2e5ca2aa08c30d03b90c972cc445273488186c9dd8fb90522751ca1ac159d7f9b5f02e542577a8fda8888e0ae22b7e00b8ac3758b2fa2786975a4111e45 SHA512 cf176112a2f7253bd73a96febfab5104ab9a93f12fa69b0fcc2ca63c58a7a22fd523a6f6f070d85b6e1b3e39f95f75720443b84d3c464627ea5aa644ddc0af64
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-libs/blib/blib-1.1.7-r4.ebuild b/media-libs/blib/blib-1.1.7-r4.ebuild
new file mode 100644
index 000000000000..1c39f810fe2c
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	aalib? ( media-libs/aalib )
+	gtk? (
+		app-accessibility/at-spi2-core:2
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+	"${FILESDIR}"/${P}-C23.patch
+)
+
+src_prepare() {
+	default
+
+	# drop DEPRECATED flags, bug #391105
+	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		-i {blib,gfx,{,test/}modules}/Makefile.{am,in} || die
+
+	#https://bugs.gentoo.org/899808
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable aalib aa)
+		--disable-directfb
+		$(use_enable gtk)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/blib/files/blib-1.1.7-C23.patch b/media-libs/blib/files/blib-1.1.7-C23.patch
new file mode 100644
index 000000000000..662e1d20dc24
--- /dev/null
+++ b/media-libs/blib/files/blib-1.1.7-C23.patch
@@ -0,0 +1,105 @@
+https://bugs.gentoo.org/921126
+Fix for incompatible pointer types: Just upsize the size
+everywhere it's used, so it fits in largest, gsize
+diff -ru a/blib/bpacket.c a/blib/bpacket.c
+--- a/blib/bpacket.c	2025-01-09 18:10:29.298407575 +0400
++++ a/blib/bpacket.c	2025-01-09 18:13:09.318508466 +0400
+@@ -48,10 +48,10 @@
+               gint  height,
+               gint  channels,
+               gint  maxval,
+-              gint *data_size)
++              gsize *data_size)
+ {
+   BPacket *packet;
+-  gint     size;
++  gsize     size;
+ 
+   g_return_val_if_fail (width > 0, NULL);
+   g_return_val_if_fail (height > 0, NULL);
+diff -ru a/blib/bpacket.h a/blib/bpacket.h
+--- a/blib/bpacket.h	2025-01-09 18:10:29.297407580 +0400
++++ a/blib/bpacket.h	2025-01-09 18:12:22.749770123 +0400
+@@ -42,7 +42,7 @@
+ 			 gint     height,
+ 			 gint     channels,
+ 			 gint     maxval,
+-			 gint    *data_size);
++			 gsize    *data_size);
+ gsize     b_packet_size (BPacket *packet);
+ void      b_packet_hton (BPacket *packet);
+ void      b_packet_ntoh (BPacket *packet);
+diff -ru a/blib/breceiver.c b/blib/breceiver.c
+--- a/blib/breceiver.c	2025-01-09 18:23:21.159070702 +0400
++++ b/blib/breceiver.c	2025-01-09 18:24:36.299648508 +0400
+@@ -354,7 +354,7 @@
+ 
+     case MAGIC_BLFRAME:
+       {
+-	gint size;
++	gsize size;
+ 
+ 	fake = b_packet_new (18, 8, 1, 1, &size);
+ 
+Dealing with implicit declarations: autoreconf and #include "config.h"
+in places where they were not included previously
+diff -ru a/configure.in a/configure.in
+--- a/configure.in	2025-01-09 18:10:29.297407580 +0400
++++ a/configure.in	2025-01-09 18:15:55.400575296 +0400
+@@ -20,6 +20,8 @@
+ BLIB_API_VERSION=$BLIB_MAJOR_VERSION.$BLIB_MINOR_VERSION
+ BLIB_VERSION=$BLIB_MAJOR_VERSION.$BLIB_MINOR_VERSION.$BLIB_MICRO_VERSION
+ 
++AC_USE_SYSTEM_EXTENSIONS
++
+ AC_SUBST(BLIB_MAJOR_VERSION)
+ AC_SUBST(BLIB_MINOR_VERSION)
+ AC_SUBST(BLIB_MICRO_VERSION)
+diff -ru a/modules/bcountdown.c b/modules/bcountdown.c
+--- a/modules/bcountdown.c	2025-01-09 18:23:21.161070691 +0400
++++ b/modules/bcountdown.c	2025-01-09 18:25:27.179362628 +0400
+@@ -21,6 +21,8 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
+diff -ru a/modules/bdropout.c b/modules/bdropout.c
+--- a/modules/bdropout.c	2025-01-09 18:23:21.161070691 +0400
++++ b/modules/bdropout.c	2025-01-09 18:25:53.499214744 +0400
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include <stdlib.h>
+ 
+ #include <glib.h>
+diff -ru a/modules/bpushline.c b/modules/bpushline.c
+--- a/modules/bpushline.c	2025-01-09 18:23:21.161070691 +0400
++++ b/modules/bpushline.c	2025-01-09 18:23:30.867016155 +0400
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include <stdlib.h>
+ 
+ #include <glib.h>
+diff -ru a/modules/btetris.c b/modules/btetris.c
+--- a/modules/btetris.c	2025-01-09 18:23:21.161070691 +0400
++++ b/modules/btetris.c	2025-01-09 18:25:36.835308374 +0400
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 1224446f1233..baf718e9dbbe 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,3 @@
 DIST flac-1.4.3.tar.xz 1006728 BLAKE2B c4f441aeaa0493433347b8a110ca01865fd40d5b21150174372af2fee4fa5c3397a67add31138e92999eab9d9abe6c46a5ac29e13cbac60093fbff6d7a672ad3 SHA512 3cf095720bd590a588be8ccbe187d22e7a1c60ab85b1d510ce5e8a22ab0a51827b9acfeaad59bbd645a17d1f200f559255a640101b0330709a164306c0e9709e
-EBUILD flac-1.4.3.ebuild 2118 BLAKE2B 984c85424ba31c39d7edaa9670978b007ea26aa35cc0af5cdd29e24ba7034f195866635c12b492bab8b6024f4ae00f403a6e958219e09a69c905c1f7d053068a SHA512 7a9b7f6afe02a7a2361e60c6cd6e99acab27473d9d389b811c021e5c68e9aa4a036d58c7a7c28819cdb6f6adfbadb408d94cb8a8926da4b64886263519e55884
+EBUILD flac-1.4.3.ebuild 2118 BLAKE2B 7bb5bbf82ef6d9341565f373a078e58710ae5811328a9477851c118d616dfcdaaac4df283bfaf394bdc21b01bf922605702955bd7712008286be2a57869678f4 SHA512 06a04f7023f05a83086665d0e88d219f5644e8f909f9bc354ddc9b7c34e6f39cec98aeb1fd29a06ab2bf994ed380f962536bebadb563cafbce1b0c76e330b1e1
 MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e
diff --git a/media-libs/flac/flac-1.4.3.ebuild b/media-libs/flac/flac-1.4.3.ebuild
index ac7441965009..c862e6b390a1 100644
--- a/media-libs/flac/flac-1.4.3.ebuild
+++ b/media-libs/flac/flac-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	# -fipa-pta exposes a test failure in replaygain_analysis (https://gcc.gnu.org/PR115533)
-	# TOOD: Replace with some -ffp-contract= option?
+	# TODO: Replace with some -ffp-contract= option?
 	append-flags $(test-flags-CC -fno-ipa-pta)
 
 	local myeconfargs=(
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 380bce07c037..692911679bb4 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -4,6 +4,8 @@ AUX lcms-2.15-meson-samples.patch 697 BLAKE2B 1d6908eb7c330219d5923f94dc2f1f036d
 AUX lcms-2.15-pthread-linking.patch 1376 BLAKE2B abeaeca00fb8bd7dcb1eb36163704874544f57e65be151cfc82e0bb64d1cc76efe92b9ba057d194e89331c77ce62c1656791a310cc11c8957ef2ed5666e49f37 SHA512 6ce3e6e8ca8ca22e5c43e58a1b5bdad61b5bb31988f1c66c7771311559681b447e07a2449c297eecc8985e24af086517c77477b3ff62f954874f47ad6483a728
 DIST lcms2-2.15.tar.gz 7548405 BLAKE2B 97ce1e87c8de17e7d0dd1b00e1b49cf4e3c6912c74ff16d5afb9979565ad830fd8b3f08f7535ae8b5e763fbd22d2a058c577536ddb7487b7aa8fb25d585f8c84 SHA512 ab038c369e66736e0dd3810fbac6cf5381bc3102c4dd693819367b1224f59d9e853ede081388464c0e7c213d92e6cddc48c23020953af10ad6c6802cfa17e213
 DIST lcms2-2.16.tar.gz 7632822 BLAKE2B cf4d10908e6b8e6cf15ec8a99f0a299a9bcb7082f0df5ab1c9d84fcb739132855edf717c2ab746040fc09bace7afaaa8a39538e7ceabd0e68cdb3b4fb5627c6d SHA512 638dd6ad6787456c8145510d18b2d0727bd0a446a13ac2934aabc9531d1156eca2a2c0fd780a453823fbd35a1895f9d8de5dc4b3cab505459dd3f0535b4e837d
+DIST lcms2-2.17.tar.gz 5245319 BLAKE2B 746b0bdff61cbb12f4b27b42a17136a64fd6c437a9f6e620e0a27ba24ebeac595635c3e79929ae4f425b98fba7df1ce1e4a05ebd8bc2e03d23c99cf246fb46e0 SHA512 81885c70fb26a9b7d37a398f43ccb0d1d3ab8f43de7da8f760b26d053a0d7e0543e7d3b0cdcaf9b3b681a1b88f032134c5a3c1a6774a9abc66a8a3f10ba64398
 EBUILD lcms-2.15.ebuild 1486 BLAKE2B 4b2d395de3775e012b1cc5e98fd30738724e0d5e55f38f729ed07cd4cdf9e4519f08de044b2a67183cfd0b3f4767e8c41db9205be182c40ef309dd4a4b8c2c1a SHA512 d93e431d023af73f6f51286cb70cf3b64652d1ad3912a0693566356a4d0855f28ab2ffabdea3a13e5261a705210271feea662393c5610d29a1bae43c181a1326
 EBUILD lcms-2.16-r1.ebuild 1306 BLAKE2B 1c5fbcb682713ccc0674a31d548d6dd9a101cc89a2f0689b0dee05144ee3cf2b520b324ad39e5f7657f3024efaca4fe3bc85ccead6dce01688ae85cf1a2ae035 SHA512 960ab2942cb036f249f0623600969add2acda16eee1d1fe70a38e5b76ab9f8151aaacf2d144f1c55435af1cb61e88038e3b55a809fe5ffdeca511f9bd7f37e96
+EBUILD lcms-2.17.ebuild 1376 BLAKE2B 9a4e20faa4c3d9e2db5943a0ab7b6de33e948b3856beaf97399c8cac940c72ae11092d0b154ddbcf2318469b8bfbd4a538ebd51aed00963100b4fa9ae956d2e1 SHA512 2f95601f60654e9514e437f02014c72c52bf46377418e0fed3c6f97883d98bf29f137777d40a82a019f2f6c4f699cd16e6b35b5bce6f5db87c31eda6d66936cf
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/lcms-2.17.ebuild b/media-libs/lcms/lcms-2.17.ebuild
new file mode 100644
index 000000000000..2eb9b2b7d368
--- /dev/null
+++ b/media-libs/lcms/lcms-2.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="https://www.littlecms.com/"
+SRC_URI="https://github.com/mm2/Little-CMS/releases/download/lcms${PV/_}/${PN}2-${PV/_}.tar.gz"
+S="${WORKDIR}/lcms2-${PV/_}"
+
+# GPL-3 for the threaded & fastfloat plugins, see meson_options.txt
+LICENSE="GPL-3 MIT"
+SLOT="2"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+IUSE="doc jpeg static-libs test tiff"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
+		-Dthreaded=true
+		-Dfastfloat=true
+		$(meson_feature jpeg)
+		$(meson_feature test tests)
+		$(meson_feature tiff)
+		$(meson_native_true utils)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# fast_float_testbed on hppa -> 1458s from default timeout of 600, #913067
+	meson_src_test --timeout-multiplier=3
+}
+
+multilib_src_install_all() {
+	use doc && dodoc doc/*.pdf
+}
diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index 0bf5ecd909dd..b384db5d6f34 100644
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,6 +1,6 @@
 AUX libfishsound-1.0.0-c99.patch 2443 BLAKE2B feb353da9bb2ea2afa87c8153eb41e7228eb1fee612d5bdfc4c494e5bb5c45409500b06b2f1ca054307056e03365f3117c2a067b9e549e70fb86149d62e2be4b SHA512 d329084bc313943873fbc7e26893e3a4a68b71713ef7e3d1fc454030e78e06e4e8c8e67e2ede7dbb59ede578006a46dccd7b0bef04f71f2b9c0e17a995c9af5a
+AUX libfishsound-1.0.0-oggz-interop.patch 4451 BLAKE2B b19fd3883e13827d8c6a3a3dd441acfffe682a98de02efab6597fc297964085aaa652536cb7afd36095d3474d8a9d22260c65381fbe54a71fbe4f4b45bb8b2e6 SHA512 827d734ef7f0bf264ab0c3ee65293ff79d83c4da7e3fc6e427e20e3f423454f5b0a68d695ec3c9529740f4c8f4cf1753e7aeccebca21bc8254b6d7205a0291ac
 AUX libfishsound-1.0.0-pc.patch 410 BLAKE2B a949e5c3e843017f7c901ef936da4dac2f9d3300cc6fe57032d28bfba94919baee9a77054464cd97c567bc90733bbd6cd92fa25f7fb4a41cc38e5f502b075eae SHA512 b4b5f70363633702ed1932454bf8133d24ff7703f432ebd0c8721e33d48c1a21fc996c4759713fb2272f230038b40fe6cc773aea715726dfee13066669e32f1e
 DIST libfishsound-1.0.0.tar.gz 444980 BLAKE2B eadb6bed80d51fa7399f9557a38b65183a4f583e431bc68ee961dcca947856c79f011206fdcb04ed6ee5f709e1045b2a9c4fd4a34afa00b09656b1a4623c3ab0 SHA512 97d850fb42b394fca098a96b1784da431a0af1d54d57127179b612e4b88a7a2e406eb1411f55536e5a11ec2e8956f2659182c60ac46d49f6d14250e39a740339
-EBUILD libfishsound-1.0.0-r1.ebuild 1032 BLAKE2B ff5e7d72437f40cddb70ae1b594adbbe2cb0f670e8ebe576581e98abc2a3d4e4a81f76f71214ae0925d988eb3e50dd856a288861e6924e7c6e2ffe2fb3912214 SHA512 513e4edaf38566bc12b408817515ffd2eeacf00d4a85f0859e3ebc2a2341de0054567989a0a374597817b01eee8188ff6263a588e3c02b674d6c0e25f4fa7012
-EBUILD libfishsound-1.0.0-r2.ebuild 1071 BLAKE2B 17ef73a95276a55dcd0020ced48c0b4e9bf6f906e23bb9561202a5f227bd91756b0abf207c120b9b0b350fc83eda972c6212da23d36843a38e8ddbdc02f54faa SHA512 d427820d96c13d7ff5940bb78a23f9e5c42daa3fba4879f977c84f92e2ecfdae964c3fc2bb6bce0daef0f17cabb7e96276d580b2680d321390c8503bc6cbfaa5
+EBUILD libfishsound-1.0.0-r3.ebuild 1117 BLAKE2B 8371fa35f97bc218411b6ab605e738f3c7bbab58e0e0d62b9ac61b53035e8f9e861f651d3d483e50a81e3a9dd3c930bf1e466f9484e27fa18203085fb6b42693 SHA512 bdcd02015dfd84519de5886f97302b578df8a62e562c2d0eea8552511077dd3ea7efd4e2666754c4f3cb626fe2f5d3bd1280d289fc1df846ea5d78792048c0e8
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch
new file mode 100644
index 000000000000..2d9f6ebdeffa
--- /dev/null
+++ b/media-libs/libfishsound/files/libfishsound-1.0.0-oggz-interop.patch
@@ -0,0 +1,102 @@
+Upstream commit https://gitlab.xiph.org/xiph/libfishsound/-/commit/e1ee9862e89b362ac49cf66f1485d91a75cffe9f
+https://bugs.gentoo.org/929253
+From e1ee9862e89b362ac49cf66f1485d91a75cffe9f Mon Sep 17 00:00:00 2001
+From: Petter Reinholdtsen <pere@hungry.com>
+Date: Sat, 8 Feb 2025 20:22:51 +0100
+Subject: [PATCH] Use correct oggz argument type in examples.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The examples using oggz must use oggz_package as the
+second argument to read_package for the callback to be acceptable by
+oggz_set_read_callback().  Adjust the method signature to use
+oggz_package and extract the required ogg_package members from this
+one to avoid compiler message like this:
+
+fishsound-identify.c: In function ‘main’:
+fishsound-identify.c:101:37: warning: passing argument 3 of ‘oggz_set_read_callback’ from incompatible pointer type [-Wincompatible-pointer-types]
+  101 |   oggz_set_read_callback (oggz, -1, read_packet, NULL);
+      |                                     ^~~~~~~~~~~
+      |                                     |
+      |                                     int (*)(OGGZ *, ogg_packet *, long int,  void *) {aka int (*)(void *, ogg_packet *, long int,  void *)}
+In file included from /usr/include/oggz/oggz.h:576,
+                 from fishsound-identify.c:39:
+/usr/include/oggz/oggz_read.h:109:44: note: expected ‘OggzReadPacket’ {aka ‘int (*)(void *, oggz_packet *, long int,  void *)’} but argument is of type ‘int (*)(OGGZ *, ogg_packet *, long int,  void *)’ {aka ‘int (*)(void *, ogg_packet *, long int,  void *)’}
+  109 |                             OggzReadPacket read_packet, void * user_data);
+      |                             ~~~~~~~~~~~~~~~^~~~~~~~~~~
+
+Fixes #13
+---
+ src/examples/fishsound-decenc.c   | 3 ++-
+ src/examples/fishsound-decode.c   | 3 ++-
+ src/examples/fishsound-identify.c | 4 ++--
+ src/examples/fishsound-info.c     | 3 ++-
+ 4 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/examples/fishsound-decenc.c b/src/examples/fishsound-decenc.c
+index 96261ad..f9e8674 100644
+--- a/src/examples/fishsound-decenc.c
++++ b/src/examples/fishsound-decenc.c
+@@ -129,9 +129,10 @@ decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+   FS_DecEnc * ed = (FS_DecEnc *) user_data;
++  ogg_packet *op = &ozp->op;
+   
+   fish_sound_prepare_truncation (ed->decoder, op->granulepos, op->e_o_s);
+   fish_sound_decode (ed->decoder, op->packet, op->bytes);
+diff --git a/src/examples/fishsound-decode.c b/src/examples/fishsound-decode.c
+index d9c178d..9c61d0a 100644
+--- a/src/examples/fishsound-decode.c
++++ b/src/examples/fishsound-decode.c
+@@ -82,9 +82,10 @@ decoded_float (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+   FishSound * fsound = (FishSound *)user_data;
++  ogg_packet *op = &ozp->op;
+ 
+   /* If we have not yet selected an audio track to decode, then try
+    * to identify this one. If it is a known audio codec, then remember its
+diff --git a/src/examples/fishsound-identify.c b/src/examples/fishsound-identify.c
+index c5ff943..5a89e34 100644
+--- a/src/examples/fishsound-identify.c
++++ b/src/examples/fishsound-identify.c
+@@ -60,9 +60,9 @@ dump_identity (unsigned char * buf, long bytes)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
+-
++  ogg_packet *op = &ozp->op;
+   if (op->bytes < 8) {
+     printf ("too short\n");
+   } else {
+diff --git a/src/examples/fishsound-info.c b/src/examples/fishsound-info.c
+index 65138a1..d119d33 100644
+--- a/src/examples/fishsound-info.c
++++ b/src/examples/fishsound-info.c
+@@ -76,8 +76,9 @@ decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+ }
+ 
+ static int
+-read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
++read_packet (OGGZ * oggz, oggz_packet * ozp, long serialno, void * user_data)
+ {
++  ogg_packet *op = &ozp->op;
+   FishSound * fsound = (FishSound *)user_data;
+ 
+   if (op->e_o_s) {
+-- 
+GitLab
+
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
deleted file mode 100644
index ab35ecbfcc2e..000000000000
--- a/media-libs/libfishsound/libfishsound-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Simple programming interface to decode and encode audio with vorbis or speex"
-HOMEPAGE="https://www.xiph.org/fishsound/"
-SRC_URI="https://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flac speex"
-
-RDEPEND="
-	media-libs/libogg
-	media-libs/libvorbis
-	flac? ( media-libs/flac:= )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# bug #395153
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-pc.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:doxygen:doxygen-dummy:' \
-		configure || die
-}
-
-src_configure() {
-	local myconf="--disable-static"
-	use flac || myconf="${myconf} --disable-flac"
-	use speex || myconf="${myconf} --disable-speex"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir="${D}/usr/share/doc/${PF}" install
-	dodoc AUTHORS ChangeLog README
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
index 71fd52981ae6..18d959853c9e 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,6 +27,7 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${P}-pc.patch
 	"${FILESDIR}"/${PN}-1.0.0-c99.patch
+	"${FILESDIR}"/${PN}-1.0.0-oggz-interop.patch
 )
 
 src_prepare() {
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 4317f8049a0a..59e487cfa59c 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -2,4 +2,5 @@ AUX libopenraw-0.3.7-fix-boost-detection.patch 558 BLAKE2B a2587de14ffd394f32b86
 AUX libopenraw-0.3.7-slibtool.patch 605 BLAKE2B 0369ca04439c0b69548079dc6ce69fd562bb3bcdb15ec2f76eafb76260846af16bbd33c60aed89967b1bd29b4cccd6ec7985b101b7af43c8dc0160569404c385 SHA512 7ee3505a2690777218b558b1016d19e00d63153cfa4a2fdb125327fb0a1f59224703b0af16329936e08e7fca65e615a840cd61e4d24f246dc89d329e1b0c5593
 DIST libopenraw-0.3.7.tar.xz 2536380 BLAKE2B 22aacfb085c59fa4b763abc3454839812327d1b6506b2e531783b0529ca3a5e24605a010e6c510d942741d4f0afc208ca626bdef1a93ad42fbf0f5c1e347f5cb SHA512 0781e9377100e954f8a7f020da537ec2af033b23341a7944fc346a973fecb463ed29b375275ae8b4bd6f40721ee4f12480729df80337d57cac30627e084594d1
 EBUILD libopenraw-0.3.7-r1.ebuild 1390 BLAKE2B 4098567d4bac1faffbe2c2e4bead5b3a302240e96a7a3f4e132ea77897d3ee01aec6df22732f568c5215fb2ebe288a7c8e9988d7e722a152ee13831828c822b5 SHA512 c2a1e0d3fd0c638942147d84b8f401298ae773299e33075693e85653051632e78fccda9778fc8f4f2ce3e1ce809d658e7db26f19536dcd5b23276d8f14408584
+EBUILD libopenraw-0.3.7-r2.ebuild 1363 BLAKE2B 835dc82da34ed762f44101ac21d5321e52337f4befc98bb4b949e27f2cac2a9a39bfc85b8a16630cdd3a29b0f48d0b36eb884b20c5f73e609c25a2bb47c7551f SHA512 c64600f645a7f7bf639e8e683c056fa56f3aee78722bcba3dd8084c1cd58f710c7170cd78471f77771534aef9fdfe2222ab91a98b72b07c0a85499205c4d2025
 MISC metadata.xml 327 BLAKE2B 535d53760f8b1440558a02aecb8ab27244d3583ded3843a38a8d418ae8a8a55859c08901a6fae91f8d63e7848a173e3e40b7ff168a0f86c710e53bcbe87f4161 SHA512 26f6a6a430380b878feabd5a692aed4cf6994701e935fda0f986b0b071702846389f8ada8f0c666f35a5107484879d7dce9f81b866081b0b06a1df1d02125cdb
diff --git a/media-libs/libopenraw/libopenraw-0.3.7-r2.ebuild b/media-libs/libopenraw/libopenraw-0.3.7-r2.ebuild
new file mode 100644
index 000000000000..08c818f04d9d
--- /dev/null
+++ b/media-libs/libopenraw/libopenraw-0.3.7-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES=" "
+
+inherit autotools cargo gnome2-utils
+
+DESCRIPTION="RAW image formats decoding library"
+HOMEPAGE="https://libopenraw.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz"
+
+# MPL-2.0 for mp4parse (https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/15)
+LICENSE="GPL-3 LGPL-3 MPL-2.0"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="gtk test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2
+	media-libs/libjpeg-turbo:=
+	gtk? (
+		dev-libs/glib:2
+		>=x11-libs/gdk-pixbuf-2.24.0:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( net-misc/curl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.7-slibtool.patch #913723
+	"${FILESDIR}"/${PN}-0.3.7-fix-boost-detection.patch #919349
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-boost="${EPREFIX}"/usr \
+		$(use_enable gtk gnome)
+}
+
+src_compile() {
+	# Avoid cargo_src_compile
+	default
+}
+
+src_test() {
+	# Avoid cargo_src_test
+	default
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 36d013d57d39..54ca8394fb98 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -3,7 +3,9 @@ AUX libva-intel-media-driver-23.3.4_testing_in_src_test.patch 2497 BLAKE2B 5db90
 AUX libva-intel-media-driver-24.4.4-c23-fix.patch 529 BLAKE2B d900912b2239c57ec1b92db104dad8d5299729012765d5144ae3f381d4b26adfa579a076bf0a8372bd86646201296f1d44c1f2973374c6e6546aa3aa7ac04284 SHA512 c3b8a74dc872dd68e0cdc6df7ff64753cd2bbf13a26d7a325de3bbbff0bdbc9aa23e73ca8940d1e378d0d7a228cafa424c0fb92ef8f008da4b6f4d4858a0e561
 DIST intel-media-24.4.4.tar.gz 27696988 BLAKE2B cf13b3d0feb005b204892a62402d2a044661279b419bbc47ac414691a5238ada5dc2d59e848a9d53219163420e6b2d364a563f57e10488325587405e2add8ef3 SHA512 0a34a707082a3d7032b472667640d40761f1c9425e291002d2bd2af42d57d69ec3cf6e835430e731ff6c7eb24b22b1843c0b83812001f4ed203fd55097a2c6dc
 DIST intel-media-25.1.0.tar.gz 28243498 BLAKE2B 7b0982cf06c13754897c46ca3c54b3d0d0d9c1b8aff6066c148770946f83655185bc02f67d83c762a2843969f6f70b4fae56c6853930ff228059e6ff7484b7bd SHA512 20c0f7952a59ab86a6e6c1281c198961d835380e5d4f17fe2cc1c74a31da426560cc244950e6e91f0b4fb659133e461f5ba539c7000ad26e8032fc2aaf79c416
+DIST intel-media-25.1.1.tar.gz 28255804 BLAKE2B 960c53a7f9920b782c2c4fa10a37c1de4b51271a37ec3b6eea1a814d842d4725564122e3d1b4b1a28dfa4beda80f13db20fe64831a5cdeeb5c299e754d2576f2 SHA512 dcdbbd5c7e2b5ae93784cc38229aab6bd9a330bcde08e6f7597264d9124a5044086c67e08828dfe81292b233e33148fe9b5426cf2d0003f62b3af6452f07de57
 EBUILD libva-intel-media-driver-24.4.4-r1.ebuild 1553 BLAKE2B 8a00e4f58d7a1b69ed18c191a03d1342bbd330af9fd76c66953ea7d5d343e3c56be2732390fa4598dfcbc271bda5709b0d0df20af478f76ebba5672af311c49f SHA512 9d2241aab18bcab1430901a8bbfa501bdd5e28a31df264579108382e309589e961d66beb29f0a1d60ef0f4905b8019ed4d5bce558a45d94fdbe42b777a8b9a87
 EBUILD libva-intel-media-driver-25.1.0.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
+EBUILD libva-intel-media-driver-25.1.1.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 EBUILD libva-intel-media-driver-9999.ebuild 1512 BLAKE2B 761266db69786809a3d777d5ef5c8698a5da93f5639b53227446a1ac5fc9f63a20a21ba4fe6e03495e05796b3f9cd768f68907f123a7a7fa49f6aa5ee1d3c01a SHA512 e1c28b94142609cf8b4eb29e18ba461ccb5fdf9b6a0b141a406b2ec0457d699faf06592d3d2eca4459c48b575e62b5bc0fc8387570bd7adf8902c635aa89ee0b
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.1.ebuild
new file mode 100644
index 000000000000..a27f472ef10b
--- /dev/null
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-25.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VA-API (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.6.0:=[${MULTILIB_USEDEP}]
+	>=media-libs/libva-2.22.0[X?,${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.3.4-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-23.3.4_testing_in_src_test.patch
+)
+
+multilib_src_configure() {
+	# https://github.com/intel/media-driver/issues/356
+	append-cxxflags -D_FILE_OFFSET_BITS=64
+
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
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
+}