aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Druzenko <vvd@FreeBSD.org>2024-01-11 07:16:41 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2024-01-11 07:16:41 +0000
commit12937b0c724c80ce3da6387e4fcf4cb8de7e995d (patch)
treec51477e2edd5cf7f48c7c305611fe1d378311437
parentddbf184ea4a9d208bbba44462d8805bea5fd62a9 (diff)
downloadports-12937b0c724c80ce3da6387e4fcf4cb8de7e995d.tar.gz
ports-12937b0c724c80ce3da6387e4fcf4cb8de7e995d.zip
net/freerdp: replace local patch with commited in the upstream repository
Approved by: arrowd (mentor, implicit)
-rw-r--r--net/freerdp/Makefile2
-rw-r--r--net/freerdp/distinfo4
-rw-r--r--net/freerdp/files/patch-winpr_libwinpr_sysinfo_sysinfo.c19
3 files changed, 5 insertions, 20 deletions
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 3700f7448b58..a04784e37ae9 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -8,6 +8,8 @@ MASTER_SITES= https://pub.freerdp.com/releases/ \
PATCH_SITES= https://github.com/FreeRDP/FreeRDP/commit/
PATCHFILES+= 61983cd6dcb86097d91b7ef405abc1266444a368.patch:-p1 # ffmpeg6 support: AVPicture
# https://github.com/FreeRDP/FreeRDP/pull/8941
+PATCHFILES+= 78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch:-p1 # add additional neon check
+ # https://github.com/FreeRDP/FreeRDP/issues/9746
MAINTAINER= vvd@FreeBSD.org
COMMENT= Free implementation of Remote Desktop Protocol
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index cc51ec2cfa87..bca923ec88c6 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1702863387
+TIMESTAMP = 1704957270
SHA256 (freerdp-2.11.4.tar.gz) = 2534e5bc53e3fd1b55611c0753a7c2b73242da33f058771cbf053e4f77483146
SIZE (freerdp-2.11.4.tar.gz) = 7380487
SHA256 (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = be68ff4ab63c15592ff576af34d4592340b70e7b6d7b5ef3cfe5ba97b5fdccf2
SIZE (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = 2826
+SHA256 (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = d49ea1c5a0fdb644b32fd61479dfca6770c0bb6446bbe9d274e5ae4f62f0a00b
+SIZE (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = 966
diff --git a/net/freerdp/files/patch-winpr_libwinpr_sysinfo_sysinfo.c b/net/freerdp/files/patch-winpr_libwinpr_sysinfo_sysinfo.c
deleted file mode 100644
index 794253fa4267..000000000000
--- a/net/freerdp/files/patch-winpr_libwinpr_sysinfo_sysinfo.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- winpr/libwinpr/sysinfo/sysinfo.c.orig 2023-12-14 18:03:49 UTC
-+++ winpr/libwinpr/sysinfo/sysinfo.c
-@@ -782,13 +782,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;
- }
-