14 files changed, 591 insertions, 15 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 22160134cb4e..79df84ef0467 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index bbd16202f6d3..c0a9d6a34ad8 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,8 +1,10 @@
 DIST babl-0.1.102.tar.xz 313872 BLAKE2B b5720b256368c0d1cba5f6da98185bcad3770390e38e0a495b19a51ef3adeb9ab25e9ada8c085fc685261ca5722ee0dd6876091bf366a0a9ef876e096b8cdba9 SHA512 7a4cbf011bdac3dbb41e76fbb7fe389b3bfc2c844b58b2f743c0805fac47ea8d8f94997ed3e8f0744d7ed8d9b7d14b807fddddb959d809cff8f729462fe1b601
 DIST babl-0.1.106.tar.xz 315068 BLAKE2B 560518beab77ec2f3fc50062bda80839f749992e4c61bef3badd4acfbc2a7bba6dce332ffabe65dcf18e4ba450d0ae1d261b5e34724a1309ea74e50ce3e452c7 SHA512 97dc57141754ff64a961f77df50dcd91b32d3cf26efa8ba9f3dd5fcfae41e96f986178a04ba7a8940effb6e6e33ac98b163551f377dc781308c750222efb4943
+DIST babl-0.1.108.tar.xz 317036 BLAKE2B a2ece95d7cad33aa70e41ee9c01bd11b7fb1730cb0e0d64df42c4c933a1ac1955b103d75d2ade613ebee0362ade8aaf8ed1257a3cbe307d623243869244f67c1 SHA512 3ebdd18b32505e3009ba8f4957ffe892226d83012fbf3217b1761645fdcae943a19bda1a1f93adde78a5dd83fa11b0ba23014118228ca4eab4fd18001f1f4970
 DIST babl-0.1.98.tar.xz 312516 BLAKE2B c12626e4b8127a5b2e17507e20cf6ce324834a58d64fa54b80fbe00ef2468d3d29c870d44a22f08f7e74404cf6f47321084c854a4ba017cf0c8c199d8210849f SHA512 33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120
 EBUILD babl-0.1.102.ebuild 1955 BLAKE2B 01813815a660c909c44be1deef9d569a6d42d31ed1f3a73d75607be1d575767b6229d0aeca9fefcdd428eb07f49ab822005fe19709a7d864dce5eefffb45183c SHA512 555fdfed03406d877a8144c808db6fcc80d4478b26fd6da9478df4f45bb7a204a4a4ae536e1189415e470ff2dab0b57c6cb765f95995757e326173c75e5a1cde
 EBUILD babl-0.1.106.ebuild 1955 BLAKE2B 01813815a660c909c44be1deef9d569a6d42d31ed1f3a73d75607be1d575767b6229d0aeca9fefcdd428eb07f49ab822005fe19709a7d864dce5eefffb45183c SHA512 555fdfed03406d877a8144c808db6fcc80d4478b26fd6da9478df4f45bb7a204a4a4ae536e1189415e470ff2dab0b57c6cb765f95995757e326173c75e5a1cde
+EBUILD babl-0.1.108.ebuild 1959 BLAKE2B 95709591267eba962f5ea1b36a2e8a6aaa11d23ca81bbabc002b082795f8e72ec76ef9b0692a1330df0e4b9940f8ee659caac87a6cdfd8a9cbe1156d26872e94 SHA512 7905062e51e7f0ccffd30d30ad2659fe5af3fdfb8fa59a0eca490544e425a59a7a5a903098ab3434be0df666fd821f8c98b41d0b7db1d4d847f1e1e64f532bc4
 EBUILD babl-0.1.98.ebuild 1903 BLAKE2B 85416421a0d21c565b8f80bbb8bcaee03c2f274a3e69e4c3d93b7b3755aa6af5ace07bf25a4df01a52422a8fdc74ef7de92cc5d8854559a667c6ce5ed7bb46da SHA512 cff863eaf3813c35e610fdeadc5970cadbb4c27c7f7002e1a48646589e728f71bfd9e018b182c5357c8d077a2f02e5f4b76288cb50b5eda9af43dd1f4f757492
 EBUILD babl-9999.ebuild 1755 BLAKE2B 7a18f2904e9df87d69729b98ac8a3d64b26823310d009d058d58ea2c42500e3b9072718839dd29b050b96dfad0d257268afd3bfdc2ab6073f1ad6a92b762a417 SHA512 b5f31d5f02a6f8f48f658d3d4286150d36aa4e1f3a63ed9a0bf6383d379f0073914ae0b684c08f407d095670a889128dda33fbf9801ab2a83055c4b5f46840d1
 MISC metadata.xml 482 BLAKE2B b87a2ff4b72fc2aeed91042dd7b6a65032aa4608c7079fbc94c1d1f85e681bc446aa1fcad5f14cba510febe1430b290417cd498ff09c797ec8b28c84e6451e4e SHA512 3345414f92106c39f8364c1554e0325cfd45cbf94f84315d809bb305faf4093b3b971c79f7c32ea998a8fd0c6c9369c249ce10063a1521690a624860e20de995
