From nobody Sun Jun 02 05:36:35 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 4VsQZq2gj0z5M5vQ; Sun, 02 Jun 2024 05:36:35 +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 4VsQZq1rQRz4WX2; Sun, 2 Jun 2024 05:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717306595; 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=73hQvb2hxnHJdpLHO3LWiPNsMMSb6Ed/OprYN41H2a8=; b=Mkorcu2r4nIUK3ivr3T8KJummz0vp8ZyjY/XtIHXareyfxNpxg2oKE6M6kVH4Fmi9l14VL IbOKpZKdbWD9Yp8tscL4gt5ckzxg4Y7sXJilq8rtsg8bZRQA3ktFGEVllpgiHowgHKQd1w JfrJLs2pBzLZtzBDpR9kexIyY66XuWUu2urjkTKR5sgMCYolm98HPX1+cNCPXiooolkxEn gmwU+xg4A28IyZ++bgw5/XVHmilNx13PgZjpXWjBe7AEH1OIQb/IH5IerhjVleJIhdFUuX qGOjaQyhBJIs3UXHaFTjrnris0yUCJcawKNsTQSu3uoL9WBm+aT3fvv+eC91nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717306595; a=rsa-sha256; cv=none; b=F01E13uHvU1N2NN14DE2z2oRM/Zhwsa1JDZN3stf7cKjru9SnJxiN/aVKhazpVkAWDIwGz wGaT1POUuPcpSxo8t4P7Ug2uXciPL4fxnLw9ZMb33C3ZClxa/JcudQ2fMcgEhgaSP3mv2n TRj3IvX+iOE0FMIguUBK++bv050VyjiBkyuH9zi1a876G4HXzK4ZXb0onKcX8wZkA/p/Fs 7OMWUb//dnR/y7guHjx085diO7kss3Ye0KzW2t3Ik2/QftceXZCOevqd+up7sgcZb89A9b 3MArL/b0UvU9MNOqWdGjkcxt2ujHqch/DzI41DLNmkq25b2Y4FhtdPVFxJRC5Q== 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=1717306595; 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=73hQvb2hxnHJdpLHO3LWiPNsMMSb6Ed/OprYN41H2a8=; b=l6+7DydoR1JCXxXMuYPHtS5NYed5Z/0O/d+WYL2s0oiZyMcKTu56JSj6MLYJgpQSCVcIE1 imw7kTEya0aP+8gdK7InPQ21pwhlE1nKJHLoj6Ipwl/5UCpqgPd34LDSUDfFHsZXAykQM7 bJoibhc/AmLCpagn18Sjgf5nWiQdhS33FUzGRUZr+xraOS2aPGj8WsqnIfPPK/T5pbjJ0w PE5n+AzNoFCv7kWNQZHaLokjqonipUZsXVKZ1aZsWt8zbu0cyRenkZEJXmj2WnL5nZi+uc M8m4UIkzaXhrnWnrdS71x542diAq4w/Mz4aGu1GvNGFuZBN1uM7z2U0FVjAuOg== 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 4VsQZq1RJJzfXs; Sun, 2 Jun 2024 05:36:35 +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 4525aZiL012961; Sun, 2 Jun 2024 05:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4525aZcs012958; Sun, 2 Jun 2024 05:36:35 GMT (envelope-from git) Date: Sun, 2 Jun 2024 05:36:35 GMT Message-Id: <202406020536.4525aZcs012958@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 4caac3599a20 - main - graphics/mesa-dri: Fix 15-CURRENT 108de784513d build 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4caac3599a20e11d0bb2bc4e1aaa35c780101379 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4caac3599a20e11d0bb2bc4e1aaa35c780101379 commit 4caac3599a20e11d0bb2bc4e1aaa35c780101379 Author: Cy Schubert AuthorDate: 2024-06-02 04:37:29 +0000 Commit: Cy Schubert CommitDate: 2024-06-02 05:30:40 +0000 graphics/mesa-dri: Fix 15-CURRENT 108de784513d build 108de784513d on main in src redefined CLOCK_BOOTTIME to alias CLOCK_MONOTONIC, instead of CLOCK_UPTIME. This results in the following errors when building this port under 15-CURRENT: ../src/intel/common/xe/intel_gem.c:72:9: error: duplicate case value '4' 72 | case CLOCK_BOOTTIME: | ^ /usr/include/sys/_clock_id.h:81:25: note: expanded from macro 'CLOCK_BOOTTIME' 81 | #define CLOCK_BOOTTIME CLOCK_MONOTONIC | ^ /usr/include/sys/_clock_id.h:56:26: note: expanded from macro 'CLOCK_MONOTONIC' 56 | #define CLOCK_MONOTONIC 4 | ^ ../src/intel/common/xe/intel_gem.c:66:9: note: previous case defined here 66 | case CLOCK_MONOTONIC: | ^ /usr/include/sys/_clock_id.h:56:26: note: expanded from macro 'CLOCK_MONOTONIC' 56 | #define CLOCK_MONOTONIC 4 | ^ 1 error generated. On FreeBSD systems without 108de784513d the old definition will be used while on 108de784513d and newer the duplicate case will be removed. Repored by: eduardo Obtained from: src 676041c41ba5 Discussed with: imp --- .../mesa-dri/files/patch-src_intel_common_xe_intel__gem.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/graphics/mesa-dri/files/patch-src_intel_common_xe_intel__gem.c b/graphics/mesa-dri/files/patch-src_intel_common_xe_intel__gem.c new file mode 100644 index 000000000000..dbaa9564c9c5 --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_intel_common_xe_intel__gem.c @@ -0,0 +1,13 @@ +--- src/intel/common/xe/intel_gem.c.orig 2024-05-22 09:48:39.000000000 -0700 ++++ src/intel/common/xe/intel_gem.c 2024-06-01 06:28:22.268439000 -0700 +@@ -69,8 +69,10 @@ + #endif + case CLOCK_REALTIME: + #ifdef CLOCK_BOOTTIME ++#if !(defined(CLOCK_BOOTTIME) && CLOCK_BOOTTIME == CLOCK_MONOTONIC) + case CLOCK_BOOTTIME: + #endif ++#endif + #ifdef CLOCK_TAI + case CLOCK_TAI: + #endif