[externals] Update dependencies

* zlib: 1.3.1.2 -> 1.3.2 * vulkan-validation-layers: 1.4.335.0 -> 1.4.341.0 * sirit: 1.0.3 -> 1.0.4 * httplib: 0.35.0 -> 0.36.0 * xbyak: 7.33.3 -> 7.34.1 * catch2: 3.12.0 -> 3.13.0 * vulkan-headers: 1.4.342 -> 1.4.344 * vulkan-utility-libraries: 1.4.342 -> 1.4.344 Signed-off-by: crueter <crueter@eden-emu.dev>
5 days ago · faaf20f68b
4 changed files with 48 additions and 19 deletions
--- a/cpmfile.json
+++ b/cpmfile.json
@ -46,9 +46,9 @@
        "package": "ZLIB",
        "repo": "madler/zlib",
        "tag": "v%VERSION%",
-        "hash": "06eaa3a1eaaeb31f461a2283b03a91ed8eb2406e62cd97ea1c69836324909edeecd93edd03ff0bf593d9dde223e3376149134c5b1fe2e8688c258cadf8cd60ff",
+        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
        "version": "1.2",
-        "git_version": "1.3.1.2",
+        "git_version": "1.3.2",
        "options": [
            "ZLIB_BUILD_SHARED OFF",
            "ZLIB_INSTALL OFF"
@ -98,9 +98,9 @@
        "package": "VVL",
        "repo": "KhronosGroup/Vulkan-ValidationLayers",
        "tag": "vulkan-sdk-%VERSION%",
-        "git_version": "1.4.335.0",
+        "git_version": "1.4.341.0",
        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "48167c4a17736301bd08f9290f41830443e1f18cce8ad867fc6f289b49e18b40e93c9850b377951af82f51b5b6d7313aa6a884fc5df79f5ce3df82696c1c1244"
+        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753"
    },
    "quazip": {
        "package": "QuaZip-Qt6",
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@ -9,7 +9,7 @@
    },
    "sirit": {
        "repo": "eden-emulator/sirit",
-        "git_version": "1.0.3",
+        "git_version": "1.0.4",
        "tag": "v%VERSION%",
        "artifact": "sirit-source-%VERSION%.tar.zst",
        "hash_suffix": "sha512sum",
@ -28,8 +28,8 @@
    "httplib": {
        "repo": "yhirose/cpp-httplib",
        "tag": "v%VERSION%",
-        "hash": "a229e24cca4afe78e5c0aa2e482f15108ac34101fd8dbd927365f15e8c37dec4de38c5277d635017d692a5b320e1b929f8bfcc076f52b8e4dcdab8fe53bfdf2e",
-        "git_version": "0.30.1",
+        "hash": "e7d87596c919296ccb07f0b2b8efd286c8b872994d2a83c039db83c8a0620842cca0b31e54ff60e8d8c9b0c1c3c2d9b510ad7a58dd3553370aea01adebe0e211",
+        "git_version": "0.36.0",
        "find_args": "MODULE GLOBAL",
        "patches": [
            "0001-mingw.patch"
@ -55,8 +55,8 @@
        "package": "xbyak",
        "repo": "herumi/xbyak",
        "tag": "v%VERSION%",
-        "hash": "ac333d7bea1d61865bebebb116201a58db431946aa2f11aa042ef5795c390ff30af4d6c90ed3b3d24443a1d430703b08f14fc13b2fa405c155a241456ed78a47",
-        "git_version": "7.33.2"
+        "hash": "cd56787f5a8a68de51a32321381c590702c79f6c4b90f2a60da29612c28f0689ec46f07469c53d0e8830b2122d4e9a75fc29bae0b1f8bb1d7589fb6cfda03002",
+        "git_version": "7.34.1"
    },
    "oaknut": {
        "repo": "eden-emulator/oaknut",
@ -146,9 +146,9 @@
        "package": "Catch2",
        "repo": "catchorg/Catch2",
        "tag": "v%VERSION%",
-        "hash": "acb3f463a7404d6a3bce52e474075cdadf9bb241d93feaf147c182d756e5a2f8bd412f4658ca186d15ab8fed36fc587d79ec311f55642d8e4ded16df9e213656",
+        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
        "version": "3.0.1",
-        "git_version": "3.12.0",
+        "git_version": "3.13.0",
        "patches": [
            "0001-solaris-isnan-fix.patch"
        ]
@ -256,15 +256,15 @@
        "repo": "KhronosGroup/Vulkan-Headers",
        "package": "VulkanHeaders",
        "version": "1.4.317",
-        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
-        "git_version": "1.4.342",
+        "hash": "8c51d91efdaae76e5d15a61e248e862ccbaf35a597503899b3b0a74f2663f6825ba3cd9b61f23233f63567adc84fbbbdf030ae76a4450ea6e9e101d9052769fa",
+        "git_version": "1.4.344",
        "tag": "v%VERSION%"
    },
    "vulkan-utility-libraries": {
        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
        "package": "VulkanUtilityLibraries",
-        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
-        "git_version": "1.4.342",
+        "hash": "6366f769f742aee66e59db309ec937e28f4020368dc245b0a06da8f7f38e57352f394f154df448dfce5b2cd734d6ec25801dbf30f5887c3297c8f91239c558d4",
+        "git_version": "1.4.344",
        "tag": "v%VERSION%"
    },
    "frozen": {
--- a/tools/cpm/package/update.sh
+++ b/tools/cpm/package/update.sh
@ -19,7 +19,8 @@ Check a specific package or packages for updates.

 Options:
    -n, --dry-run 	Do not update the package if it has an update available
-    -a, --all       Operate on all packages in this project.
+    -a, --all    	Operate on all packages in this project.
+    -c, --commit   	Automatically generate a commit message

 EOF

@ -38,6 +39,7 @@ while :; do
 			case "$char" in
 			a) ALL=1 ;;
 			n) UPDATE=false ;;
+			c) COMMIT=true ;;
 			h) usage ;;
 			*) die "Invalid option -$char" ;;
 			esac
