3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 13:08:00 +08:00
Code Issues Projects Releases Wiki Activity

[freerdp] Update to 3.0.0 (#35727)

Browse Source
This commit is contained in:
Kai Pastor 2023-12-22 21:53:15 +01:00 committed by GitHub
parent 4c59249deb
commit 6c937c3223
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 239 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ports/freerdp/dependencies.patch Normal file
View File

@ -0,0 +1,59 @@
diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
index 35b74c1..a4e48c9 100644
--- a/client/FreeRDP-ClientConfig.cmake.in
+++ b/client/FreeRDP-ClientConfig.cmake.in
@@ -1,6 +1,7 @@
include(CMakeFindDependencyMacro)
find_dependency(WinPR @FREERDP_VERSION@)
find_dependency(FreeRDP @FREERDP_VERSION@)
+find_dependency(ZLIB)
@PACKAGE_INIT@
diff --git a/cmake/FindFeature.cmake b/cmake/FindFeature.cmake
index bd25fd4..dd180a3 100644
--- a/cmake/FindFeature.cmake
+++ b/cmake/FindFeature.cmake
@@ -15,7 +15,7 @@ macro(find_feature _feature _type _purpose _description)
set(_feature_default "ON")
message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
find_package(${_feature} REQUIRED)
- elseif(${_type} STREQUAL "RECOMMENDED")
+ elseif(0)
if(NOT ${WITH_${_feature_upper}})
set(_feature_default "OFF")
message(STATUS "Skipping ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
@@ -29,7 +29,7 @@ macro(find_feature _feature _type _purpose _description)
message(STATUS "Not detected ${_type_lower} feature ${_feature} for ${_purpose} (${_description}), feature disabled")
endif()
endif()
- elseif(${_type} STREQUAL "OPTIONAL")
+ elseif(1)
if(${WITH_${_feature_upper}})
set(_feature_default "ON")
message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})")
diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
index 21ecd59..2613a59 100644
--- a/libfreerdp/FreeRDPConfig.cmake.in
+++ b/libfreerdp/FreeRDPConfig.cmake.in
@@ -1,5 +1,7 @@
include(CMakeFindDependencyMacro)
find_dependency(WinPR @FREERDP_VERSION@)
+find_dependency(cJSON)
+find_dependency(ZLIB)
@PACKAGE_INIT@
diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
index 21ea0c7..71b8e18 100644
--- a/libfreerdp/freerdp.pc.in
+++ b/libfreerdp/freerdp.pc.in
@@ -14,7 +14,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation
URL: http://www.freerdp.com/
Version: @FREERDP_VERSION@
Requires:
-Requires.private: winpr@FREERDP_API_VERSION@
+Requires.private: winpr@FREERDP_API_VERSION@ libcjson zlib
Libs: -L${libdir} ${libs}
Libs.private: -ldl -lpthread
Cflags: -I${includedir}

203
ports/freerdp/export-include.patch
View File

