gentoo auto-resync : 05:06:2024 - 00:07:52

3 files changed, 108 insertions, 2 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 56b07ccabe4f..e4dec2678802 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -5,9 +5,10 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c
 DIST qtmultimedia-everywhere-src-6.7.0.tar.xz 8315312 BLAKE2B 769689567de9c400a5472d8d40966c942a2ec95d599d166f8a3c47cb6ac0c4d1dd66f33fa0f6f5fac22675134798ef986053eb924ed6c3a1d9035f27127cc612 SHA512 4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1
 DIST qtmultimedia-everywhere-src-6.7.1.tar.xz 8362120 BLAKE2B 2dc442d9ee1290507ebe437e0087756b98ba63baa65fb64174e876d84758dd1062044934610134a782ec1d2a32c6281657e060554be3a2fe9591ad925e7c0129 SHA512 18e7b2036baac68a421cb8741713b43d739f558cad8b9d2b8192e390b2c37cfda17f6bb290c9313ae9e3b7ea2ee4fda52b86a58195201e99179d6f4a4e386783
 EBUILD qtmultimedia-5.15.13.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
-EBUILD qtmultimedia-5.15.14.ebuild 1513 BLAKE2B e19a86a79b737b022870f6f8718ff0110282a7bca227937e1664b625d43aadb4934d7d1c77172512b5f8e63e2a185fec2c5b01b3ab58fad96282688d4f22832d SHA512 2933288a987b9cbeb863743fafa71a6974e3773dd63dd32da0e7fee5908ed004ffce80faabe4f4ee8ed43d7fcd275dd4b244d5cd882d86e420ed4157859f0f6e
+EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
 EBUILD qtmultimedia-6.7.0.ebuild 2702 BLAKE2B c6fc5c5e440c868c1d37c26f2e3554594ec0e120129c9026ee5c0a3d307cbccd4ddeacde0d44c6b2d257ee411220c984239d0c2dd88300a47b46ad48296d9e06 SHA512 fec076e72de5f395ea3dd46365a4cedbf13b505c7df024f79992a071803b11fc809c47b74b130d51d2591b64158e13e83a12c61f0a328acd8eca55402d0b3644
 EBUILD qtmultimedia-6.7.1.ebuild 2724 BLAKE2B 10e18c20e92695cb962064a67c0a953082ae0169596a8dc3d8f48985b52337c112bbf6e8224395a28eb16c106553cc8ce1e4d4caa757e4fd2f3d94fd41c5f8e4 SHA512 c7317dd0751dedc2adfa243236c0f6fcfeba26fe7f6bd9e828d0b33e90f2f8e6e06e46a03fd08c865808aa230546f802a6abf36980c2a221874408f4f2787981
 EBUILD qtmultimedia-6.7.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
+EBUILD qtmultimedia-6.8.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
 EBUILD qtmultimedia-6.9999.ebuild 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild
index ce7bdeb47429..135e11b14425 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.14.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
new file mode 100644
index 000000000000..99d03b1ca8be
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -0,0 +1,105 @@
+# 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=(
+	# unimportant and expects all backends to be available (bug #928420)
+	tst_backends
+	# 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
+	tst_qvideoframebackend
+	# 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
+}
+
+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
+}