diff options
| author | KangLin <kl222@126.com> | 2021-02-11 16:54:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 00:54:50 -0800 |
| commit | d264b0eb1d94c481abc74bcfcb0605a980531e07 (patch) | |
| tree | df94107c18e0d6366c8cf07f0c2d87270ab45118 | |
| parent | f9d514aea5da5294a80ab081e84d9bcca1c9939f (diff) | |
| download | vcpkg-d264b0eb1d94c481abc74bcfcb0605a980531e07.tar.gz vcpkg-d264b0eb1d94c481abc74bcfcb0605a980531e07.zip | |
[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>
| -rw-r--r-- | ports/freerdp/CONTROL | 10 | ||||
| -rw-r--r-- | ports/freerdp/fix-include-path.patch | 4 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/freerdp/vcpkg.json | 23 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/freerdp.json | 5 |
6 files changed, 33 insertions, 13 deletions
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL deleted file mode 100644 index 1c78dfbb1..000000000 --- a/ports/freerdp/CONTROL +++ /dev/null @@ -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 diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch index 4a9f7d641..dc6523080 100644 --- a/ports/freerdp/fix-include-path.patch +++ b/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} diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 6907618fa..3fb58548c 100644 --- a/ports/freerdp/portfile.cmake +++ b/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() diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json new file mode 100644 index 000000000..0c6a5bfb8 --- /dev/null +++ b/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" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c8c47cdcd..bec6b74c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2034,7 +2034,7 @@ }, "freerdp": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "freetds": { "baseline": "1.2.11", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index f4b760ab9..71e405bef 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9691eb7a176a1bbe9da26f853d59403f00aef9a0", + "version-semver": "2.2.0", + "port-version": 1 + }, + { "git-tree": "1c37decc1c0ae21cb895e8c263e7ff06454425e8", "version-string": "2.2.0", "port-version": 0 |