diff --git a/media-libs/babl/babl-0.1.108.ebuild b/media-libs/babl/babl-0.1.108.ebuild
new file mode 100644
index 000000000000..94c8dae39e51
--- /dev/null
+++ b/media-libs/babl/babl-0.1.108.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="https://gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	lcms? ( >=media-libs/lcms-2.13.1:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	use vala && vala_setup
+
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Create symlink for backward compatibility. See also bug 871690
+	dosym -r /usr/"$(get_libdir)"/pkgconfig/babl-0.1.pc /usr/"$(get_libdir)"/pkgconfig/babl.pc
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 81222f540461..19b5946edb6c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -4,9 +4,11 @@ DIST gegl-0.4.40.tar.xz 5784744 BLAKE2B c4466a76ec4f7939161e9ead6980b8a701f3fc45
 DIST gegl-0.4.42.tar.xz 5787100 BLAKE2B 6ae3ec98e72b1057b9d84551f56b675edb511994a73979bfccf559e24d3d636ba915aab10d3b3a1b38989d69c63692d3f312c621819700332c8cc1a4b3e86875 SHA512 29ccd93faa6127b6a9b1180eeba47f1b6f9bc06da8a5c9d68315d7474b77ff19d1084a6f4e7b218666b355329b17bc562f5906a334aa2baf93840d7caa0adf57
 DIST gegl-0.4.44.tar.xz 5791844 BLAKE2B dbbdca0ff9985025f528fe298df32672069c09dd87e22ab70330f078ca7fc7efb8b78f8f9077bb559eb61c790c5ab50c53853a1032fe00fbea7080d140baa28c SHA512 4dd3fad0c5e391fc1ac3784d4365ffdc483d37b90a24a29eaa632dd337971674999b2e0f8facf255d86852a3899cc51f4d27f9875ab5849f8b38d9ed5bb7413a
 DIST gegl-0.4.46.tar.xz 5799248 BLAKE2B 2fc9ccd0c711cc901abd50740a24d0f75b162cbb196bdd62ab8430882da3b9ea72c08dd587ecfecaf5e4ba9aca4df51bcd7d98ec197325375b1d954c2995029e SHA512 cd733208da7dc1ec77ca023f03f47e578350e156ad07ece701b39f517a292e9f9c081b3a8a2db846813483b4ddb21f32f9fc8b9c70fea8a6ba27bb97ef8bb847
+DIST gegl-0.4.48.tar.xz 5805488 BLAKE2B 3a800004f166fdbfbd563688bb71c4579bba132380f5f45496e8fb813943333b89781320230adf6e0ee49b9bde7db37d81929a8fd42e19e62281e7f8d1ea3bfb SHA512 8f47e6445062894c16d54eeeec4a55cccc32fc49c9fb9be3428a591daaeb21b1a5b8529a68d82613fd75f107bb8c0418c9e5337346bd94da3226e545189c226b
 EBUILD gegl-0.4.40-r1.ebuild 5058 BLAKE2B 81eaf48488fe7ca7cb5271c0ae0a48444611a26629ca710afbf7a79227d00a872d338eb65882b140dc257183102a8e385ee2362a4a3b9b91e9bce1c9e98fa049 SHA512 53e81de8dbf1f5f9b066eae0acbd8c77904044ac2b199daa54e14dc37859fd97693506566659eb2f10cb5f14d551d570ee51a6a10eb78c53420aa0805f5109d4
 EBUILD gegl-0.4.42-r1.ebuild 5037 BLAKE2B dfadb084b9b429f6b27023c0609e4ed2a19d6acae8a371a39c9337bf83a84c97b531200b494f5c88bc707e385f2401dd3914798fb8082c41aff823330beb0258 SHA512 dc662dcf59f852bef86655966a9cc4e22bf50627d549e4a686a86ace9f5e1b376e0a5b23b04989403d98792acbfd638435cc85f5e11e0c5b6b641c7cdbb57318
 EBUILD gegl-0.4.44.ebuild 4968 BLAKE2B 22e3e0835c82edb5e4174fda51722d0726421a17207a89128b9d8e7f4ce10bd86efefaa414ba78bde94168c8023b7fb10de3721518144f383fa34849a3a45ea7 SHA512 4808a5736a788c602695e03fd617ff63a868adebc8b88fa523c1a013fcb26f7a001b7add6b12c1ee65c244b8636f6b9920a2c77dcd5c88e163567e38d51db191
 EBUILD gegl-0.4.46.ebuild 4968 BLAKE2B 22e3e0835c82edb5e4174fda51722d0726421a17207a89128b9d8e7f4ce10bd86efefaa414ba78bde94168c8023b7fb10de3721518144f383fa34849a3a45ea7 SHA512 4808a5736a788c602695e03fd617ff63a868adebc8b88fa523c1a013fcb26f7a001b7add6b12c1ee65c244b8636f6b9920a2c77dcd5c88e163567e38d51db191
