[Daxa] Fix missing header <algorithm> for std::sort (#41461)

chrullrich · Oct 11, 2024 · 0d14033 · 0d14033
1 parent 99685fa
commit 0d14033
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/ports/daxa/fix-std-sort.patch b/ports/daxa/fix-std-sort.patch
@@ -0,0 +1,12 @@
+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 <algorithm>
+ #include <vector>
+
+ // --- Begin API Functions ---
diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF ${VERSION}
     SHA512 53e31bd89170ee18f404ae778c6fd0d5a1cefa2faf9f28e98d793c79dddeb03acda5525c98b875e45024de5db9c5e9cd9216042978c3a107587fefb6343db1e0
     HEAD_REF master
+    PATCHES
+        fix-std-sort.patch #https://github.com/Ipotrick/Daxa/pull/96
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -50,7 +52,4 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL "${SOURCE_PATH}/LICENSE"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "daxa",
   "version": "3.0.2",
+  "port-version": 1,
   "description": "Daxa C++ Vulkan Abstraction",
   "homepage": "https://github.com/Ipotrick/Daxa",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2222,7 +2222,7 @@
     },
     "daxa": {
       "baseline": "3.0.2",
-      "port-version": 0
+      "port-version": 1
     },
     "dbg-macro": {
       "baseline": "0.5.1",

diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "320d4418d0cdcf84777100c9a53c170227c3b4dc",
+      "version": "3.0.2",
+      "port-version": 1
+    },
     {
       "git-tree": "11b337b86d5d7f3962cdc06942918607f7bd4489",
       "version": "3.0.2",