gentoo auto-resync : 10:10:2024 - 04:03:57

5 files changed, 6 insertions, 140 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 62ef0413e4d3..da370bda65ca 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -8,8 +8,7 @@ DIST qtmultimedia-everywhere-src-6.8.0.tar.xz 9591692 BLAKE2B fd55d8a97573c6eef6
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
 EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84
 EBUILD qtmultimedia-6.7.3.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967
-EBUILD qtmultimedia-6.7.9999.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967
-EBUILD qtmultimedia-6.8.0.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
-EBUILD qtmultimedia-6.8.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
-EBUILD qtmultimedia-6.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
+EBUILD qtmultimedia-6.8.0.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
+EBUILD qtmultimedia-6.8.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
+EBUILD qtmultimedia-6.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
deleted file mode 100644
index 2921a408326e..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ /dev/null
@@ -1,133 +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 wayland
-"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	test? ( qml )
-	vaapi? ( ffmpeg opengl )
-"
-
-# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
-# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( 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=]
-		media-libs/gstreamer:1.0
-		opengl? (
-			~dev-qt/qtbase-${PV}:6[X?,wayland?]
-			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
-		)
-	)
-	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_qmediacapture_gstreamer
-	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 ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer "
-			$(qt_feature opengl gstreamer_gl)
-			$(usev opengl "
-				$(qt_feature X gstreamer_gl_x11)
-				$(qt_feature wayland gstreamer_gl_wayland)
-			")
-		")
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	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.8.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
index abc7252aee13..90448d9168fe 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild
@@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=(
 
 src_configure() {
 	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index abc7252aee13..90448d9168fe 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=(
 
 src_configure() {
 	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index abc7252aee13..90448d9168fe 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=(
 
 src_configure() {
 	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
+	use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)