Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VideoManager: Remove Old GStreamer Qt Plugin Code #12299

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/find-modules/FindGStreamer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ elseif(GST_VERSION_MINOR EQUAL 20)
elseif(GST_VERSION_MINOR EQUAL 22)
set(GST_VERSION_PATCH 12)
elseif(GST_VERSION_MINOR EQUAL 24)
set(GST_VERSION_PATCH 8)
set(GST_VERSION_PATCH 11)
endif()

set(GST_PLUGINS_VERSION ${GST_VERSION_MAJOR}.${GST_VERSION_MINOR}.${GST_VERSION_PATCH})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,21 @@ endif()

################################################################################

if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.20)
if(GStreamer_VERSION VERSION_LESS 1.24)
set(GST_PLUGINS_VERSION 1.22.12)
endif()
FetchContent_Declare(gstreamer_good_plugins
# URL https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${GST_PLUGINS_VERSION}/gstreamer-${GST_PLUGINS_VERSION}.zip?path=subprojects/gst-plugins-good/ext/qt6
URL https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${GST_PLUGINS_VERSION}.tar.xz
DOWNLOAD_EXTRACT_TIMESTAMP true
)
FetchContent_MakeAvailable(gstreamer_good_plugins)
set(QGC_GST_QT6_PLUGIN_PATH "${gstreamer_good_plugins_SOURCE_DIR}/ext/qt6")
cmake_print_variables(QGC_GST_QT6_PLUGIN_PATH)
else()
set(QGC_GST_QT6_PLUGIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qt6")
return()
endif()
cmake_print_variables(QGC_GST_QT6_PLUGIN_PATH)

################################################################################

Expand Down

This file was deleted.

Loading
Loading