@ -1,203 +0,0 @@
diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
index 882fef7..4ae7737 100644
--- a/channels/CMakeLists.txt
+++ b/channels/CMakeLists.txt
@@ -213,6 +213,7 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif()
endif()
+ target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
endmacro(add_channel_client_library)
macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry)
@@ -253,6 +254,7 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_
client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif()
endif()
+ target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
endmacro(add_channel_client_subsystem_library)
macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry)
@@ -290,6 +292,7 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna
server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH})
endif()
endif()
+ target_include_directories(${_module_name} INTERFACE $<INSTALL_INTERFACE:include>)
endmacro(add_channel_server_library)
set(FILENAME "ChannelOptions.cmake")
diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt
index 1f49c3b..67d361f 100644
--- a/channels/server/CMakeLists.txt
+++ b/channels/server/CMakeLists.txt
@@ -29,6 +29,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_SERVER_MODULES})
endforeach()
add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt
index b3473a9..5537033 100644
--- a/client/Android/CMakeLists.txt
+++ b/client/Android/CMakeLists.txt
@@ -51,4 +51,5 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics)
#set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT AndroidTargets)
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index b3eb591..f6f756b 100644
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -95,6 +95,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${EXTRA_LIBS} freerdp-client)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
# Set a list of the dependent targets used by the application. There should be a way to get this list automatically
# from cmake, but for now I put it down manually. I got the references by calling "otool -L MacFreeRDP-client"
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index b0a5d27..278b0fc 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -80,6 +80,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
if(WITH_CLIENT_INTERFACE)
install(TARGETS ${MODULE_NAME} COMPONENT libraries)
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index 869652c..d170277 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -238,6 +238,8 @@ if(WITH_IPP)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST})
endif()
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
+
if(WITH_CLIENT_INTERFACE)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
add_subdirectory(cli)
diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index 1de7461..acb6ecf 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -77,6 +77,7 @@ else()
target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS})
endif()
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index 7e9a63d..b9b0ab0 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -395,6 +395,7 @@ endif()
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt
index 000e6d2..a84ce5e 100644
--- a/rdtk/librdtk/CMakeLists.txt
+++ b/rdtk/librdtk/CMakeLists.txt
@@ -42,6 +42,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr)
list(APPEND ${MODULE_PREFIX}_LIBS freerdp)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk")
diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
index 4086542..976bd86 100644
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -96,6 +96,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dsound)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
if(WITH_SERVER_INTERFACE)
install(TARGETS ${MODULE_NAME} COMPONENT libraries)
diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
index 7c533b7..8503928 100644
--- a/server/common/CMakeLists.txt
+++ b/server/common/CMakeLists.txt
@@ -62,6 +62,7 @@ endif()
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS})
target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp)
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 0daa245..583c0a4 100644
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -80,6 +80,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr-tools)
list(APPEND ${MODULE_PREFIX}_LIBS rdtk)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_VERSION_MAJOR})
if (WITH_LIBRARY_VERSIONING)
@@ -285,6 +286,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow freerdp winpr)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
if (WITH_LIBRARY_VERSIONING)
diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt
index f66a8c4..ea08bed 100644
--- a/uwac/libuwac/CMakeLists.txt
+++ b/uwac/libuwac/CMakeLists.txt
@@ -81,6 +81,7 @@ if (HAVE_PIXMAN_REGION)
else()
target_link_libraries(${MODULE_NAME} PRIVATE freerdp)
endif()
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/uwac0>)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac)
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 2616439..1f4688e 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -144,6 +144,7 @@ endif()
add_definitions(${WINPR_DEFINITIONS})
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
index 13f4c13..4a73333 100644
--- a/winpr/tools/CMakeLists.txt
+++ b/winpr/tools/CMakeLists.txt
@@ -111,6 +111,7 @@ endif()
add_definitions(${WINPR_DEFINITIONS})
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS})
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)

44
ports/freerdp/find-dependency.patch
View File

@ -1,44 +0,0 @@
diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in
index 779374c..35b74c1 100644
--- a/client/FreeRDP-ClientConfig.cmake.in
+++ b/client/FreeRDP-ClientConfig.cmake.in
@@ -1,3 +1,6 @@
+include(CMakeFindDependencyMacro)
+find_dependency(WinPR @FREERDP_VERSION@)
+find_dependency(FreeRDP @FREERDP_VERSION@)
@PACKAGE_INIT@
diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in
index a2321e7..4c8379e 100644
--- a/libfreerdp/FreeRDPConfig.cmake.in
+++ b/libfreerdp/FreeRDPConfig.cmake.in
@@ -1,3 +1,5 @@
+include(CMakeFindDependencyMacro)
+find_dependency(WinPR @FREERDP_VERSION@)
@PACKAGE_INIT@
diff --git a/server/FreeRDP-ServerConfig.cmake.in b/server/FreeRDP-ServerConfig.cmake.in
index b9edb55..db7cb44 100644
--- a/server/FreeRDP-ServerConfig.cmake.in
+++ b/server/FreeRDP-ServerConfig.cmake.in
@@ -1,3 +1,6 @@
+include(CMakeFindDependencyMacro)
+find_dependency(WinPR @FREERDP_VERSION@)
+find_dependency(FreeRDP @FREERDP_VERSION@)
@PACKAGE_INIT@
diff --git a/server/shadow/FreeRDP-ShadowConfig.cmake.in b/server/shadow/FreeRDP-ShadowConfig.cmake.in
index 1eb11e0..9b6f24c 100644
--- a/server/shadow/FreeRDP-ShadowConfig.cmake.in
+++ b/server/shadow/FreeRDP-ShadowConfig.cmake.in
@@ -1,3 +1,7 @@
+include(CMakeFindDependencyMacro)
+find_dependency(WinPR @FREERDP_VERSION@)
+find_dependency(FreeRDP @FREERDP_VERSION@)
+find_dependency(FreeRDP-Server @FREERDP_VERSION@)
@PACKAGE_INIT@

