gentoo auto-resync : 05:09:2023 - 16:23:54

6 files changed, 260 insertions, 67 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 8c68fc39b3a6..855b4caf14db 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -2,5 +2,7 @@ DIST qtmultimedia-5.15.10-gentoo-kde-1.tar.xz 2420 BLAKE2B 9062d863dc7e47a5690c7
 DIST qtmultimedia-everywhere-opensource-src-5.15.10.tar.xz 3832156 BLAKE2B 88c01c685294085fdde9f00e2e2ea0952311cef910ee037bd6ee204cf7e00bc25a6aeecbdd70e4822bfe4de40cb6b991a8f4a72bfd74872110d43154aefce0b3 SHA512 a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e
 DIST qtmultimedia-everywhere-src-6.5.2.tar.xz 6415576 BLAKE2B c0032c405315e6884de6bb851de3aed0b60827a932c15b1022dca70ebfaa5dffb258b2b22f9ab40f57586490db6ec50ea862152fca8429e600f9c6bffe2f42a2 SHA512 e12a2406e78eda8f3f4674b8fe01b06bc2c7b8fcbe5342e25e28340e13c0ab0db44a78c91a8a1f268664e5bb11c3bc7116248700f0c67faa618e058af0dfb1e0
 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
-EBUILD qtmultimedia-6.5.2.ebuild 1304 BLAKE2B 8d4ebb427a8c00d86b49d6d93f07ef0f0e0431540e471c50e9e741d4f5d8cff40daf4c0a5234b0deb2401a19dc272bbe9e3816a7f964046a5ec2851ae8d6bf0f SHA512 c999d2bef01cf7f01d720128eec4d73366d92c157fbcf365f07f975f633b90fc61e4ac5dfd3e3ac1d568e8736e565fc92d7b8921a15d29cc95dd4ef8e0f21716
-MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
+EBUILD qtmultimedia-6.5.2-r1.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
+EBUILD qtmultimedia-6.5.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
+EBUILD qtmultimedia-6.9999.ebuild 1949 BLAKE2B b9dd4a9d8bf7916e2a31e658ca5d1231342df6d2ac70925a0511f528eef3aad030000ae3eb09c3e440c06aa9cc39ed71ad18655a6ea078431171049bb6fc3cc7 SHA512 dd805568e002ebb3d46222e255a4fa22b09658e6121e09b2b95f48db62ad0b3eedfe9eb2ec9a7af4058595a51909750d46acbcf54e05011e491278bc5545cecb
+MISC metadata.xml 773 BLAKE2B e4b291f7b0f103011af120ad0cb9766cc03341c44f751127997958d704803cbc278094050693f4cc7ba17fb3c2f311252c2304e5a93cf17363ebbbc4e6c2cce0 SHA512 d5c729736723cf7296234acc39d55cd28924449b4bca425c37b8fa7582dbab9c649b501ac88ffcd3c5a5cc696390d18cf9912a4fb6e2520768ff704533d7f909
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 72fd89719ada..49778c48acf6 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -13,6 +13,7 @@
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
 		<doc>https://doc.qt.io/</doc>
+		<remote-id type="github">qt/qtmultimedia</remote-id>
 	</upstream>
 	<slots>
 		<subslots>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..8e203f8eaec1
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2021-2023 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"
+fi
+
+IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+	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=]
+		media-video/ffmpeg:=[vaapi?]
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrandr
+		)
+		vaapi? (
+			media-libs/libglvnd
+			media-libs/libva:=
+		)
+	)
+	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 )
+"
+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 hardware acceleration for encoding
+	tst_qscreencapture_integration
+)
+
+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.5.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
deleted file mode 100644
index 1091cf2d5cf6..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.5.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE="alsa +ffmpeg gstreamer pulseaudio v4l vaapi"
-
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	vaapi? ( ffmpeg )
-"
-
-RDEPEND="
-	=dev-qt/qtbase-${PV}*[gui,network,widgets]
-	=dev-qt/qtdeclarative-${PV}*
-	=dev-qt/qtquick3d-${PV}*
-	=dev-qt/qtshadertools-${PV}*
-	=dev-qt/qtsvg-${PV}*
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		media-libs/libva:=
-		media-video/ffmpeg:=
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/libglvnd
-	)
-	pulseaudio? ( media-libs/libpulse[glib] )
-	vaapi? (
-		=dev-qt/qtbase-${PV}*[opengl]
-		media-libs/libglvnd
-		media-libs/libva:=
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(qt_feature alsa)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature pulseaudio)
-		$(qt_feature vaapi)
-	)
-
-	qt6-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
new file mode 100644
index 000000000000..8e203f8eaec1
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.5.9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2021-2023 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"
+fi
+
+IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+	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=]
+		media-video/ffmpeg:=[vaapi?]
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrandr
+		)
+		vaapi? (
+			media-libs/libglvnd
+			media-libs/libva:=
+		)
+	)
+	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 )
+"
+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 hardware acceleration for encoding
+	tst_qscreencapture_integration
+)
+
+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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
new file mode 100644
index 000000000000..8e203f8eaec1
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2021-2023 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"
+fi
+
+IUSE="+X alsa +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
+# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
+REQUIRED_USE="
+	|| ( ffmpeg gstreamer )
+	vaapi? ( ffmpeg )
+	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=]
+		media-video/ffmpeg:=[vaapi?]
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrandr
+		)
+		vaapi? (
+			media-libs/libglvnd
+			media-libs/libva:=
+		)
+	)
+	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 )
+"
+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 hardware acceleration for encoding
+	tst_qscreencapture_integration
+)
+
+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
+}