git: 4caac3599a20 - main - graphics/mesa-dri: Fix 15-CURRENT 108de784513d build

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4caac3599a20e11d0bb2bc4e1aaa35c780101379

commit 4caac3599a20e11d0bb2bc4e1aaa35c780101379
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-06-02 04:37:29 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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