gentoo auto-resync : 21:06:2024 - 00:11:18

3 files changed, 26 insertions, 1 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index d63fee6725ab..48c9bc24abda 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,10 +1,11 @@
+AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481
 DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a979c1f317cb213c6121b4e1285294c132a1266eaeb559e7239c7cd58da072e50dc85dd9aa0c1b6aa493f95fe31268171780cd3346883 SHA512 5427c7a5e06f8296b091b2bb3fc67e678ac01bd1179de5a11c38cfe9f87ba8e3ac87a1395c2c3044ad31fc5c040230e35a1e71e173e12109c24cd97da70d9e9d
 DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c95b4f14e566c667e16c4eb264e466174a9548c6a4bd39dbab9cf14ddad444cc3318ecdf18ca9e3999a3f95a669fd121937287d466a6b9a9c14af74ff686 SHA512 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c
 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 2728 BLAKE2B 183da22be878b7fddf6af1b6a88927c9e38917308d19c28400933d82c7c332a741a2385579f2b2c63ab84a5353e71bc8eabcc38cec4b50da0f81059a7ce08108 SHA512 47f4e25c9a44eff18fa7300dddcd33d88b02da61433112fbc1bc74648e469454aef72ab9cca067bb4742bb5a2fc7029afd9e92713656e56607fbbd5459762d50
+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
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
new file mode 100644
index 000000000000..0f61539b00d2
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
@@ -0,0 +1,20 @@
+# https://bugs.gentoo.org/934582
+
+--- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
++++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
+@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const
+         return control.value;
+     });
+ }
++#endif // QT_CONFIG(linux_v4l)
+ 
+ QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera)
+     : QGstreamerCameraBase{
+@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active)
+     emit activeChanged(active);
+ }
+ 
+-#endif
+-
+ QT_END_NAMESPACE
+
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild
index 99d03b1ca8be..25d6f40c49e6 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild
@@ -53,6 +53,10 @@ DEPEND="
 "
 BDEPEND="~dev-qt/qtshadertools-${PV}:6"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
+)
+
 CMAKE_SKIP_TESTS=(
 	# unimportant and expects all backends to be available (bug #928420)
 	tst_backends