Merge branch 'xmake-io:dev' into dev

Author: pewpewnor

packages/a/alembic/xmake.lua

@@ -6,6 +6,7 @@ package("alembic")
     add_urls("https://github.com/alembic/alembic/archive/refs/tags/$(version).tar.gz",
              "https://github.com/alembic/alembic.git")
 
+    add_versions("1.8.10", "06c9172faf29e9fdebb7be99621ca18b32b474f8e481238a159c87d16b298553")
     add_versions("1.8.9", "8c59c10813feee917d262c71af77d6fa3db1acaf7c5fecfd4104167077403955")
     add_versions("1.8.8", "ba1f34544608ef7d3f68cafea946ec9cc84792ddf9cda3e8d5590821df71f6c6")
     add_versions("1.8.7", "6de0b97cd14dcfb7b2d0d788c951b6da3c5b336c47322ea881d64f18575c33da")

packages/a/aws-c-http/xmake.lua

@@ -6,6 +6,7 @@ package("aws-c-http")
     add_urls("https://github.com/awslabs/aws-c-http/archive/refs/tags/$(version).tar.gz",
              "https://github.com/awslabs/aws-c-http.git")
 
+    add_versions("v0.10.7", "ce9e71c3eae67b1c6c0149278e0d0929a7d928c3547de64999430c8592864ad4")
     add_versions("v0.10.6", "0e513d25bc49a7f583d9bb246dabbe64d23d8a2bd105026a8f914d05aa1df147")
     add_versions("v0.10.1", "1550f7bf9666bb8f86514db9e623f07249e3c53e868d2f36ff69b83bd3eadfec")
     add_versions("v0.10.0", "f7881e2f9af1a2e114b4147be80d70480f06af2b9cd195e8448afb750c74b1ae")

packages/c/clip/xmake.lua

@@ -6,6 +6,7 @@ package("clip")
     add_urls("https://github.com/dacap/clip/archive/refs/tags/$(version).tar.gz",
              "https://github.com/dacap/clip.git")
 
+    add_versions("v1.13", "0d07f80bc48c16d049778501bfb4a58d4f5c4087fd99a53b0640d64dc3b86868")
     add_versions("v1.12", "54e96e04115c7ca1eeeecf432548db5cd3dddb08a91ededb118adc31b128e08c")
     add_versions("v1.11", "047d43f837adffcb3a26ce09fd321472615cf35a18e86418d789b70d742519dc")
 

packages/c/croaring/xmake.lua

@@ -6,6 +6,7 @@ package("croaring")
     add_urls("https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/$(version).tar.gz",
              "https://github.com/RoaringBitmap/CRoaring.git")
 
+    add_versions("v4.4.2", "11cc5d37b2d719e02936c71db83d3a5d1f3d27c59005348f4ee6417a63617b77")
     add_versions("v4.4.0", "5fd485bfdb83261143e6d0ad8967bf779cf99eda6747ac198d861f3b8e4a1e46")
     add_versions("v4.3.12", "9f1602d7ff83e84ce0a5928129bb957a1eeacd3b092b39e21f5f0b931682b8d6")
     add_versions("v4.3.6", "d9c63e6fa06630cd626be004a226bea15eb4acba6740a46f58c6b189fa5d49b3")

packages/g/g2o/xmake.lua

@@ -7,8 +7,11 @@ package("g2o")
     end})
     add_urls("https://github.com/RainerKuemmerle/g2o.git")
     add_versions("2020.12.23", "20af80edf8fd237e29bd21859b8fc734e615680e8838824e8b3f120c5f4c1672")
+    add_versions("2024.12.28", "d691ead69184ebbb8256c9cd9f4121d1a880b169370efc0554dd31a64802a452")
 
