From 9d915fb83ff8791958f65f390fefd9bbb5ca9eee Mon Sep 17 00:00:00 2001 From: GabeRundlett Date: Mon, 6 Jan 2025 00:46:25 +0100 Subject: [PATCH 1/5] WIP update to daxa 3.0.3 --- ports/daxa/fix-std-sort.patch | 12 ------------ ports/daxa/portfile.cmake | 6 ++---- ports/daxa/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/daxa.json | 5 +++++ 5 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 ports/daxa/fix-std-sort.patch diff --git a/ports/daxa/fix-std-sort.patch b/ports/daxa/fix-std-sort.patch deleted file mode 100644 index 34595803011ad2..00000000000000 --- a/ports/daxa/fix-std-sort.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/impl_instance.cpp b/src/impl_instance.cpp -index 1c49a91..300d0db 100644 ---- a/src/impl_instance.cpp -+++ b/src/impl_instance.cpp -@@ -3,6 +3,7 @@ - #include "impl_device.hpp" - #include "impl_features.hpp" - -+#include - #include - - // --- Begin API Functions --- diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake index beecabb87e1e12..15a054cd4f299b 100644 --- a/ports/daxa/portfile.cmake +++ b/ports/daxa/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ipotrick/Daxa - REF ${VERSION} - SHA512 53e31bd89170ee18f404ae778c6fd0d5a1cefa2faf9f28e98d793c79dddeb03acda5525c98b875e45024de5db9c5e9cd9216042978c3a107587fefb6343db1e0 + REF d91f215842ca0d49cc6882a234172fdeb5b383b7 # ${VERSION} + SHA512 6c83ced7cf1388beb470a728916f9e954d359e88d016c6a55daf568bce032d20d3a21221b7c336f1f8bb99a29837c648a96c47d7aa22c595853aae71724c80a9 HEAD_REF master - PATCHES - fix-std-sort.patch #https://github.com/Ipotrick/Daxa/pull/96 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json index d007aa149fd3cb..99fa54b5a82fbc 100644 --- a/ports/daxa/vcpkg.json +++ b/ports/daxa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daxa", - "version": "3.0.2", + "version": "3.0.3", "port-version": 1, "description": "Daxa C++ Vulkan Abstraction", "homepage": "https://github.com/Ipotrick/Daxa", diff --git a/versions/baseline.json b/versions/baseline.json index c517b3bd5fb398..311f041a64df8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2237,7 +2237,7 @@ "port-version": 0 }, "daxa": { - "baseline": "3.0.2", + "baseline": "3.0.3", "port-version": 1 }, "dbg-macro": { diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index 7f9720ec3d0efe..62e8407e347dfe 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "139cec4bae71fc2536a0151fe9aa37204015e736", + "version": "3.0.3", + "port-version": 0 + }, { "git-tree": "320d4418d0cdcf84777100c9a53c170227c3b4dc", "version": "3.0.2", From dddc13d013e970c529a819428316f7b9b4ad4ad0 Mon Sep 17 00:00:00 2001 From: GabeRundlett Date: Mon, 6 Jan 2025 00:58:17 +0100 Subject: [PATCH 2/5] Fix port-version --- ports/daxa/vcpkg.json | 2 +- versions/d-/daxa.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json index 99fa54b5a82fbc..faa384ee2c4f1e 100644 --- a/ports/daxa/vcpkg.json +++ b/ports/daxa/vcpkg.json @@ -1,7 +1,7 @@ { "name": "daxa", "version": "3.0.3", - "port-version": 1, + "port-version": 0, "description": "Daxa C++ Vulkan Abstraction", "homepage": "https://github.com/Ipotrick/Daxa", "license": "MIT", diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index 62e8407e347dfe..49c06d48dc3fa6 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "139cec4bae71fc2536a0151fe9aa37204015e736", + "git-tree": "c80cf9ce96907a6258cbd2780222906a2c2fdae9", "version": "3.0.3", "port-version": 0 }, From c68d898093322d00c85f587650581822e8bb7292 Mon Sep 17 00:00:00 2001 From: GabeRundlett Date: Mon, 6 Jan 2025 01:01:59 +0100 Subject: [PATCH 3/5] remove port-version --- ports/daxa/vcpkg.json | 1 - versions/baseline.json | 2 +- versions/d-/daxa.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json index faa384ee2c4f1e..4df77eb025a15e 100644 --- a/ports/daxa/vcpkg.json +++ b/ports/daxa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "daxa", "version": "3.0.3", - "port-version": 0, "description": "Daxa C++ Vulkan Abstraction", "homepage": "https://github.com/Ipotrick/Daxa", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 311f041a64df8e..9990e988a1461a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2238,7 +2238,7 @@ }, "daxa": { "baseline": "3.0.3", - "port-version": 1 + "port-version": 0 }, "dbg-macro": { "baseline": "0.5.1", diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index 49c06d48dc3fa6..4f7923467426bf 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c80cf9ce96907a6258cbd2780222906a2c2fdae9", + "git-tree": "359363aa9bfb10cedec2df0fa42cf4d6ee25270d", "version": "3.0.3", "port-version": 0 }, From 108c07c10f43eca8a81a91ed61d81820d6e1e49b Mon Sep 17 00:00:00 2001 From: GabeRundlett Date: Mon, 6 Jan 2025 01:20:03 +0100 Subject: [PATCH 4/5] Change to use ${VERSION} variable in portfile --- ports/daxa/portfile.cmake | 2 +- versions/d-/daxa.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake index 15a054cd4f299b..579cb4d6e5451d 100644 --- a/ports/daxa/portfile.cmake +++ b/ports/daxa/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ipotrick/Daxa - REF d91f215842ca0d49cc6882a234172fdeb5b383b7 # ${VERSION} + REF ${VERSION} SHA512 6c83ced7cf1388beb470a728916f9e954d359e88d016c6a55daf568bce032d20d3a21221b7c336f1f8bb99a29837c648a96c47d7aa22c595853aae71724c80a9 HEAD_REF master ) diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index 4f7923467426bf..bda053535dfe6d 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "359363aa9bfb10cedec2df0fa42cf4d6ee25270d", + "git-tree": "49ce42900d08a9cb5f42c309d3bba548f6fc3c6f", "version": "3.0.3", "port-version": 0 }, From 6dca92d56c24c0874def7dc8a14ae501bbcc196b Mon Sep 17 00:00:00 2001 From: GabeRundlett Date: Mon, 6 Jan 2025 16:20:08 +0100 Subject: [PATCH 5/5] Update sha --- ports/daxa/portfile.cmake | 2 +- versions/d-/daxa.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake index 579cb4d6e5451d..8f89e832f19d17 100644 --- a/ports/daxa/portfile.cmake +++ b/ports/daxa/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ipotrick/Daxa REF ${VERSION} - SHA512 6c83ced7cf1388beb470a728916f9e954d359e88d016c6a55daf568bce032d20d3a21221b7c336f1f8bb99a29837c648a96c47d7aa22c595853aae71724c80a9 + SHA512 5843d95ced3ec154d46e31ad5bf822a8470c785415819d235d5b499c3de629c30f5e4afe12b68ef3505ef7287afc68a70f06e255379136fae2e63976310ca3e0 HEAD_REF master ) diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json index bda053535dfe6d..46f22ea6c2a4f9 100644 --- a/versions/d-/daxa.json +++ b/versions/d-/daxa.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "49ce42900d08a9cb5f42c309d3bba548f6fc3c6f", + "git-tree": "bc183994ac48b1065f51a6a7d05c10a6eab487cc", "version": "3.0.3", "port-version": 0 },