diff --git a/packages/c/cuda-samples/xmake.lua b/packages/c/cuda-samples/xmake.lua
new file mode 100644
index 000000000..7a7de540a
--- /dev/null
+++ b/packages/c/cuda-samples/xmake.lua
@@ -0,0 +1,34 @@
+package("cuda-samples")
+
+    set_kind("library", {headeronly = true})
+    set_homepage("https://github.com/NVIDIA/cuda-samples")
+    set_description("CUDA Sample Utility Code")
+    set_license("BSD-3-Clause")
+
+    add_urls("https://github.com/NVIDIA/cuda-samples/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/NVIDIA/cuda-samples.git")
+    add_versions("v11.8", "1bc02c0ca42a323f3c7a05b5682eae703681a91e95b135bfe81f848b2d6a2c51")
+    add_versions("v12.3", "a40e4d3970185f38477dd8b5bdbd81642b04648d8b812af914333b8f83355efe")
+
+    on_fetch(function (package, opt)
+        if opt.system and package:is_plat("windows") then
+            import("lib.detect.find_path")
+            local paths = {
+                "C:\\ProgramData\\NVIDIA Corporation\\CUDA Samples\\v*\\common"
+            }
+            local headerpath = find_path("helper_cuda.h", paths, {suffixes = {"inc"}})
+            if headerpath then
+                vprint("CUDA Samples Found: " .. path.directory(headerpath))
+                return {includedirs = {headerpath}}
+            end
+        end
+    end)
+
+    add_includedirs("include/Common")
+    on_install(function (package)
+        os.cp("Common", package:installdir("include"))
+    end)
+
+    on_test(function (package)
+        assert(os.isfile(path.join(package:installdir("include"), "Common", "helper_cuda.h")))
+    end)
diff --git a/packages/f/flann/xmake.lua b/packages/f/flann/xmake.lua
index 8887749f9..0c76ce268 100644
--- a/packages/f/flann/xmake.lua
+++ b/packages/f/flann/xmake.lua
@@ -7,6 +7,7 @@ package("flann")
     add_urls("https://github.com/flann-lib/flann/archive/refs/tags/$(version).tar.gz",
              "https://github.com/flann-lib/flann.git")
     add_versions("1.9.1", "b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3")
+    add_versions("1.9.2", "e26829bb0017f317d9cc45ab83ddcb8b16d75ada1ae07157006c1e7d601c8824")
 
     add_patches("1.9.1", path.join(os.scriptdir(), "patches", "1.9.1", "cuda10.patch"), "087492b422362f42c83b320296d9af7b22023cf20d81ea7bd99efabd1535f7d6")
 
diff --git a/packages/u/util-macros/xmake.lua b/packages/u/util-macros/xmake.lua
index 28c051a07..a78465b31 100644
--- a/packages/u/util-macros/xmake.lua
+++ b/packages/u/util-macros/xmake.lua
@@ -3,9 +3,9 @@ package("util-macros")
     set_homepage("https://www.x.org/")
     set_description("X.Org: Set of autoconf macros used to build other xorg packages")
 
-    set_urls("https://www.x.org/archive/individual/util/util-macros-$(version).tar.bz2")
-    add_versions("1.19.2", "d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712")
-    add_versions("1.19.3", "0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971")
+    set_urls("https://www.x.org/archive/individual/util/util-macros-$(version).tar.gz")
+    add_versions("1.19.3", "624bb6c3a4613d18114a7e3849a3d70f2d7af9dc6eabeaba98060d87e3aef35b")
+    add_versions("1.20.0", "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74")
 
     add_deps("pkg-config")