52
ports/freerdp/fix-include-path.patch
View File

@ -1,52 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54df8cf..5232d46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ endif()
message(STATUS "Git Revision ${GIT_REVISION}")
-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 d8a40da..73ffba4 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -221,7 +221,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)

127
ports/freerdp/fix-install-destination.patch
View File

@ -1,127 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8894a58..d2f8b2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -960,6 +960,9 @@ else()
set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
endif()
+set(FREERDP_DATA_PATH "share/freerdp")
+set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
+set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
# Path to put extensions
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index 6274571..b0a5d27 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -82,7 +82,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
if(WITH_CLIENT_INTERFACE)
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
endif()
diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt
index b465a63..1de7461 100644
--- a/client/common/CMakeLists.txt
+++ b/client/common/CMakeLists.txt
@@ -78,7 +78,7 @@ else()
endif()
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index a259b68..10a0921 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -396,7 +396,7 @@ endif()
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr)
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt
index c7833ad..4086542 100644
--- a/server/Windows/CMakeLists.txt
+++ b/server/Windows/CMakeLists.txt
@@ -98,7 +98,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
if(WITH_SERVER_INTERFACE)
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt
index c94a209..7c533b7 100644
--- a/server/common/CMakeLists.txt
+++ b/server/common/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS})
target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp)
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 3e0df0b..0daa245 100644
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -86,7 +86,7 @@ if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
endif()
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
@@ -291,7 +291,7 @@ if (WITH_LIBRARY_VERSIONING)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
endif()
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 2df8d89..da23a1b 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -144,7 +144,7 @@ endif()
add_definitions(${WINPR_DEFINITIONS})
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC})
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
index 0ddf9fb..b89a954 100644
--- a/winpr/tools/CMakeLists.txt
+++ b/winpr/tools/CMakeLists.txt
@@ -112,7 +112,7 @@ endif()
add_definitions(${WINPR_DEFINITIONS})
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS})
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)

88
ports/freerdp/install-layout.patch Normal file
View File

@ -0,0 +1,88 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1633656..db346d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ endif()
message(STATUS "Git Revision ${GIT_REVISION}")
set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}")
-set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/")
+set(FREERDP_INCLUDE_DIR "include/")
option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON)
if (WITH_SMARTCARD_EMULATE)
@@ -711,6 +711,9 @@ else()
set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}")
endif()
+set(FREERDP_DATA_PATH "share/freerdp")
+set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}")
+set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}")
set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}")
# Path to put extensions
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index cc94b99..0423242 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -107,7 +107,7 @@ endif()
target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
if(WITH_CLIENT_INTERFACE)
- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+ install(TARGETS ${MODULE_NAME} COMPONENT libraries)
if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
endif()
diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
index 7555957..21ea0c7 100644
--- a/libfreerdp/freerdp.pc.in
+++ b/libfreerdp/freerdp.pc.in
@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@FREERDP_INCLUDE_DIR@
libs=-lfreerdp@FREERDP_API_VERSION@
datarootdir=${prefix}/share
-datadir=${datarootdir}/@FREERDP_MAJOR_DIR@
+datadir=${datarootdir}/freerdp
plugindir=${libdir}/@FREERDP_MAJOR_DIR@
proxy_plugindir=${plugindir}/proxy
extensiondir=${plugindir}/extensions
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 4769741..eb3fe11 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -320,7 +320,7 @@ endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
+set(WINPR_INCLUDE_DIR "include")
add_subdirectory(libwinpr)
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 4be2015..00c64e0 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -195,7 +195,7 @@ else()
endif()
target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS})
target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES})
-target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS})
target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS})
target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS})
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
index e995172..f612718 100644
--- a/winpr/tools/CMakeLists.txt
+++ b/winpr/tools/CMakeLists.txt
@@ -110,7 +110,7 @@ if (WITH_LIBRARY_VERSIONING)
endif()
add_definitions(${WINPR_DEFINITIONS})
-target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS})
install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets

22
ports/freerdp/keep-dup-libs.patch
View File

