diff --git a/ports/freerdp/install-layout.patch b/ports/freerdp/install-layout.patch index 7ae08cbe1a..f4e9bb71dd 100644 --- a/ports/freerdp/install-layout.patch +++ b/ports/freerdp/install-layout.patch @@ -1,17 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1633656..db346d3 100644 +index 0a44b35..49e987a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -149,7 +149,7 @@ message(STATUS "Git Revision ${GIT_REVISION}") - set(FREERDP_DEFAULT_PROJECT_VERSION ${FREERDP_VERSION} CACHE STRING INTERNAL) - - 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() +@@ -666,6 +666,9 @@ else() set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}") endif() endif() @@ -22,67 +13,15 @@ index 1633656..db346d3 100644 # Path to put extensions diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt -index cc94b99..0423242 100644 +index 72d3ca6..9e2bc12 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt -@@ -107,7 +107,7 @@ endif() - target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS}) +@@ -77,7 +77,7 @@ target_link_libraries(${MODULE_NAME} PUBLIC ${PUB_LIBS}) + target_link_libraries(${MODULE_NAME} PRIVATE ${PRIV_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 $) -+target_include_directories(${MODULE_NAME} INTERFACE $) - 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_subdirectory(cli) - add_definitions(${WINPR_DEFINITIONS}) --target_include_directories(${MODULE_NAME} INTERFACE $) -+target_include_directories(${MODULE_NAME} INTERFACE $) - target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS}) - - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets diff --git a/ports/freerdp/keep-dup-libs.patch b/ports/freerdp/keep-dup-libs.patch deleted file mode 100644 index 7336ad59b3..0000000000 --- a/ports/freerdp/keep-dup-libs.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index 2ce9c42..bbd202a 100644 ---- a/libfreerdp/CMakeLists.txt -+++ b/libfreerdp/CMakeLists.txt -@@ -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 4be2015..f1266f3 100644 ---- a/winpr/libwinpr/CMakeLists.txt -+++ b/winpr/libwinpr/CMakeLists.txt -@@ -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) - - # On windows create dll version information. -diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index e995172..90c4e58 100644 ---- a/winpr/tools/CMakeLists.txt -+++ b/winpr/tools/CMakeLists.txt -@@ -82,7 +82,6 @@ add_subdirectory(makecert) - - set(MODULE_NAME winpr-tools) - list(REMOVE_DUPLICATES WINPR_TOOLS_DEFINITIONS) --list(REMOVE_DUPLICATES WINPR_TOOLS_LIBS) - list(REMOVE_DUPLICATES WINPR_TOOLS_INCLUDES) - include_directories(${WINPR_TOOLS_INCLUDES}) - diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index f3f26a4cfb..d23c75483d 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -2,14 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP REF "${VERSION}" - SHA512 aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501 + SHA512 72d978326a3641e69706c158cd5c4b1a4138dedbe1bf8c0f1c02fbb03291c1a49ff36afdaf8cf432fee84952bbaecf8801efa3f1afb50f600490e36ec3d577ef HEAD_REF master PATCHES dependencies.patch install-layout.patch - keep-dup-libs.patch windows-linkage.patch - winpr_strerror.patch ) file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg") file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "") @@ -84,7 +82,7 @@ vcpkg_fixup_pkgconfig() vcpkg_list(SET tools) if(VCPKG_TARGET_IS_WINDOWS) if("server" IN_LIST FEATURES) - list(APPEND tools wfreerdp-server) + list(APPEND tools wfreerdp-server-cli) endif() elseif(VCPKG_TARGET_IS_OSX) if("server" IN_LIST FEATURES) @@ -113,27 +111,21 @@ if(tools) vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "." IGNORE_UNCHANGED) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "" IGNORE_UNCHANGED) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "" IGNORE_UNCHANGED) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp3/freerdp/build-config.h" "\"${CURRENT_PACKAGES_DIR}" "/* vcpkg redacted */ \"" IGNORE_UNCHANGED) 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") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp3/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(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles") file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/include/config" - "${CURRENT_PACKAGES_DIR}/include/CMakeFiles" + ${cmakefiles} + "${CURRENT_PACKAGES_DIR}/include/winpr3/config" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles") -if(cmakefiles) - file(REMOVE_RECURSE ${cmakefiles}) -endif() - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index a1da8721c1..974c49696e 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freerdp", - "version": "3.4.0", - "port-version": 3, + "version": "3.8.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/ports/freerdp/winpr_strerror.patch b/ports/freerdp/winpr_strerror.patch deleted file mode 100644 index 39f95937df..0000000000 --- a/ports/freerdp/winpr_strerror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -index d43b588..854c93a 100644 ---- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -+++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -@@ -73,6 +73,7 @@ - #include - #include - #include -+#include - - static pthread_once_t g_once; - static int g_inited; diff --git a/versions/baseline.json b/versions/baseline.json index 5b77ce78d9..4101b584e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2897,8 +2897,8 @@ "port-version": 7 }, "freerdp": { - "baseline": "3.4.0", - "port-version": 3 + "baseline": "3.8.0", + "port-version": 0 }, "freetds": { "baseline": "1.3.10", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index f74db2707c..80c2330d52 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29289f0bc351348dce1ddfff4630e85fd33cbb2e", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "440881d33c525ec8f3d832776f021e847f677c17", "version": "3.4.0",