From nobody Thu Jan 25 12:52:26 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 4TLLMG23RQz58S6M; Thu, 25 Jan 2024 12:52:26 +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 4TLLMG1fgrz4cn4; Thu, 25 Jan 2024 12:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706187146; 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=Ok7jgNjGX8e3Hi5l58MG0TLJALt67u8AI2xZTsaslsM=; b=Th1ZKVPuRlGXkBe+K5J44WfXc1trQ5ax29FrzlkRwI8ZhlcC9yAQrwykBJVMiv3IErL/xS FXqVppsBPZe1SRRzY9zCB+FiBVLwAyQnhocapuhOAN5KVNoswxP2B7IgRq/4NO+s8yyjU7 h3jmtRPQrWbXnXryTULU/j+5OTBVCJM7FbG43gNWF9hVaPEXqKo6ruE5oAn0P3BavT/fFv TYhN/isl7HTf1Ze2Zwhy1Y/nbHIcEjxT/OJlEtmVoVb6EBf9bGJQEgBTRacuP/L0/jhyKY +D4UCzpVLyMzTB/NWajDBhrfVxT0wIWG0zfeTvq7Pb3v1/+ejRAX6K8WxHn6cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706187146; 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=Ok7jgNjGX8e3Hi5l58MG0TLJALt67u8AI2xZTsaslsM=; b=XjUL2ooA4FeQ6oJGpWta3wCH+vM2dvQ1lhjMjQAJ5385Nl2mGLxmOKi6WZADk7iFrwFmTb hpcT5XqtNfpWX8svBWolBXx21SvPxZ4oT7EgtfwgI/vZF7S0exwy2M+WjC1z5f/y3EJhTF TgiGcPtOX0qCAwgOAQ1UC9CBM/uJBvqQFYMSrEqjLPT+pipCEiZ7zpNOx7gspqzlimQHp8 wwOcsWpP/UdrNUheP+L+VNTmBhdyvisgr95kwyVjc4iYESj0UaLet39p7Ea2GrYb6ZQhtP CbNOVALfYQVEXok0+oPB+IDJxn2WR350Mpf1Ac882Th/LasRNM4i3hTd9hzupA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706187146; a=rsa-sha256; cv=none; b=uONiteE4kRQpK+qklTljvpafIbNg1cZ6RNu69Lf8avriCDdvOP69+wA8UjvG9ZsAAaoWs2 YyepqWQLUTRa6An/LFLT8V0cKhhD3BzcdNjl11HamzK2PsNbXuAG6wb5D50w3b901VX0W3 B1FrN45GIeW6Y5Bh6/qzByCJgudsr5j2wMYcA2lPd4KQP9doxi4Gwub330cefaxxkBFoAq T/C9hbZ4s18FHnMCqDXrMmmTftUFwNda4smVXKgvrRN6zvLpWLwvrVYRrEINl9yjvs1hR3 CPX0FIiJbiqXXYoHulTf4+suMehByHvsc6KGzyuN4sHn0dc7AHns9dbT5GZ5bA== 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 4TLLMG0kK3zygt; Thu, 25 Jan 2024 12:52:26 +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 40PCqQmq039316; Thu, 25 Jan 2024 12:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40PCqQHv039313; Thu, 25 Jan 2024 12:52:26 GMT (envelope-from git) Date: Thu, 25 Jan 2024 12:52:26 GMT Message-Id: <202401251252.40PCqQHv039313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 168e1199a502 - main - graphics/mesa: Add a patch for testing kcmp 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 168e1199a5020101ba16eb7e69feb0fc3d76371a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=168e1199a5020101ba16eb7e69feb0fc3d76371a commit 168e1199a5020101ba16eb7e69feb0fc3d76371a Author: Emmanuel Vadot AuthorDate: 2024-01-25 12:49:49 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-25 12:52:17 +0000 graphics/mesa: Add a patch for testing kcmp Upstream patch is based on the mesa main branch and this branch have extra checks for kcmp, add those test locally as they are not in 23.3.4 Fixes: 2080c2eddaca ("graphics/mesa: Update to 23.3.4") Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/files/patch-src_util_os__file.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/graphics/mesa-dri/files/patch-src_util_os__file.c b/graphics/mesa-dri/files/patch-src_util_os__file.c new file mode 100644 index 000000000000..f1bb54593c5a --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_util_os__file.c @@ -0,0 +1,22 @@ +--- src/util/os_file.c.orig 2024-01-25 12:45:07 UTC ++++ src/util/os_file.c +@@ -207,13 +207,19 @@ os_same_file_description(int fd1, int fd2) + int + os_same_file_description(int fd1, int fd2) + { ++#ifdef SYS_kcmp + pid_t pid = getpid(); ++#endif + + /* Same file descriptor trivially implies same file description */ + if (fd1 == fd2) + return 0; + ++#ifdef SYS_kcmp + return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); ++#else ++ return -1; ++#endif + } + + #else