diff options
| -rw-r--r-- | dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch | 20 | ||||
| -rw-r--r-- | dev-qt/qtmultimedia/qtmultimedia-6.7.2.ebuild | 4 | ||||
| -rw-r--r-- | profiles/base/package.use.force | 5 |
3 files changed, 24 insertions, 5 deletions
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 diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index bcae6b1e7b1d..eba34cff8088 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,11 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Ionen Wolkens <ionen@gentoo.org> (2024-06-18) -# Disabling currently breaks build with USE=gstreamer, so forcing as -# a quick workaround until this is more closely looked at (bug #934582) ->=dev-qt/qtmultimedia-6.7.2 v4l - # Sam James <sam@gentoo.org> (2024-06-03) # Poor rendering performance otherwise (bug #931215). kde-plasma/kwin caps |