From nobody Sun Mar 17 17:58:18 2024 X-Original-To: dev-commits-ports-main@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 4TyQhB5MvNz5Dplj; Sun, 17 Mar 2024 17:58:18 +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 4TyQhB4tZ6z4KST; Sun, 17 Mar 2024 17:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710698298; 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=4dxFj+JdAgZW3PlidIpcsUqvJA0BntHhTd+Qj4FIJzU=; b=w2Jq5TO7ABxiX5x2VTmKdcuA4DXSFDsLaO7iX/QCX0r6B2NG901gLiec/9LnKWzDEjnVgV xUvAM02vkoS5RZCLc3shWwTSeveYQQP1yC0+5g8S8TJI4DkZL6BwXz/VvJmYMTIxihNiTl yI4iiwMrHA1LAGznxKc4E7ij+Qiw98rMne4xfvxBLiUH6YYFS8lUgNxM4aEFnIzO5IpOab 7faxUr3tRLhkSQEPxp+dxEfPpUftybsNOzLjaBOtEvkNgHOywJ8pWKrexfdVHxGuxsK10J XQ7jL/dGavQcChA0OH8GIdmVVPphk8zchscXCm6pQqH4TTonw7xtYfqZIT+nSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710698298; a=rsa-sha256; cv=none; b=QWJolKHscBtDDAjUnUVNcd+N/cHIZH4wiUNZ7oaIH6ldYoSB71x2HGH1oUCmh/UNtkaQZT pjDavgN2ViyTb4UDBJlHZJV57IEXK+/0HXotN12zCKSk4Nby1e1gI7+2KM20iwe+QpK+oQ sMBVIhxz7nstZ7oGDLl3QBB5+LNllyNe+lKQVnlYHc4TgAvoTbi8U0W/twY2qOwtCnwQWu quVUufB2Z5GFZKXLTAEBTFt3B/D8dsw0BFBs+jjx1gdHB5hS+Ia91QWJTEjcWGLt5epmlw uAWkcE4hy9T7hDSADA/doUfY9zIv4JpXfD4E/SKB1iS8OTQhgNqpQnQF72Vlag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710698298; 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=4dxFj+JdAgZW3PlidIpcsUqvJA0BntHhTd+Qj4FIJzU=; b=oH6M+z78Ef5i04CLK+7bqcrhutrMAfGGnctec0dCL6essSYRvS0LqLyqaCem6uQWgPANZC vbk68mxgYhloZsCPBYqHEGMdW4izs7e874xLcj3OQmepJump03QCB10MchoC6wMKGpjnJ5 LzT6S+EC58ohCNcEdtvcyhP/ibWS4GFqyOnCFV/uecljYqPNuvCoUjBiWNMV5zD4rcVd5X Ih+9R8gsWw8fYr3usG8C+x6RB2w9qHMsyL1Sy3sMiKCh3iiGK5BXt1G5K5sgRrIeXZTI2r TRPsJVDbFcSoTLOQhbaDKu6N0YUnmWeCb5Nc5dgnyQ5DqDLU/8uC/d9xhR5yvg== 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 4TyQhB4TCBzpbv; Sun, 17 Mar 2024 17:58:18 +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 42HHwIGx067813; Sun, 17 Mar 2024 17:58:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42HHwIjl067810; Sun, 17 Mar 2024 17:58:18 GMT (envelope-from git) Date: Sun, 17 Mar 2024 17:58:18 GMT Message-Id: <202403171758.42HHwIjl067810@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: f2aa302b1089 - main - net/freerdp3: fix "sysinfo" breakage List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f2aa302b1089d3f818d3d3c0e4d0548aaf766e7b Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2aa302b1089d3f818d3d3c0e4d0548aaf766e7b commit f2aa302b1089d3f818d3d3c0e4d0548aaf766e7b Author: Vladimir Druzenko AuthorDate: 2024-03-17 17:41:09 +0000 Commit: Vladimir Druzenko CommitDate: 2024-03-17 17:58:07 +0000 net/freerdp3: fix "sysinfo" breakage After upstream commit https://github.com/FreeRDP/FreeRDP/commit/4732f379d4d723378a5ec4948b00061cebbd67af net/freerdp3 build fails in enveronments without devel/libsysinfo installed. But with devel/libsysinfo installed net/freerdp3 grab silently LOCALBASE/include/sys/sysinfo.h, build without errors, but sdl-freerdp and wlfreerdp3 run failed with error: ld-elf.so.1: /usr/local/lib/libwinpr3.so.3: Undefined symbol "sysinfo" Upstream check supported version of the posix using _POSIX_C_SOURCE define. This doesn't work on FreeBSD. Together with upstream trying to find correct solution... Approved by: arrowd (mentor) --- net/freerdp3/Makefile | 1 + .../files/patch-winpr_libwinpr_sysinfo_sysinfo.c | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/net/freerdp3/Makefile b/net/freerdp3/Makefile index 1cbeaac94829..7d102ef502eb 100644 --- a/net/freerdp3/Makefile +++ b/net/freerdp3/Makefile @@ -1,5 +1,6 @@ PORTNAME= freerdp DISTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ diff --git a/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c b/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c new file mode 100644 index 000000000000..23b92abce568 --- /dev/null +++ b/net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c @@ -0,0 +1,29 @@ +--- winpr/libwinpr/sysinfo/sysinfo.c.orig 2024-03-14 10:28:33 UTC ++++ winpr/libwinpr/sysinfo/sysinfo.c +@@ -34,7 +34,7 @@ + #endif + + #if !defined(_WIN32) +-#if defined(_POSIX_SOURCE) && (_POSIX_C_SOURCE >= 200112L) ++#if (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__) + #include + #elif !defined(__APPLE__) + #include +@@ -579,7 +579,7 @@ ULONGLONG winpr_GetTickCount64(void) + UINT64 winpr_GetTickCount64NS(void) + { + UINT64 ticks = 0; +-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) ++#if (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__) + struct timespec ts = { 0 }; + + if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts) == 0) +@@ -632,7 +632,7 @@ UINT64 winpr_GetUnixTimeNS(void) + } t = { 0 }; + GetSystemTimeAsFileTime(&t.ft); + return (t.u64 - FILETIME_TO_UNIX_OFFSET_S * 10000000ull) * 100ull; +-#elif _POSIX_C_SOURCE >= 200112L ++#elif (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__) + struct timespec ts = { 0 }; + if (clock_gettime(CLOCK_REALTIME, &ts) != 0) + return 0;