-    add_deps("cmake", "eigen")
+    add_deps("cmake", "eigen <5.0")
+
+    add_links("g2o_solver_slam2d_linear", "g2o_solver_structure_only", "g2o_solver_dense", "g2o_solver_eigen", "g2o_solver_pcg", "g2o_types_data", "g2o_types_icp", "g2o_types_sim3", "g2o_types_sba", "g2o_types_sclam2d", "g2o_types_slam2d_addons", "g2o_types_slam2d", "g2o_types_slam3d_addons", "g2o_types_slam3d", "g2o_core", "g2o_stuff", "g2o_opengl_helper", "g2o_ext_freeglut_minimal")
 
     on_install("linux", "windows", "macosx", function (package)
         local configs = {"-DG2O_BUILD_APPS=OFF", "-DG2O_BUILD_EXAMPLES=OFF"}
@@ -28,5 +31,5 @@ package("g2o")
                 g2o::SparseOptimizer optimizer;
                 optimizer.setVerbose(false);
             }
-        ]]}, {configs = {languages = "c++14"}}))
+        ]]}, {configs = {languages = package:version():ge("2023.08.06") and "c++17" or "c++14"}}))
     end)

packages/l/lzav/xmake.lua

@@ -7,6 +7,7 @@ package("lzav")
     add_urls("https://github.com/avaneev/lzav/archive/refs/tags/$(version).tar.gz",
              "https://github.com/avaneev/lzav.git")
 
+    add_versions("5.3", "1d66d3702b8b380fccbe8aeef24e59e36e79468ecc0e7a18cdfe105bde6c3f5d")
     add_versions("4.23", "f3ea9cfbbc99da786ff6c336ea43cc629502638d457b07e64c182d4ab98c5c09")
     add_versions("4.19", "e19e093f465b69906aec109ab78f5a38c00fee1d21c61c013d7b185da33911dc")
     add_versions("4.9", "460aaed16cce0ce1d6af03cf20db1dd9566adef7e1cbc8529ce1b8653ede0412")

packages/o/omath/xmake.lua

@@ -6,6 +6,7 @@ package("omath")
     add_urls("https://github.com/orange-cpp/omath/archive/refs/tags/$(version).tar.gz",
              "https://github.com/orange-cpp/omath.git", {submodules = false})
 
+    add_versions("v4.4.0", "46fe67d0524c643b28892d2c27b33c5bb4941b0cd5393390cc17e11ae5d31741")
     add_versions("v4.3.0", "e21c2e1ff22360715ef6dd231e9f0ac506256b786a246061fac2dfd4cd37d20d")
     add_versions("v4.2.0", "f1482c5fd0de0ed26b8197c51e4eb59425c541d4819a3ed6f9639aef251b4a53")
     add_versions("v4.1.0", "df5b6774a747ef91b8a34b23db774e92ecba3d3907cc060e36985ec2bd31c6d5")

packages/o/openmvs/xmake.lua

@@ -3,31 +3,44 @@ package("openmvs")
     set_description("open Multi-View Stereo reconstruction library")
     set_license("AGPL-3.0")
 
-    add_urls("https://github.com/cdcseacave/openMVS/archive/refs/tags/v$(version).tar.gz")
+    add_urls("https://github.com/cdcseacave/openMVS/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/cdcseacave/openMVS.git")
 
-    add_versions("2.3.0", "ac7312fb71dbab18c5b2755ad9ac3caa40ec689f6f369c330ca73c87c1f34258")
+    add_versions("v2.3.0", "ac7312fb71dbab18c5b2755ad9ac3caa40ec689f6f369c330ca73c87c1f34258")
 
-    add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
+    if is_plat("windows") then
+        add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
+    end
 
     add_configs("ceres", {description = "Enable CERES optimization library", default = false, type = "boolean"})
     add_configs("cuda", {description = "Enable CUDA library", default = false, type = "boolean"})
     add_configs("openmp", {description = "Enable OpenMP library", default = true, type = "boolean"})
     add_configs("python", {description = "Enable Python library bindings", default = false, type = "boolean"})
 
