From nobody Fri Jun 07 09:27:00 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 4VwbSN5plTz5N90T; Fri, 07 Jun 2024 09:27:00 +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 4VwbSN4ssJz47B2; Fri, 7 Jun 2024 09:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717752420; 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=1tA3E+cf41iZd7E/kznI0DvrsjLbRUlG2PPrrnEl0jo=; b=E/Cn56an9M2ebz9M+NtOE1Ihq/O4rE41foTnkHwJEpVotH6pq8l88Ld1WNBbvWLTGVaCnK DTV/nZweunkhCiVhGsqHkZQ3alR++wBbxfozBRUKO3/Bn6nLF3Wgtck7h3oluBgPI3Us4S SwhHguYWXnReGPS8MlQcsRQpYqFp7WjIs9CrA+70dpTX1Zcw7Wv/FPC23+R/h+b9IhTgaD DLqFfRAoRknc6dEAm4JAQgnILlDOwFRkEP4o/oZz8ZocP1xmd0K9gdcb0oyezXanhu8bRk OcMwP/1FX6tPFYmCJWXRKKO4yyMCnll0Hzj8mMk5TZ70qoyel3S3QSP0fyNyGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717752420; a=rsa-sha256; cv=none; b=yhDRB7sfa7ZlB9ROY3w5HtJfiJhf2U2y+dq6l7UTuqow6VBXWR4JPbBdpZyoHx9Y0fNAXL r7OtlwVBfbLA/lECKzw7LahnC0MaMCP+sV3n/P/gA9Ze6S5oVncGhoGY59knbbVQ9CGnZd x3ZGQmMY/7J3WpbMvY3ZjE0ROdyrTvxT3uN+OWxTtnTGUjlxb/mfeBba51h7Z9ySX2w9t2 riobQZJMppnxm4nzVkic/gr49AeqGoIoftyLD+6Ql9x4aDQ0E7YVIPqv/gybv1wllxTiEq 1TWKlEJGdQOPryvpB1zU3wt3qKtgPolvjyrMNJPfS+9ZkTuUwsWO782ujwt/Jw== 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=1717752420; 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=1tA3E+cf41iZd7E/kznI0DvrsjLbRUlG2PPrrnEl0jo=; b=Rj8Z0Jhj7nBtsajHvYxR9kYakaODr2c3Rs6dgiUZJ6qXLyqLjWanqeBlBdfmyaAHDeV3tF hP+BPZspGmorgr57OXo5Csy1qZhiTjTd1qT4uZQVF964mcHmTK38FxTuQDHPDHnLqkQrUB 7Cunlcrh6NyB1pPT1rdIvH9Oo4VYLKL0c5EVklGSwaXG5UngjibRKr2kNl3A5Ld+izPWUj mFLglHtvhwVno318eDaEMoI0UPEkS7FMebG3JsWLSIlX4P1illilCU+jXdhuE9Lu2TmOss NSpWP4leQIykhvK0U0+qEwkZg27HNMd5kf4CofSytliRDaH4yx0fDujT0JQroA== 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 4VwbSN4LKRz1NYw; Fri, 7 Jun 2024 09:27:00 +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 4579R0Qd029717; Fri, 7 Jun 2024 09:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4579R02a029714; Fri, 7 Jun 2024 09:27:00 GMT (envelope-from git) Date: Fri, 7 Jun 2024 09:27:00 GMT Message-Id: <202406070927.4579R02a029714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1634c88f12a3 - main - graphics/mesa-devel: 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1634c88f12a37d8d00ee59e2619578a1ea514a04 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1634c88f12a37d8d00ee59e2619578a1ea514a04 commit 1634c88f12a37d8d00ee59e2619578a1ea514a04 Author: Cy Schubert AuthorDate: 2024-06-02 04:37:29 +0000 Commit: Jan Beich CommitDate: 2024-06-07 09:25:46 +0000 graphics/mesa-devel: 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. Reported by: pkg-fallout Obtained from: src 676041c41ba5 Discussed with: imp --- .../mesa-devel/files/patch-src_intel_common_xe_intel__gem.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/graphics/mesa-devel/files/patch-src_intel_common_xe_intel__gem.c b/graphics/mesa-devel/files/patch-src_intel_common_xe_intel__gem.c new file mode 100644 index 000000000000..b4f8bfd180d1 --- /dev/null +++ b/graphics/mesa-devel/files/patch-src_intel_common_xe_intel__gem.c @@ -0,0 +1,12 @@ +--- src/intel/common/xe/intel_gem.c.orig 2024-06-05 23:45:33 UTC ++++ src/intel/common/xe/intel_gem.c +@@ -69,7 +69,9 @@ xe_gem_read_correlate_cpu_gpu_timestamp(int fd, + #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: