[freerdp] Fix x64-osx triplet (microsoft#12037)

* [freerdp] Fix x64-osx triplet Signed-off-by: Alexandro Sanchez Bach <[email protected]> * 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 <[email protected]>
ron-gabriel · Jul 8, 2020 · 33e3e20 · 33e3e20
1 parent fd4a088
commit 33e3e20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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