diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-03-24 09:17:51 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-25 16:44:44 +0000 |
| commit | 469ae2acab2b0330b2510b7760b74a2995e49bb1 (patch) | |
| tree | 3243cf9cb557b567dfb78762ca7986b09d77d890 | |
| parent | c69b1736f208ff78c9483dfc13081c806f9374dc (diff) | |
CMake: use gstreamer "feature" only when egl/gstreamer_gl are available
The GStreamer plugin requires gstreamer_gl/egl for video output. Tying
the CMake feature to both gstreamer and gstreamer_gl would allow devs to
compile the gstreamer plugin on all platforms where the implementation
is reasonably feature-complete.
Pick-to: 6.5
Change-Id: I51162ade8e167dfc6ea4e2117609d9ef39b8de4d
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Mikko Hallamaa <mikko.hallamaa@qt.io>
(cherry picked from commit cccaeb77fcfe927d1db9a283288d8862ac625ddc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d63bc4cf1fe98c2e2ef944dcf3e70c34608fe201)
| -rw-r--r-- | src/multimedia/configure.cmake | 13 | ||||
| -rw-r--r-- | src/plugins/multimedia/gstreamer/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 5e6682f21..e6053d1e6 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -101,12 +101,7 @@ qt_feature("evr" PUBLIC PRIVATE ) qt_feature("gstreamer_1_0" PRIVATE LABEL "GStreamer 1.0" - CONDITION ( LINUX AND GStreamer_FOUND ) - ENABLE INPUT_gstreamer STREQUAL 'yes' - DISABLE INPUT_gstreamer STREQUAL 'no' -) -qt_feature("gstreamer" PRIVATE - CONDITION QT_FEATURE_gstreamer_1_0 + CONDITION GStreamer_FOUND ) qt_feature("gstreamer_app" PRIVATE LABEL "GStreamer App" @@ -120,6 +115,12 @@ qt_feature("gstreamer_gl" PRIVATE LABEL "GStreamer OpenGL" CONDITION QT_FEATURE_opengl AND QT_FEATURE_gstreamer_1_0 AND GStreamer_Gl_FOUND AND EGL_FOUND ) +qt_feature("gstreamer" PRIVATE + LABEL "QtMM GStreamer plugin" + CONDITION (QT_FEATURE_gstreamer_1_0 AND QT_FEATURE_gstreamer_gl AND QT_FEATURE_gstreamer_app) + ENABLE INPUT_gstreamer STREQUAL 'yes' + DISABLE INPUT_gstreamer STREQUAL 'no' +) qt_feature("gpu_vivante" PRIVATE LABEL "Vivante GPU" diff --git a/src/plugins/multimedia/gstreamer/CMakeLists.txt b/src/plugins/multimedia/gstreamer/CMakeLists.txt index d37151bf2..f7ffb612b 100644 --- a/src/plugins/multimedia/gstreamer/CMakeLists.txt +++ b/src/plugins/multimedia/gstreamer/CMakeLists.txt @@ -56,7 +56,7 @@ qt_internal_add_plugin(QGstreamerMediaPlugin qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_photography LIBRARIES - -lgstphotography-1.0 + GStreamer::Photography ) qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_gl |