@ -46,6 +48,7 @@ while :; do
 	--dry-run) UPDATE=false ;;
 	--all) ALL=1 ;;
 	--help) usage ;;
+	--commit) COMMIT=true ;;
 	"$0") break ;;
 	"") break ;;
 	*) packages="$packages $1" ;;
@ -56,6 +59,7 @@ done

 [ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
 : "${UPDATE:=true}"
+: "${COMMIT:=false}"
 [ -n "$packages" ] || usage

 for pkg in $packages; do
@ -93,6 +97,9 @@ for pkg in $packages; do

 	filter_out yotta # mbedtls

+	# ????????????????????????????????
+	filter_out vksc
+
 	# ignore betas/alphas (remove if needed)
 	filter_out alpha
 	filter_out beta
@ -119,19 +126,35 @@ for pkg in $packages; do
 		else
 			NEW_GIT_VERSION=$(echo "$LATEST" | sed "s/$VERSION_PREFIX//g")
 		fi
+	else
+		NEW_GIT_VERSION="$LATEST"
 	fi

+	_commit="$_commit
+* $PACKAGE: $GIT_VERSION -> $NEW_GIT_VERSION"
+
 	echo "-- * Version $LATEST available, current is $TAG"

 	if [ "$UPDATE" = "true" ]; then
 		if [ "$HAS_REPLACE" = "true" ]; then
 			NEW_JSON=$(echo "$JSON" | jq ".git_version = \"$NEW_GIT_VERSION\"")
 		else
-			NEW_JSON=$(echo "$JSON" | jq ".tag = \"$LATEST\"")
+			NEW_JSON=$(echo "$JSON" | jq ".tag = \"$NEW_GIT_VERSION\"")
 		fi

 		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"

-		QUIET=true "$SCRIPTS"/util/fix-hash.sh
+		echo "-- * -- Updating hash"
+
+		export UPDATE
+		QUIET=true "$SCRIPTS"/util/fix-hash.sh "$PACKAGE"
 	fi
 done
+
+if [ "$UPDATE" = "true" ] && [ "$COMMIT" = "true" ] && [ -n "$_commit" ]; then
+	for file in $CPMFILES; do
+		git add "$file"
+	done
+	git commit -m "Update dependencies
+$_commit"
+fi
--- a/tools/cpm/package/util/fix-hash.sh
+++ b/tools/cpm/package/util/fix-hash.sh
@ -3,9 +3,15 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later

+# shellcheck disable=SC1091
+
 : "${PACKAGE:=$1}"

-# shellcheck disable=SC1091
+# re-read json files
+# shellcheck disable=SC2016
+PACKAGES=$(echo "$CPMFILES" | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
+export PACKAGES
+
 . "$SCRIPTS"/vars.sh

 [ "$CI" = null ] || exit 0