8 files changed, 93 insertions, 121 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5f72a1ce0636..0dccff9b4af4 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 04610c093eba..6757ac174530 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,3 @@
-DIST cimg-3.4.1.tar.gz 12667815 BLAKE2B ad65938c75e28dbf9645e23972bd7d4e867c0ec16df686ce16b56cf4704869159ae3716d5d10675ac5965832341551612fbdb78ac6e5ca79157c948200ec031c SHA512 54357c177c1e25117778d444e0317a5a5f9dc9dd40ff2c280b6c05f846b2352c523ba6ab9eeea2e05094cc8fbbfe5a544a5f83eeda46394b3d87962b3b1e31d5
 DIST cimg-3.4.3.tar.gz 12669374 BLAKE2B a7899c21e99c19a9422b3774cfa8b81e0ffc60e853bf184e7e33eac3e5a3dc8d604a1235f3824f414ad64c3647c81a720cd722a2814c11ebc8fb1c5fafd0b750 SHA512 df6e45cef8dfb3eb121bd8bcb76c1b21e2dbad0ce5d651b1fa507a64667fbfad2b64817c5d072c1e34080bdae2dfce8cab6ee8410e261033f001c03967370fbc
-EBUILD cimg-3.4.1.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2
 EBUILD cimg-3.4.3.ebuild 592 BLAKE2B 85b45e53554357ec149a6125a8d545bf0152324f34b99d5a3064123d79a691a1f4f895a28be73a8bedfadd074016cd5a1f9869854878045d1e0a1259cfe88ae6 SHA512 f4d2728375dc7ff893dafc2da8f942a4a0498c5666adad3ad1404b4b47ff711a9d3e8fb9698756d31b18f061631456be1e59bd36be7d711499a77cb57e32d1d2
 MISC metadata.xml 695 BLAKE2B 01ff882592a3d248209386d0873eadd0df9a2ded4bf0595c55228aa722b4297634c6fcc14e1b8b4d474cd6b3632cabcd8174f3ef66eaae94cb9b1b10a0de1628 SHA512 1ef8fabd67cecb9e9dd5fc949cb3e670764fdc34b472ff74611d5629f5bcda62013d8e87efdb997d85c1395ea08bbefec76092ea55242a5200af7584eb188d74
