From 9f39f6c0b26032b27d8b8274f87a23c4a6883f33 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 5 Mar 2025 09:32:46 +0100 Subject: [PATCH 1/3] [channels,rdpear] default client channel to ON If rdpear is enabled, enable the client channel by default. --- channels/rdpear/ChannelOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/rdpear/ChannelOptions.cmake b/channels/rdpear/ChannelOptions.cmake index 636701d3e..06706492e 100644 --- a/channels/rdpear/ChannelOptions.cmake +++ b/channels/rdpear/ChannelOptions.cmake @@ -1,5 +1,5 @@ set(OPTION_DEFAULT OFF) -set(OPTION_CLIENT_DEFAULT OFF) +set(OPTION_CLIENT_DEFAULT ON) set(OPTION_SERVER_DEFAULT OFF) define_channel_options( From 38b8f693aa06044e86a68026019dc502a0b86279 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 5 Mar 2025 09:33:21 +0100 Subject: [PATCH 2/3] [channels,rdpear] link rdpear-common to tests --- channels/rdpear/common/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/rdpear/common/test/CMakeLists.txt b/channels/rdpear/common/test/CMakeLists.txt index 0a09a4ac0..68ebd4b8f 100644 --- a/channels/rdpear/common/test/CMakeLists.txt +++ b/channels/rdpear/common/test/CMakeLists.txt @@ -18,7 +18,7 @@ add_executable(${MODULE_NAME} ${TEST_RDPEAR_SRCS}) add_compile_definitions(TESTING_OUTPUT_DIRECTORY="${PROJECT_BINARY_DIR}") add_compile_definitions(TESTING_SRC_DIRECTORY="${PROJECT_SOURCE_DIR}") -target_link_libraries(${MODULE_NAME} freerdp winpr freerdp-client) +target_link_libraries(${MODULE_NAME} freerdp winpr freerdp-client rdpear-common) set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}") From 6598b02329ea620b90204274c71a59dfc22ffa0b Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 5 Mar 2025 09:37:08 +0100 Subject: [PATCH 3/3] [ci,config] enable channels Enable RDPECAM, RDPEAR, RDP2TCP and SSHAGENT channel support for ci builders --- ci/cmake-preloads/config-abi.txt | 7 +++++++ ci/cmake-preloads/config-freebsd.txt | 7 +++++++ ci/cmake-preloads/config-linux-all.txt | 7 +++++++ ci/cmake-preloads/config-linux-alt-arch.txt | 7 +++++++ ci/cmake-preloads/config-oss-fuzz.cmake | 7 +++++++ ci/cmake-preloads/config-qa-static.cmake | 4 ++++ 6 files changed, 39 insertions(+) diff --git a/ci/cmake-preloads/config-abi.txt b/ci/cmake-preloads/config-abi.txt index b3ed0b5bc..df39dd465 100644 --- a/ci/cmake-preloads/config-abi.txt +++ b/ci/cmake-preloads/config-abi.txt @@ -19,3 +19,10 @@ set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "preload") set(WITH_PULSE ON CACHE BOOL "preload") set(WITH_OPAQUE_SETTINGS ON CACHE BOOL "preload") set(WITH_VERBOSE_WINPR_ASSERT OFF CACHE BOOL "preload") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") +set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") +set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-freebsd.txt b/ci/cmake-preloads/config-freebsd.txt index 7c4f30b31..b16e81378 100644 --- a/ci/cmake-preloads/config-freebsd.txt +++ b/ci/cmake-preloads/config-freebsd.txt @@ -46,3 +46,10 @@ set(WITH_DSP_FFMPEG ON CACHE BOOL "preload") set(WITH_PROXY ON CACHE BOOL "preload") set(WITH_PROXY_MODULES ON CACHE BOOL "preload") set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "preload") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") +set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") +set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-linux-all.txt b/ci/cmake-preloads/config-linux-all.txt index 9a0563cda..ddd7f5e6f 100644 --- a/ci/cmake-preloads/config-linux-all.txt +++ b/ci/cmake-preloads/config-linux-all.txt @@ -53,3 +53,10 @@ set(WITH_DSP_FFMPEG ON CACHE BOOL "preload") set(WITH_PROXY ON CACHE BOOL "preload") set(WITH_PROXY_MODULES ON CACHE BOOL "preload") set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "preload") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") +set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") +set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-linux-alt-arch.txt b/ci/cmake-preloads/config-linux-alt-arch.txt index cad2abe54..ee596352e 100644 --- a/ci/cmake-preloads/config-linux-alt-arch.txt +++ b/ci/cmake-preloads/config-linux-alt-arch.txt @@ -53,3 +53,10 @@ set(WITH_DSP_FFMPEG ON CACHE BOOL "preload") set(WITH_PROXY ON CACHE BOOL "preload") set(WITH_PROXY_MODULES ON CACHE BOOL "preload") set(WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "preload") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") +set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") +set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-oss-fuzz.cmake b/ci/cmake-preloads/config-oss-fuzz.cmake index 4b9f31712..34cb17067 100644 --- a/ci/cmake-preloads/config-oss-fuzz.cmake +++ b/ci/cmake-preloads/config-oss-fuzz.cmake @@ -27,3 +27,10 @@ set(OSS_FUZZ ON CACHE BOOL "oss fuzz") set(BUILD_FUZZERS ON CACHE BOOL "oss fuzz") set(BUILD_TESTING_INTERNAL ON CACHE BOOL "oss fuzz") set(WITH_STREAMPOOL_DEBUG ON CACHE BOOL "oss fuzz") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") +set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") +set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default") diff --git a/ci/cmake-preloads/config-qa-static.cmake b/ci/cmake-preloads/config-qa-static.cmake index ba945b4a5..729158252 100644 --- a/ci/cmake-preloads/config-qa-static.cmake +++ b/ci/cmake-preloads/config-qa-static.cmake @@ -7,6 +7,10 @@ set(WITH_STREAMPOOL_DEBUG ON CACHE BOOL "preload") set(WITH_VERBOSE_WINPR_ASSERT OFF CACHE BOOL "qa default") set(ENABLE_WARNING_VERBOSE ON CACHE BOOL "preload") set(BUILD_SHARED_LIBS OFF CACHE BOOL "qa default") +set(CHANNEL_RDPECAM ON CACHE BOOL "qa default") +set(CHANNEL_RDPECAM_CLIENT ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR ON CACHE BOOL "qa default") +set(CHANNEL_RDPEAR_CLIENT ON CACHE BOOL "qa default") set(CHANNEL_GFXREDIR ON CACHE BOOL "qa default") set(CHANNEL_RDP2TCP ON CACHE BOOL "qa default") set(CHANNEL_SSHAGENT ON CACHE BOOL "qa default")