+EBUILD gegl-0.4.48.ebuild 4972 BLAKE2B 1b9b0918bff87ea05e18367db6d9c9b5ae9e0fe8656ab4b57e8e248941a10fecc52beb973a83195360bad127d429d743c96fd3907d329b87a47510f6902ef4bc SHA512 0de68ee617f4393f4189714911f9715f0bba48776f57ef5001651119510a67314517be7d967993096c2f7a2033100d119411de0ac45e4a1a0ba43bab4cd76689
 EBUILD gegl-9999.ebuild 4751 BLAKE2B da0a5742a5090e4ddf4fad1cb57cfa261f92198b61bd8040e9a07e3e6ed1ea3ed9f1bbbdb33a05988e327a9c55217ac2d840a5dde1cd05559918ffb259a9aa5a SHA512 d27728e4022cfdcf5c8ab4aa73bf3688713ae555889c2f363e97054e236f7bd2b4659e4af96d48c3d1655ec8f849a1f4c03863c24181a8d62d8ba247a59cebd3
 MISC metadata.xml 761 BLAKE2B fa74f6ff5ae13c05793505d0a27b7bc8587748ad356fa4f3ec5b48bd2919c6197788ab02bdc02fbdbdfe2f376d93222b600e30915e50f4ee4643e973ce054d86 SHA512 8cf93e9c5130a017bb864144e88cd2a4f2eff17b5543514a3ca84066b90e394dda6ee64a5e49d8db3b48eb905df5eef815f3b2689bc2be9772a01dcd2cecad30
diff --git a/media-libs/gegl/gegl-0.4.48.ebuild b/media-libs/gegl/gegl-0.4.48.ebuild
new file mode 100644
index 000000000000..7127527cb64e
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.48.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="https://gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.68.2:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.98[introspection?,lcms?,vala?]
+	media-libs/libjpeg-turbo
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	sdl2? ( >=media-libs/libsdl2-2.0.20 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:= )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-build/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=dev-build/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [[ -f ${file} ]]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+}
+
+src_configure() {
+	# Bug #859901
+	filter-lto
+
+	use vala && vala_setup
+
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Djasper=disabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature openmp)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature sdl2 sdl2)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index e25a08752dcb..e4c67310ada7 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -1,3 +1,4 @@
+AUX libopenraw-0.3.7-slibtool.patch 605 BLAKE2B 0369ca04439c0b69548079dc6ce69fd562bb3bcdb15ec2f76eafb76260846af16bbd33c60aed89967b1bd29b4cccd6ec7985b101b7af43c8dc0160569404c385 SHA512 7ee3505a2690777218b558b1016d19e00d63153cfa4a2fdb125327fb0a1f59224703b0af16329936e08e7fca65e615a840cd61e4d24f246dc89d329e1b0c5593
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
@@ -34,5 +35,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 EBUILD libopenraw-0.1.3.ebuild 986 BLAKE2B 702704845523d8fb68c95580bf559b3fdde303a3e9008e0eecbd98670baa35ccd0e8757a38f8d0c2bb246f2684bced9883005d396b9bf0f03e57fc520af2e1fc SHA512 32f9ba29728f7f7b78aea1fadc06e7b8a1b17a0c53e3721a1b8a51038739a8294e9bda4851edfc047daf412eabb5a40f36418640f18cb3b61fcd4b5e25b9f26b
 EBUILD libopenraw-0.3.3.ebuild 1694 BLAKE2B dc43a94dd64d896f4ebfdd04e4945c0400b51dfa307252d693332f4532a3f24c319b8f292d430a708bfc5489fc7cbfed7ef6fd4aa244fe7e786df279e312cecd SHA512 6ab151224863c7089e185f0d60e7ec3e25823dcb6edce79aff293f3468617b3a8c18f25f79ee976466252cdfbbd6a9a3b1e3522494d4e9b1de6f2a6b77b0fe65
 EBUILD libopenraw-0.3.6.ebuild 1180 BLAKE2B ed9db5aa48db8b021d819757185d2eb12484d625164669ad828747d4366de33a1727a54018b2a5dbb0ad1a2300ec36d267bc7efba27f0eb1e079bdbeaa25bd15 SHA512 1ad5d05934499a757ab52ae4100e297475de68bc4ac1cdec6173d3cba6cb33ceb13e884cdf0e5bc4a7eacfa8d521a3930b331a1cdc7d42a6dc42108999854377
