gentoo auto-resync : 30:03:2024 - 01:13:30

4 files changed, 32 insertions, 90 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index c775835d5911..80f61d7b40c7 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -9,8 +9,7 @@ EBUILD qtmultimedia-5.15.12.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef63595
 EBUILD qtmultimedia-5.15.13.ebuild 1517 BLAKE2B f58c9922692fdbcc42efab3ff9f7c02a1c6d77f809b4b828baf5765d6fe11301330b479ce1d1f610c1ca4bd8ddf91f717bee3307699d60beac354007a3b35e29 SHA512 eb2c7ff70d9efe5ad1753261e07f4c34f0f1736c39eb21c261ffb41627f87686355449a32d8df18418f1d2a1c66573049b79f7ee6731bc47e6483a671435a60a
 EBUILD qtmultimedia-6.6.2.ebuild 2170 BLAKE2B fd230c42d990efc14874526cc8cda39287f04273e60e674f240744a14dae125caa0f28b9a8cdaebb6e2927adec9756d9da4d6c9378f590732c4abb134085d163 SHA512 21a1295d8d03d51027b1e9dd68fda8a947a7bf858edd9c16e2a0a45f6c1632f7b6a1df86f0ca2d2a2711c9d4be8b8b339adf2506771a938da3cfc1f075e3772a
 EBUILD qtmultimedia-6.6.3.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.6.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
 EBUILD qtmultimedia-6.7.0_rc2.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.7.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
-EBUILD qtmultimedia-6.9999.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416
+EBUILD qtmultimedia-6.7.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec
+EBUILD qtmultimedia-6.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
deleted file mode 100644
index 2359fc0aabd3..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl )
-	vaapi? ( ffmpeg opengl )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
-		media-libs/gstreamer:1.0
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index 2359fc0aabd3..4f3890da25d9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -85,3 +85,18 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
+			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
+			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
+			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 2359fc0aabd3..4f3890da25d9 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -85,3 +85,18 @@ src_configure() {
 
 	qt6-build_src_configure
 }
+
+src_install() {
+	qt6-build_src_install
+
+	if use test; then
+		local delete=( # sigh
+			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
+			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
+			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
+			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
+		)
+		# using -f given not tracking which tests may be skipped or not
+		rm -rf -- "${delete[@]}" || die
+	fi
+}