diff --git a/media-libs/cimg/cimg-3.4.1.ebuild b/media-libs/cimg/cimg-3.4.1.ebuild
deleted file mode 100644
index 81ead1e98430..000000000000
--- a/media-libs/cimg/cimg-3.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="https://cimg.eu/ https://github.com/GreycLab/CImg"
-SRC_URI="https://github.com/GreycLab/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CImg-v.${PV}"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-src_install() {
-	doheader CImg.h
-	dodoc README.txt
-
-	use doc && dodoc -r html
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/media-libs/glycin-loaders/Manifest b/media-libs/glycin-loaders/Manifest
index 2169d7f0edee..b31bc65b7ef6 100644
--- a/media-libs/glycin-loaders/Manifest
+++ b/media-libs/glycin-loaders/Manifest
@@ -1,5 +1,7 @@
 DIST glycin-1.1.4.tar.xz 28352904 BLAKE2B 0623a05462fb8a59d9d7e7f49968b4b68a26bd4f2088702d857048f206e9bc466907dfe2b979fdd4f80ee08e9daa888e4210cc177ca8ca5cc87fc9c10bd86e03 SHA512 8bfeefbbc36794d8b57ac86a0166038372c93aeec65a335db91a098f7442f9d33838c7f657f6a98b5528f62f89cc24b6d52e0e45738e333a3fe0179d0b02ee8c
+DIST glycin-1.1.5.tar.xz 28348220 BLAKE2B 79ddbe2d68246200f0026ff418abeaadd8779091925c83a8e253f2598aacce48e6ed3ddd557444a2f6ad3bb27e50fef3d5365ebd03ce2a38b2df3f1af8a0a69b SHA512 fcc2856eeaf10708ebd876186405330544ca83a262d1fccfe8d338e565657579142a8b496d993233755a21b82e96eab7b73457eacaca756ef3f8795b1cbd254f
 DIST glycin-1.2.beta.1.tar.xz 36989732 BLAKE2B 47e9d07f5487767fa0625fda352e6cb686227474addc38d2bc8acde1cb81689d62bd834949a82302153bdbe6dc3a08bb42f7fd1ba85ea67c61f62a7ba08d1b2a SHA512 2479f8044745e9203e2733359248d78e01cf1407eda770478936101dc7cbf32218c6c6cb21583b6e2444eecb8645c81cb8b9c73c6986593908cf6b11e4a5a25d
 EBUILD glycin-loaders-1.1.4.ebuild 1917 BLAKE2B 0dcd849afa9ce8769054770c41745dfd1513662c6e85b729c725286517727a7206fcb2a30fe5326d8e69692a5f8634c4e57457e7693b0c015b1ed971e98ca342 SHA512 f2b93eab34949f7c93b2df94211e2f265e302aa34a48cffaa8afa03be5f21fbd012266ae4c2d660a1b8238453a3b6aba93d9decac43ecc721d0c98bff9e6d66c
+EBUILD glycin-loaders-1.1.5.ebuild 1917 BLAKE2B 0dcd849afa9ce8769054770c41745dfd1513662c6e85b729c725286517727a7206fcb2a30fe5326d8e69692a5f8634c4e57457e7693b0c015b1ed971e98ca342 SHA512 f2b93eab34949f7c93b2df94211e2f265e302aa34a48cffaa8afa03be5f21fbd012266ae4c2d660a1b8238453a3b6aba93d9decac43ecc721d0c98bff9e6d66c
 EBUILD glycin-loaders-1.2_beta1.ebuild 1994 BLAKE2B 30fbfabccef9587a6e1aa07f43b92dc841c56be9b3f000cdfc22bc012e15adce31f4a4abfaa50bdd7ae587fbdeee7a9205fa216371a2710f5520d4314d4e7a35 SHA512 cf95ca963a8551793624d45dfbc9a14567ee68448060236890b16d145b33b8bd175476e2747050dec7ab32d6401c488284e6c8563ce0fb60e80c8fdcaeb13a24
 MISC metadata.xml 331 BLAKE2B b62bbf18b3c5de49ceb8429587082188fa6503b3dc24d8aae4d79cebcba1889846d20724f0293eb87413e554a1c2dea698e452070889c945ed9b3ce823eb7107 SHA512 4408889d08fe53cf137df4ea60d15e4cbda90c1df5da9072f66be025dc97693570c3af4a1e7a22cbba5475c9e30210af07e338197e1a2cfe72f341b28d2f5e7d
diff --git a/media-libs/glycin-loaders/glycin-loaders-1.1.5.ebuild b/media-libs/glycin-loaders/glycin-loaders-1.1.5.ebuild
new file mode 100644
index 000000000000..217ae3663814
--- /dev/null
+++ b/media-libs/glycin-loaders/glycin-loaders-1.1.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo meson
+
+MY_P=glycin-${PV/_/.}
+DESCRIPTION="Loaders for glycin clients (glycin crate or libglycin)"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/glycin/"
+SRC_URI="
+	https://download.gnome.org/sources/glycin/$(ver_cut 1-2)/${MY_P}.tar.xz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT
+	Unicode-DFS-2016
+	|| ( LGPL-2.1+ MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="heif jpegxl svg test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.60:2
+	>=sys-libs/libseccomp-2.5.0
+	heif? ( >=media-libs/libheif-1.17.0:= )
+	jpegxl? ( >=media-libs/libjxl-0.10.0:= )
+	svg? (
+		>=gnome-base/librsvg-2.52.0:2
+		>=x11-libs/cairo-1.17.0
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=gui-libs/gtk-4.12.0:4
+		>=media-libs/lcms-2.14:2
+	)
+"
+BDEPEND="
+	test? (
+		sys-apps/bubblewrap
+		sys-apps/dbus
+	)
+"
+
+ECARGO_VENDOR=${S}/vendor
+
+QA_FLAGS_IGNORED="usr/libexec/glycin-loaders/.*"
+
+src_prepare() {
+	default
+
+	# https://gitlab.gnome.org/GNOME/glycin/-/issues/81
+	sed -i -e '\|/fonts|d' tests/tests.rs || die
+	# avoid depending on git
+	# https://gitlab.gnome.org/GNOME/glycin/-/issues/110
+	sed -i -e 's/git/false/' loaders/meson.build || die
+}
+
+src_configure() {
+	local formats=(
+		$(usev heif glycin-heif)
+		$(usev jpegxl glycin-jxl)
+		$(usev svg glycin-svg)
+		glycin-image-rs
+	)
+	local formats_s=${formats[*]}
+	local emesonargs=(
+		-Dprofile=$(usex debug dev release)
+		-Dglycin-loaders=true
+		-Dloaders="${formats_s// /,}"
+		-Dtests=$(usex test true false)
+		-Dlibglycin=false
+	)
+
+	meson_src_configure
+	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
+}
+
+src_test() {
+	# tests write to /proc/*/uid_map
+	# apparently, "addpredict /" in Portage breaks it
+	local -x SANDBOX_ON=0
+	meson_src_test
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 0a7f649e477a..b3a56635374d 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,6 +1,3 @@
-AUX libraw-0.21.1-CVE-2023-1729.patch 810 BLAKE2B 23388d0f1fe99d6d7641a6d871da5165118260107d70dd34dee691704f626e6bd12f9763b4076d0f790f21fccb590d95bdaa26329edb864ac0338b9535c23572 SHA512 c0e77285f9de35bd5511b1f07317facb63393135e5615fc6b44ad9b396d4486b7e95cbee5acef8ba82afd296d95d17fd10ead47686d07919a625b301f72de040
-DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d
 DIST LibRaw-0.21.2.tar.gz 1639305 BLAKE2B 8ff6cbc205335bdf12bfdfb77e390cf45f6e7a3dfcc0e6cc5ea759ac3a7b11d9f8a89c19218f779951dd8b1d96c779cb1d502c4691ee11cdccd83c27f09c6bf8 SHA512 ba7839d8eb5f999982c7b89f89f63387d7fee82054d7edcc2698924e268559b561230e329a0c669bd6f7c075983da6c054a6d63fad49ab3c1e2e9edc653b2bae
-EBUILD libraw-0.21.1-r1.ebuild 1691 BLAKE2B 72cfc26bd845fa5277fd18acd13c43afee879276941fd8aebf8ed022d66a6edbd485833378ccdc0760be6ff24737be42848ac98ce17c3bafae9265e88536f3b4 SHA512 d20f60b9841bc9ed82c9487f6ce673cb4993874671b1d3131eda00911fe6bb9a62b890ec1b2a650d8845ed0aeb9bdb27fe281688711a7d67ef4b365b6220b2b1
 EBUILD libraw-0.21.2.ebuild 1639 BLAKE2B 36efe9fd8f036a729d279d55e9eb6a2bb63b3703a7c0d2afaa976dc5f33cb400fdd96e38ebf309d9bfea510ba97b848a53f25ae5cf242146fe68d49f8064aea0 SHA512 8ba2bad8adeecd549dc4f74432c7e47f5b03a83f8a9a5fd1b3e768257b16ab1609101a428c912cb1390563ea837d6f4185d93801c87fa051492064545537bb8e
 MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda
diff --git a/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
deleted file mode 100644
index 427b3c852c16..000000000000
--- a/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9ab70f6dca19229cb5caad7cc31af4e7501bac93 Mon Sep 17 00:00:00 2001
-From: Alex Tutubalin <lexa@lexa.ru>
-Date: Sat, 14 Jan 2023 18:32:59 +0300
-Subject: [PATCH] do not set shrink flag for 3/4 component images
-
----
- src/preprocessing/raw2image.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
-index e65e2ad7..702cf290 100644
---- a/src/preprocessing/raw2image.cpp
-+++ b/src/preprocessing/raw2image.cpp
-@@ -43,6 +43,8 @@ void LibRaw::raw2image_start()
- 
-   // adjust for half mode!
-   IO.shrink =
-+	  !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image &&
-+	  !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image &&
-       P1.filters &&
-       (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1)));
- 
diff --git a/media-libs/libraw/libraw-0.21.1-r1.ebuild b/media-libs/libraw/libraw-0.21.1-r1.ebuild
deleted file mode 100644
index 9c21307b42d2..000000000000
--- a/media-libs/libraw/libraw-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV="${PV/_b/-B}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
-SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1 CDDL"
-# SONAME isn't exactly the same as PV but it does correspond and
-# libraw has unstable ABI across releases.
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg +lcms openmp zlib"
-
-RDEPEND="
-	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( Changelog.txt README.md )
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2023-1729.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	if tc-is-clang && use openmp ; then
-		append-libs omp
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-jasper
-		$(multilib_native_use_enable examples)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable openmp)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}