@ -1,30 +1,30 @@
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index 10a0921..7e9a63d 100644
index 2ce9c42..bbd202a 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -363,7 +363,6 @@ endif()
# /primitives
@@ -415,7 +415,6 @@ endif()
list(APPEND LIBFREERDP_PUB_LIBS winpr)
list(REMOVE_DUPLICATES LIBFREERDP_DEFINITIONS)
-list(REMOVE_DUPLICATES LIBFREERDP_LIBS)
list(REMOVE_DUPLICATES LIBFREERDP_PUB_LIBS)
list(REMOVE_DUPLICATES LIBFREERDP_INCLUDES)
include_directories(${LIBFREERDP_INCLUDES})
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index da23a1b..2616439 100644
index 4be2015..f1266f3 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -113,8 +113,6 @@ endforeach()
set(MODULE_NAME winpr)
list(REMOVE_DUPLICATES WINPR_DEFINITIONS)
@@ -157,8 +157,6 @@ list(REMOVE_DUPLICATES WINPR_DEFINITIONS)
list(REMOVE_DUPLICATES WINPR_COMPILE_OPTIONS)
list(REMOVE_DUPLICATES WINPR_LINK_OPTIONS)
list(REMOVE_DUPLICATES WINPR_LINK_DIRS)
-list(REMOVE_DUPLICATES WINPR_LIBS_PRIVATE)
-list(REMOVE_DUPLICATES WINPR_LIBS_PUBLIC)
list(REMOVE_DUPLICATES WINPR_INCLUDES)
include_directories(${WINPR_INCLUDES})
# On windows create dll version information.
diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
index b89a954..13f4c13 100644
index e995172..90c4e58 100644
--- a/winpr/tools/CMakeLists.txt
+++ b/winpr/tools/CMakeLists.txt
@@ -82,7 +82,6 @@ add_subdirectory(makecert)

15
ports/freerdp/openssl-3.patch
View File

@ -1,15 +0,0 @@
diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h
index e273ec3..3cc265e 100644
--- a/include/freerdp/crypto/tls.h
+++ b/include/freerdp/crypto/tls.h
@@ -34,6 +34,10 @@
#include <winpr/stream.h>
+#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
+ #define tls_free freerdp_tls_free
+#endif
+
#define TLS_ALERT_LEVEL_WARNING 1
#define TLS_ALERT_LEVEL_FATAL 2

72
ports/freerdp/portfile.cmake
View File

