aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/freerdp/Makefile4
-rw-r--r--net/freerdp/distinfo6
-rw-r--r--net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h11
-rw-r--r--net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c11
-rw-r--r--net/freerdp/pkg-plist3
5 files changed, 8 insertions, 27 deletions
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 9016d8f41744..f02bf557829e 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,7 +1,7 @@
# Created by: Alexander Logvinov <avl@FreeBSD.org>
PORTNAME= freerdp
-DISTVERSION= 2.5.0
+DISTVERSION= 2.6.0
CATEGORIES= net comms
MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
@@ -29,7 +29,7 @@ CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \
WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
- WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK WITH_X264
+ WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
CMAKE_ARGS_aarch64+= -DWITH_NEON=ON
CFLAGS_aarch64+= -D__ARM_NEON__=__ARM_NEON # clang
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index 4f67a3b454bd..76725b0dc1d8 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642080752
-SHA256 (freerdp-2.5.0.tar.gz) = 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b
-SIZE (freerdp-2.5.0.tar.gz) = 7303832
+TIMESTAMP = 1645661414
+SHA256 (freerdp-2.6.0.tar.gz) = a4ba0a75e30ed25fffc4cd4e89d0eb92e66894caeb6c78dc5e23b6b7c04f60fe
+SIZE (freerdp-2.6.0.tar.gz) = 7270635
diff --git a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h b/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h
deleted file mode 100644
index 67e8ab7b2759..000000000000
--- a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/urbdrc/client/libusb/libusb_udevice.h.orig 2020-05-20 14:45:43 UTC
-+++ channels/urbdrc/client/libusb/libusb_udevice.h
-@@ -75,4 +75,8 @@ IUDEVICE* udev_new_by_addr(URBDRC_PLUGIN* urbdrc, libu
- BYTE dev_number);
- const char* usb_interface_class_to_string(uint8_t class);
-
-+#ifndef LIBUSB_CLASS_PHYSICAL
-+#define LIBUSB_CLASS_PHYSICAL 5
-+#endif
-+
- #endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H */
diff --git a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c b/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c
deleted file mode 100644
index f1662e96308a..000000000000
--- a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/urbdrc/client/libusb/libusb_udevman.c.orig 2020-06-08 15:33:51 UTC
-+++ channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -832,7 +832,7 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
- {
- libusb_hotplug_callback_handle handle;
- UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;
-- BOOL hasHotplug = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG);
-+ BOOL hasHotplug = TRUE;
-
- if (hasHotplug)
- {
diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist
index b49bd7312f2e..a0c6b2a2163d 100644
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@@ -16,6 +16,7 @@ include/freerdp2/freerdp/cache/nine_grid.h
include/freerdp2/freerdp/cache/offscreen.h
include/freerdp2/freerdp/cache/palette.h
include/freerdp2/freerdp/cache/pointer.h
+include/freerdp2/freerdp/channels/ainput.h
include/freerdp2/freerdp/channels/audin.h
include/freerdp2/freerdp/channels/channels.h
include/freerdp2/freerdp/channels/cliprdr.h
@@ -35,6 +36,7 @@ include/freerdp2/freerdp/channels/urbdrc.h
include/freerdp2/freerdp/channels/video.h
include/freerdp2/freerdp/channels/wtsvc.h
include/freerdp2/freerdp/client.h
+include/freerdp2/freerdp/client/ainput.h
include/freerdp2/freerdp/client/audin.h
include/freerdp2/freerdp/client/channels.h
include/freerdp2/freerdp/client/cliprdr.h
@@ -112,6 +114,7 @@ include/freerdp2/freerdp/primitives.h
include/freerdp2/freerdp/rail.h
include/freerdp2/freerdp/scancode.h
include/freerdp2/freerdp/secondary.h
+include/freerdp2/freerdp/server/ainput.h
include/freerdp2/freerdp/server/audin.h
include/freerdp2/freerdp/server/channels.h
include/freerdp2/freerdp/server/cliprdr.h