From d1ca2316202ab8d2c1d8703f6ba7d7bb99b1185d Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Thu, 14 Dec 2023 11:07:37 +0200
Subject: [PATCH] [MinGW] Rename conflicting file, add missing timespec
 function implementation.

---
 SConstruct     | 3 ++-
 update_mesa.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 update_mesa.sh

diff --git a/SConstruct b/SConstruct
index 89d3218..b4254c4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -279,7 +279,7 @@ extra_defines += [
     "__STDC_CONSTANT_MACROS",
     "__STDC_FORMAT_MACROS",
     "__STDC_LIMIT_MACROS",
-    ("PACKAGE_VERSION", '\\"' + Path(mesa_absdir + "/VERSION").read_text().strip() + '\\"'),
+    ("PACKAGE_VERSION", '\\"' + Path(mesa_absdir + "/VERSION.info").read_text().strip() + '\\"'),
     ("PACKAGE_BUGREPORT", '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
     "PIPE_SUBSYSTEM_WINDOWS_USER",
     "_USE_MATH_DEFINES",
@@ -297,6 +297,7 @@ if env.get("is_msvc", False):
         ("_HAS_EXCEPTIONS", 0),
         "NOMINMAX",
         "HAVE_STRUCT_TIMESPEC",
+        "HAVE_TIMESPEC_GET",
         ("_Static_assert", "static_assert"),
     ]
     env.Append(CFLAGS=["/std:c11"])
diff --git a/update_mesa.sh b/update_mesa.sh
old mode 100644
new mode 100755
index caa0e9b..4aff185
--- a/update_mesa.sh
+++ b/update_mesa.sh
@@ -89,7 +89,6 @@ copy_sources() {
     }
 
     # These are the first we know for sure we want to copy.
-    copy_file . VERSION
     copy_file . .editorconfig
     copy_subir_sources src/microsoft/compiler
     copy_subir_sources src/microsoft/spirv_to_dxil
@@ -106,6 +105,7 @@ copy_sources() {
     copy_subir_headers include/KHR
     copy_subir_headers src/c11
     copy_file src/c11/impl threads_win32.*
+    copy_file src/c11/impl time.c
     copy_subir_sources src/compiler
     copy_subir_headers src/compiler/glsl
     copy_subir_sources src/compiler/nir
@@ -146,7 +146,7 @@ copy_sources() {
     copy_file src/util u_vector.c
     copy_file src/util u_worklist.c
 
-    cp ./mesa/VERSION godot-mesa
+    cp ./mesa/VERSION godot-mesa/VERSION.info
     check_error
 }