-    add_deps("cmake", "eigen", "glew", "opencv", "cgal", "vcglib", "zstd")
+    add_deps("cmake", "cgal", "eigen <5.0", "glew", "opencv", "vcglib", "zstd")
     add_deps("boost", {configs = {iostreams = true, container = true, graph=true, program_options = true, serialization = true, thread = true, zlib = true, zstd = true}})
 
-    on_load("windows", function (package)
-        package:add("defines", "BOOST_ALL_NO_LIB") -- disable boost auto-linking
-        if package:toolchain("msvc") then package:add("cxxflags", "/Zc:__cplusplus") end -- enable msvc __cplusplus
+    if on_check then
+        on_check("linux", function (package)
+            assert(not package:has_tool("cxx", "clang"), "Linux Clang is not supported yet.")
+        end)
+    end
+
+    add_includedirs("include", "include/OpenMVS")
+    add_linkdirs("lib/OpenMVS")
+    add_links("MVS", "Math", "IO", "Common")
+    on_load(function (package)
+        if package:has_tool("cxx", "cl") then
+            package:add("cxxflags", "/Zc:__cplusplus")
+        end
 
         if package:config("ceres") then package:add("deps", "ceres-solver") end
         if package:config("cuda") then package:add("deps", "cuda") end
         if package:config("openmp") then package:add("deps", "openmp") end
         if package:config("python") then package:add("deps", "python") end
     end)
 
-    on_install("windows|x64", "windows|x86", function (package)
+    on_install("windows|!arm64", "linux", function (package)
         io.replace("CMakeLists.txt", "# Project-wide settings", [[
             # Project-wide settings
             find_package(PkgConfig REQUIRED)
@@ -44,17 +57,11 @@ package("openmvs")
             "-DOpenMVS_ENABLE_TESTS=OFF",
         }
         import("package.tools.cmake").install(package, configs)
-
-        package:add("linkdirs", "lib/OpenMVS")
-        local libs = os.files(package:installdir("lib/OpenMVS/*.lib"))
-        for _, filepath in ipairs(libs) do
-            package:add("links", path.basename(filepath))
-        end
     end)
 
     on_test(function (package)
         assert(package:check_cxxsnippets({test = [[
-            #include <openMVS/MVS.h>
+            #include "MVS.h"
             using namespace MVS;
             void test() {
                 SEACAVE::cListTest<true>(100);
@@ -63,5 +70,5 @@ package("openmvs")
                 SEACAVE::TestRayTriangleIntersection<float>(1000);
                 SEACAVE::TestRayTriangleIntersection<double>(1000);
             }
-        ]]}, {configs = {languages = "c++11"}}))
+        ]]}, {configs = {languages = "c++14"}}))
     end)

packages/r/rocksdb/xmake.lua

@@ -6,6 +6,7 @@ package("rocksdb")
     add_urls("https://github.com/facebook/rocksdb/archive/refs/tags/$(version).tar.gz",
              "https://github.com/facebook/rocksdb.git")
 
+    add_versions("v10.7.5", "a9948bf5f00dd1e656fc40c4b0bf39001c3773ad22c56959bdb1c940d10e3d8d")
     add_versions("v10.5.1", "7ec942baab802b2845188d02bc5d4e42c29236e61bcbc08f5b3a6bdd92290c22")
     add_versions("v10.4.2", "afccfab496556904900afacf7d99887f1d50cb893e5d2288bd502db233adacac")
     add_versions("v10.0.1", "3fdc9ca996971c4c039959866382c4a3a6c8ade4abf888f3b2ff77153e07bf28")
@@ -100,5 +101,5 @@ package("rocksdb")
                 options.create_if_missing = true;
                 rocksdb::Status status = rocksdb::DB::Open(options, "./test", &db);
             }
-        ]]}, {configs = {languages = "c++17"}, includes = "rocksdb/db.h"}))
+        ]]}, {configs = {languages = package:version():ge("10.7.0") and "c++20" or "c++17"}, includes = "rocksdb/db.h"}))
     end)