-EBUILD libopenraw-0.3.7.ebuild 1187 BLAKE2B cd4694784bc425c28f834c024c16a0aba83007be26b0aee21b751e2fb41825818428530d3ea4d9e39ecd140986c4d1c65198afb68722d42690250d94e38e39d5 SHA512 163935de2f7f62dbbba53757e2c98067182ff03b87788d16dfb670590a961261b1d04ccd9a21fe718889b677b35acab9bd883268a5916083916ea6e4291b64a7
+EBUILD libopenraw-0.3.7.ebuild 1301 BLAKE2B bfd7ca97de5f37e0f9c9ac43ca0eec1182128dab658d7aaf0949fbb2baf3c6907d1bb6c199365ec29218a2ce481e9618b56f388f65993feb5986963bf74a572f SHA512 bc83004f78f2a5ab961dc1943adb6b427701d640467fe3ddb608decbfb11b605aaddbafa7fb648305417c36787b85f76fc3249f63cf5fdce703a6542086b182e
 MISC metadata.xml 327 BLAKE2B 535d53760f8b1440558a02aecb8ab27244d3583ded3843a38a8d418ae8a8a55859c08901a6fae91f8d63e7848a173e3e40b7ff168a0f86c710e53bcbe87f4161 SHA512 26f6a6a430380b878feabd5a692aed4cf6994701e935fda0f986b0b071702846389f8ada8f0c666f35a5107484879d7dce9f81b866081b0b06a1df1d02125cdb
diff --git a/media-libs/libopenraw/files/libopenraw-0.3.7-slibtool.patch b/media-libs/libopenraw/files/libopenraw-0.3.7-slibtool.patch
new file mode 100644
index 000000000000..1109a332402e
--- /dev/null
+++ b/media-libs/libopenraw/files/libopenraw-0.3.7-slibtool.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/913723
+https://gitlab.freedesktop.org/libopenraw/libopenraw/-/commit/eb873c75b09074d710e3f105b9c988a28058db53
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -118,10 +118,8 @@ clean-local:
+ 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo clean $(CARGO_VERBOSE) $(CARGO_RELEASE_ARGS)
+ 	rm -f $(CARGO_TARGET_DIR)/.rustc_info.json
+ 
+-# The use of --all-static is necesary for the RUST_LIB
+ libopenraw_la_LDFLAGS = \
+ 	-version-info @LIBOPENRAW_VERSION_INFO@ \
+-	--all-static \
+ 	-lpthread -ldl
+ libopenraw_la_LIBADD = -ljpeg $(RUST_LIB) libopenraw_internals.la
+ libopenraw_la_SOURCES = \
diff --git a/media-libs/libopenraw/libopenraw-0.3.7.ebuild b/media-libs/libopenraw/libopenraw-0.3.7.ebuild
index 51dac50a7387..f31d6215774d 100644
--- a/media-libs/libopenraw/libopenraw-0.3.7.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CRATES=" "
-inherit cargo gnome2-utils
+inherit autotools cargo gnome2-utils
 
 DESCRIPTION="RAW image formats decoding library"
 HOMEPAGE="https://libopenraw.freedesktop.org/"
@@ -34,6 +34,15 @@ BDEPEND="
 	test? ( net-misc/curl )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.7-slibtool.patch #913723
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--with-boost="${EPREFIX}"/usr \
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 20b5c16150e8..6145a91839fc 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,10 +1,11 @@
 AUX pulseaudio-16.1-memfd-cleanup.patch 988 BLAKE2B cbb25ef86099e1c13bd07c33c871b38d2d21015759569f6ed51c7f04a4997e85e3926ea573e76699d3615744ebfa3fd7cab20e3cb0a6a53f11975c0cd3314ef1 SHA512 62029ff446d005fb0d47b3c88694e0d4497321a8967802de2e915b5a885f596354310e6f5f5805cb352dbdf8a9339beca67377447a69b64c1916b4c3e6f14e31
 AUX pulseaudio-16.1-proplist-util-without-gdkx.patch 1486 BLAKE2B 74b6ed59dff2ab4c62bab9e218874ff4da1d651f8ff80d715965b7be61323d77436851f6f2ffb9f8667c9ee918d6eca315fea3f6fe2670798f1ef6ed58728a3c SHA512 a5b5ac40083237ea0cd916506eb490891937affc1d69f81399a6a1f8f0782ebe9654641463ab33931add749282880ab415dbf0f89bd1a1d6a0f88f2845886d13
 AUX pulseaudio-16.99.1-memfd-compat.patch 971 BLAKE2B 6228f8b01cd8799221d5e121a8c1bc2f3635acebf2c75f1538abf88f2f717da93c3d90ebee038a5fb3bfe8d015c6d3a4f5d6e20026eb44b889fde3d45f6c6769 SHA512 498f86291cb5837494a6b698ea7590ae778edf58ca9b82d58b2d93e30f5e424b93f3ecf8a0a203817eba7bcea7702bf3f1a6cdd346b02088f1748cd1231787bf