@ -2,20 +2,16 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FreeRDP/FreeRDP
REF "${VERSION}"
SHA512 722d95d7591b5ce6a7e8a3b6ac8999df278dbcfc286a532f56bcbc4a3881e75b02c7e3cd4b296e67bc19d1165020acdcca198bf4bcc92aea5611760037fcc57f
SHA512 6c9061674716ca8c83a3913222db4002d893d751b0072a8af10013e09462a9cc847689dc874e30c499ae0d5be73c464f610057744c771fcd678bc43185d0f923
HEAD_REF master
PATCHES
dependencies.patch
DontInstallSystemRuntimeLibs.patch
fix-include-path.patch
fix-install-destination.patch
install-layout.patch
keep-dup-libs.patch
windows-linkage.patch
wfreerdp-server-cli.patch
pr-7060-jni-onload.patch
find-dependency.patch
export-include.patch
openssl-3.patch # Remove in freerdp 3.0.0
)
file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake")
file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg")
if("x11" IN_LIST FEATURES)
@ -24,14 +20,14 @@ endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
client-mac WITH_CLIENT_MAC
ffmpeg WITH_FFMPEG
ffmpeg WITH_SWSCALE
server WITH_SERVER
urbdrc CHANNEL_URBDRC
wayland WITH_WAYLAND
client-mac WITH_CLIENT_MAC
ffmpeg WITH_FFMPEG
ffmpeg WITH_SWSCALE
server WITH_SERVER
urbdrc CHANNEL_URBDRC
wayland WITH_WAYLAND
winpr-tools WITH_WINPR_TOOLS
x11 WITH_X11
x11 WITH_X11
)
vcpkg_list(SET GENERATOR_OPTION)
@ -47,18 +43,36 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
"-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
-DCMAKE_REQUIRE_FIND_PACKAGE_cJSON=ON
-DUSE_VERSION_FROM_GIT_TAG=OFF
-DWITH_AAD=ON
-DWITH_CCACHE=OFF
-DWITH_CLANG_FORMAT=OFF
-DWITH_MANPAGES=OFF
-DWITH_OPENSSL=ON
-DWITH_SAMPLE=OFF
-DWITH_UNICODE_BUILTIN=ON
"-DMSVC_RUNTIME=${VCPKG_CRT_LINKAGE}"
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
-DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON
# Uncontrolled dependencies w.r.t. vcpkg ports
# Uncontrolled dependencies w.r.t. vcpkg ports, system libs, or tools
# Can be overriden in custom triplet file
-DUSE_UNWIND=OFF
-DWITH_ALSA=OFF
-DWITH_CAIRO=OFF
-DWITH_CLIENT_SDL=OFF
-DWITH_CUPS=OFF
-DWITH_FUSE=OFF
-DWITH_KRB5=OFF
-DWITH_LIBSYSTEMD=OFF
-DWITH_OPUS=OFF
-DWITH_OSS=OFF
-DWITH_PCSC=OFF
-DWITH_PKCS11=OFF
-DWITH_PROXY_MODULES=OFF
-DWITH_PULSE=OFF
-DWITH_URIPARSER=OFF
-DVCPKG_TRACE_FIND_PACKAGE=ON
MAYBE_UNUSED_VARIABLES
MSVC_RUNTIME
)
@ -95,12 +109,12 @@ if("winpr-tools" IN_LIST FEATURES)
endif()
if("server" IN_LIST FEATURES)
list(APPEND tools freerdp-proxy freerdp-shadow-cli)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server2 PACKAGE_NAME freerdp-server2 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow2 PACKAGE_NAME freerdp-shadow2 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server3 PACKAGE_NAME freerdp-server3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow3 PACKAGE_NAME freerdp-shadow3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
endif()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2 PACKAGE_NAME freerdp-client2 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2 PACKAGE_NAME winpr2 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2 PACKAGE_NAME freerdp)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client3 PACKAGE_NAME freerdp-client3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR3 PACKAGE_NAME winpr3 DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP3 PACKAGE_NAME freerdp)
if(tools)
vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
@ -109,10 +123,24 @@ endif()
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}" "")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# They build static with dllexport, so it must be used with dllexport. Proper fix needs invasive patching.
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/api.h" "#ifdef FREERDP_EXPORTS" "#if 1")
if(WITH_SERVER)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rdtk0/rdtk/api.h" "#ifdef RDTK_EXPORTS" "#if 1")
endif()
endif()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/config"
"${CURRENT_PACKAGES_DIR}/include/CMakeFiles"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles")
if(cmakefiles)
file(REMOVE_RECURSE ${cmakefiles})
endif()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

89
ports/freerdp/pr-7060-jni-onload.patch
View File

