From 979a9558438d023273e3c3b44aa06c4dd27e6a91 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Sat, 4 Oct 2025 14:11:54 -0400
Subject: [PATCH] update spirv-headers, fix cpmutil scripts

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 externals/cpmfile.json | 4 ++--
 tools/cpm/common.sh    | 3 ++-
 tools/cpm/format.sh    | 7 +++++--
 tools/cpm/which.sh     | 6 ++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index 47ac1d6e3d..eb1e5853cd 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -125,8 +125,8 @@
     "spirv-headers": {
         "package": "SPIRV-Headers",
         "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "4e209d3d7e",
-        "hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4",
+        "sha": "01e0577914",
+        "hash": "d0f905311faf7d743de686fdf241dc4cb0a4f08e2184f5a3b3b2946e680db3cd89eeb72954eafe6fa457f93550e27d516575c8709cb134d8aecc0b43064636ce",
         "options": [
             "SPIRV_WERROR OFF"
         ]
diff --git a/tools/cpm/common.sh b/tools/cpm/common.sh
index f26d76ee05..4aff058bdc 100755
--- a/tools/cpm/common.sh
+++ b/tools/cpm/common.sh
@@ -15,7 +15,8 @@ MAXDEPTH=3
 
 # shellcheck disable=SC2038
 # shellcheck disable=SC2016
-[ -z "$PACKAGES" ] && PACKAGES=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
+# shellcheck disable=SC2086
+[ -z "$PACKAGES" ] && PACKAGES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
 
 # For your project you'll want to change the PACKAGES call to include whatever locations you may use (externals, src, etc.)
 # Always include .
diff --git a/tools/cpm/format.sh b/tools/cpm/format.sh
index 873a18debe..8d99b4796b 100755
--- a/tools/cpm/format.sh
+++ b/tools/cpm/format.sh
@@ -3,8 +3,11 @@
 # SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# like common.sh, change for your directories
-FILES=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json)
+# shellcheck disable=SC1091
+. tools/cpm/common.sh
+
+# shellcheck disable=SC2086
+FILES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json)
 
 for file in $FILES; do
     jq --indent 4 < "$file" > "$file".new
diff --git a/tools/cpm/which.sh b/tools/cpm/which.sh
index fd1029ef3d..c936d0a97f 100755
--- a/tools/cpm/which.sh
+++ b/tools/cpm/which.sh
@@ -4,9 +4,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # check which file a package is in
+# shellcheck disable=SC1091
+. tools/cpm/common.sh
 
-# like common.sh, change for your directories
-JSON=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json -exec grep -l "$1" {} \;)
+# shellcheck disable=SC2086
+JSON=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json -exec grep -l "$1" {} \;)
 
 [ -z "$JSON" ] && echo "!! No cpmfile definition for $1"