From nobody Thu Jan 11 07:32:20 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T9bwN5PXKz56lZ6; Thu, 11 Jan 2024 07:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T9bwN3Lp8z4Pt8; Thu, 11 Jan 2024 07:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704958340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Fcg3kteDeXf665fXhQ/3iOxPqJ9FpCp8fCzrI6kUm8=; b=LLwjGlsTsTHihpbHYtJ/Af4La1by7yOH70eYvWYP+c7fKp0CeNX0iPp+7hcF1cjAYfSi1A azzufuvT2kkbXWAKKViCjECK1S1nfM174AVY/kCbOJDAHgLypVf679Lh5BLBX0vH0AdlIn zq2NdVbvAuwC6eOhED5IsPfiOdJ3J3FblbSNFlhxi6y1n2zNYM+US29MY0oLVcR11/mulO mlzbugLuwX/kcuTBl/c4XS3DPtkGJ7sNUxF87CRBzrLY2NL1GPK4M8IacvVwj+WddvmIyi RQQ94CFL+6GJS0E/rLDwo0z4AWDK9E3dOHjtVwSu1CjdSaSns4QFou0X8oMR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704958340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Fcg3kteDeXf665fXhQ/3iOxPqJ9FpCp8fCzrI6kUm8=; b=qD6MYx2D0IHz3uVyhi5Gk4/mGwyAqdzURAPSeci+aQF/bqpeaxd3PKeMHpczD6dnir1rrI AId/gCIdaNp1+IQUYAmV1ufBcuIzbYmLyygRxsUzN9lgxaRGZ/qgOBVShT/9cIAOfnjguZ 1f0S2cloh6ZZVsfqkVll7HZaGkNDzKOVy1O45yxJcrG2LmSKWcPrvz3B13bcd+DMxhUqX0 kiuBM7q1RLHndTonMMcbf9jkCQjCzisN3HIXGrYptXl2YVY700UmUex6e6UEaiVQXAvh24 hH6jZjBlEdOslqcYt7hNVZAclOsDjWHAc9d7JwsV5Yy0RBbdWmitP1O1jWSQbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704958340; a=rsa-sha256; cv=none; b=PJbj+t6fPQte1OfPI9ucEMqyOUzrwHQC6yT8UxT/J3NPQ68nayAZ4qQKYb4skIiAi/bs7z cdOQsJsO9D9wtqNeTmVwjEUs/S7ggmFXpY/VR3YcOvxnGcuHNqjwPOuUGMQ1iM0oUllGUK 2aAsZGlesSDM7GrSEW0yMetbzy/Y9QOCMMd9ifEXvj3gUEGYCA3T8yhJB1LCscL9U0lyKk 2XD9GET30QSlDNVI0A7QKFS4yDcZb/GeAI0lqBVJf6Z5iOFDZUndhDGpo8N0UsYQfm9vye uh1tvRhqQ6utopwjxN7wdBIVI00rsI9eJB9gtJC17+e4PtShU6E7kDbr3IJ89g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T9bwN2S5Fz197w; Thu, 11 Jan 2024 07:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40B7WKrx010185; Thu, 11 Jan 2024 07:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B7WKaG010182; Thu, 11 Jan 2024 07:32:20 GMT (envelope-from git) Date: Thu, 11 Jan 2024 07:32:20 GMT Message-Id: <202401110732.40B7WKaG010182@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f623f66ecbdc - main - net/freerdp3: replace local patches with commited in the upstream repository List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f623f66ecbdca27230b5a72cfece5dabaeb7a4bd Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f623f66ecbdca27230b5a72cfece5dabaeb7a4bd commit f623f66ecbdca27230b5a72cfece5dabaeb7a4bd Author: Vladimir Druzenko AuthorDate: 2024-01-11 07:30:41 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-11 07:30:41 +0000 net/freerdp3: replace local patches with commited in the upstream repository Approved by: arrowd (mentor, implicit) --- net/freerdp3/Makefile | 6 ++++++ net/freerdp3/distinfo | 6 +++++- net/freerdp3/files/patch-CMakeLists.txt | 11 ----------- .../files/patch-winpr_libwinpr_sysinfo_sysinfo.c | 19 ------------------- 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; - } -