diff options
| -rw-r--r-- | ports/freerdp/fix-libusb.patch | 15 | ||||
| -rw-r--r-- | ports/freerdp/install-dirs.patch | 13 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/freerdp/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/f-/freerdp.json | 5 |
6 files changed, 34 insertions, 13 deletions
diff --git a/ports/freerdp/fix-libusb.patch b/ports/freerdp/fix-libusb.patch index c6da6eb92..51f98b471 100644 --- a/ports/freerdp/fix-libusb.patch +++ b/ports/freerdp/fix-libusb.patch @@ -1,8 +1,8 @@ diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c -index 214cb7a..56c986c 100644 +index 814540756..56809fe45 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c -@@ -184,7 +184,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data) +@@ -232,7 +232,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data) } } @@ -10,8 +10,8 @@ index 214cb7a..56c986c 100644 +static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer) { ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; - #if defined(HAVE_STREAM_ID_API) -@@ -285,7 +285,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT + 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; } @@ -21,10 +21,10 @@ index 214cb7a..56c986c 100644 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 2eebc1a..399ecbb 100644 +index 1638b8c13..b1440f300 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c -@@ -550,7 +550,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, +@@ -580,7 +580,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, return filtered; } @@ -33,7 +33,7 @@ index 2eebc1a..399ecbb 100644 libusb_hotplug_event event, void* user_data) { VID_PID_PAIR pair; -@@ -828,7 +828,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman) +@@ -859,7 +859,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman) return rc > 0; } @@ -42,3 +42,4 @@ index 2eebc1a..399ecbb 100644 { libusb_hotplug_callback_handle handle; UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter; +
\ No newline at end of file diff --git a/ports/freerdp/install-dirs.patch b/ports/freerdp/install-dirs.patch new file mode 100644 index 000000000..175be0ecf --- /dev/null +++ b/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)
+
\ No newline at end of file diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 3fb58548c..32e2b5594 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF d2ba84a6885f57674098fe8e76c5f99d880e580d #2.2.0 - SHA512 3f166213039358dc0cab09b8895e6cff8a7a9c7e7711ea5652604fc6070b1524aba9fec3b860f4deb1f54ea1f17709ab25ffb108116e2914800e892efb9fb9ae + REF c3df0be63953ed98525d9b736ba878ad733de059 #2.3.2 + SHA512 622d2a1f90f5ef2212dd345a0e51b57a16c69a2972acefdc1cb1d062100ad559932330cca5883e9711a96c032ae56f6f7a084ad48760d763fc38f86cf0fa3bce HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch @@ -31,6 +31,7 @@ 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 ) @@ -89,6 +90,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Cli vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 TARGET_PATH share/FreeRDP) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/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}" diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 0c6a5bfb8..63d6f7959 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freerdp", - "version-semver": "2.2.0", - "port-version": 1, + "version-semver": "2.3.2", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index ca3a138fe..ae0396a56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2121,8 +2121,8 @@ "port-version": 0 }, "freerdp": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.3.2", + "port-version": 0 }, "freetds": { "baseline": "1.2.11", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 71e405bef..9e63e71d9 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "50c37de4c7ad0b1cfec9f285c83b231f2225ff7c", + "version-semver": "2.3.2", + "port-version": 0 + }, + { "git-tree": "9691eb7a176a1bbe9da26f853d59403f00aef9a0", "version-semver": "2.2.0", "port-version": 1 |