@ -1,89 +0,0 @@
diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c
index 0fd987f446e..014c4d4db96 100644
--- a/client/Android/android_freerdp.c
+++ b/client/Android/android_freerdp.c
@@ -1093,7 +1093,10 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
(*env)->RegisterNatives(env, activityClass, methods, sizeof(methods) / sizeof(methods[0]));
/* create global reference for class */
gJavaActivityClass = (*env)->NewGlobalRef(env, activityClass);
+
g_JavaVm = vm;
+ winpr_set_java_vm((void*)vm);
+
return init_callback_environment(vm, env);
}
diff --git a/winpr/include/winpr/sysinfo.h b/winpr/include/winpr/sysinfo.h
index c14e999d970..7af615947bd 100644
--- a/winpr/include/winpr/sysinfo.h
+++ b/winpr/include/winpr/sysinfo.h
@@ -344,6 +344,20 @@ extern "C"
#define PF_SSE_INSTRUCTIONS_AVAILABLE PF_XMMI_INSTRUCTIONS_AVAILABLE
#define PF_SSE2_INSTRUCTIONS_AVAILABLE PF_XMMI64_INSTRUCTIONS_AVAILABLE
+#ifdef ANDROID
+
+ /*
+ * Call winpr_set_java_vm() from JNI_OnLoad in a shared library:
+ * JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
+ * and then call winpr_get_java_vm to obtain the JavaVM* handle.
+ * The functions use void* to avoid including jni.h in exported headers.
+ */
+
+ WINPR_API void winpr_set_java_vm(void* vm);
+ WINPR_API void* winpr_get_java_vm();
+
+#endif
+
#ifdef __cplusplus
}
#endif
diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c
index dd15bb374e2..a4d0ddf90cc 100644
--- a/winpr/libwinpr/sysinfo/sysinfo.c
+++ b/winpr/libwinpr/sysinfo/sysinfo.c
@@ -988,3 +988,20 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature)
#endif
return ret;
}
+
+#ifdef ANDROID
+
+#include <jni.h>
+static JavaVM* g_JavaVM = NULL;
+
+void winpr_set_java_vm(void* vm)
+{
+ g_JavaVM = (JavaVM*)vm;
+}
+
+void* winpr_get_java_vm()
+{
+ return (void*)g_JavaVM;
+}
+
+#endif
diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c
index b29ecab33dd..c42928d6738 100644
--- a/winpr/libwinpr/timezone/timezone.c
+++ b/winpr/libwinpr/timezone/timezone.c
@@ -151,18 +151,12 @@ static char* winpr_get_timezone_from_link(void)
#if defined(ANDROID)
#include <jni.h>
-static JavaVM* jniVm = NULL;
-
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
- jniVm = vm;
- return JNI_VERSION_1_6;
-}
static char* winpr_get_android_timezone_identifier(void)
{
char* tzid = NULL;
JNIEnv* jniEnv;
+ JavaVM* jniVm = (JavaVM*)winpr_get_java_vm();
/* Preferred: Try to get identifier from java TimeZone class */
if (jniVm && ((*jniVm)->GetEnv(jniVm, (void**)&jniEnv, JNI_VERSION_1_6) == JNI_OK))

13
ports/freerdp/vcpkg.json
View File

@ -1,12 +1,12 @@
{
"name": "freerdp",
"version": "2.11.2",
"port-version": 2,
"version": "3.0.0",
"description": "A free implementation of the Remote Desktop Protocol (RDP)",
"homepage": "https://github.com/FreeRDP/FreeRDP",
"license": "Apache-2.0",
"supports": "!uwp & !(arm & windows)",
"dependencies": [
"cjson",
{
"name": "glib",
"platform": "!windows"
@ -20,10 +20,7 @@
"name": "vcpkg-cmake-config",
"host": true
},
{
"name": "zlib",
"platform": "!windows"
}
"zlib"
],
"features": {
"client-mac": {
@ -66,7 +63,7 @@
},
"wayland": {
"description": "Enable wayland support",
"supports": "!windows & !android & !ios & !osx & !openbsd",
"supports": "!android & !ios & !openbsd & !osx & !windows",
"dependencies": [
"wayland"
]
@ -77,7 +74,7 @@
},
"x11": {
"description": "Enable X11 support",
"supports": "!windows & !android & !ios",
"supports": "!android & !ios & !windows",
"dependencies": [
"xcb"
]

8
ports/freerdp/wfreerdp-server-cli.patch
View File

@ -1,11 +1,13 @@
diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt
index fcfa811..e4d4360 100644
index 58d5df0..fdba313 100644
--- a/server/Windows/cli/CMakeLists.txt
+++ b/server/Windows/cli/CMakeLists.txt
@@ -41,5 +41,5 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
@@ -41,7 +41,7 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "wfreerdp-server")
-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME})
+set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_NAME wfreerdp-server PDB_NAME wfreerdp-server.exe)
set(${MODULE_PREFIX}_LIBS wfreerdp-server)

14
ports/freerdp/windows-linkage.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db346d3..6ad72d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,6 +439,9 @@ if(WIN32)
endif()
add_definitions(-DFREERDP_EXPORTS)
+if(NOT BUILD_SHARED_LIBS)
+ add_definitions(-DRDTK_EXPORTS)
+endif()
# Mac OS X
if(APPLE)

4
versions/baseline.json
View File

@ -2773,8 +2773,8 @@
"port-version": 7
},
"freerdp": {
"baseline": "2.11.2",
"port-version": 2
"baseline": "3.0.0",
"port-version": 0
},
"freetds": {
"baseline": "1.3.10",

5
versions/f-/freerdp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dfb634ed4a717897d4cb646a34dc9c663dcfceb8",
"version": "3.0.0",
"port-version": 0
},
{
"git-tree": "00aea4e71fcfa8fa2ea4c294996726290abe3243",
"version": "2.11.2",