gentoo auto-resync : 02:04:2025 - 01:33:40

6 files changed, 245 insertions, 5 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 378ca8d1034a..5ea72eac76ca 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index dc075ea8ead3..d0ce8bb74ea5 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,5 +1,6 @@
 AUX ffmpeg-5.patch 18698 BLAKE2B 9000187da3e0c486a432578a3e87fc40c48ce1ebd259e3b051ddab83c45cd7eb5a0bc5586daeb18c3867cdf26d1a36c4b61b9c2110758ec7a84007a072dc01c4 SHA512 d093f251fb2e7c9d98298a814434bc91e72387a2c214ceba561282a561ffcd256a44d51230bcc2f9f459403b76d0f589d5a4f1e26d5666d007e4babd38b3e702
+AUX ffmpeg-7.patch 1629 BLAKE2B 3f8dbd1e20f6ea6dd94da71862fec8d10327349264afaffaab44045f8dcc1d020b0e601379524bee680181a564042c317d97602e6a3da4223b0ca4bba5bd4cae SHA512 b9c431aacb4d4fe834466b6df90d5b3cce7fcbb4061615a3e74ee950ca06512f6a478df4394adf979ee5f692c3825f36a5d3e15d65351a6a848c1640b2637b9f
 DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.1-r3.ebuild 1675 BLAKE2B 0ff2f62eaf8f6a0f4490456b93e5dd11763134419eb29420aaf8cadee3299498d0c97a022a048e1372bca6f260a2bbde718483271327b03cbc4c2aa4bd6daf93 SHA512 56188a3b02f2e525393c25b6ab06639d0367ff5482276d1740a49e84ca6066e1b69d2ea47671182b937f79c7f094e9441dd16b233f978b117f0f4543c33c1c94
+EBUILD chromaprint-1.5.1-r4.ebuild 1714 BLAKE2B 38480493dda11a42da34062940b442b3e3b8c5911da6612490161ea006ed367237286b77e6209325dfd10823ad92ae4e76c3ca7de716228c3e2fa8a6d7fe42d8 SHA512 8d9303c9692f1af31a16cde6f0a64f3daa2f684b2324c15923694c32ee5c65c21f09097bd06754e7891c9b978faefe3ff1cc17d5186758863163ca9c6b91d33a
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r3.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r4.ebuild
index 752ca312c06d..c1b5aa0cf383 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r4.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
@@ -9,8 +9,12 @@ inherit cmake-multilib
 
 DESCRIPTION="Library implementing a custom algorithm for extracting audio fingerprints"
 HOMEPAGE="https://acoustid.org/chromaprint"
-SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
-	test? ( https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz -> gtest-${GTEST_VERSION}.tar.gz )
+SRC_URI="
+	https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
+	test? (
+		https://github.com/google/googletest/archive/v$(ver_cut 1-2 ${GTEST_VERSION}).x.tar.gz
+			-> gtest-${GTEST_VERSION}.tar.gz
+	)
 "
 
 LICENSE="LGPL-2.1"
@@ -27,7 +31,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
 
 DOCS=( NEWS.txt README.md )
-PATCHES=( "${FILESDIR}"/ffmpeg-5.patch )
+PATCHES=(
+	"${FILESDIR}"/ffmpeg-5.patch
+	"${FILESDIR}"/ffmpeg-7.patch
+)
 
 multilib_src_configure() {
 	export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_DIR_VERSION}/googletest/"
