gentoo auto-resync : 03:07:2024 - 08:05:42

6 files changed, 75 insertions, 15 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 48c9bc24abda..f7a5e1ea70b1 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -4,9 +4,9 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c
 DIST qtmultimedia-everywhere-src-6.7.1.tar.xz 8362120 BLAKE2B 2dc442d9ee1290507ebe437e0087756b98ba63baa65fb64174e876d84758dd1062044934610134a782ec1d2a32c6281657e060554be3a2fe9591ad925e7c0129 SHA512 18e7b2036baac68a421cb8741713b43d739f558cad8b9d2b8192e390b2c37cfda17f6bb290c9313ae9e3b7ea2ee4fda52b86a58195201e99179d6f4a4e386783
 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
-EBUILD qtmultimedia-6.7.1.ebuild 2723 BLAKE2B 8c80a6f06289f4c5efafbc12643326c8f8cc52e39c4890e985e9c959d0b9ebaa0e4df6c249735ee202e45fd2acd5f3926681f0965ef7eb9ecd014f9c7e918c52 SHA512 2c96316b085ef0e7a2c0646e8617b482a1a740742677e9734375ce3394330cca6ee446412b95b314f01d83b18f37732b780d5340145eddba15a6239b6668d67c
-EBUILD qtmultimedia-6.7.2.ebuild 2784 BLAKE2B 89a5cd726ee152e9a72ce36b0a5d2b8e2f356f4ae03717657500b1a291a08ec873f7ea70f8bd254d706476c10b6c894d0d3363292b817d5d031c7752302ffe11 SHA512 dc951d455f55da4bb63c87b8751b99e82d07f14df85f3d9449ce2b8c106929c687d9b146acbc9b28174c140d5b5c9f055d4c3eb8584139ba61f24d5cb0734233
-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
+EBUILD qtmultimedia-6.7.1-r1.ebuild 3188 BLAKE2B dcb9e39eec40a1b84a17c07a60523d65a8eb51aa9b1cf5e02dd98b29a895968250a145069bec014122832367b5af62dea50497360757bcd2a119ca2982df2db2 SHA512 b89cea044c03896b03d438e71e511e377ab89a7b6874c99b6511467293afa684302b49b7b42b6dbc20db8fe741ea11ff90d3247bc65bb53d10cb71e1503dedc1
+EBUILD qtmultimedia-6.7.2-r1.ebuild 3249 BLAKE2B a0747832a4cf9206a7b4b46d657c886e7939a1d737c819d266b4f3d05f577756145693d366e33a637a8d4646b97ad064447e2714e86bb9e579fbce59bf8cfaf4 SHA512 05fc3e1770c320737318054fbcebfd3cfb1b4ef8878f7135884dbeebbd2e3b0abf19133a8ecc74338edbc2f4804098bb864e4f84d16f148ce37c82924a41be11
+EBUILD qtmultimedia-6.7.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
+EBUILD qtmultimedia-6.8.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
+EBUILD qtmultimedia-6.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667
 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild
index 1d78a1de5024..ddf6bb150a26 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.1-r1.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(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
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
index 25d6f40c49e6..3325d8cc1142 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -81,7 +83,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -90,6 +91,17 @@ src_configure() {
 		$(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
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(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
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(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
 }
 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
index 99d03b1ca8be..3b8589664575 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild
@@ -22,7 +22,9 @@ REQUIRED_USE="
 
 RDEPEND="
 	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? ( media-libs/alsa-lib )
+	alsa? (
+		!pulseaudio? ( media-libs/alsa-lib )
+	)
 	ffmpeg? (
 		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
 		media-video/ffmpeg:=[vaapi?]
@@ -77,7 +79,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature alsa)
 		$(qt_feature ffmpeg)
 		$(qt_feature gstreamer)
 		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
@@ -86,6 +87,17 @@ src_configure() {
 		$(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
 }