aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2024-01-11 07:30:41 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2024-01-11 07:30:41 +0000
commitf623f66ecbdca27230b5a72cfece5dabaeb7a4bd (patch)
treeb511fae6c6719fc900ffef09f7ec2ec867628a44
parent12937b0c724c80ce3da6387e4fcf4cb8de7e995d (diff)
downloadports-f623f66ecbdca27230b5a72cfece5dabaeb7a4bd.tar.gz
ports-f623f66ecbdca27230b5a72cfece5dabaeb7a4bd.zip
net/freerdp3: replace local patches with commited in the upstream repository
Approved by: arrowd (mentor, implicit)
-rw-r--r--net/freerdp3/Makefile6
-rw-r--r--net/freerdp3/distinfo6
-rw-r--r--net/freerdp3/files/patch-CMakeLists.txt11
-rw-r--r--net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c19
4 files changed, 11 insertions, 31 deletions
diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile
index 245c0d9bec08..48c9b6b381ca 100644
--- a/net/freerdp3/Makefile
+++ b/net/freerdp3/Makefile
@@ -5,6 +5,12 @@ MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
PKGNAMESUFFIX= 3
+PATCH_SITES= https://github.com/FreeRDP/FreeRDP/commit/
+PATCHFILES+= 78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch:-p1 # Use NEON instructions on all platforms
+ # https://github.com/FreeRDP/FreeRDP/issues/9746
+PATCHFILES+= a371309672bfb1a8de4f558422ea8e7ee08190ea.patch:-p1 # enable wayland on BSD
+ # https://github.com/FreeRDP/FreeRDP/pull/9730
+
MAINTAINER= vvd@FreeBSD.org
COMMENT= Free implementation of Remote Desktop Protocol
WWW= https://www.freerdp.com/
diff --git a/net/freerdp3/distinfo b/net/freerdp3/distinfo
index c76816174b9b..7b67ffcf12d2 100644
--- a/net/freerdp3/distinfo
+++ b/net/freerdp3/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1703304844
+TIMESTAMP = 1704958062
SHA256 (freerdp-3.1.0.tar.gz) = ae8f499049d6e1735dc318c258887e383f613a2ffda1d70c38326df21d40affc
SIZE (freerdp-3.1.0.tar.gz) = 8462182
+SHA256 (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = d49ea1c5a0fdb644b32fd61479dfca6770c0bb6446bbe9d274e5ae4f62f0a00b
+SIZE (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = 966
+SHA256 (a371309672bfb1a8de4f558422ea8e7ee08190ea.patch) = 29814af240a184665c4a6caa8ae904929324c1440581554695c0d9d034c087d2
+SIZE (a371309672bfb1a8de4f558422ea8e7ee08190ea.patch) = 697
diff --git a/net/freerdp3/files/patch-CMakeLists.txt b/net/freerdp3/files/patch-CMakeLists.txt
deleted file mode 100644
index 32d51662b455..000000000000
--- a/net/freerdp3/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2024-01-05 17:52:01 UTC
-+++ CMakeLists.txt
-@@ -494,7 +494,7 @@ else()
- unset(FREERDP_HAVE_VALGRIND_MEMCHECK_H CACHE)
- endif()
-
--if((UNIX OR CYGWIN) AND NOT BSD)
-+if(UNIX OR CYGWIN)
- set(WAYLAND_FEATURE_TYPE "RECOMMENDED")
- else()
- set(WAYLAND_FEATURE_TYPE "DISABLED")
diff --git a/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c b/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c
deleted file mode 100644
index 99bd543a4f03..000000000000
--- a/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- winpr/libwinpr/sysinfo/sysinfo.c.orig 2023-12-22 16:29:20 UTC
-+++ winpr/libwinpr/sysinfo/sysinfo.c
-@@ -800,13 +800,15 @@ BOOL IsProcessorFeaturePresent(DWORD ProcessorFeature)
- break;
- }
-
--#elif defined(__APPLE__) // __linux__
-+#else // __linux__
-
- switch (ProcessorFeature)
- {
- case PF_ARM_NEON_INSTRUCTIONS_AVAILABLE:
- case PF_ARM_NEON:
-+#ifdef __ARM_NEON
- ret = TRUE;
-+#endif
- break;
- }
-