+AUX pulseaudio-17.0-backport-pr807.patch 10732 BLAKE2B a1a3129ff5d95c190f15dc0a32c21185e7c1c5e0784b565bc00d994b41202a4a609db92d8b67a77f9d55d6f9e7df2decdf58dbe2affc81c7dfe4009d80af33a8 SHA512 a03b46640c76ae2029374ee18cbb485a7d7866412b974c34f65a760525fc2346b39186fd0ac8ed905754547a775d7419844d07304aa36de73c29f9f4fd11acb7
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
 DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2
 DIST pulseaudio-17.0.tar.xz 1566556 BLAKE2B 781ece3d507916aa681d3b0132689730a621b4d92e45f86570e4d2fdebc4c0025ebe7f7a05046545f9b26caca513e8975f12498fa314524bc67eacaea72842fa SHA512 be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97
 EBUILD libpulse-16.1-r2.ebuild 5882 BLAKE2B 82a1b54af068c843e675d0c1e1caae6b658aed9ba84cf47813a404509eabcd10fa76cc571c3c8f1a47849b0afacb5e77bf6f8302efa1b251ab390471b0a17906 SHA512 d5ea7bdc3720b275ddc637f7ed5e60da10386cfb92bc124369d24a35cf334a0da3784cc7cd9ae6c5792bca1d2c0f83bdf4afa642cb0b88aa8c5c48410f8439cb
 EBUILD libpulse-16.99.1.ebuild 6149 BLAKE2B 37a350786d2d957805df97a41692a7eb013c45700ff82bbf7b8e9a79cde0c53af7d8088f24e6c7ec4b783b87dc715c2b8fa1b8e0c10b77d72e5d5a00712aafe2 SHA512 292d971ae96757462068c1b7c83b2bff54a27ecbdac0c7dd8740c47d83318a8bf84e09ca710c1acec9d46fb88088936b3e6fb7a6c585cf4ead5fc7ec5adc28fd
-EBUILD libpulse-17.0.ebuild 5840 BLAKE2B 19d0ee3e1a8f161c047dc0baf568f232eb9ad8236a4f00c57809700f4ba36dbd3c8f5bd71d150c4d1d60dd2a982dd7897842b4673d33810e46390a21792a036c SHA512 0b27f550770ecc736ee4bf237ff7350e181e8823a45c4516b636386a4bb2b5e99d0ed7ab4b519e4a80adf80fcd2b960a7303d1147307a9c50204bb2ea3e3d89c
+EBUILD libpulse-17.0.ebuild 5892 BLAKE2B 3cd9a55afd278b601e765a33c28c37553dad380a6b73874cb4ed587797d73a63659b3a086309aaf987c098b06ab0f7d361601dc770dd513b4319d99d9f1773f1 SHA512 81e30acfdb2a4383efded76fbfb87e253d3a26fc0674493897870d25ca1b012b435ad125a4c95a2b35c15e2bc2b207603d000090d8a3b61f1d5feb4fc29e5cb6
 MISC metadata.xml 961 BLAKE2B 0aea6824645ccb54d4da477c5f65728abe5100176c5bb05f30c30704b0209f83dccda23380de7231a5fc0a5ffb31650c96d024b4d0511ced9806fc5652f51f9f SHA512 408206d9da60312898a87c2b400292178bd20b57b7a17b74e768c154ec3fc95f9ec9412ba497a03b32558e8ffaa21e8a50b0478c8908930f90ecd9b6aa81548e
