Skip to content

CMake: Fix GStreamer Shaders #12918

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.

Sign up for GitHub

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

Merged
HTRamsey merged 1 commit into from
Jun 18, 2025
Merged

CMake: Fix GStreamer Shaders #12918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "qgcresources_cmake"
FILES
resources/qtquickcontrols2.conf
${SDL_GAMECONTROLLERDB_PATH}
${QGC_GSTREAMER_SHADER_RESOURCES}
)

# cmake_print_variables(QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE)
Expand Down
2 changes: 2 additions & 0 deletions cmake/find-modules/FindGStreamer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
if(NOT DEFINED GStreamer_FIND_VERSION)
if(LINUX)
set(GStreamer_FIND_VERSION 1.20)
# elseif(ANDROID)
# set(GStreamer_FIND_VERSION 1.26.2)
else()
set(GStreamer_FIND_VERSION 1.22.12)
endif()
Expand Down
56 changes: 43 additions & 13 deletions src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif()
################################################################################

if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
# Use Latest Revisions for each minor version: 1.20.7, 1.22.12, 1.24.12, 1.26.1
# Use Latest Revisions for each minor version: 1.20.7, 1.22.12, 1.24.12, 1.26.2
string(REPLACE "." ";" GST_VERSION_LIST ${GStreamer_VERSION})
list(GET GST_VERSION_LIST 0 GST_VERSION_MAJOR)
list(GET GST_VERSION_LIST 1 GST_VERSION_MINOR)
Expand All @@ -36,7 +36,7 @@ if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
elseif(GST_VERSION_MINOR EQUAL 24)
set(GST_VERSION_PATCH 12)
elseif(GST_VERSION_MINOR EQUAL 26)
set(GST_VERSION_PATCH 1)
set(GST_VERSION_PATCH 2)
endif()

set(GST_PLUGINS_VERSION ${GST_VERSION_MAJOR}.${GST_VERSION_MINOR}.${GST_VERSION_PATCH})
Expand Down Expand Up @@ -111,7 +111,7 @@ if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
LIST(APPEND OUTPUTS "YUV_BIPLANAR.frag.qsb")
endif()

qt6_add_shaders(gstqml6gl "gstqml6gl_shaders"
qt_add_shaders(gstqml6gl "gstqml6gl_shaders"
PREFIX "/org/freedesktop/gstreamer/qml6"
GLSL "100 es,120,330"
OUTPUT_TARGETS gstqml6gl_shaders
Expand All @@ -120,16 +120,46 @@ if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
BATCHABLE
)

# if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/RGBA_gles.frag")
# set(RGBA_SHADER_EXTERNAL "${CMAKE_CURRENT_BINARY_DIR}/.qsb/_RGBA.frag.qsb")
# file(COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/.qsb/RGBA.frag.qsb" "${RGBA_SHADER_EXTERNAL}")
# qt6_add_shaders(gstqml6gl "gstqml6gl_shaders1"
# PREFIX "/org/freedesktop/gstreamer/qml6"
# OUTPUT_TARGETS gstqml6gl_shaders1
# FILES "${RGBA_SHADER_EXTERNAL}@glsl,100es,${QGC_GST_QT6_PLUGIN_PATH}/RGBA_gles.frag"
# OUTPUTS "RGBA.frag.qsb.external"
# )
# endif()
if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/RGBA_gles.frag")
find_program(QSB_PROGRAM
NAMES qsb
HINTS ${QT_HOST_PATH} ${QT_ROOT_DIR} ${QTDIR}
ENV QTDIR
PATH_SUFFIXES bin
REQUIRED
)

find_program(QSB_WRAPPER
NAMES qsb-wrapper.py
PATHS "${QGC_GST_QT6_PLUGIN_PATH}"
REQUIRED
)

set(RGBA_BASE_QSB "${CMAKE_CURRENT_BINARY_DIR}/.qsb/RGBA.frag.qsb")
set(RGBA_GLES_SRC "${QGC_GST_QT6_PLUGIN_PATH}/RGBA_gles.frag")
set(RGBA_EXTERNAL "${CMAKE_CURRENT_BINARY_DIR}/.qsb/RGBA.frag.qsb.external")

add_custom_command(
OUTPUT ${RGBA_EXTERNAL}
COMMAND ${QSB_WRAPPER}
${QSB_PROGRAM}
${RGBA_EXTERNAL}
${RGBA_GLES_SRC}
${RGBA_BASE_QSB}
DEPENDS
${RGBA_BASE_QSB}
${RGBA_GLES_SRC}
COMMENT "Generating external GLES shader: ${RGBA_EXTERNAL}"
VERBATIM
)

set_source_files_properties(${RGBA_EXTERNAL} PROPERTIES QT_RESOURCE_ALIAS org/freedesktop/gstreamer/qml6/RGBA.frag.qsb.external)
set(QGC_GSTREAMER_SHADER_RESOURCES "${RGBA_EXTERNAL}" CACHE INTERNAL "")
# qt_add_resources(gstqml6gl "gstqml6gl_shaders1"
# PREFIX "/org/freedesktop/gstreamer/qml6"
# FILES "${RGBA_EXTERNAL}"
# )
endif()
endif()

################################################################################
Expand Down
Loading