[freerdp] Fix include path (#15724)

* [freerdp] Fix include path

* [freerdp] update port version

* [freerdp] Partial revert of remove include fixup

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

ports/freerdp/CONTROL

@@ -1,10 +0,0 @@
-Source: freerdp
-Version: 2.2.0
-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
-Build-Depends: libusb

ports/freerdp/fix-include-path.patch

@@ -7,7 +7,7 @@ index 97ba2f9..64a2f33 100644
  message("FREERDP_VERSION=${FREERDP_VERSION_FULL}")
  
 -set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")
-+set(FREERDP_INCLUDE_DIR "include/freerdp/")
++set(FREERDP_INCLUDE_DIR "include/")
  
  # Compatibility options
  if(DEFINED STATIC_CHANNELS)
@@ -33,7 +33,7 @@ index a94090a..08b6b88 100644
  	SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
  
 -	set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
-+	set(WINPR_INCLUDE_DIR "include/winpr")
++	set(WINPR_INCLUDE_DIR "include")
  
  	configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake
  		INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR}

ports/freerdp/portfile.cmake

@@ -15,10 +15,12 @@ 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()
+set(FREERDP_WITH_CLIENT)
 if (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
     set(FREERDP_WITH_CLIENT -DWITH_CLIENT=OFF)
 endif()
 
+set(FREERDP_CRT_LINKAGE)
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
     set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
 endif()

ports/freerdp/vcpkg.json

@@ -0,0 +1,23 @@
+{
+  "name": "freerdp",
+  "version-semver": "2.2.0",
+  "port-version": 1,
+  "description": "A free implementation of the Remote Desktop Protocol (RDP)",
+  "homepage": "https://github.com/FreeRDP/FreeRDP",
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+    {
+      "name": "glib",
+      "platform": "!windows"
+    },
+    "openssl"
+  ],
+  "features": {
+    "urbdrc": {
+      "description": "USB redirection channel support",
+      "dependencies": [
+        "libusb"
+      ]
+    }
+  }
+}

versions/baseline.json

@@ -2034,7 +2034,7 @@
     },
     "freerdp": {
       "baseline": "2.2.0",
-      "port-version": 0
+      "port-version": 1
     },
     "freetds": {
       "baseline": "1.2.11",

versions/f-/freerdp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9691eb7a176a1bbe9da26f853d59403f00aef9a0",
+      "version-semver": "2.2.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1c37decc1c0ae21cb895e8c263e7ff06454425e8",
       "version-string": "2.2.0",