early-access version 2853

externals/vcpkg/ports/freerdp/DontInstallSystemRuntimeLibs.patch

@@ -0,0 +1,17 @@
+diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
+index 6ccfc7d..75479bf 100644
+--- a/CMakeCPack.cmake
++++ b/CMakeCPack.cmake
+@@ -67,9 +67,9 @@ if(MSVC)
+ 		set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+ 		include(InstallRequiredSystemLibraries)
+ 
+-		install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
+-			DESTINATION ${CMAKE_INSTALL_BINDIR}
+-			COMPONENT libraries)
++		# install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
++		# 	DESTINATION ${CMAKE_INSTALL_BINDIR}
++		# 	COMPONENT libraries)
+ 	endif()
+ endif()
+ 

externals/vcpkg/ports/freerdp/fix-include-path.patch

@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97ba2f9..64a2f33 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@ else()
+ endif()
+ message("FREERDP_VERSION=${FREERDP_VERSION_FULL}")
+ 
+-set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/")
++set(FREERDP_INCLUDE_DIR "include/")
+ 
+ # Compatibility options
+ if(DEFINED STATIC_CHANNELS)
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index a020dc5..0bc1157 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
+-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
++set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)
+ 
+ file(GLOB FREERDP_HEADERS "freerdp/*.h")
+ install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
+diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
+index a94090a..08b6b88 100644
+--- a/winpr/CMakeLists.txt
++++ b/winpr/CMakeLists.txt
+@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
+ 
+ 	SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
+ 
+-	set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
++	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/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
+index 452383d..3faab0c 100644
+--- a/winpr/include/CMakeLists.txt
++++ b/winpr/include/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
+-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
++set(WINPR_INSTALL_INCLUDE_DIR include/winpr)
+ 
+ file(GLOB WINPR_HEADERS "winpr/*.h")
+ install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)

externals/vcpkg/ports/freerdp/fix-libusb.patch

@@ -0,0 +1,45 @@
+diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c
+index 814540756..56809fe45 100644
+--- a/channels/urbdrc/client/libusb/libusb_udevice.c
++++ b/channels/urbdrc/client/libusb/libusb_udevice.c
+@@ -232,7 +232,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data)
+ 	}
+ }
+ 
+-static void func_iso_callback(struct libusb_transfer* transfer)
++static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer)
+ {
+ 	ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data;
+ 	const UINT32 streamID = stream_id_from_buffer(transfer);
+@@ -331,7 +331,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT
+ 	return NULL;
+ }
+ 
+-static void func_bulk_transfer_cb(struct libusb_transfer* transfer)
++static void LIBUSB_CALL func_bulk_transfer_cb(struct libusb_transfer* transfer)
+ {
+ 	ASYNC_TRANSFER_USER_DATA* user_data;
+ 	uint32_t streamID;
+diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
+index 1638b8c13..b1440f300 100644
+--- a/channels/urbdrc/client/libusb/libusb_udevman.c
++++ b/channels/urbdrc/client/libusb/libusb_udevman.c
+@@ -580,7 +580,7 @@ static BOOL device_is_filtered(struct libusb_device* dev,
+ 	return filtered;
+ }
+ 
+-static int hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
++static int LIBUSB_CALL hotplug_callback(struct libusb_context* ctx, struct libusb_device* dev,
+                             libusb_hotplug_event event, void* user_data)
+ {
+ 	VID_PID_PAIR pair;
+@@ -859,7 +859,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman)
+ 	return rc > 0;
+ }
+ 
+-static DWORD poll_thread(LPVOID lpThreadParameter)
++static DWORD __stdcall poll_thread(LPVOID lpThreadParameter)
+ {
+ 	libusb_hotplug_callback_handle handle;
+ 	UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;
+	 

externals/vcpkg/ports/freerdp/fix-linux-build.patch

@@ -0,0 +1,13 @@
+diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt
+index 48fda5b..4e15a22 100644
+--- a/winpr/tools/makecert-cli/CMakeLists.txt
++++ b/winpr/tools/makecert-cli/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+ 
+ set(${MODULE_PREFIX}_LIBS winpr-tools)
+ 
+-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
++target_link_libraries(${MODULE_NAME} ${OPENSSL_LIBRARIES} ${${MODULE_PREFIX}_LIBS} winpr)
+ 
+ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
+ 

externals/vcpkg/ports/freerdp/install-dirs.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5e67ef9..4ef3e8e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.11)
+ 
+ project(FreeRDP C CXX)
+ 

