From nobody Sat Jan 20 13:26:22 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 4THHLl1crFz577Pp; Sat, 20 Jan 2024 13:26:23 +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 4THHLk6nMxz4hKm; Sat, 20 Jan 2024 13:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705757183; 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=4jDP4mbwj888mcqUWVdPHrAVZ7QcWceVTfjoky6gQfE=; b=DbBBNgO7j31wFdM+KUH+ssEoZiqtT0Q/dH+tlqQN2/xraQfnFD9UnRCHHHIYeus8DVuUFB JYHUuxOb9ItVkSYOsP2JjywpGT0IyR38X50xKNN3zmlRzQgQHWBApjFz2hxkmmXiR0z80s YUI9HjulXX28Y+BnzkO426xqb1vjtvNB+d8ZJ/ANn5bcaAcdp6fCEKcRxZYH9jhxzWL03g 94gAWJUgzCS29bjv7yDPxB5g/jxAryp0TdwPFiXefTb5yMnE5AZ4FCz/SuwBJekHzMZkeH 99ZBXXVkOHtOxYVyuzmz0QBwbtkkmm/7sELO92GtHGQ5JA+WEQIoqujropM9zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705757182; 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=4jDP4mbwj888mcqUWVdPHrAVZ7QcWceVTfjoky6gQfE=; b=ns6wWOPzjjiovCOZxV19py7dQxmUPBdEPIWGBWK8f5iNJ30VRdaxawC2ha82zp46J4PUgT JL2M7VKQNcKo+niiHFaelOoY3SyBIIc/3eQ3PkgEilAZy4Jve0V3yRPmJz2r+L9AQshM3x CV1g96aziITrhfw0uKkogRXEWKbynDWo8ueuRZ30iZdO/dKiNzhTGs3vlSX3tj+UqVAY1u lNVENvrZjQiQkCV4TjNFYAedHez6ILsDY0owtk04zk2NjRyZZ/rOE5X/bC4Q35Boif54Wd EHH0sHmsr7oh6D/7I98YKBoynZwwzK8En4ygs20ii4SqL9nFie4Dee6sPV3XCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705757182; a=rsa-sha256; cv=none; b=X5aHnEbLPAsDDirv/HdJFGzparp4Ka/1+gGJyZNGIAjTru9ViJd1P4ct3dWCT1S8EjvRp/ DG7XhvpyBwav/f2iL1mK16cJ6T8QFVo8lH3oSo6RehuStbwu/joHFUsPAU7xI86aMG1q8h ZtZRF6QjBv5B8tz/vXw9Hc5MHUpZn+NR8apiblv+NKNFWanrrWvkLqa7He8AzOu3gP+LFO uoPW2bwT94m0vdoHEoj9ugMRsMZMDkGgsj0m3dQ7BI4AYlhtZQAQjt87+H1k27njKLzPwD oZFzwwPC72NljFWVC5jAPaXhVyiap0Wh9ehpbWvxKjSX1YapAksZP0CbXuAiJA== 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 4THHLk5RNBzcv9; Sat, 20 Jan 2024 13:26:22 +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 40KDQMwq032419; Sat, 20 Jan 2024 13:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KDQMnR032416; Sat, 20 Jan 2024 13:26:22 GMT (envelope-from git) Date: Sat, 20 Jan 2024 13:26:22 GMT Message-Id: <202401201326.40KDQMnR032416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 33b0bed92e30 - 2024Q1 - net/freerdp: replace local patch 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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 33b0bed92e30a059634c405edba6c796d56ca9b1 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=33b0bed92e30a059634c405edba6c796d56ca9b1 commit 33b0bed92e30a059634c405edba6c796d56ca9b1 Author: Vladimir Druzenko AuthorDate: 2024-01-11 07:16:41 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-20 13:24:41 +0000 net/freerdp: replace local patch with commited in the upstream repository Approved by: arrowd (mentor, implicit) (cherry picked from commit 12937b0c724c80ce3da6387e4fcf4cb8de7e995d) --- net/freerdp/Makefile | 2 ++ net/freerdp/distinfo | 4 +++- .../files/patch-winpr_libwinpr_sysinfo_sysinfo.c | 19 ------------------- 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; - } -