mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-04-03 04:42:47 +02:00
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e0e8ea1..c861725 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -244,7 +244,7 @@ endif()
|
|
# Add XCB cursor library for static linking (Linux only) - Legacy support
|
|
if(UNIX AND NOT APPLE AND XCB_CURSOR_FOUND)
|
|
# This is redundant now but keeping for compatibility
|
|
- message(STATUS "XCB cursor already linked via static approach above")
|
|
+ target_link_libraries(openterfaceQT PRIVATE X11)
|
|
endif()
|
|
|
|
# Add TurboJPEG if available
|
|
@@ -307,4 +307,4 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
|
|
endif()
|
|
endif()
|
|
|
|
-# Qt components already found above
|
|
\ No newline at end of file
|
|
+# Qt components already found above
|
|
index 220e9f5..576535f 100644
|
|
diff --git a/cmake/Resources.cmake.orig b/cmake/Resources.cmake
|
|
index 9680e81..e4b9b2b 100644
|
|
--- a/cmake/Resources.cmake.orig
|
|
+++ b/cmake/Resources.cmake
|
|
@@ -346,7 +346,7 @@ if(COMMAND qt_generate_deploy_app_script)
|
|
if(ENABLE_QT_DEPLOY)
|
|
qt_generate_deploy_app_script(
|
|
TARGET openterfaceQT
|
|
- FILENAME_VARIABLE deploy_script
|
|
+ OUTPUT_SCRIPT deploy_script
|
|
NO_UNSUPPORTED_PLATFORM_ERROR
|
|
)
|
|
install(SCRIPT ${deploy_script})
|
|
diff --git a/cmake/GStreamer.cmake.orig b/cmake/GStreamer.cmake
|
|
index 4ee6438..220e9f5 100644
|
|
--- a/cmake/GStreamer.cmake.orig
|
|
+++ b/cmake/GStreamer.cmake
|
|
@@ -316,10 +316,11 @@ else()
|
|
# Check for Qt6 plugin availability in system
|
|
message(STATUS "Checking for Qt6 GStreamer plugin in system...")
|
|
find_file(GSTREAMER_QT6_PLUGIN
|
|
- NAMES libgstqt6.so
|
|
+ NAMES libgstqml6.so
|
|
PATHS
|
|
/usr/lib/x86_64-linux-gnu/gstreamer-1.0
|
|
/usr/lib/aarch64-linux-gnu/gstreamer-1.0
|
|
+ /usr/lib/gstreamer-1.0
|
|
/usr/local/lib/gstreamer-1.0
|
|
NO_DEFAULT_PATH
|
|
)
|