diff --git a/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
new file mode 100644
index 000000000000..0506e6b05577
--- /dev/null
+++ b/media-libs/libpulse/files/pulseaudio-17.0-backport-pr807.patch
@@ -0,0 +1,298 @@
+https://bugs.gentoo.org/918447
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807
+
+From 26ccd1167a6188fb28745f3f5c9940657f64343c Mon Sep 17 00:00:00 2001
+From: matoro <75928-matoro1@users.noreply.gitlab.freedesktop.org>
+Date: Wed, 24 Jan 2024 12:08:28 -0500
+Subject: [PATCH] tests: remove check2 timeouts in favor of meson
+
+Meson already handles timeouts, configurable on the command line with
+--timeout-multiplier.  They are set to 300s for all tests.
+
+Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/807>
+---
+ src/tests/alsa-mixer-path-test.c | 1 -
+ src/tests/connect-stress.c       | 1 -
+ src/tests/cpu-mix-test.c         | 1 -
+ src/tests/cpu-remap-test.c       | 2 --
+ src/tests/cpu-sconv-test.c       | 1 -
+ src/tests/cpu-volume-test.c      | 1 -
+ src/tests/extended-test.c        | 1 -
+ src/tests/interpol-test.c        | 1 -
+ src/tests/lfe-filter-test.c      | 1 -
+ src/tests/lo-latency-test.c      | 1 -
+ src/tests/lock-autospawn-test.c  | 4 ----
+ src/tests/meson.build            | 1 +
+ src/tests/mult-s16-test.c        | 1 -
+ src/tests/once-test.c            | 4 ----
+ src/tests/passthrough-test.c     | 1 -
+ src/tests/rtpoll-test.c          | 4 ----
+ src/tests/sync-playback.c        | 1 -
+ src/tests/thread-mainloop-test.c | 4 ----
+ src/tests/thread-test.c          | 1 -
+ src/tests/volume-test.c          | 1 -
+ 20 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
+index 63b4a4cacb..208d75d475 100644
+--- a/src/tests/alsa-mixer-path-test.c
++++ b/src/tests/alsa-mixer-path-test.c
+@@ -107,7 +107,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Alsa-mixer-path");
+     tc = tcase_create("alsa-mixer-path");
+     tcase_add_test(tc, mixer_path_test);
+-    tcase_set_timeout(tc, 30);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/connect-stress.c b/src/tests/connect-stress.c
+index a243df9ea1..35f8ea9c4a 100644
+--- a/src/tests/connect-stress.c
++++ b/src/tests/connect-stress.c
+@@ -223,7 +223,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Connect Stress");
+     tc = tcase_create("connectstress");
+     tcase_add_test(tc, connect_stress_test);
+-    tcase_set_timeout(tc, 20 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
+index 6b5b8e37a6..2190ea4bdf 100644
+--- a/src/tests/cpu-mix-test.c
++++ b/src/tests/cpu-mix-test.c
+@@ -212,7 +212,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, mix_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
+index 2554688927..21fc5dc9dc 100644
+--- a/src/tests/cpu-remap-test.c
++++ b/src/tests/cpu-remap-test.c
+@@ -524,7 +524,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, remap_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     tc = tcase_create("rearrange");
+@@ -532,7 +531,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, rearrange_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-sconv-test.c b/src/tests/cpu-sconv-test.c
+index 6a84722fd8..5ae939d45b 100644
+--- a/src/tests/cpu-sconv-test.c
++++ b/src/tests/cpu-sconv-test.c
+@@ -251,7 +251,6 @@ int main(int argc, char *argv[]) {
+ #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON)
+     tcase_add_test(tc, sconv_neon_test);
+ #endif
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
+index 5de8c83045..c7d73be04b 100644
+--- a/src/tests/cpu-volume-test.c
++++ b/src/tests/cpu-volume-test.c
+@@ -235,7 +235,6 @@ int main(int argc, char *argv[]) {
+     tcase_add_test(tc, svolume_arm_test);
+ #endif
+     tcase_add_test(tc, svolume_orc_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c
+index e855c7746a..33c08eef4c 100644
+--- a/src/tests/extended-test.c
++++ b/src/tests/extended-test.c
+@@ -211,7 +211,6 @@ int main(int argc, char *argv[]) {
+     tc = tcase_create("extended");
+     tcase_add_test(tc, extended_test);
+     /* 4s of audio, 0.5s grace time */
+-    tcase_set_timeout(tc, 4.5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
+index bb69e52537..e0e467bf53 100644
+--- a/src/tests/interpol-test.c
++++ b/src/tests/interpol-test.c
+@@ -282,7 +282,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Interpol");
+     tc = tcase_create("interpol");
+     tcase_add_test(tc, interpol_test);
+-    tcase_set_timeout(tc, 5 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
+index d779e05a4f..c5fdeb304f 100644
+--- a/src/tests/lfe-filter-test.c
++++ b/src/tests/lfe-filter-test.c
+@@ -184,7 +184,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("lfe-filter");
+     tc = tcase_create("lfe-filter");
+     tcase_add_test(tc, lfe_filter_test);
+-    tcase_set_timeout(tc, 10);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lo-latency-test.c b/src/tests/lo-latency-test.c
+index 813b337697..3f985a5c63 100644
+--- a/src/tests/lo-latency-test.c
++++ b/src/tests/lo-latency-test.c
+@@ -175,7 +175,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Loopback latency");
+     tc = tcase_create("loopback latency");
+     tcase_add_test(tc, loopback_test);
+-    tcase_set_timeout(tc, 5 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/lock-autospawn-test.c b/src/tests/lock-autospawn-test.c
+index d475d2dcd6..13a3e40d01 100644
+--- a/src/tests/lock-autospawn-test.c
++++ b/src/tests/lock-autospawn-test.c
+@@ -114,10 +114,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Lock Auto Spawn");
+     tc = tcase_create("lockautospawn");
+     tcase_add_test(tc, lockautospawn_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index dceca55c7e..bbdd231300 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -208,6 +208,7 @@ endif
+ 
+ test_env = environment()
+ test_env.set('MAKE_CHECK', '1')
++test_env.set('CK_DEFAULT_TIMEOUT', '0')
+ 
+ foreach t : default_tests + norun_tests
+   name = t[0]
+diff --git a/src/tests/mult-s16-test.c b/src/tests/mult-s16-test.c
+index 91740c2fe9..b222c18114 100644
+--- a/src/tests/mult-s16-test.c
++++ b/src/tests/mult-s16-test.c
+@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Mult-s16");
+     tc = tcase_create("mult-s16");
+     tcase_add_test(tc, mult_s16_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/once-test.c b/src/tests/once-test.c
+index c4d4b4be6c..f14d2edc6b 100644
+--- a/src/tests/once-test.c
++++ b/src/tests/once-test.c
+@@ -132,10 +132,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Once");
+     tc = tcase_create("once");
+     tcase_add_test(tc, once_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/passthrough-test.c b/src/tests/passthrough-test.c
+index 4a1ef783e9..cbeedd03ab 100644
+--- a/src/tests/passthrough-test.c
++++ b/src/tests/passthrough-test.c
+@@ -335,7 +335,6 @@ int main(int argc, char *argv[]) {
+     tcase_add_test(tc, passthrough_playback_test);
+     sink_num++;
+     tcase_add_test(tc, passthrough_volume_test);
+-    tcase_set_timeout(tc, 5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
+index aab637be1d..48dcdd1205 100644
+--- a/src/tests/rtpoll-test.c
++++ b/src/tests/rtpoll-test.c
+@@ -91,10 +91,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("RT Poll");
+     tc = tcase_create("rtpoll");
+     tcase_add_test(tc, rtpoll_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
+index 18afa180b2..3c356a7508 100644
+--- a/src/tests/sync-playback.c
++++ b/src/tests/sync-playback.c
+@@ -208,7 +208,6 @@ int main(int argc, char *argv[]) {
+     tc = tcase_create("syncplayback");
+     tcase_add_test(tc, sync_playback_test);
+     /* 4s of audio, 0.5s grace time */
+-    tcase_set_timeout(tc, 4.5);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
+index 5f6952cdec..8ee14da57d 100644
+--- a/src/tests/thread-mainloop-test.c
++++ b/src/tests/thread-mainloop-test.c
+@@ -102,10 +102,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Thread MainLoop");
+     tc = tcase_create("threadmainloop");
+     tcase_add_test(tc, thread_mainloop_test);
+-    /* the default timeout is too small,
+-     * set it to a reasonable large one.
+-     */
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/thread-test.c b/src/tests/thread-test.c
+index 4fcbfd4d3c..0c83e67e07 100644
+--- a/src/tests/thread-test.c
++++ b/src/tests/thread-test.c
+@@ -153,7 +153,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Thread");
+     tc = tcase_create("thread");
+     tcase_add_test(tc, thread_test);
+-    tcase_set_timeout(tc, 60 * 60);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c
+index 55486f6427..dc5b90d0d7 100644
+--- a/src/tests/volume-test.c
++++ b/src/tests/volume-test.c
+@@ -161,7 +161,6 @@ int main(int argc, char *argv[]) {
+     s = suite_create("Volume");
+     tc = tcase_create("volume");
+     tcase_add_test(tc, volume_test);
+-    tcase_set_timeout(tc, 120);
+     suite_add_tcase(s, tc);
+ 
+     sr = srunner_create(s);
+-- 
+GitLab
+
diff --git a/media-libs/libpulse/libpulse-17.0.ebuild b/media-libs/libpulse/libpulse-17.0.ebuild
index 1e6c94b43613..43965de41571 100644
--- a/media-libs/libpulse/libpulse-17.0.ebuild
+++ b/media-libs/libpulse/libpulse-17.0.ebuild
@@ -75,6 +75,7 @@ DOCS=( NEWS README )
 
 # patches merged upstream, to be removed with 17.1 or later bump
 PATCHES=(
+	"${FILESDIR}/pulseaudio-17.0-backport-pr807.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/quirc/Manifest b/media-libs/quirc/Manifest
index 77205801bf77..bcac6ed410d4 100644
--- a/media-libs/quirc/Manifest
+++ b/media-libs/quirc/Manifest
@@ -1,4 +1,4 @@
 DIST quirc-1.2.tar.gz 42916 BLAKE2B f12e015a703807e1e8aa6dbfcbedc4065a7249df2e3b902f6fb069c12e3d8905329414fa826f912adad8bd1ccd49b659d96ebcdcf6bc0b229eb112a46bf86b09 SHA512 0f694d16bc24012ef29a9aab8e48419bc7c346153ead3feed8e83845927f9683bb62b2e61c6872643f66b0c864c2e3c7e1a4ea4c657399b38cabfa687bedee82
-EBUILD quirc-1.2.ebuild 1657 BLAKE2B 532a234831d8a7b3a982bec725f54fad3de61bdaf1962d7916866f8d6e5d16002efdb029a7f6842f50bf49b5d6ff0b3bddc8a1e39736a8e4c0c8582e36d5f547 SHA512 a121639418fcb1050cfaf96bfc56c5731f0f9009c531ab0732131e9a7b9b3a994755aabce86f32e24becff84e7947989e9fb0a06dd51d9c3b3bab496b430f015
-EBUILD quirc-9999.ebuild 1657 BLAKE2B 532a234831d8a7b3a982bec725f54fad3de61bdaf1962d7916866f8d6e5d16002efdb029a7f6842f50bf49b5d6ff0b3bddc8a1e39736a8e4c0c8582e36d5f547 SHA512 a121639418fcb1050cfaf96bfc56c5731f0f9009c531ab0732131e9a7b9b3a994755aabce86f32e24becff84e7947989e9fb0a06dd51d9c3b3bab496b430f015
+EBUILD quirc-1.2-r1.ebuild 1914 BLAKE2B 395d2eae51a6cb47130b9b4b9586c5d74debc3f3b37c1f0c5a72049030834435e3749e5a03960596f32b96faa96abebead0e08b66d20375da2f8e9cef12d5dc1 SHA512 e3438bc824a7e5b2ccada0724258091afe850b8fecab72d0bd8fd9196ea31076062fa24ff3bcb93f7cb9e7b6f7e66301c07e3f7bd73ef45a53a4961e343b0522
+EBUILD quirc-9999.ebuild 1914 BLAKE2B 395d2eae51a6cb47130b9b4b9586c5d74debc3f3b37c1f0c5a72049030834435e3749e5a03960596f32b96faa96abebead0e08b66d20375da2f8e9cef12d5dc1 SHA512 e3438bc824a7e5b2ccada0724258091afe850b8fecab72d0bd8fd9196ea31076062fa24ff3bcb93f7cb9e7b6f7e66301c07e3f7bd73ef45a53a4961e343b0522
 MISC metadata.xml 846 BLAKE2B a20c7b5f02ebfcae0dabd26ad6651c1f1605f1e26b506048d1f4b61e0de5bd23eaaa047187949067c94fc549b1e60b5c96d40c6e20eefbfc158e5ee36325eb13 SHA512 73bad8eb5f00a76bb9456a108550789a81f2c29cfbc477073bd0313ce73d76a8703caf6344eea511018b268956882960bc6a302f0b8241947195778e0b058b21
diff --git a/media-libs/quirc/quirc-1.2.ebuild b/media-libs/quirc/quirc-1.2-r1.ebuild
index 3f7560659bd6..6264615597ee 100644
--- a/media-libs/quirc/quirc-1.2.ebuild
+++ b/media-libs/quirc/quirc-1.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="QR decoder library"
 HOMEPAGE="https://github.com/dlbeer/quirc"
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
@@ -21,6 +21,7 @@ fi
 DEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
+	media-libs/libsdl:=
 	opencv? ( media-libs/opencv:= )
 	sdl? ( media-libs/sdl-gfx:= )
 "
@@ -34,8 +35,9 @@ SLOT="0/${PV}"
 IUSE="opencv sdl tools v4l"
 
 src_prepare() {
+	LIB_VERSION=$(grep '^LIB_VERSION = ' "${S}/Makefile" | cut -d ' ' -f 3 || die)
 	sed -r \
-		-e "s#\.o libquirc.a#.o libquirc.so.${PV}#g" \
+		-e "s#\.o libquirc.a#.o libquirc.so.${LIB_VERSION}#g" \
 		-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
 		-i Makefile || die
 
@@ -44,6 +46,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	tc-export CC CXX
+
 	targets=( libquirc.so )
 	use opencv && targets+=( opencv )
 	use sdl && targets+=( sdl )
@@ -52,13 +56,14 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+	append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
 	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
 }
 
 multilib_src_install() {
-	dolib.so "libquirc.so.${PV}"
-	dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
-	dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1)"
+	dolib.so "libquirc.so.${LIB_VERSION}"
+	dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
+	dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
 
 	if multilib_is_native_abi; then
 		into "/usr/libexec/${PN}"
diff --git a/media-libs/quirc/quirc-9999.ebuild b/media-libs/quirc/quirc-9999.ebuild
index 3f7560659bd6..6264615597ee 100644
--- a/media-libs/quirc/quirc-9999.ebuild
+++ b/media-libs/quirc/quirc-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="QR decoder library"
 HOMEPAGE="https://github.com/dlbeer/quirc"
 
-inherit multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
@@ -21,6 +21,7 @@ fi
 DEPEND="
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
+	media-libs/libsdl:=
 	opencv? ( media-libs/opencv:= )
 	sdl? ( media-libs/sdl-gfx:= )
 "
@@ -34,8 +35,9 @@ SLOT="0/${PV}"
 IUSE="opencv sdl tools v4l"
 
 src_prepare() {
+	LIB_VERSION=$(grep '^LIB_VERSION = ' "${S}/Makefile" | cut -d ' ' -f 3 || die)
 	sed -r \
-		-e "s#\.o libquirc.a#.o libquirc.so.${PV}#g" \
+		-e "s#\.o libquirc.a#.o libquirc.so.${LIB_VERSION}#g" \
 		-e '/^QUIRC_CFLAGS/ s/$/ -fPIC/' \
 		-i Makefile || die
 
@@ -44,6 +46,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	tc-export CC CXX
+
 	targets=( libquirc.so )
 	use opencv && targets+=( opencv )
 	use sdl && targets+=( sdl )
@@ -52,13 +56,14 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+	append-ldflags "-Wl,-soname,lib${QUIRC}.so.${LIB_VERSION}"
 	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" "${targets[@]}"
 }
 
 multilib_src_install() {
-	dolib.so "libquirc.so.${PV}"
-	dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
-	dosym "libquirc.so.${PV}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1)"
+	dolib.so "libquirc.so.${LIB_VERSION}"
+	dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so"
+	dosym "libquirc.so.${LIB_VERSION}" "${EPREFIX}/usr/$(get_libdir)/libquirc.so.$(ver_cut 1 LIB_VERSION)"
 
 	if multilib_is_native_abi; then
 		into "/usr/libexec/${PN}"