diff --git a/media-libs/chromaprint/files/ffmpeg-7.patch b/media-libs/chromaprint/files/ffmpeg-7.patch
new file mode 100644
index 000000000000..58e16564b8f6
--- /dev/null
+++ b/media-libs/chromaprint/files/ffmpeg-7.patch
@@ -0,0 +1,46 @@
+While this was to fix an occasional ffmpeg-5 issue, it fixes
+a bigger issue with ffmpeg-7.
+
+https://bugs.gentoo.org/953008
+https://github.com/acoustid/chromaprint/issues/142
+https://github.com/acoustid/chromaprint/commit/82781d02cd30
+From: Marshal Walker <CatmanIX@gmail.com>
+Date: Thu, 8 Dec 2022 11:53:58 -0500
+Subject: [PATCH] ffmpeg5 fix for issue #122
+
+tested on Arch Linux, needs testing on win/mac/etc (should be fine tho)
+--- a/src/audio/ffmpeg_audio_processor_swresample.h
++++ b/src/audio/ffmpeg_audio_processor_swresample.h
+@@ -29,7 +29,7 @@ class FFmpegAudioProcessor {
+ 	}
+ 
+ 	void SetInputChannelLayout(AVChannelLayout *channel_layout) {
+-		av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0);
++		av_opt_set_chlayout(m_swr_ctx, "in_chlayout", channel_layout, 0);
+ 	}
+ 
+ 	void SetInputSampleFormat(AVSampleFormat sample_format) {
+@@ -41,7 +41,7 @@ class FFmpegAudioProcessor {
+ 	}
+ 
+ 	void SetOutputChannelLayout(AVChannelLayout *channel_layout) {
+-		av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0);
++		av_opt_set_chlayout(m_swr_ctx, "out_chlayout", channel_layout, 0);
+ 	}
+ 
+ 	void SetOutputSampleFormat(AVSampleFormat sample_format) {
+--- a/src/audio/ffmpeg_audio_reader.h
++++ b/src/audio/ffmpeg_audio_reader.h
+@@ -301,9 +301,10 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) {
+ 				} else {
+ 					m_has_more_frames = false;
+ 				}
++			} else {
++				SetError("Error decoding the audio source", ret);
++				return false;
+ 			}
+-			SetError("Error decoding the audio source", ret);
+-			return false;
+ 		}
+ 
+ 		if (m_frame->nb_samples > 0) {
diff --git a/media-libs/libsdl3/Manifest b/media-libs/libsdl3/Manifest
index ea7e89df6b4b..88a4ff039586 100644
--- a/media-libs/libsdl3/Manifest
+++ b/media-libs/libsdl3/Manifest
@@ -1,3 +1,5 @@
+DIST SDL3-3.2.10.tar.gz 15876292 BLAKE2B 32e33d4209582fd0889969b30700f793562c7cb0afa3fc05befe421d10e101f558f9c817c7cc7855d793d78339a4c5b01129f24a5981a5651271e14d2e5aeff8 SHA512 e919749ded768ed15c2014efcacfb8ee6614d47727ceb45bbfd4248b36c3790640b4dcbd66de46e4f6870182e13d0d4ceb35da4eb064f9feabdde30ca6eae30d
 DIST SDL3-3.2.8.tar.gz 15866007 BLAKE2B e89f240f9643305fb191049b9162f8adfe2f59b07464df28d08437130f8724b8ac8ab22075a6548cb6d8203ec289f3a8a917c08697047f3d39377af267d8187b SHA512 741550120f26fe983fa829d38d37ff4caeded31e899e4ded99ebb5b084eecebaa4081454b8e176e0103fa7faa6a230ad3f23f8c2453c6babfe59fab981cac6db
+EBUILD libsdl3-3.2.10.ebuild 4960 BLAKE2B 6e236eb6f39443a1f0a5e3c5967dada7f9afcbe022136bd9c173ccbcc132da9fbe2355745e0764204d1ab490bb791e123c96f8003b3f126782858ad9f3f108b3 SHA512 b23bd91118dd8a98a049e3ab2f5746625bed848978f73114025f46bff9ec78e4bcacaafa2044589295327ad50b6e42202668925e6768ab0bc7a10da32f15b54d
 EBUILD libsdl3-3.2.8.ebuild 4960 BLAKE2B 6e236eb6f39443a1f0a5e3c5967dada7f9afcbe022136bd9c173ccbcc132da9fbe2355745e0764204d1ab490bb791e123c96f8003b3f126782858ad9f3f108b3 SHA512 b23bd91118dd8a98a049e3ab2f5746625bed848978f73114025f46bff9ec78e4bcacaafa2044589295327ad50b6e42202668925e6768ab0bc7a10da32f15b54d
 MISC metadata.xml 662 BLAKE2B f9f126d856a7f2daf998c35f6dd43e0efc7e329dfaad1c1713b7afe1afa57c955f39f5c5f1e0b42ab23aa4cbd07ff14dcccde8887f694444c927817c39696b5e SHA512 caa6f3a3459396c6726feb1af317e982a3baff9ad7ae1ee4d9fa78dd3f197e43b9e9cd4808a28ee8481fc2ebe663549a289f8db829ab3f79f1dbab8fbe624287
diff --git a/media-libs/libsdl3/libsdl3-3.2.10.ebuild b/media-libs/libsdl3/libsdl3-3.2.10.ebuild
new file mode 100644
index 000000000000..401240306f28
--- /dev/null
+++ b/media-libs/libsdl3/libsdl3-3.2.10.ebuild
@@ -0,0 +1,184 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="https://www.libsdl.org/"
+SRC_URI="https://www.libsdl.org/release/SDL3-${PV}.tar.gz"
+S=${WORKDIR}/SDL3-${PV}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="
+	X alsa aqua dbus doc ibus io-uring jack kms opengl oss pipewire
+	pulseaudio sndio static-libs test udev usb vulkan wayland
+	cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2
+	cpu_flags_x86_avx512f cpu_flags_x86_mmx cpu_flags_x86_sse
+	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+	cpu_flags_x86_sse4_2
+"
+REQUIRED_USE="
+	ibus? ( dbus )
+	kms? ( opengl )
+	wayland? ( opengl )
+"
+RESTRICT="!test? ( test )"
+
+# dlopen/dbus-only: dbus, ibus, libudev, liburing, vulkan-loader
+RDEPEND="
+	virtual/libiconv[${MULTILIB_USEDEP}]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	ibus? ( app-i18n/ibus )
+	io-uring? ( sys-libs/liburing:=[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	kms? (
+		media-libs/mesa[gbm(+),${MULTILIB_USEDEP}]
+		x11-libs/libdrm[${MULTILIB_USEDEP}]
+	)
+	opengl? ( media-libs/libglvnd[X?,${MULTILIB_USEDEP}] )
+	pipewire? ( media-video/pipewire:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		gui-libs/libdecor[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	test? (
+		dev-util/vulkan-headers
+		media-libs/libglvnd
+	)
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# unbundle libglvnd and vulkan headers
+	rm -r src/video/khronos || die
+	ln -s -- "${ESYSROOT}"/usr/include src/video/khronos || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSDL_ASSERTIONS=disabled
+		-DSDL_DBUS=$(usex dbus)
+		-DSDL_DEPS_SHARED=no # link rather than dlopen() where possible
+		-DSDL_LIBURING=$(usex io-uring)
+		-DSDL_RPATH=no
+		-DSDL_STATIC=$(usex static-libs)
+		-DSDL_TESTS=$(usex test)
+
+		# audio
+		-DSDL_ALSA=$(usex alsa)
+		-DSDL_JACK=$(usex jack)
+		-DSDL_OSS=$(usex oss)
+		-DSDL_PIPEWIRE=$(usex pipewire)
+		-DSDL_PULSEAUDIO=$(usex pulseaudio)
+		-DSDL_SNDIO=$(usex sndio)
+
+		# input
+		-DSDL_HIDAPI_LIBUSB=$(usex usb)
+		-DSDL_IBUS=$(use ibus)
+		-DSDL_LIBUDEV=$(usex udev)
+
+		# video
+		-DSDL_COCOA=$(usex aqua)
+		-DSDL_DIRECTX=no
+		-DSDL_KMSDRM=$(usex kms)
+		-DSDL_OPENGL=$(usex opengl)
+		-DSDL_OPENGLES=$(usex opengl)
+		-DSDL_OPENVR=$(usex opengl) # only dependency is libglvnd
+		-DSDL_ROCKCHIP=no
+		-DSDL_RPI=no
+		-DSDL_VIVANTE=no
+		-DSDL_VULKAN=$(usex vulkan)
+		-DSDL_WAYLAND=$(usex wayland)
+		-DSDL_X11=$(usex X)
+		# SDL disallows this by default, allow it but warn in pkg_postinst
+		$(use !X && use !wayland && echo -DSDL_UNIX_CONSOLE_BUILD=yes)
+
+		# cpu instruction sets
+		-DSDL_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+		-DSDL_AVX=$(usex cpu_flags_x86_avx)
+		-DSDL_AVX2=$(usex cpu_flags_x86_avx2)
+		-DSDL_AVX512F=$(usex cpu_flags_x86_avx512f)
+		-DSDL_MMX=$(usex cpu_flags_x86_mmx)
+		-DSDL_SSE=$(usex cpu_flags_x86_sse)
+		-DSDL_SSE2=$(usex cpu_flags_x86_sse2)
+		-DSDL_SSE3=$(usex cpu_flags_x86_sse3)
+		-DSDL_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DSDL_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+	)
+
+	cmake-multilib_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use doc; then
+		cd docs && doxygen || die
+	fi
+}
+
+src_test() {
+	unset "${!SDL_@}" # ignore users' preferences for tests
+
+	cmake-multilib_src_test
+}
+
+src_install() {
+	local DOCS=( {BUGS,WhatsNew}.txt {CREDITS,README}.md docs/*.md )
+	cmake-multilib_src_install
+
+	rm -r -- "${ED}"/usr/share/licenses || die
+
+	use doc && dodoc -r docs/output/html/
+}
+
+pkg_postinst() {
+	# skipping audio/video can make sense given many packages only use SDL
+	# for input, but still warn given off-by-default and may be unexpected
+	if use !X && use !aqua && use !kms && use !wayland; then
+		ewarn
+		ewarn "All typical display drivers (e.g. USE=wayland) are disabled,"
+		ewarn "applications using SDL for display may not function properly."
+	fi
+
+	if use !alsa && use !jack && use !oss && use !pipewire &&
+		use !pulseaudio && use !sndio; then
+		ewarn
+		ewarn "All typical audio drivers (e.g. USE=pipewire) are disabled,"
+		ewarn "applications using SDL for audio may not function properly."
+	fi
+}