diff --git a/ports/daxa/daxa_swp_current_cpu_timeline_value.patch b/ports/daxa/daxa_swp_current_cpu_timeline_value.patch
new file mode 100644
index 0000000000..367867aa37
--- /dev/null
+++ b/ports/daxa/daxa_swp_current_cpu_timeline_value.patch
@@ -0,0 +1,13 @@
+diff --git a/src/impl_swapchain.cpp b/src/impl_swapchain.cpp
+index dfbdebc5..e190490b 100644
+--- a/src/impl_swapchain.cpp
++++ b/src/impl_swapchain.cpp
+@@ -238,7 +238,7 @@ auto daxa_swp_gpu_timeline_semaphore(daxa_Swapchain self) -> daxa_TimelineSemaph
+ 
+ auto daxa_swp_current_cpu_timeline_value(daxa_Swapchain self) -> u64
+ {
+-    return static_cast<u64>(std::max(0ll, self->cpu_frame_timeline));
++    return static_cast<u64>(std::max(int64_t{0}, self->cpu_frame_timeline));
+ }
+ 
+ auto daxa_swp_info(daxa_Swapchain self) -> daxa_SwapchainInfo const *
diff --git a/ports/daxa/portfile.cmake b/ports/daxa/portfile.cmake
index 8f89e832f1..cc53c14f9a 100644
--- a/ports/daxa/portfile.cmake
+++ b/ports/daxa/portfile.cmake
@@ -2,8 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ipotrick/Daxa
     REF ${VERSION}
-    SHA512 5843d95ced3ec154d46e31ad5bf822a8470c785415819d235d5b499c3de629c30f5e4afe12b68ef3505ef7287afc68a70f06e255379136fae2e63976310ca3e0
+    SHA512 2cdb653be68e9c70fd023d1d3c450830b9fb9fcd3d7257e85715390f422501ae17633b01fdc1b9da7b9563ace1c4b524f8b69e5a24636b387b7960b52906ed94
     HEAD_REF master
+    PATCHES
+        daxa_swp_current_cpu_timeline_value.patch # fix std::max(long long int, long int), as int64_t is long int on some platforms
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/daxa/vcpkg.json b/ports/daxa/vcpkg.json
index 4df77eb025..e8b8ea0031 100644
--- a/ports/daxa/vcpkg.json
+++ b/ports/daxa/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "daxa",
-  "version": "3.0.3",
+  "version": "3.3.1",
   "description": "Daxa C++ Vulkan Abstraction",
   "homepage": "https://github.com/Ipotrick/Daxa",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7abdd9befb..4487038b13 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2361,7 +2361,7 @@
       "port-version": 1
     },
     "daxa": {
-      "baseline": "3.0.3",
+      "baseline": "3.3.1",
       "port-version": 0
     },
     "dbg-macro": {
diff --git a/versions/d-/daxa.json b/versions/d-/daxa.json
index 46f22ea6c2..6249279b9f 100644
--- a/versions/d-/daxa.json
+++ b/versions/d-/daxa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c30760c6064005bb2e6aa81acf15a861506ec18b",
+      "version": "3.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bc183994ac48b1065f51a6a7d05c10a6eab487cc",
       "version": "3.0.3",