From 33e3e20c5c8d72c2e4f2116dc156822106258bf9 Mon Sep 17 00:00:00 2001 From: Alexandro Sanchez Date: Thu, 9 Jul 2020 00:24:36 +0200 Subject: [PATCH] [freerdp] Fix x64-osx triplet (#12037) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [freerdp] Fix x64-osx triplet Signed-off-by: Alexandro Sanchez Bach * Update ports/freerdp/CONTROL * Update scripts/ci.baseline.txt * Update scripts/ci.baseline.txt * Update scripts/ci.baseline.txt * Update ports/freerdp/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/freerdp/CONTROL | 3 ++- ports/freerdp/portfile.cmake | 4 ++++ scripts/ci.baseline.txt | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL index a87f32956a..3eb885b911 100644 --- a/ports/freerdp/CONTROL +++ b/ports/freerdp/CONTROL @@ -1,8 +1,9 @@ Source: freerdp -Version: 2.1.1 +Version: 2.1.1-1 Homepage: https://github.com/FreeRDP/FreeRDP Description: A free implementation of the Remote Desktop Protocol (RDP) Build-Depends: openssl, glib (!windows) +Supports: !(arm|uwp) Feature: urbdrc Description: USB redirection channel support diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 8e8f6fa2b2..0510f5961f 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -16,6 +16,9 @@ vcpkg_from_github( if (NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxfixes-dev\n") endif() +if (VCPKG_TARGET_IS_OSX) + set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF) +endif() if(VCPKG_CRT_LINKAGE STREQUAL "static") set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static) @@ -35,6 +38,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FREERDP_CRT_LINKAGE} + ${FREERDP_WITH_CLIENT} ${FEATURE_OPTIONS} ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 233d645078..5079b1abf7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -447,10 +447,6 @@ freeglut:arm64-windows=fail freeglut:arm-uwp=fail freeglut:x64-uwp=fail freeglut:x64-osx=fail -freerdp:arm64-windows=fail -freerdp:arm-uwp=fail -freerdp:x64-osx=fail -freerdp:x64-uwp=fail freetds:arm-uwp=fail freetds:x64-linux=fail freetds:x64-osx=fail