gentoo auto-resync : 26:09:2023 - 23:29:12

4 files changed, 93 insertions, 2 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index d569852eddf7..a253ec7c0d88 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,9 +1,11 @@
 DIST qtmultimedia-5.15.10-gentoo-kde-1.tar.xz 2420 BLAKE2B 9062d863dc7e47a5690c75a98610ecca442a24ba1fc29ef62ef75db8f2e9cbc7ea02d82fa46dcc78200b6393dc36e726a92fbb95d3e8326395400c36160b77a3 SHA512 acf901d880cfb8478647c62ec349009bfea62bb65fad1f4431a918029f482a493ce4e2d78e8d00815659e3e109cc9f668dd7d1d6b9cb8eb2b41b487a0fceac5c
 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
+DIST qtmultimedia-everywhere-src-6.6.0-rc.tar.xz 6576756 BLAKE2B 1fb1607ac74f02a8d37ca91e34594e94d69ce0de3955644f24735a24cc76ad5a6e7b5c040d729165dfd452149e639511c3c4b5154f944165ee87d198f4ddb89f SHA512 322ee2747619a272872b3aa164763b5cff1e56c7bc2ff1b4dcd665c32aa2261f319400821df5d046dfb62497b60d31fd1df47a8386a98285a607a94a551a70fe
 EBUILD qtmultimedia-5.15.10.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-6.5.2-r1.ebuild 1996 BLAKE2B aaeafccd740aa263e6fdb7cb1ecfa62251f40a0cf7045bb0b03b90c75ab9a1861fd29972a00f00c49974efede1a56a7c231e938d6f12d7ee076dabdd3438c08b SHA512 1d8d76a0c1e63dca123bb7d9e95752ff2a1f32f6b3192247ff0795160ee5a1e6f47a191cf0b0ed41ea42b40becd0eccb5b083f0965c8b766666ee02d5c00bd4e
 EBUILD qtmultimedia-6.5.9999.ebuild 1970 BLAKE2B 508c83cfe024185ff49861bfda52575bc3c7ada33465c983af49bcf3a324e9a815ac59d754341b298f9fe0d2ec4d462a8b4e82d186d88eda4cb89ffdd37b9d4c SHA512 822053421a4e1ef7d0a46fef4476d63edfab5231634a9d6a0cd11279289d66b30c252d6fc3a207c77a60455b664804bfa09208d81bfc62607daf4a27e3e809b7
-EBUILD qtmultimedia-6.6.9999.ebuild 1970 BLAKE2B 508c83cfe024185ff49861bfda52575bc3c7ada33465c983af49bcf3a324e9a815ac59d754341b298f9fe0d2ec4d462a8b4e82d186d88eda4cb89ffdd37b9d4c SHA512 822053421a4e1ef7d0a46fef4476d63edfab5231634a9d6a0cd11279289d66b30c252d6fc3a207c77a60455b664804bfa09208d81bfc62607daf4a27e3e809b7
-EBUILD qtmultimedia-6.9999.ebuild 1970 BLAKE2B 508c83cfe024185ff49861bfda52575bc3c7ada33465c983af49bcf3a324e9a815ac59d754341b298f9fe0d2ec4d462a8b4e82d186d88eda4cb89ffdd37b9d4c SHA512 822053421a4e1ef7d0a46fef4476d63edfab5231634a9d6a0cd11279289d66b30c252d6fc3a207c77a60455b664804bfa09208d81bfc62607daf4a27e3e809b7
+EBUILD qtmultimedia-6.6.0_rc.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
+EBUILD qtmultimedia-6.6.9999.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
+EBUILD qtmultimedia-6.9999.ebuild 2031 BLAKE2B dba5f93bef4e9da68603d27547c8bdd48acb1fa73ee9c7699bc3c581c72d58b9c7238bc8fb84f6f3ea302fba944f07c988be17a415eb00b7f174dbf91d70e9b7 SHA512 94d9a75e1a91e7bf2735d773d85f1ad875f72e673230a36c0f1b14d0b7c32d84453ad4f4a8286323e120756c4a7ba10c25cd2a1ae9819d6a996deccd64d1d2b1
 MISC metadata.xml 773 BLAKE2B e4b291f7b0f103011af120ad0cb9766cc03341c44f751127997958d704803cbc278094050693f4cc7ba17fb3c2f311252c2304e5a93cf17363ebbbc4e6c2cce0 SHA512 d5c729736723cf7296234acc39d55cd28924449b4bca425c37b8fa7582dbab9c649b501ac88ffcd3c5a5cc696390d18cf9912a4fb6e2520768ff704533d7f909
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.0_rc.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.0_rc.ebuild
new file mode 100644
index 000000000000..4087cd2852a8
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.0_rc.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 )
+	)
+	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 v4l2 or hardware acceleration depending on availability
+	tst_qscreencapture_integration
+	tst_qscreencapturebackend
+	# fails with offscreen rendering
+	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.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
index d2ceca20f2b0..4087cd2852a8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild
@@ -62,6 +62,8 @@ CMAKE_SKIP_TESTS=(
 	# may try to use v4l2 or hardware acceleration depending on availability
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
+	# fails with offscreen rendering
+	tst_qwindowcapturebackend
 )
 
 src_configure() {
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index d2ceca20f2b0..4087cd2852a8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -62,6 +62,8 @@ CMAKE_SKIP_TESTS=(
 	# may try to use v4l2 or hardware acceleration depending on availability
 	tst_qscreencapture_integration
 	tst_qscreencapturebackend
+	# fails with offscreen rendering
+	tst_qwindowcapturebackend
 )
 
 src_configure() {