externals/vcpkg/ports/freerdp/openssl_threads.patch

@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 97ba2f9..fc36185 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -907,6 +907,7 @@ if(OPENSSL_FOUND)
+ 	add_definitions("-DWITH_OPENSSL")
+ 	message(STATUS "Using OpenSSL Version: ${OPENSSL_VERSION}")
+ 	include_directories(${OPENSSL_INCLUDE_DIR})
++    list(APPEND OPENSSL_LIBRARIES Threads::Threads)
+ endif()
+ 
+ if(MBEDTLS_FOUND)

externals/vcpkg/ports/freerdp/portfile.cmake

@@ -0,0 +1,145 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO FreeRDP/FreeRDP
+    REF 2.5.0
+    SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c
+    HEAD_REF master
+    PATCHES
+        DontInstallSystemRuntimeLibs.patch
+        fix-linux-build.patch
+        openssl_threads.patch
+        fix-include-path.patch
+        fix-libusb.patch
+        install-dirs.patch
+)
+
+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()
+
+get_filename_component(SOURCE_VERSION "${SOURCE_PATH}" NAME)
+file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg")
+
+file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") # Remove outdated Module
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    urbdrc CHANNEL_URBDRC
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FREERDP_CRT_LINKAGE}
+        ${FREERDP_WITH_CLIENT}
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(GLOB_RECURSE TOOLS_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*.exe")
+
+if(TOOLS_RELEASE)
+    file(COPY ${TOOLS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+    file(GLOB_RECURSE TOOLS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
+    file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG})
+endif()
+
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
+    foreach(FREERDP_DLL ${FREERDP_DLLS})
+        file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(REMOVE "${FREERDP_DLL}")
+    endforeach()
+
+    file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
+    foreach(FREERDP_DLL ${FREERDP_DLLS})
+        file(COPY "${FREERDP_DLL}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(REMOVE "${FREERDP_DLL}")
+    endforeach()
+else()
+    file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
+    foreach(FREERDP_TOOL ${FREERDP_TOOLS})
+        file(COPY "${FREERDP_TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+        file(REMOVE "${FREERDP_TOOL}")
+    endforeach()
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}")
+endforeach()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 PACKAGE_NAME FreeRDP-Client)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 PACKAGE_NAME FreeRDP)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 PACKAGE_NAME WinPR)
+
+vcpkg_fixup_pkgconfig(SKIP_CHECK)
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
+    "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake"
+    "debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
+    "lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake"
+    "lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake"
+    "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake"
+    "lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake"
+    "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake"
+    "lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+    "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/debug/*.lib")
+    file(REMOVE ${OBJS})
+    file(GLOB OBJS "${CURRENT_PACKAGES_DIR}/*.lib")
+    file(REMOVE ${OBJS})
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
+                    "${CURRENT_PACKAGES_DIR}/lib/cmake")
+
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

externals/vcpkg/ports/freerdp/vcpkg.json

@@ -0,0 +1,31 @@
+{
+  "name": "freerdp",
+  "version": "2.5.0",
+  "description": "A free implementation of the Remote Desktop Protocol (RDP)",
+  "homepage": "https://github.com/FreeRDP/FreeRDP",
+  "license": "Apache-2.0",
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+    {
+      "name": "glib",
+      "platform": "!windows"
+    },
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "urbdrc": {
+      "description": "USB redirection channel support",
+      "dependencies": [
+        "libusb"
+      ]
+    }
+  }
+}