From 5e0e856f05249f2bbea06071ceff8d8666019b35 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 01:22:27 +0800 Subject: [PATCH 001/671] Auto-update thorvg to v0.13.5 (#4156) * Update thorvg to v0.13.5 * improve configs * improve configs * python: fix mkdir --------- Co-authored-by: star9029 --- packages/p/python/xmake.lua | 13 ++++++---- packages/t/thorvg/xmake.lua | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/packages/p/python/xmake.lua b/packages/p/python/xmake.lua index b71e686ee..73234eaec 100644 --- a/packages/p/python/xmake.lua +++ b/packages/p/python/xmake.lua @@ -123,6 +123,7 @@ package("python") end) on_install("@macosx", "@bsd", "@linux", function (package) + local version = package:version() -- init configs local configs = {"--enable-ipv6", "--with-ensurepip", "--enable-optimizations"} @@ -149,7 +150,7 @@ package("python") end end if openssl_dir then - if package:version():ge("3.0") then + if version:ge("3.0") then table.insert(configs, "--with-openssl=" .. openssl_dir) else io.gsub("setup.py", "/usr/local/ssl", openssl_dir) @@ -230,20 +231,24 @@ package("python") table.insert(configs, "LDFLAGS=" .. table.concat(ldflags, " ")) end + local pyver = ("python%d.%d"):format(version:major(), version:minor()) + -- https://github.com/python/cpython/issues/109796 + if version:ge("3.12.0") then + os.mkdir(package:installdir("lib", pyver)) + end + -- unset these so that installing pip and setuptools puts them where we want -- and not into some other Python the user has installed. import("package.tools.autoconf").configure(package, configs, {envs = {PYTHONHOME = "", PYTHONPATH = ""}}) os.vrunv("make", {"-j4", "PYTHONAPPSDIR=" .. package:installdir()}) os.vrunv("make", {"install", "-j4", "PYTHONAPPSDIR=" .. package:installdir()}) - if package:version():ge("3.0") then + if version:ge("3.0") then os.cp(path.join(package:installdir("bin"), "python3"), path.join(package:installdir("bin"), "python")) os.cp(path.join(package:installdir("bin"), "python3-config"), path.join(package:installdir("bin"), "python-config")) end -- install wheel local python = path.join(package:installdir("bin"), "python") - local version = package:version() - local pyver = ("python%d.%d"):format(version:major(), version:minor()) local envs = { PATH = package:installdir("bin"), PYTHONPATH = package:installdir("lib", pyver, "site-packages"), diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index 004fa1bec..8862ea045 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,8 +6,17 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.13.5", "977ed74c3846c9a6acd5765aff776745d40e3c91507b22e51177d59c69afd198") add_versions("v0.13.2", "03b5dbb4c73ff221a4bd7243cc0ad377aecff4c3077f5a57ee2902e4122d3218") + add_configs("engines", {description = "Enable Rasterizer Engine in thorvg", default = {"sw"}, type = "table"}) + add_configs("loaders", {description = "Enable File Loaders", type = "table"}) + add_configs("savers", {description = "Enable File Savers", type = "table"}) + add_configs("tools", {description = "Enable building thorvg tools", type = "table"}) + add_configs("extra", {description = "Enable support for exceptionally advanced features", type = "table"}) + add_configs("threads", {description = "Enable the multi-threading task scheduler in thorvg", default = false, type = "boolean"}) + add_configs("simd", {description = "Enable CPU Vectorization(SIMD) in thorvg", default = false, type = "boolean"}) + add_configs("log", {description = "Enable log message", default = false, type = "boolean"}) add_configs("c_api", {description = "Enable API bindings", default = false, type = "boolean"}) if is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) @@ -18,6 +27,32 @@ package("thorvg") end add_deps("meson", "ninja") + if is_plat("windows") then + add_deps("pkgconf") + end + + on_load(function (package) + import("core.base.hashset") + + local loaders = package:config("loaders") + if loaders then + local loaders = hashset.from(loaders) + if loaders then + local deps = {jpg = "libjpeg-turbo", png = "libpng", webp = "libwebp"} + if loaders:has("all") then + for _, dep in pairs(deps) do + package:add("deps", dep) + end + else + for name, dep in pairs(deps) do + if loaders:has(name) then + package:add("deps", dep) + end + end + end + end + end + end) on_install("!android", function (package) if package:is_plat("mingw") then @@ -31,9 +66,22 @@ package("thorvg") table.insert(configs, "-Ddefault_library=static") package:add("defines", "TVG_STATIC") end + + local loaders = package:config("loaders") + local savers = package:config("savers") + local tools = package:config("tools") + local extra = package:config("extra") + table.insert(configs, "-Dengines=" .. table.concat(package:config("engines"), ",")) + table.insert(configs, "-Dloaders=" .. (loaders and table.concat(loaders, ",") or "")) + table.insert(configs, "-Dsavers=" .. (savers and table.concat(savers, ",") or "")) + table.insert(configs, "-Dtools=" .. (tools and table.concat(tools, ",") or "")) + table.insert(configs, "-Dextra=" .. (extra and table.concat(extra, ",") or "")) if package:config("c_api") then table.insert(configs, "-Dbindings=capi") end + table.insert(configs, "-Dthreads=" .. (package:config("threads") and "true" or "false")) + table.insert(configs, "-Dsimd=" .. (package:config("simd") and "true" or "false")) + table.insert(configs, "-Dlog=" .. (package:config("log") and "true" or "false")) import("package.tools.meson").install(package, configs) end) From 355761a2a0fe44982b9a17cde506ac5c9801f412 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 01:45:23 +0800 Subject: [PATCH 002/671] Update gdal to 3.9.0 (#4031) Co-authored-by: star9029 --- packages/g/gdal/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 502722c7f..586fe9641 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -4,6 +4,7 @@ package("gdal") set_license("MIT") add_urls("https://github.com/OSGeo/gdal/releases/download/v$(version)/gdal-$(version).tar.gz") + add_versions("3.9.0", "3b29b573b60d156cf160805290474b625c4197ca36a79fd14f83ec8f77f29ba0") add_versions("3.8.5", "0c865c7931c7e9bb4832f50fb53aec8676cbbaccd6e55945011b737fb89a49c2") add_versions("3.5.1", "7c4406ca010dc8632703a0a326f39e9db25d9f1f6ebaaeca64a963e3fac123d1") From 3595144b083a8c695e736dc52670774129606355 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 11:46:07 +0800 Subject: [PATCH 003/671] Update symengine to v0.12.0 (#4174) --- packages/s/symengine/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/symengine/xmake.lua b/packages/s/symengine/xmake.lua index 62ca0c9bd..c9adf117b 100644 --- a/packages/s/symengine/xmake.lua +++ b/packages/s/symengine/xmake.lua @@ -6,6 +6,7 @@ package("symengine") add_urls("https://github.com/symengine/symengine/archive/refs/tags/$(version).tar.gz", "https://github.com/symengine/symengine.git") + add_versions("v0.12.0", "1b5c3b0bc6a9f187635f93585649f24a18e9c7f2167cebcd885edeaaf211d956") add_versions("v0.11.2", "f6972acd6a65354f6414e69460d2e175729470632bdac05919bc2f7f32e48cbd") add_configs("integer_class", {description = "Integer class for symengine. Either gmp, gmpxx, flint or piranha", default = "boost", type = "string", values = {"boost", "gmp"}}) From 289cec42dc5ff51e7d982f8d0a5cc71561ad6c4e Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 14:09:14 +0800 Subject: [PATCH 004/671] Update whisper.cpp to 1.6.2 (#4176) --- packages/w/whisper.cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/w/whisper.cpp/xmake.lua b/packages/w/whisper.cpp/xmake.lua index 565d5aadf..b8a20fc3f 100644 --- a/packages/w/whisper.cpp/xmake.lua +++ b/packages/w/whisper.cpp/xmake.lua @@ -6,6 +6,7 @@ package("whisper.cpp") set_urls("https://github.com/ggerganov/whisper.cpp/archive/refs/tags/v$(version).tar.gz", "https://github.com/ggerganov/whisper.cpp.git") + add_versions("1.6.2", "da7988072022acc3cfa61b370b3c51baad017f1900c3dc4e68cb276499f66894") add_versions("1.6.0", "2729a83662edf909dad66115a3b616c27011cbe4c05335656034954c91ba0c92") add_versions("1.5.5", "27fa5c472657af2a6cee63de349a34b23d0f3781fa9b8ef301a940cf64964a79") add_versions("1.5.4", "06eed84de310fdf5408527e41e863ac3b80b8603576ba0521177464b1b341a3a") From 48f4d33782c0ab5c8d73a7cd344bc4d546ee21a8 Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 28 May 2024 14:41:53 +0800 Subject: [PATCH 005/671] Update zig to 0.12.0 (#4178) --- packages/z/zig/xmake.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/z/zig/xmake.lua b/packages/z/zig/xmake.lua index 03cdcc1eb..f4adbea5d 100644 --- a/packages/z/zig/xmake.lua +++ b/packages/z/zig/xmake.lua @@ -9,33 +9,40 @@ package("zig") set_urls("https://ziglang.org/download/$(version)/zig-macos-aarch64-$(version).tar.xz") add_versions("0.10.1", "b9b00477ec5fa1f1b89f35a7d2a58688e019910ab80a65eac2a7417162737656") add_versions("0.11.0", "c6ebf927bb13a707d74267474a9f553274e64906fd21bf1c75a20bde8cadf7b2") + add_versions("0.12.0", "294e224c14fd0822cfb15a35cf39aa14bd9967867999bf8bdfe3db7ddec2a27f") else set_urls("https://ziglang.org/download/$(version)/zig-macos-x86_64-$(version).tar.xz") add_versions("0.10.1", "02483550b89d2a3070c2ed003357fd6e6a3059707b8ee3fbc0c67f83ca898437") add_versions("0.11.0", "1c1c6b9a906b42baae73656e24e108fd8444bb50b6e8fd03e9e7a3f8b5f05686") + add_versions("0.12.0", "4d411bf413e7667821324da248e8589278180dbc197f4f282b7dbb599a689311") end elseif is_host("windows") then if os.arch() == "arm64" then set_urls("https://ziglang.org/download/$(version)/zig-windows-aarch64-$(version).zip") add_versions("0.10.1", "ece93b0d77b2ab03c40db99ef7ccbc63e0b6bd658af12b97898960f621305428") add_versions("0.11.0", "5d4bd13db5ecb0ddc749231e00f125c1d31087d708e9ff9b45c4f4e13e48c661") + add_versions("0.12.0", "04c6b92689241ca7a8a59b5f12d2ca2820c09d5043c3c4808b7e93e41c7bf97b") else set_urls("https://ziglang.org/download/$(version)/zig-windows-x86_64-$(version).zip") add_versions("0.10.1", "5768004e5e274c7969c3892e891596e51c5df2b422d798865471e05049988125") add_versions("0.11.0", "142caa3b804d86b4752556c9b6b039b7517a08afa3af842645c7e2dcd125f652") + add_versions("0.12.0", "2199eb4c2000ddb1fba85ba78f1fcf9c1fb8b3e57658f6a627a8e513131893f5") end elseif is_host("linux") then if os.arch() == "i386" then set_urls("https://ziglang.org/download/$(version)/zig-linux-x86-$(version).tar.xz") add_versions("0.11.0", "7b0dc3e0e070ae0e0d2240b1892af6a1f9faac3516cae24e57f7a0e7b04662a8") + add_versions("0.12.0", "fb752fceb88749a80d625a6efdb23bea8208962b5150d6d14c92d20efda629a5") elseif os.arch() == "arm64" then set_urls("https://ziglang.org/download/$(version)/zig-linux-aarch64-$(version).tar.xz") add_versions("0.10.1", "db0761664f5f22aa5bbd7442a1617dd696c076d5717ddefcc9d8b95278f71f5d") add_versions("0.11.0", "956eb095d8ba44ac6ebd27f7c9956e47d92937c103bf754745d0a39cdaa5d4c6") + add_versions("0.12.0", "754f1029484079b7e0ca3b913a0a2f2a6afd5a28990cb224fe8845e72f09de63") else set_urls("https://ziglang.org/download/$(version)/zig-linux-x86_64-$(version).tar.xz") add_versions("0.10.1", "6699f0e7293081b42428f32c9d9c983854094bd15fee5489f12c4cf4518cc380") add_versions("0.11.0", "2d00e789fec4f71790a6e7bf83ff91d564943c5ee843c5fd966efc474b423047") + add_versions("0.12.0", "c7ae866b8a76a568e2d5cfd31fe89cdb629bdd161fdd5018b29a4a0a17045cad") end elseif is_host("bsd") then if os.arch() == "x86_64" then From 7fddd500f54f72d75dfeef899fd8c98bc4cafbdb Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 14:43:14 +0800 Subject: [PATCH 006/671] Update drogon to v1.9.4 (#4175) --- packages/d/drogon/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/drogon/xmake.lua b/packages/d/drogon/xmake.lua index ee83c9d45..a3c5b02f5 100644 --- a/packages/d/drogon/xmake.lua +++ b/packages/d/drogon/xmake.lua @@ -6,6 +6,7 @@ package("drogon") add_urls("https://github.com/an-tao/drogon/archive/refs/tags/$(version).tar.gz", "https://github.com/an-tao/drogon.git") + add_versions("v1.9.4", "b23d9d01d36fb1221298fcdbedcf7fd3e1b8b8821bf6fb8ed073c8b0c290d11d") add_versions("v1.9.3", "fb4ef351b3e4c06ed850cfbbf50c571502decb1738fb7d62a9d7d70077c9fc23") add_versions("v1.4.1", "ad794d7744b600240178348c15e216c919fe7a2bc196cf1239f129aee2af19c7") add_versions("v1.6.0", "9f8802b579aac29e9eddfb156e432276727a3d3c49fffdf453a2ddcd1cb69093") From a6b5eac073346dd17c27cd97aa14d1bc23054e28 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Tue, 28 May 2024 15:05:18 +0800 Subject: [PATCH 007/671] update imgui to v1.90.7 (#4179) --- packages/i/imgui/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 3888a74a7..1230b9950 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -6,6 +6,8 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz", "https://github.com/ocornut/imgui.git") + add_versions("v1.90.7-docking", "v1.90.7-docking") + add_versions("v1.90.7", "872574217643d4ad7e9e6df420bb8d9e0d468fb90641c2bf50fd61745e05de99") add_versions("v1.90.6-docking", "v1.90.6-docking") add_versions("v1.90.6", "70b4b05ac0938e82b4d5b8d59480d3e2ca63ca570dfb88c55023831f387237ad") add_versions("v1.90.5-docking", "v1.90.5-docking") From b0cf1a54d513976f1798c5e6e9403f1e2f7b852b Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 15:43:57 +0800 Subject: [PATCH 008/671] improve llvm urls (#4177) --- packages/l/llvm/xmake.lua | 105 ++++++++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/packages/l/llvm/xmake.lua b/packages/l/llvm/xmake.lua index 2b1a3f6ff..a2123be30 100644 --- a/packages/l/llvm/xmake.lua +++ b/packages/l/llvm/xmake.lua @@ -2,40 +2,6 @@ package("llvm") set_kind("toolchain") set_homepage("https://llvm.org/") set_description("The LLVM Compiler Infrastructure") - - local precompiled = false - if is_plat("windows") then - if is_arch("x86") then - set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win32.zip") - add_versions("11.0.0", "268043ae0b656cf6272ccb9b8e3f21f51170b74ed8997ddc0b99587983b821ca") - add_versions("14.0.0", "63afc3c472cb279978c5a7efc25b8783a700aeb416df67886b7057eba52a8742") - add_versions("15.0.7", "8dbabb2194404220f8641b4b18b24b36eca0ae751380c23fc7743097e205b95f") - add_versions("16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818") - add_versions("17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41") - add_versions("18.1.1", "9f59dd99d45f64a5c00b00d27da8fe8b5f162905026f5c9ef0ade6e73ae18df3") - precompiled = true - else - set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip") - add_versions("11.0.0", "db5b3a44f8f784ebc71f716b54eb63c0d8d21aead12449f36291ab00820271c7") - add_versions("14.0.0", "c1e1ddf11aa73c58073956d9217086550544328ed5e6ec64c1a709badb231711") - add_versions("15.0.7", "7d29ca82f8b73e9973209e90428ec9f3fbd3b01925bd26e34f59e959e9ea7eb3") - add_versions("16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3") - add_versions("17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187") - add_versions("18.1.1", "28a9fbcd18f1e7e736ece6d663726bc15649f025343c3004dcbfc2d367b9924c") - precompiled = true - end - end - if not precompiled then - set_urls("https://github.com/llvm/llvm-project/releases/download/llvmorg-$(version)/llvm-project-$(version).src.tar.xz") - add_versions("11.0.0", "b7b639fc675fa1c86dd6d0bc32267be9eb34451748d2efd03f674b773000e92b") - add_versions("14.0.0", "35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23") - add_versions("15.0.7", "8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6") - add_versions("16.0.5", "37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863") - add_versions("16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e") - add_versions("17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813") - add_versions("18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad") - end - add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) add_configs("all", {description = "Enable all projects.", default = false, type = "boolean"}) @@ -57,6 +23,77 @@ package("llvm") add_configs("libcxxabi", {description = "Enable libcxxabi runtime.", default = true, type = "boolean"}) add_configs("openmp", {description = "Enable openmp runtime.", default = false, type = "boolean"}) + if on_source then + on_source(function (package) + local precompiled = false + if package:is_plat("windows") then + if package:is_arch("x86") then + package:set("urls", "https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win32.zip") + package:add("versions", "11.0.0", "268043ae0b656cf6272ccb9b8e3f21f51170b74ed8997ddc0b99587983b821ca") + package:add("versions", "14.0.0", "63afc3c472cb279978c5a7efc25b8783a700aeb416df67886b7057eba52a8742") + package:add("versions", "15.0.7", "8dbabb2194404220f8641b4b18b24b36eca0ae751380c23fc7743097e205b95f") + package:add("versions", "16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818") + package:add("versions", "17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41") + package:add("versions", "18.1.1", "9f59dd99d45f64a5c00b00d27da8fe8b5f162905026f5c9ef0ade6e73ae18df3") + precompiled = true + else + package:set("urls", "https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip") + package:add("versions", "11.0.0", "db5b3a44f8f784ebc71f716b54eb63c0d8d21aead12449f36291ab00820271c7") + package:add("versions", "14.0.0", "c1e1ddf11aa73c58073956d9217086550544328ed5e6ec64c1a709badb231711") + package:add("versions", "15.0.7", "7d29ca82f8b73e9973209e90428ec9f3fbd3b01925bd26e34f59e959e9ea7eb3") + package:add("versions", "16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3") + package:add("versions", "17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187") + package:add("versions", "18.1.1", "28a9fbcd18f1e7e736ece6d663726bc15649f025343c3004dcbfc2d367b9924c") + precompiled = true + end + end + if not precompiled then + package:set("urls", "https://github.com/llvm/llvm-project/releases/download/llvmorg-$(version)/llvm-project-$(version).src.tar.xz") + package:add("versions", "11.0.0", "b7b639fc675fa1c86dd6d0bc32267be9eb34451748d2efd03f674b773000e92b") + package:add("versions", "14.0.0", "35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23") + package:add("versions", "15.0.7", "8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6") + package:add("versions", "16.0.5", "37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863") + package:add("versions", "16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e") + package:add("versions", "17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813") + package:add("versions", "18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad") + end + end) + else + -- After xmake v2.9.5, we'll remove it. + local precompiled = false + if is_plat("windows") then + if is_arch("x86") then + set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win32.zip") + add_versions("11.0.0", "268043ae0b656cf6272ccb9b8e3f21f51170b74ed8997ddc0b99587983b821ca") + add_versions("14.0.0", "63afc3c472cb279978c5a7efc25b8783a700aeb416df67886b7057eba52a8742") + add_versions("15.0.7", "8dbabb2194404220f8641b4b18b24b36eca0ae751380c23fc7743097e205b95f") + add_versions("16.0.6", "5e1f560f75e7a4c7a6509cf7d9a28b4543e7afcb4bcf4f747e9f208f0efa6818") + add_versions("17.0.6", "ce78b510603cb3b347788d2f52978e971cf5f55559151ca13a73fd400ad80c41") + add_versions("18.1.1", "9f59dd99d45f64a5c00b00d27da8fe8b5f162905026f5c9ef0ade6e73ae18df3") + precompiled = true + else + set_urls("https://github.com/xmake-mirror/llvm-windows/releases/download/$(version)/clang+llvm-$(version)-win64.zip") + add_versions("11.0.0", "db5b3a44f8f784ebc71f716b54eb63c0d8d21aead12449f36291ab00820271c7") + add_versions("14.0.0", "c1e1ddf11aa73c58073956d9217086550544328ed5e6ec64c1a709badb231711") + add_versions("15.0.7", "7d29ca82f8b73e9973209e90428ec9f3fbd3b01925bd26e34f59e959e9ea7eb3") + add_versions("16.0.6", "7adb1a630b6cc676a4b983aca9b01e67f770556c6e960e9ee9aa7752c8beb8a3") + add_versions("17.0.6", "c480a4c280234b91f7796a1b73b18134ae62fe7c88d2d0c33312d33cb2999187") + add_versions("18.1.1", "28a9fbcd18f1e7e736ece6d663726bc15649f025343c3004dcbfc2d367b9924c") + precompiled = true + end + end + if not precompiled then + set_urls("https://github.com/llvm/llvm-project/releases/download/llvmorg-$(version)/llvm-project-$(version).src.tar.xz") + add_versions("11.0.0", "b7b639fc675fa1c86dd6d0bc32267be9eb34451748d2efd03f674b773000e92b") + add_versions("14.0.0", "35ce9edbc8f774fe07c8f4acdf89ec8ac695c8016c165dd86b8d10e7cba07e23") + add_versions("15.0.7", "8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6") + add_versions("16.0.5", "37f540124b9cfd4680666e649f557077f9937c9178489cea285a672e714b2863") + add_versions("16.0.6", "ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e") + add_versions("17.0.6", "58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813") + add_versions("18.1.1", "8f34c6206be84b186b4b31f47e1b52758fa38348565953fad453d177ef34c0ad") + end + end + on_load(function (package) if not package:is_plat("windows", "msys") then package:add("deps", "cmake") From 4e91f1a60ca30f17a047d17955d06033b976c282 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Wed, 29 May 2024 07:13:50 +0800 Subject: [PATCH 009/671] Upgrade json-c to 0.17 (#4181) * Update `json-c` to 0.17 * Remove `json-c 0.13` due to lack of CMake support --- packages/j/json-c/xmake.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/j/json-c/xmake.lua b/packages/j/json-c/xmake.lua index 66c8c82b6..661826e87 100644 --- a/packages/j/json-c/xmake.lua +++ b/packages/j/json-c/xmake.lua @@ -5,19 +5,19 @@ package("json-c") set_urls("https://github.com/json-c/json-c/archive/refs/tags/json-c-$(version).zip") - add_versions("0.13.1-20180305", "8a244527eb4f697362f713f7d6dca3f6f9b5335e18fe7b705130ae62e599e864") + add_versions("0.17-20230812", "471e9eb1dad4fd2e4fec571d8415993e66a89f23a5b052f1ba11b54db90252de") - if is_plat("windows") and winos.version():gt("winxp") then - add_deps("cmake") - on_install("windows", function (package) - import("package.tools.cmake").install(package) - os.cp("json_object_iterator.h", package:installdir("include/json-c")) - end) - end - - on_install("linux", "macosx", "iphoneos", "android", function (package) - local configs = {"--disable-dependency-tracking", "--disable-silent-rules", "--enable-shared=no"} - import("package.tools.autoconf").install(package, configs) + add_deps("cmake") + on_install(function (package) + local configs = {"-DBUILD_TESTING=OFF", "-DBUILD_APPS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_STATIC_LIBS=" .. (package:config("shared") and "OFF" or "ON")) + if package:config("pic") ~= false then + table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") + table.insert(configs, "-DDISABLE_STATIC_FPIC=OFF") + end + import("package.tools.cmake").install(package, configs) end) on_test(function (package) From 2fd4e41d59a080947c06e0c50871aaba24a7276c Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 29 May 2024 09:39:13 +0800 Subject: [PATCH 010/671] boost: fix v144 toolset (#4182) --- packages/b/boost/xmake.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 5d508f4a5..c1c757298 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -343,6 +343,18 @@ package("boost") table.insert(argv, "pch=off") end + if package:is_plat("windows") and package:version():le("1.85.0") then + local vs_toolset = build_toolchain:config("vs_toolset") + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + if minor and minor >= 40 then + io.replace("tools/build/src/engine/config_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/build.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/guess_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/tools/intel-win.jam", "14.3", "14.4", {plain = true}) + io.replace("tools/build/src/tools/msvc.jam", "14.3", "14.4", {plain = true}) + end + end local ok = os.execv("./b2", argv, {envs = runenvs, try = true, stdout = "boost-log.txt"}) if ok ~= 0 then raise("boost build failed, please check log in " .. path.join(os.curdir(), "boost-log.txt")) From 72e59ec465558125cdc36fdee277b5a18a12db93 Mon Sep 17 00:00:00 2001 From: Altina Orion <139891033+Altina-oz@users.noreply.github.com> Date: Wed, 29 May 2024 14:08:41 +0800 Subject: [PATCH 011/671] Update onednn 3.4.3 (#4184) --- packages/o/onednn/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onednn/xmake.lua b/packages/o/onednn/xmake.lua index 456374269..0550d361f 100644 --- a/packages/o/onednn/xmake.lua +++ b/packages/o/onednn/xmake.lua @@ -6,6 +6,7 @@ package("onednn") add_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/$(version).tar.gz", "https://github.com/oneapi-src/oneDNN.git") + add_versions("v3.4.3", "b795dc07d0d83aaec531081e77d5fb2e503a143f4330eabe4f035d4117c191ae") add_versions("v3.4.2", "5131ac559a13daa6e2784d20ab24e4607e55aa6da973518086326a647d389425") add_versions("v3.4.1", "906559a25581b292352420721112e1656d21029b66e8597816f9e741fbcdeadb") add_versions("v3.4", "1044dc3655d18de921c98dfc61ad7f65799ba5e897063d4a56d291394e12dcf5") From 2f6415728fb0b2aba779b08b37d0c96d5e466ecf Mon Sep 17 00:00:00 2001 From: KkemChen Date: Wed, 29 May 2024 15:31:11 +0800 Subject: [PATCH 012/671] libstatgrab: add package (#4187) * libstatgrab: add package * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/l/libstatgrab/xmake.lua | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/l/libstatgrab/xmake.lua diff --git a/packages/l/libstatgrab/xmake.lua b/packages/l/libstatgrab/xmake.lua new file mode 100644 index 000000000..4cb6115af --- /dev/null +++ b/packages/l/libstatgrab/xmake.lua @@ -0,0 +1,38 @@ +package("libstatgrab") + set_homepage("https://libstatgrab.org/") + set_description("A cross platform library for accessing system statistics") + set_license("GPL-2.1") + + add_urls("https://github.com/libstatgrab/libstatgrab.git") + add_urls("https://github.com/libstatgrab/libstatgrab/releases/download/$(version).tar.gz", {version = function (version) + return "LIBSTATGRAB_" .. version:gsub('%.', '_') .. "/libstatgrab-" .. version + end}) + + add_versions("0.92.1", "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11") + + add_configs("thread_support", {description = "support for multi-threaded environments", default = true, type = "boolean"}) + + add_deps("automake", "autoconf", "libtool") + + if is_plat("macosx") then + add_frameworks("IOKit", "CoreFoundation") + end + + on_install("macosx", "linux", function (package) + local configs = {"--disable-statgrab", + "--disable-saidar", + "--disable-man", + "--disable-tests"} + table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) + table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes")) + if not package:config("thread_support") then + table.insert(configs, "--disable-thread-support") + else + package:add("syslinks", "pthread") + end + import("package.tools.autoconf").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("sg_init", {includes = "statgrab.h"})) + end) From e4242b048a38d5103aa72464208efc0c7f4cce40 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 29 May 2024 23:59:42 +0800 Subject: [PATCH 013/671] cpuinfo: add clog (#4191) * cpuinfo: add clog * improve on_check --- packages/c/cpuinfo/clog.lua | 10 ++++++++++ packages/c/cpuinfo/xmake.lua | 13 +++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 packages/c/cpuinfo/clog.lua diff --git a/packages/c/cpuinfo/clog.lua b/packages/c/cpuinfo/clog.lua new file mode 100644 index 000000000..846521ebf --- /dev/null +++ b/packages/c/cpuinfo/clog.lua @@ -0,0 +1,10 @@ +function main(package) + os.cd("deps/clog") + local configs = {"-DCLOG_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DCLOG_RUNTIME_TYPE=" .. (package:config("shared") and "shared" or "static")) + if package:config("shared") and package:is_plat("windows") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + import("package.tools.cmake").install(package, configs) +end diff --git a/packages/c/cpuinfo/xmake.lua b/packages/c/cpuinfo/xmake.lua index b97c1b53c..4d253fe11 100644 --- a/packages/c/cpuinfo/xmake.lua +++ b/packages/c/cpuinfo/xmake.lua @@ -10,6 +10,7 @@ package("cpuinfo") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end + add_configs("clog", {description = "Build clog library.", default = false, type = "boolean"}) add_deps("cmake") if is_plat("windows") then @@ -18,12 +19,12 @@ package("cpuinfo") add_syslinks("pthread") end - on_check("windows|arm.*", function (package) + on_check("windows", function (package) import("core.tool.toolchain") import("core.base.semver") local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - if msvc then + if msvc and package:is_arch("arm.*") then local vs_sdkver = msvc:config("vs_sdkver") assert(vs_sdkver and semver.match(vs_sdkver):gt("10.0.19041"), "package(cpuinfo): need vs_sdkver > 10.0.19041.0") end @@ -57,6 +58,10 @@ package("cpuinfo") end end import("package.tools.cmake").install(package, configs) + + if package:config("clog") then + import("clog")(package) + end end) on_test(function (package) @@ -67,4 +72,8 @@ package("cpuinfo") std::cout << "Running on CPU " << cpuinfo_get_package(0)->name; } ]]}, {configs = {languages = "c++11"}, includes = "cpuinfo.h"})) + + if package:config("clog") then + assert(package:has_cfuncs("clog_vlog_info", {includes = "clog.h"})) + end end) From e622cc60f3939a5572c291562b58198ab2659476 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 30 May 2024 07:54:36 +0800 Subject: [PATCH 014/671] asmjit: update version (#4193) * asmjit: update version * asmtk: enable all platform --- packages/a/asmjit/xmake.lua | 14 +++++++------- packages/a/asmtk/xmake.lua | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/a/asmjit/xmake.lua b/packages/a/asmjit/xmake.lua index d7ae2d5fd..8ada93d8b 100644 --- a/packages/a/asmjit/xmake.lua +++ b/packages/a/asmjit/xmake.lua @@ -1,25 +1,25 @@ package("asmjit") - set_homepage("https://asmjit.com/") set_description("AsmJit is a lightweight library for machine code generation written in C++ language.") set_license("zlib") add_urls("https://github.com/asmjit/asmjit.git") + add_versions("2024.05.21", "55c5d6cef59619fb81014531b32f434a793cfb18") add_versions("2024.03.09", "268bce7952883dec5015ae539906e9e9d7fb65a0") add_versions("2022.01.18", "9a92d2f97260749f6f29dc93e53c743448f0137a") add_versions("2021.06.27", "d02235b83434943b52a6d7c57118205c5082de08") - add_deps("cmake") - if is_plat("linux") then - add_syslinks("rt") + if is_plat("linux", "bsd") then + add_syslinks("pthread", "rt", "m") end - on_load("windows", "macosx", "linux", function (package) + + add_deps("cmake") + + on_install("!iphoneos", function (package) if not package:config("shared") then package:add("defines", "ASMJIT_STATIC") end - end) - on_install("windows", "macosx", "linux", function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DASMJIT_STATIC=" .. (package:config("shared") and "OFF" or "ON")) diff --git a/packages/a/asmtk/xmake.lua b/packages/a/asmtk/xmake.lua index 56a3e34ba..a4d05ee2d 100644 --- a/packages/a/asmtk/xmake.lua +++ b/packages/a/asmtk/xmake.lua @@ -4,11 +4,11 @@ package("asmtk") set_license("zlib") set_urls("https://github.com/asmjit/asmtk.git") - add_versions("2023.6.14", "6e25b8983fbd8bf455c01ed7c5dd40c99b789565") + add_versions("2023.07.18", "e2752c85d39da4b0c5c729737a6faa25286b8e0c") add_deps("asmjit") - on_install("windows", "linux", "macosx", function (package) + on_install("!iphoneos", function (package) if not package:config("shared") then package:add("defines", "ASMTK_STATIC") end From aa9e74306e18ded5657b7aab62b8a4bed8310fa5 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 30 May 2024 11:08:21 +0800 Subject: [PATCH 015/671] Update sentry-native to 0.7.5 (#4196) --- packages/s/sentry-native/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sentry-native/xmake.lua b/packages/s/sentry-native/xmake.lua index ea099ecf9..00f704328 100644 --- a/packages/s/sentry-native/xmake.lua +++ b/packages/s/sentry-native/xmake.lua @@ -5,6 +5,7 @@ package("sentry-native") set_urls("https://github.com/getsentry/sentry-native/releases/download/$(version)/sentry-native.zip", "https://github.com/getsentry/sentry-native.git") + add_versions("0.7.5", "d9f1b44753fae3e9462aa1e6fd3021cb0ff2f51c1a1fa02b34510e3bc311f429") add_versions("0.7.2", "afb44d5cc4e0ec5f2e8068132c68256959188f6bf015e1837e7cc687014b9c70") add_versions("0.7.1", "c450a064b0dbb1883a355455db2b6469abef59c04686a53719384bbc7ff507d3") add_versions("0.7.0", "4dfccc879a81771b9da1c335947ffc9e5987ca3d16b3035efa2c66a06f727543") From fa9880ef62f78a5da65240561348f43d5772bc09 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 30 May 2024 11:08:24 +0800 Subject: [PATCH 016/671] Update ittapi to v3.24.7 (#4194) --- packages/i/ittapi/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/ittapi/xmake.lua b/packages/i/ittapi/xmake.lua index 30bbad09f..1a5f3d88d 100644 --- a/packages/i/ittapi/xmake.lua +++ b/packages/i/ittapi/xmake.lua @@ -6,6 +6,7 @@ package("ittapi") add_urls("https://github.com/intel/ittapi/archive/refs/tags/$(version).tar.gz", "https://github.com/intel/ittapi.git") + add_versions("v3.24.7", "2ff56c5c3f144b92e34af9bee451115f6076c9070ec92d361c3c07de8ff42649") add_versions("v3.24.6", "4e6cb42b6bd9e699e3dfbaf678e572f4292127dfee3312744137ac567064a26f") add_versions("v3.24.4", "f7341c563f228f4358b645fce526208c742fe13e61fc3ba2c777ba94d36e98f5") From 0eafa641a60721fd97ba06bc634d0e8fb3efd0f3 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 30 May 2024 12:09:35 +0800 Subject: [PATCH 017/671] Update libsais to v2.8.2 (#4197) --- packages/l/libsais/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsais/xmake.lua b/packages/l/libsais/xmake.lua index c54130a92..6f7e3779a 100644 --- a/packages/l/libsais/xmake.lua +++ b/packages/l/libsais/xmake.lua @@ -5,6 +5,7 @@ package("libsais") add_urls("https://github.com/IlyaGrebnov/libsais/archive/refs/tags/$(version).tar.gz", "https://github.com/IlyaGrebnov/libsais.git") + add_versions("v2.8.2", "a17918936d6231cf6b019629d65ad7170f889bab5eb46c09b775dede7d890502") add_versions("v2.8.1", "01852e93305fe197d8f2ffdc32a856e78d6796aa3f40708325084c55b450747a") add_versions("v2.8.0", "71f608d1e2a28652e66076f42becc3bbd3e0c8a21ba11a4de226a51459e894a9") add_versions("v2.7.5", "613c597b64fb096738d4084e0f2eb3b490aded7295cffc7fb23bdccc30097ebf") From afdaf1a804ce643b0225caa38fe609f95409b4ea Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 30 May 2024 14:33:47 +0800 Subject: [PATCH 018/671] Update cpptrace to 0.6.0 (#4198) --- packages/c/cpptrace/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index 24922b29e..f2fea4f22 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.6.0", "7c2996f03d15f61016bc81fe7fa5220b1cc42498333c5c0e699ad2f96b918b96") add_versions("v0.5.4", "bab0f76330f90c445216ccade1a3ff29c9c4bbd44805be34d52095cd95b02df4") add_versions("v0.5.2", "d148998e175b9c69ffb4383ab321a0d27487392e4eee3f39441d35b6856c8f78") add_versions("v0.5.1", "27b9f862ec6185f570ee59c07fdd12bebb55a986191518e896621317d2654f26") From ae87044f3cc458239e282ac76b4444f7e585bb5d Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 30 May 2024 20:15:44 +0800 Subject: [PATCH 019/671] fbgemm: add package (#4192) * fbgemm: add package * asmjit: enable all platform * Revert "asmjit: enable all platform" This reverts commit 5ddf6ec6fc6be05dcab6db21da68af03ee70f2af. * fbgemm: fix openmp * limit plat --- .../f/fbgemm/patches/0.7.0/dep-unbundle.patch | 57 +++++++++++++++++++ packages/f/fbgemm/xmake.lua | 46 +++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 packages/f/fbgemm/patches/0.7.0/dep-unbundle.patch create mode 100644 packages/f/fbgemm/xmake.lua diff --git a/packages/f/fbgemm/patches/0.7.0/dep-unbundle.patch b/packages/f/fbgemm/patches/0.7.0/dep-unbundle.patch new file mode 100644 index 000000000..078616e5c --- /dev/null +++ b/packages/f/fbgemm/patches/0.7.0/dep-unbundle.patch @@ -0,0 +1,57 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b51071..ecc2c9e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -240,8 +240,8 @@ message(WARNING "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") + message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") +- +-if(NOT TARGET asmjit) ++find_package(asmjit CONFIG REQUIRED) ++if(0) + #Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -269,8 +269,8 @@ if(NOT TARGET asmjit) + target_compile_options_if_supported(asmjit -Wno-unused-but-set-variable) + endif() + endif() +- +-if(NOT TARGET cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++if(0) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -354,12 +354,7 @@ target_include_directories(fbgemm BEFORE + PUBLIC $ + PUBLIC $) + +-target_link_libraries(fbgemm +- $ +- $) +-add_dependencies(fbgemm +- asmjit +- cpuinfo) ++target_link_libraries(fbgemm asmjit cpuinfo) + + if(OpenMP_FOUND) + target_link_libraries(fbgemm OpenMP::OpenMP_CXX) +@@ -383,12 +378,12 @@ install( + + if(MSVC) + if(FBGEMM_LIBRARY_TYPE STREQUAL "shared") +- install( +- FILES $ $ +- DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) ++ # install( ++ # FILES $ $ ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) + endif() + install(TARGETS fbgemm DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ # install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + #Make project importable from the build directory diff --git a/packages/f/fbgemm/xmake.lua b/packages/f/fbgemm/xmake.lua new file mode 100644 index 000000000..a22bc9b32 --- /dev/null +++ b/packages/f/fbgemm/xmake.lua @@ -0,0 +1,46 @@ +package("fbgemm") + set_homepage("https://github.com/pytorch/FBGEMM") + set_description("FB (Facebook) + GEMM (General Matrix-Matrix Multiplication) - https://code.fb.com/ml-applications/fbgemm/") + set_license("BSD") + + add_urls("https://github.com/pytorch/FBGEMM/archive/refs/tags/$(version).tar.gz", + "https://github.com/pytorch/FBGEMM.git") + + add_versions("v0.7.0", "c51ac26bc0aa8fef7e80631c4abdd3a7c33d1a097359cef9b008bf9e1203c071") + + add_patches("0.7.0", "patches/0.7.0/dep-unbundle.patch", "f3117ff728989146d5ab0c370fe410c73459091f65cae5f6b304e5637889fb8f") + + -- need libtorch + add_configs("gpu", {description = "Build fbgemm_gpu library", default = false, type = "boolean"}) + add_configs("cpu", {description = "Build FBGEMM_GPU without GPU support", default = false, type = "boolean"}) + add_configs("rocm", {description = "Build FBGEMM_GPU for ROCm", default = false, type = "boolean"}) + + add_deps("cmake", "python", {kind = "binary"}) + add_deps("asmjit", "cpuinfo", "openmp") + + -- mingw support: https://github.com/pytorch/FBGEMM/pull/2114 + -- arm support: https://github.com/pytorch/FBGEMM/issues/2074 + on_install("windows|x64", "linux|x86_64", "macosx|x86_64", function (package) + io.replace("CMakeLists.txt", "-Werror", "", {plain = true}) + + if not package:config("shared") then + package:add("defines", "FBGEMM_STATIC") + end + + local configs = {"-DFBGEMM_BUILD_TESTS=OFF", "-DFBGEMM_BUILD_BENCHMARKS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DFBGEMM_LIBRARY_TYPE=" .. (package:config("shared") and "shared" or "static")) + + table.insert(configs, "-DFBGEMM_BUILD_FBGEMM_GPU=" .. (package:config("gpu") and "ON" or "OFF")) + table.insert(configs, "-DFBGEMM_CPU_ONLY=" .. (package:config("cpu") and "ON" or "OFF")) + table.insert(configs, "-DUSE_ROCM=" .. (package:config("rocm") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs, {packagedeps = {"asmjit", "cpuinfo"}}) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + fbgemm::Xor128(); + } + ]]}, {configs = {languages = "c++20"}, includes = "fbgemm/QuantUtilsAvx2.h"})) + end) From 061a3ad2f3f4aca64173a0fa57e9b34473d2f5dd Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 30 May 2024 22:25:47 +0800 Subject: [PATCH 020/671] ceres-solver: add cuda configs --- packages/c/ceres-solver/xmake.lua | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/c/ceres-solver/xmake.lua b/packages/c/ceres-solver/xmake.lua index c72014629..443203549 100644 --- a/packages/c/ceres-solver/xmake.lua +++ b/packages/c/ceres-solver/xmake.lua @@ -1,5 +1,4 @@ package("ceres-solver") - set_homepage("http://ceres-solver.org/") set_description("Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems.") set_license("BSD-3-Clause") @@ -11,25 +10,38 @@ package("ceres-solver") add_patches("2.1.0", "patches/2.1.0/int64.patch", "1df14f30abf1a942204b408c780eabbeac0859ba5a6db3459b55c47479583c57") - add_configs("blas", {description = "Choose BLAS library to use.", default = "openblas", type = "string", values = {"mkl", "openblas"}}) + add_configs("blas", {description = "Choose BLAS library to use.", default = "openblas", type = "string", values = {"mkl", "openblas"}}) add_configs("suitesparse", {description = "Enable SuiteSparse.", default = true, type = "boolean"}) + add_configs("cuda", {description = "Enable CUDA support.", default = false, type = "boolean"}) add_deps("cmake", "eigen", "glog", "gflags") - on_load("windows", "linux", "macosx", function (package) + + on_load(function (package) if package:config("suitesparse") then package:add("deps", "suitesparse", {configs = {blas = package:config("blas")}}) package:add("deps", "openmp") end + if package:config("cuda") then + package:add("deps", "cuda") + end end) on_install("windows|x64", "windows|x86", "linux", "macosx", function (package) - local configs = {"-DBUILD_TESTING=OFF", "-DBUILD_DOCUMENTATION=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_BENCHMARKS=OFF", "-DCXSPARSE=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + local configs = { + "-DBUILD_TESTING=OFF", + "-DBUILD_DOCUMENTATION=OFF", + "-DBUILD_EXAMPLES=OFF", + "-DBUILD_BENCHMARKS=OFF", + "-DCXSPARSE=OFF" + } + + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DMSVC_USE_STATIC_CRT=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) end table.insert(configs, "-DSUITESPARSE=" .. (package:config("suitesparse") and "ON" or "OFF")) + table.insert(configs, "-DUSE_CUDA=" .. (package:config("cuda") and "ON" or "OFF")) if package:config("suitesparse") then import("package.tools.cmake").install(package, configs, {packagedeps = {"openmp", "libomp"}}) else From 55d9e72f799128ee5b360c8e52303b85d14c082a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 30 May 2024 22:32:53 +0800 Subject: [PATCH 021/671] Auto-update astc-encoder to 4.8.0 (#4195) * Update astc-encoder to 4.8.0 * remove werror * Update xmake.lua --------- Co-authored-by: star9029 --- packages/a/astc-encoder/xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/a/astc-encoder/xmake.lua b/packages/a/astc-encoder/xmake.lua index 94292f69a..095b6cac6 100644 --- a/packages/a/astc-encoder/xmake.lua +++ b/packages/a/astc-encoder/xmake.lua @@ -6,6 +6,7 @@ package("astc-encoder") add_urls("https://github.com/ARM-software/astc-encoder/archive/refs/tags/$(version).tar.gz", "https://github.com/ARM-software/astc-encoder.git") + add_versions("4.8.0", "6c12f4656be21a69cbacd9f2c817283405decb514072dc1dcf51fd9a0b659852") add_versions("4.7.0", "a57c81f79055aa7c9f8c82ac5464284e3df9bba682895dee09fa35bd1fdbab93") add_versions("4.6.1", "a73c7afadb2caba00339a8f715079d43f9b7e75cf57463477e5ac36ef7defd26") @@ -25,6 +26,8 @@ package("astc-encoder") add_deps("cmake") on_install("windows|x64", "windows|x86", "mingw|x86_64", "linux", function (package) + io.replace("Source/cmake_core.cmake", "-Werror", "", {plain = true}) + local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DASTCENC_SHAREDLIB=" .. (package:config("shared") and "ON" or "OFF")) @@ -63,7 +66,7 @@ package("astc-encoder") astcenc_error status = astcenc_context_alloc(config, 1, &context); } ]]}, {configs = {languages = "c++14"}})) - if package:config("cli") then + if package:config("cli") and (not package:is_cross()) then os.vrun("astcenc -help") end end) From 32b86097c3b09cacd36cebcfcee00b69b38c6353 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 31 May 2024 01:03:48 +0800 Subject: [PATCH 022/671] snappy: fix build type (#4200) * snappy: fix build type * Update xmake.lua --- packages/s/snappy/xmake.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/s/snappy/xmake.lua b/packages/s/snappy/xmake.lua index 580d7bc43..6f2b8be4b 100644 --- a/packages/s/snappy/xmake.lua +++ b/packages/s/snappy/xmake.lua @@ -1,5 +1,4 @@ package("snappy") - set_homepage("https://github.com/google/snappy") set_description("A fast compressor/decompressor") @@ -19,17 +18,20 @@ package("snappy") add_configs("avx2", {description = "Use the AVX2 instruction set", default = false, type = "boolean"}) add_configs("bmi2", {description = "Use the BMI2 instruction set", default = false, type = "boolean"}) - on_install("windows", "linux", "macosx", "mingw", "android", function (package) + on_install(function (package) + io.replace("CMakeLists.txt", "-Werror", "", {plain = true}) + if package:version():eq("1.1.10") then io.replace("snappy.cc", "(op + deferred_length) < op_limit_min_slop);", "static_cast(op + deferred_length) < op_limit_min_slop);", {plain = true}) end local configs = {"-DSNAPPY_BUILD_TESTS=OFF", "-DSNAPPY_BUILD_BENCHMARKS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DSNAPPY_REQUIRE_AVX=" .. (package:config("avx") and "ON" or "OFF")) table.insert(configs, "-DSNAPPY_REQUIRE_AVX2=" .. (package:config("avx2") and "ON" or "OFF")) table.insert(configs, "-DSNAPPY_HAVE_BMI2=" .. (package:config("bmi2") and "ON" or "OFF")) - if package:config("pic") ~= false then - table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") + if package:is_plat("windows") then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") end import("package.tools.cmake").install(package, configs) end) From a30a51783286519ae817e3c0e81c12a762941a15 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 31 May 2024 08:36:41 +0800 Subject: [PATCH 023/671] openvdb: fix windows build (#4199) * openvdb: fix windows build * fix linux * add patch * Update xmake.lua --- .../o/openvdb/patches/10.1.0/blosc-dep.patch | 31 +++++++++++++++++++ packages/o/openvdb/xmake.lua | 13 +++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 packages/o/openvdb/patches/10.1.0/blosc-dep.patch diff --git a/packages/o/openvdb/patches/10.1.0/blosc-dep.patch b/packages/o/openvdb/patches/10.1.0/blosc-dep.patch new file mode 100644 index 000000000..dc7dc8b74 --- /dev/null +++ b/packages/o/openvdb/patches/10.1.0/blosc-dep.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake +index 5ccf524..65f68c9 100644 +--- a/cmake/FindBlosc.cmake ++++ b/cmake/FindBlosc.cmake +@@ -191,12 +191,12 @@ list(APPEND _BLOSC_LIBRARYDIR_SEARCH_DIRS + # Library suffix handling + + set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) +-set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES}) ++# set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES}) + + if(MSVC) + if(BLOSC_USE_STATIC_LIBS) + set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") +- set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib") ++ # set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib") + endif() + else() + if(BLOSC_USE_STATIC_LIBS) +@@ -249,9 +249,9 @@ endforeach() + # Reset library suffix + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) +-set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES}) ++# set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES}) + unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) +-unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES) ++# unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES) + + if(Blosc_LIBRARY_DEBUG AND Blosc_LIBRARY_RELEASE) + # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for diff --git a/packages/o/openvdb/xmake.lua b/packages/o/openvdb/xmake.lua index 8df25d830..793d3e1d7 100644 --- a/packages/o/openvdb/xmake.lua +++ b/packages/o/openvdb/xmake.lua @@ -16,6 +16,8 @@ package("openvdb") add_versions("v10.1.0", "2746236e29659a0d35ab90d832f7c7987dd2537587a1a2f9237d9c98afcd5817") add_versions("v11.0.0", "6314ff1db057ea90050763e7b7d7ed86d8224fcd42a82cdbb9c515e001b96c74") + add_patches(">=10.1.0", "patches/10.1.0/blosc-dep.patch", "a1a5adf4ae2c75c3a3a390b25654dd7785b88d15e459a1620fc0b42b20f81ba0") + add_deps("cmake") add_deps("boost >1.73", {configs = {regex = true, system = true, iostreams = true}}) @@ -67,7 +69,15 @@ package("openvdb") io.replace("cmake/FindBlosc.cmake", "${BUILD_TYPE} ${_BLOSC_LIB_NAME}", "${BUILD_TYPE} blosc libblosc", {plain = true}) io.replace("cmake/FindBlosc.cmake", "lz4 snappy zlib zstd", "lz4", {plain = true}) io.replace("cmake/FindTBB.cmake", "Tbb_${COMPONENT}_LIB_TYPE STREQUAL STATIC", "TRUE", {plain = true}) - local configs = {"-DOPENVDB_BUILD_DOCS=OFF", "-DUSE_PKGCONFIG=OFF", "-DBoost_USE_STATIC_LIBS=ON", "-DUSE_CCACHE=OFF", "-DBLOSC_USE_EXTERNAL_SOURCES=ON"} + + local configs = { + "-DOPENVDB_BUILD_DOCS=OFF", + "-DUSE_PKGCONFIG=OFF", + "-DBoost_USE_STATIC_LIBS=ON", + "-DUSE_CCACHE=OFF", + "-DBLOSC_USE_EXTERNAL_SOURCES=ON" + } + if package:config("shared") then table.insert(configs, "-DOPENVDB_CORE_SHARED=ON") table.insert(configs, "-DOPENVDB_CORE_STATIC=OFF") @@ -84,6 +94,7 @@ package("openvdb") end table.insert(configs, "-DOPENVDB_BUILD_VDB_LOD=" .. (package:config("lod") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_VDB_PRINT=" .. (package:config("print") and "ON" or "OFF")) + table.insert(configs, "-DOPENVDB_BUILD_BINARIES=" .. (package:config("print") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_VDB_RENDER=" .. (package:config("render") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_VDB_VIEW=" .. (package:config("view") and "ON" or "OFF")) if package:version():ge("10.0") then From f8979b54a18dd958abfc868531eccda4363ed4a3 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 31 May 2024 16:09:42 +0800 Subject: [PATCH 024/671] Auto-update zziplib to v0.13.76 (#4201) * Update zziplib to v0.13.76 * Update xmake.lua * Update xmake.lua --------- Co-authored-by: c8ef --- packages/z/zziplib/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/z/zziplib/xmake.lua b/packages/z/zziplib/xmake.lua index 100faebe6..b3b092676 100644 --- a/packages/z/zziplib/xmake.lua +++ b/packages/z/zziplib/xmake.lua @@ -6,12 +6,14 @@ package("zziplib") add_urls("https://github.com/gdraheim/zziplib/archive/refs/tags/$(version).tar.gz", "https://github.com/gdraheim/zziplib.git") + add_versions("v0.13.76", "08b0e300126329c928a41b6d68e397379fad02469e34a0855d361929968ea4c0") add_versions("v0.13.74", "319093aa98d39453f3ea2486a86d8a2fab2d5632f6633a2665318723a908eecf") add_versions("v0.13.72", "93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc") add_versions("v0.13.73", "2aa9d317f70060101064863e4e8fe698c32301e2d293d2b4964608cf2d5b2d8b") add_deps("cmake", "zlib") on_install("windows", "macosx", "linux", function (package) + io.replace("zzip/CMakeLists.txt", "include ( CodeCoverage )", "", {plain = true}) local configs = {"-DZZIPTEST=OFF", "-DZZIPDOCS=OFF", "-DZZIPWRAP=OFF", "-DZZIPSDL=OFF", "-DZZIPMMAPPED=OFF", "-DZZIPFSEEKO=OFF", "-DZZIPBINS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From d6ed3d033ed1f0456b8c065bd00509e2174c761d Mon Sep 17 00:00:00 2001 From: hxhc Date: Fri, 31 May 2024 19:19:02 +0800 Subject: [PATCH 025/671] update cminpack versions (#4203) * update cminpack versions * only test single version * remove old version * Update xmake.lua --------- Co-authored-by: star9029 --- packages/c/cminpack/xmake.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/c/cminpack/xmake.lua b/packages/c/cminpack/xmake.lua index 78dab7555..194cc1d3c 100644 --- a/packages/c/cminpack/xmake.lua +++ b/packages/c/cminpack/xmake.lua @@ -1,9 +1,11 @@ package("cminpack") - set_homepage("http://devernay.free.fr/hacks/cminpack/") + set_homepage("https://devernay.github.io/cminpack/") set_description("A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems") - add_urls("https://github.com/devernay/cminpack.git") - add_versions("2024.01.04", "cba7bcce88d93011411799ee3275caef18aaf7dd") + add_urls("https://github.com/devernay/cminpack/archive/$(version).tar.gz", + "https://github.com/devernay/cminpack.git") + + add_versions("v1.3.9", "aa37bac5b5caaa4f5805ea5c4240e3834c993672f6dab0b17190ee645e251c9f") add_configs("blas", {description = "Compile cminpack using cblas library if possible", default = false, type = "boolean"}) From ecf7f2e3beba0428fe941306d400d488e1a890ba Mon Sep 17 00:00:00 2001 From: sanqideshi Date: Fri, 31 May 2024 20:03:59 +0800 Subject: [PATCH 026/671] Add Linux support to Crashpad. (#4157) * 1. Compile binary files. 2. Modify crashpad/xmake.lua. 3. Add Linux support. * format crashpad xmake.lua * 1. add on_test check function 2. modify link sort 3. move add_includedirs position when platform is windows * - add crashpad's license(Apache-2.0) * Update xmake.lua * Update xmake.lua * - modify build type,now build from source - windows is testing * - passed build in linux * - scope include and libs for linux * - moidfy /include to include * - add libcurl depedency * - scope linux deps * Update xmake.lua delete libcurl * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua - add cmake options - change verify platforms bin * Update xmake.lua --------- Co-authored-by: SanQi <1459998132@.qq.com> Co-authored-by: ruki Co-authored-by: star9029 --- packages/c/crashpad/xmake.lua | 58 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/packages/c/crashpad/xmake.lua b/packages/c/crashpad/xmake.lua index a6068d0e3..8a1652c62 100644 --- a/packages/c/crashpad/xmake.lua +++ b/packages/c/crashpad/xmake.lua @@ -1,37 +1,35 @@ package("crashpad") set_homepage("https://chromium.googlesource.com/crashpad/crashpad/+/refs/heads/main/README.md") set_description("Crashpad is a crash-reporting system.") + set_license("Apache-2.0") - if is_host("windows") then - - local map = { - ["2021.8.1"] = "stable", - ["2022.4.16"] = "latest" - } - - function map_version(version) - return map[tostring(version)] - end - - if is_arch("x64", "x86_64") then - set_urls("http://get.backtrace.io/crashpad/builds/crashpad-release-x86-64-$(version).zip", {version = map_version}) - add_versions("2021.8.1", "b3facf8a802dfd12daf4d9fba416f4d4b5df0ae544afa14080662fa978aa18cb") - add_versions("2022.4.16", "7705073dfff89c376303cacea3a6f8c63322f77566ad5cdbe37060cf3cef9f8b") - else - set_urls("http://get.backtrace.io/crashpad/builds/crashpad-release-x86-$(version).zip", {version = map_version}) - add_versions("2021.8.1", "699fdf741f39da1c68069820ce891b6eb8b48ef29ab399fc1bcf210b67ff8547") - add_versions("2022.4.16", "c3bffb64d1087198946739dfb30d24b2355e49ddfe90d8e2a75ed373ed6e3377") - end - end + add_urls("https://github.com/getsentry/crashpad.git") + add_versions("2024.04.15", "96e301b7d6b81990a244d7de41a0d36eeb60899e") + + add_includedirs("include/crashpad", "include/crashpad/mini_chromium") + add_links("crashpad_client", "crashpad_util", "mini_chromium") - add_includedirs("include", "include/mini_chromium") + add_deps("cmake") + add_deps("libcurl") - on_install("windows", function (package) - os.cp("include/*", package:installdir("include")) - os.cp("bin/crashpad_handler.exe", package:installdir("bin")) - if package:config("shared") then - os.cp("lib_md/*", package:installdir("lib")) - else - os.cp("lib_mt/*", package:installdir("lib")) + on_install("linux", "windows|x64", "windows|x86", function(package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs, {packagedeps = "libcurl"}) + package:addenv("PATH", "bin") + end) + + on_test(function(package) + if not package:is_cross() then + os.vrun("crashpad_handler --help") end - end) + + assert(package:check_cxxsnippets({test = [[ + #include "client/crashpad_client.h" + using namespace crashpad; + void test() { + CrashpadClient *client = new CrashpadClient(); + } + ]]}, {configs = {languages = "cxx17"}})) + end) From b90a891b04651e67ba9fdc321cbf4e752dc0d7ae Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 1 Jun 2024 08:57:33 +0800 Subject: [PATCH 027/671] basisu: add package (#4207) * basisu: add package * fix c++11 --- packages/b/basisu/port/xmake.lua | 37 +++++++++++++++++++++++++++ packages/b/basisu/xmake.lua | 43 ++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 packages/b/basisu/port/xmake.lua create mode 100644 packages/b/basisu/xmake.lua diff --git a/packages/b/basisu/port/xmake.lua b/packages/b/basisu/port/xmake.lua new file mode 100644 index 000000000..55b6b0456 --- /dev/null +++ b/packages/b/basisu/port/xmake.lua @@ -0,0 +1,37 @@ +option("opencl", {default = false}) +option("tools", {default = false}) + +add_rules("mode.debug", "mode.release") + +set_languages("c++11") +add_rules("utils.install.cmake_importfiles") + +if has_config("opencl") then + add_requires("opencl") + add_packages("opencl") + add_defines("BASISU_SUPPORT_OPENCL") +end + +add_requires("zstd") +add_packages("zstd") +add_defines("BASISD_SUPPORT_KTX2_ZSTD") + +target("basisu") + set_kind("$(kind)") + add_files("encoder/*.cpp", "transcoder/*.cpp") + add_headerfiles("(encoder/*.h)", "(transcoder/*.h)", "(transcoder/*.inc)", {prefixdir = "basisu"}) + + add_vectorexts("all") + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + elseif is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + end + +if has_config("tools") then + target("basisu_tool") + set_kind("binary") + add_files("basisu_tool.cpp") + add_deps("basisu") +end diff --git a/packages/b/basisu/xmake.lua b/packages/b/basisu/xmake.lua new file mode 100644 index 000000000..39acbd7c7 --- /dev/null +++ b/packages/b/basisu/xmake.lua @@ -0,0 +1,43 @@ +package("basisu") + set_homepage("https://github.com/BinomialLLC/basis_universal") + set_description("Basis Universal GPU Texture Codec") + set_license("Apache-2.0") + + add_urls("https://github.com/BinomialLLC/basis_universal/archive/refs/tags/$(version).tar.gz", + "https://github.com/BinomialLLC/basis_universal.git") + + add_versions("1.16.4", "e5740fd623a2f8472c9700b9447a8725a6f27d65b0b47c3e3926a60db41b8a64") + + add_configs("opencl", {description = "Enable opencl", default = false, type = "boolean"}) + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + end + + add_deps("zstd") + + on_load(function (package) + if package:config("opencl") then + package:add("deps", "opencl") + end + end) + + on_install(function (package) + io.replace("encoder/basisu_comp.cpp", "../zstd/zstd.h", "zstd.h", {plain = true}) + + local configs = { + opencl = package:config("opencl"), + tools = package:config("tools"), + } + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + basist::basisu_transcoder_init(); + } + ]]}, {configs = {languages = "c++11"}, includes = "basisu/transcoder/basisu_transcoder.h"})) + end) From 63e995cbd44ad1e66009ec44e362c90783d630e2 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 1 Jun 2024 09:55:37 +0800 Subject: [PATCH 028/671] Update thorvg to v0.13.6 (#4208) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index 8862ea045..25cb606b0 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.13.6", "f24fd3647e1a309dec00f6455b32258c0dd0e0dbd1133233169467571f188bad") add_versions("v0.13.5", "977ed74c3846c9a6acd5765aff776745d40e3c91507b22e51177d59c69afd198") add_versions("v0.13.2", "03b5dbb4c73ff221a4bd7243cc0ad377aecff4c3077f5a57ee2902e4122d3218") From 4da4a72bbbfb782674444f4c6c921bec964f199b Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 1 Jun 2024 11:22:01 +0800 Subject: [PATCH 029/671] Update simdjson to 3.9.3 (#4210) --- packages/s/simdjson/xmake.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/s/simdjson/xmake.lua b/packages/s/simdjson/xmake.lua index 86374639e..f18da6a04 100644 --- a/packages/s/simdjson/xmake.lua +++ b/packages/s/simdjson/xmake.lua @@ -6,17 +6,18 @@ package("simdjson") add_urls("https://github.com/simdjson/simdjson/archive/refs/tags/$(version).tar.gz", "https://github.com/simdjson/simdjson.git") + add_versions("v3.9.3", "2e3d10abcde543d3dd8eba9297522cafdcebdd1db4f51b28f3bc95bf1d6ad23c") add_versions("v3.9.2", "79fbe700f4ac3dd69c4f08275af58399daabd612bca0c0465aea959c60256651") add_versions("v3.9.1", "a4b6e7cd83176e0ccb107ce38521da40a8df41c2d3c90566f2a0af05b0cd05c4") add_versions("v3.8.0", "e28e3f46f0012d405b67de6c0a75e8d8c9a612b0548cb59687822337d73ca78b") - add_versions("v0.9.5", "db69582fc5e4ece8c0a6a64894efeef475fe22fe466bd67195422de11b08b4d2") - add_versions("v0.9.7", "a21279ae4cf0049234a822c5c3550f99ec1707d3cda12156d331dcc8cd411ba0") - add_versions("v1.0.0", "fe54be1459b37e88abd438b01968144ed4774699d1272dd47a790b9362c5df42") - add_versions("v1.1.0", "9effcb21fe48e4bcc9b96031e60c3911c58aa656ad8c78212d269c0db9e0133e") - add_versions("v3.0.0", "e6dd4bfaad2fd9599e6a026476db39a3bb9529436d3508ac3ae643bc663526c5") - add_versions("v3.1.1", "4fcb1c9b1944e2eb8a4a4a22c979e2827165216f859e94d93c846c1261e0e432") - add_versions("v3.6.0", "9eab3197231382b8b99d14d8ca647d6ab6bea1b40008df086d25e6f687309bf6") add_versions("v3.7.0", "27315c4861893b3e036c1f672b1c238ee86be6edb84c0824d1ed20dea5999777") + add_versions("v3.6.0", "9eab3197231382b8b99d14d8ca647d6ab6bea1b40008df086d25e6f687309bf6") + add_versions("v3.1.1", "4fcb1c9b1944e2eb8a4a4a22c979e2827165216f859e94d93c846c1261e0e432") + add_versions("v3.0.0", "e6dd4bfaad2fd9599e6a026476db39a3bb9529436d3508ac3ae643bc663526c5") + add_versions("v1.1.0", "9effcb21fe48e4bcc9b96031e60c3911c58aa656ad8c78212d269c0db9e0133e") + add_versions("v1.0.0", "fe54be1459b37e88abd438b01968144ed4774699d1272dd47a790b9362c5df42") + add_versions("v0.9.7", "a21279ae4cf0049234a822c5c3550f99ec1707d3cda12156d331dcc8cd411ba0") + add_versions("v0.9.5", "db69582fc5e4ece8c0a6a64894efeef475fe22fe466bd67195422de11b08b4d2") add_configs("threads", { description = "Enable threads.", default = true, type = "boolean"}) add_configs("noexceptions", { description = "Disable exceptions.", default = false, type = "boolean"}) From f8b8f94fd111aba0e8701310e8a3a30f3f1caa8d Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 1 Jun 2024 15:53:19 +0800 Subject: [PATCH 030/671] dfdutils: add package (#4209) --- packages/d/dfdutils/xmake.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/d/dfdutils/xmake.lua diff --git a/packages/d/dfdutils/xmake.lua b/packages/d/dfdutils/xmake.lua new file mode 100644 index 000000000..bd403c548 --- /dev/null +++ b/packages/d/dfdutils/xmake.lua @@ -0,0 +1,30 @@ +package("dfdutils") + set_homepage("https://github.com/KhronosGroup/dfdutils") + set_description("Utilities for working with Khronos data format descriptors") + set_license("Apache-2.0") + + add_urls("https://github.com/KhronosGroup/dfdutils.git") + add_versions("2023.10.27", "854792a6ced4cb7cce64f26bf297bf7ea294a9b6") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.release", "mode.debug") + target("dfdutils") + set_kind("$(kind)") + add_files( + "createdfd.c", "colourspaces.c", "interpretdfd.c", + "printdfd.c", "queries.c", "vk2dfd.c" + ) + add_headerfiles("dfd.h", {prefixdir = "dfdutils"}) + add_headerfiles("(vulkan/*.h)", "(KHR/*.h)") + add_includedirs(".", "KHR") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("vk2dfd", {includes = "dfdutils/dfd.h"})) + end) From 741cec2fbcc3ed3d50dedc7a54f076ab87f8ae4a Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 1 Jun 2024 22:07:26 +0800 Subject: [PATCH 031/671] rename vs runtimes (#4206) --- packages/a/aqt/xmake.lua | 2 +- packages/q/qtbase/xmake.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/a/aqt/xmake.lua b/packages/a/aqt/xmake.lua index 2ca1a1ed2..103640050 100644 --- a/packages/a/aqt/xmake.lua +++ b/packages/a/aqt/xmake.lua @@ -6,7 +6,7 @@ package("aqt") if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) - add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) + add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true}) if os.arch() == "x86" then add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86_signed.exe", { alias = "signed" }) diff --git a/packages/q/qtbase/xmake.lua b/packages/q/qtbase/xmake.lua index 390f1cbff..7e63910f2 100644 --- a/packages/q/qtbase/xmake.lua +++ b/packages/q/qtbase/xmake.lua @@ -5,7 +5,7 @@ package("qtbase") set_license("LGPL-3") add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) - add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) + add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true}) add_deps("aqt") From c5a3a5e71458d2d7433d4bc375f35a429727bc95 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 2 Jun 2024 09:24:37 +0800 Subject: [PATCH 032/671] Update uriparser to 0.9.8 (#4214) --- packages/u/uriparser/xmake.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/u/uriparser/xmake.lua b/packages/u/uriparser/xmake.lua index 22da790d9..c8b1b1cd6 100644 --- a/packages/u/uriparser/xmake.lua +++ b/packages/u/uriparser/xmake.lua @@ -5,9 +5,10 @@ package("uriparser") set_license("BSD-3-Clause") add_urls("https://github.com/uriparser/uriparser/archive/refs/tags/uriparser-$(version).tar.gz") - add_versions("0.9.5", "dece5067b4517c4b16cde332c491b4b3508249d2a8f4ba393229575d3c5241c0") - add_versions("0.9.6", "defaf550bf6fe05e89afb9814dccc6bd643a3b0a8308801a2c04b76682b87383") + add_versions("0.9.8", "d6289387eaf2495e38ed80d709ad673fe04d63fad707badfee96f3d2dabc7c35") add_versions("0.9.7", "8e19250654a204af0858408b55dc78941382a8c824bf38fc7f2a95ca6e16d7a0") + add_versions("0.9.6", "defaf550bf6fe05e89afb9814dccc6bd643a3b0a8308801a2c04b76682b87383") + add_versions("0.9.5", "dece5067b4517c4b16cde332c491b4b3508249d2a8f4ba393229575d3c5241c0") add_deps("cmake") on_load(function (package) From 8e98f2b332c99261c440ef0251a0390a3b01ac02 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 2 Jun 2024 09:57:41 +0800 Subject: [PATCH 033/671] Update hpx to v1.10.0 (#4215) --- packages/h/hpx/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/hpx/xmake.lua b/packages/h/hpx/xmake.lua index ae09aa768..563465ae8 100644 --- a/packages/h/hpx/xmake.lua +++ b/packages/h/hpx/xmake.lua @@ -6,6 +6,7 @@ package("hpx") add_urls("https://github.com/STEllAR-GROUP/hpx/archive/refs/tags/$(version).tar.gz", "https://github.com/STEllAR-GROUP/hpx.git") + add_versions("v1.10.0", "5720ed7d2460fa0b57bd8cb74fa4f70593fe8675463897678160340526ec3c19") add_versions("v1.9.1", "1adae9d408388a723277290ddb33c699aa9ea72defadf3f12d4acc913a0ff22d") add_configs("malloc", {description = "Use a custom allocator", default = "system", values = {"system", "tcmalloc", "jemalloc", "mimalloc"}}) From 5334f9918233716bdc909fe9cd65fc4e737beccd Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 2 Jun 2024 10:27:28 +0800 Subject: [PATCH 034/671] Update liboai to 4.0.1 (#4216) --- packages/l/liboai/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/liboai/xmake.lua b/packages/l/liboai/xmake.lua index 3ce19081c..89be46927 100644 --- a/packages/l/liboai/xmake.lua +++ b/packages/l/liboai/xmake.lua @@ -6,6 +6,7 @@ package("liboai") set_urls("https://github.com/D7EAD/liboai/archive/refs/tags/v$(version).tar.gz", "https://github.com/D7EAD/liboai.git") + add_versions("4.0.1", "abe127ae1cd3049f19976e31d8414e8130a73d7978552e863b767fe04b20697f") add_versions("3.2.1", "9058bcc1485967061c9c33b2e7a109a254cdf71638b1448f21cfefd7ffd9c4fa") add_versions("3.1.0", "4b3564740f7dbf099c785d5720327a4e7acaca2535d329f487d877ce17524a73") From 0eae31caf1cc1e3098f10ff6a6519f6218d713ba Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 2 Jun 2024 12:08:29 +0800 Subject: [PATCH 035/671] Update minizip-ng to 4.0.6 (#4217) --- packages/m/minizip-ng/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/minizip-ng/xmake.lua b/packages/m/minizip-ng/xmake.lua index 2c5c38aa3..08d2672ff 100644 --- a/packages/m/minizip-ng/xmake.lua +++ b/packages/m/minizip-ng/xmake.lua @@ -6,6 +6,7 @@ package("minizip-ng") add_urls("https://github.com/zlib-ng/minizip-ng/archive/refs/tags/$(version).tar.gz", "https://github.com/zlib-ng/minizip-ng.git") + add_versions("4.0.6", "e96ed3866706a67dbed05bf035e26ef6b60f408e1381bf0fe9af17fe2c0abebc") add_versions("4.0.5", "9bb636474b8a4269280d32aca7de4501f5c24cc642c9b4225b4ed7b327f4ee73") add_versions("4.0.4", "955800fe39f9d830fcb84e60746952f6a48e41093ec7a233c63ad611b5fcfe9f") add_versions("3.0.3", "5f1dd0d38adbe9785cb9c4e6e47738c109d73a0afa86e58c4025ce3e2cc504ed") From a5e98dbb129971e21eef7e451846026690367c10 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 3 Jun 2024 00:04:11 +0800 Subject: [PATCH 036/671] telebot: add package (#4220) * telebot: add package * pthreads4w: limit plat * telebot: fix unistd * limit plat * improve mingw --- packages/p/pthreads4w/xmake.lua | 2 +- packages/t/telebot/xmake.lua | 54 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 packages/t/telebot/xmake.lua diff --git a/packages/p/pthreads4w/xmake.lua b/packages/p/pthreads4w/xmake.lua index f6af9c1e9..1dfa3c71f 100644 --- a/packages/p/pthreads4w/xmake.lua +++ b/packages/p/pthreads4w/xmake.lua @@ -15,7 +15,7 @@ package("pthreads4w") add_deps("autoconf", "automake") end - on_install("windows", function (package) + on_install("windows|x64", "windows|x86", function (package) local target = "VC" if not package:config("shared") then target = target .. "-static" diff --git a/packages/t/telebot/xmake.lua b/packages/t/telebot/xmake.lua new file mode 100644 index 000000000..290eed9da --- /dev/null +++ b/packages/t/telebot/xmake.lua @@ -0,0 +1,54 @@ +package("telebot") + set_homepage("https://elmurod.net/telebot") + set_description("Telegram Bot API in C") + set_license("Apache-2.0") + + add_urls("https://github.com/smartnode/telebot.git") + add_versions("2024.05.11", "63693b4f9bcdc3fd0b0f2b37104b6694d723b5b4") + + if is_plat("linux") then + add_syslinks("pthread") + end + + add_deps("json-c", "libcurl") + if is_plat("windows", "mingw@macosx,linux") then + add_deps("pthreads4w") + end + + on_install("windows|x64", "windows|x86", "mingw@macosx,linux", "linux", function (package) + if package:is_plat("windows") then + io.replace("src/telebot.c", "#include ", "", {plain = true}) + io.replace("src/telebot-core.c", "#include ", "", {plain = true}) + end + + io.replace("src/telebot.c", "#include ", "#include ", {plain = true}) + io.replace("src/telebot-core.c", "#include ", "#include ", {plain = true}) + io.replace("src/telebot-parser.c", "#include ", "#include ", {plain = true}) + + io.replace("src/telebot.c", "#include ", "#include ", {plain = true}) + io.replace("src/telebot-parser.c", "#include ", "#include ", {plain = true}) + + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + set_encodings("utf-8") + if is_plat("windows", "mingw@macosx,linux") then + add_requires("pthreads4w") + add_packages("pthreads4w") + end + add_requires("json-c", "libcurl") + add_packages("json-c", "libcurl") + target("telebot") + set_kind("$(kind)") + add_files("src/*.c") + add_headerfiles("include/*.h") + add_includedirs("include") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("telebot_create", {includes = "telebot.h"})) + end) From 8e8a950d6b032eb72bce95b39db26118f1d30b85 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 10:53:39 +0800 Subject: [PATCH 037/671] Update yomm2 to v1.5.2 (#4225) --- packages/y/yomm2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/y/yomm2/xmake.lua b/packages/y/yomm2/xmake.lua index 063689ee3..3c66c84eb 100644 --- a/packages/y/yomm2/xmake.lua +++ b/packages/y/yomm2/xmake.lua @@ -6,6 +6,7 @@ package("yomm2") add_urls("https://github.com/jll63/yomm2/archive/refs/tags/$(version).tar.gz", "https://github.com/jll63/yomm2.git") + add_versions("v1.5.2", "12f3f735b4870606199b889a242ebfed84cf0cd392b04a1c32db11291de684be") add_versions("v1.5.1", "323abba27a356555cc3ead3e3e950746ab43f90d97ad21950f2ba3afaf565ecc") add_versions("v1.5.0", "daebc9bc56e3f67f1513c40b4b185cf435d8e16fe9936f3e5ed6fbb337a39030") add_versions("v1.4.0", "3f1f3a2b6fa5250405986b6cc4dff82299f866e2c6c2db75c7c3f38ecb91360f") From fe4d5183ed148ceb76ef340d5a5d4ccccb23236a Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 10:53:41 +0800 Subject: [PATCH 038/671] Update emmylua_debugger to 1.8.0 (#4224) --- packages/e/emmylua_debugger/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/emmylua_debugger/xmake.lua b/packages/e/emmylua_debugger/xmake.lua index bb0915476..a9276db0b 100644 --- a/packages/e/emmylua_debugger/xmake.lua +++ b/packages/e/emmylua_debugger/xmake.lua @@ -6,6 +6,7 @@ package("emmylua_debugger") add_urls("https://github.com/EmmyLua/EmmyLuaDebugger/archive/refs/tags/$(version).tar.gz", "https://github.com/EmmyLua/EmmyLuaDebugger.git") + add_versions("1.8.0", "21e5ba1c82e4386cd8ad4f8c76511d70319b899b414d29ecdaba35649325d2ee") add_versions("1.7.1", "8757d372c146d9995b6e506d42f511422bcb1dc8bacbc3ea1a5868ebfb30015f") add_versions("1.6.3", "4e10cf1c729fc58f72880895e63618cb91d186ff3b55f270cdaa089a2f8b20bc") From c05f74f9d518ce149dcb9c91c5fae962effd3613 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 10:53:44 +0800 Subject: [PATCH 039/671] Update harfbuzz to 8.5.0 (#4222) --- packages/h/harfbuzz/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/harfbuzz/xmake.lua b/packages/h/harfbuzz/xmake.lua index 6317c4ebb..45a3ad4b5 100644 --- a/packages/h/harfbuzz/xmake.lua +++ b/packages/h/harfbuzz/xmake.lua @@ -6,6 +6,7 @@ package("harfbuzz") add_urls("https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$(version).tar.gz", {excludes = "README"}) add_urls("https://github.com/harfbuzz/harfbuzz.git") + add_versions("8.5.0", "7ad8e4e23ce776efb6a322f653978b3eb763128fd56a90252775edb9fd327956") add_versions("8.4.0", "9f1ca089813b05944ad1ce8c7e018213026d35dc9bab480a21eb876838396556") add_versions("2.8.1", "b3f17394c5bccee456172b2b30ddec0bb87e9c5df38b4559a973d14ccd04509d") add_versions("2.9.0", "bf5d5bad69ee44ff1dd08800c58cb433e9b3bf4dad5d7c6f1dec5d1cf0249d04") From b7c6ef58e30d1e576d4e53f3b312e7a6f1062c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 3 Jun 2024 05:47:39 +0200 Subject: [PATCH 040/671] Use on_source instead of on_load to set urls if supported (xmake 2.9.3) (#4204) * Use on_source instead of on_load to set urls if supported (xmake 2.9.3) * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/i/imgui/xmake.lua | 78 ++++++++++++++++---------------- packages/o/onnxruntime/xmake.lua | 2 +- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 1230b9950..5b847c8f6 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -3,60 +3,61 @@ package("imgui") set_description("Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies") set_license("MIT") - add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz", - "https://github.com/ocornut/imgui.git") + add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz") + add_urls("https://github.com/ocornut/imgui.git", {alias = "git"}) - add_versions("v1.90.7-docking", "v1.90.7-docking") add_versions("v1.90.7", "872574217643d4ad7e9e6df420bb8d9e0d468fb90641c2bf50fd61745e05de99") - add_versions("v1.90.6-docking", "v1.90.6-docking") add_versions("v1.90.6", "70b4b05ac0938e82b4d5b8d59480d3e2ca63ca570dfb88c55023831f387237ad") - add_versions("v1.90.5-docking", "v1.90.5-docking") add_versions("v1.90.5", "e94b48dba7311c85ba8e3e6fe7c734d76a0eed21b2b42c5180fd5706d1562241") - add_versions("v1.90.4-docking", "v1.90.4-docking") add_versions("v1.90.4", "5d9dc738af74efa357f2a9fc39fe4a28d29ef1dfc725dd2977ccf3f3194e996e") - add_versions("v1.90.3-docking", "v1.90.3-docking") add_versions("v1.90.3", "40b302d01092c9393373b372fe07ea33ac69e9491893ebab3bf952b2c1f5fd23") - add_versions("v1.90.2-docking", "v1.90.2-docking") add_versions("v1.90.2", "452d1c11e5c4b4dfcca272915644a65f1c076498e8318b141ca75cd30470dd68") - add_versions("v1.90.1-docking", "v1.90.1-docking") add_versions("v1.90.1", "21dcc985bb2ae8fe48047c86135dbc438d6980a8f2e08babbda5be820592f282") - add_versions("v1.90-docking", "v1.90-docking") - add_versions("v1.90", "170986e6a4b83d165bfc1d33c2c5a5bc2d67e5b97176287485c51a2299249296") - add_versions("v1.89.9-docking", "v1.89.9-docking") + add_versions("v1.90", "170986e6a4b83d165bfc1d33c2c5a5bc2d67e5b97176287485c51a2299249296") add_versions("v1.89.9", "1acc27a778b71d859878121a3f7b287cd81c29d720893d2b2bf74455bf9d52d6") - add_versions("v1.89.8-docking", "v1.89.8-docking") add_versions("v1.89.8", "6680ccc32430009a8204291b1268b2367d964bd6d1b08a4e0358a017eb8e8c9e") - add_versions("v1.89.7-docking", "v1.89.7-docking") add_versions("v1.89.7", "115ee9e242af98a884302ac0f6ca3b2b26b1f10c660205f5e7ad9f1d1c96d269") - add_versions("v1.89.6-docking", "823a1385a269d923d35b82b2f470f3ae1fa8b5a3") add_versions("v1.89.6", "e95d1cba1481e66386acda3e7da19cd738da86c6c2a140a48fa55046e5f6e208") - add_versions("v1.89.5-docking", "0ea3b87bd63ecbf359585b7c235839146e84dedb") add_versions("v1.89.5", "eab371005c86dd029523a0c4ba757840787163740d45c1f4e5a110eb21820546") - add_versions("v1.89.4-docking", "9e30fb0ec1b44dc1b041db6bdd53b130b2a18509") add_versions("v1.89.4", "69f1e83adcab3fdd27b522f5075f407361b0d3875e3522b13d33bc2ae2c7d48c") - add_versions("v1.89.3-docking", "192196711a7d0d7c2d60454d42654cf090498a74") add_versions("v1.89.3", "3b665fadd5580b7ef494d5d8bb1c12b2ec53ee723034caf43332956381f5d631") - add_versions("v1.89-docking", "94e850fd6ff9eceb98fda3147e3ffd4781ad2dc7") - add_versions("v1.89", "4038b05bd44c889cf40be999656d3871a0559916708cb52a6ae2fa6fa35c5c60") - add_versions("v1.88-docking", "9cd9c2eff99877a3f10a7f9c2a3a5b9c15ea36c6") - add_versions("v1.88", "9f14c788aee15b777051e48f868c5d4d959bd679fc5050e3d2a29de80d8fd32e") - add_versions("v1.87-docking", "1ee252772ae9c0a971d06257bb5c89f628fa696a") - add_versions("v1.87", "b54ceb35bda38766e36b87c25edf7a1cd8fd2cb8c485b245aedca6fb85645a20") - add_versions("v1.86", "6ba6ae8425a19bc52c5e067702c48b70e4403cd339cba02073a462730a63e825") - add_versions("v1.85-docking", "dc8c3618e8f8e2dada23daa1aa237626af341fd8") - add_versions("v1.85", "7ed49d1f4573004fa725a70642aaddd3e06bb57fcfe1c1a49ac6574a3e895a77") + add_versions("v1.89", "4038b05bd44c889cf40be999656d3871a0559916708cb52a6ae2fa6fa35c5c60") + add_versions("v1.88", "9f14c788aee15b777051e48f868c5d4d959bd679fc5050e3d2a29de80d8fd32e") + add_versions("v1.87", "b54ceb35bda38766e36b87c25edf7a1cd8fd2cb8c485b245aedca6fb85645a20") + add_versions("v1.86", "6ba6ae8425a19bc52c5e067702c48b70e4403cd339cba02073a462730a63e825") + add_versions("v1.85", "7ed49d1f4573004fa725a70642aaddd3e06bb57fcfe1c1a49ac6574a3e895a77") add_versions("v1.84.2", "35cb5ca0fb42cb77604d4f908553f6ef3346ceec4fcd0189675bdfb764f62b9b") add_versions("v1.84.1", "292ab54cfc328c80d63a3315a242a4785d7c1cf7689fbb3d70da39b34db071ea") - add_versions("v1.83-docking", "80b5fb51edba2fd3dea76ec3e88153e2492243d1") - add_versions("v1.83", "ccf3e54b8d1fa30dd35682fc4f50f5d2fe340b8e29e08de71287d0452d8cc3ff") - add_versions("v1.82", "fefa2804bd55f3d25b134af08c0e1f86d4d059ac94cef3ee7bd21e2f194e5ce5") - add_versions("v1.81", "f7c619e03a06c0f25e8f47262dbc32d61fd033d2c91796812bf0f8c94fca78fb") - add_versions("v1.80", "d7e4e1c7233409018437a646680316040e6977b9a635c02da93d172baad94ce9") - add_versions("v1.79", "f1908501f6dc6db8a4d572c29259847f6f882684b10488d3a8d2da31744cd0a4") - add_versions("v1.78", "f70bbb17581ee2bd42fda526d9c3dc1a5165f3847ff047483d4d7980e166f9a3") - add_versions("v1.77", "c0dae830025d4a1a169df97409709f40d9dfa19f8fc96b550052224cbb238fa8") - add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc") - add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866") + add_versions("v1.83", "ccf3e54b8d1fa30dd35682fc4f50f5d2fe340b8e29e08de71287d0452d8cc3ff") + add_versions("v1.82", "fefa2804bd55f3d25b134af08c0e1f86d4d059ac94cef3ee7bd21e2f194e5ce5") + add_versions("v1.81", "f7c619e03a06c0f25e8f47262dbc32d61fd033d2c91796812bf0f8c94fca78fb") + add_versions("v1.80", "d7e4e1c7233409018437a646680316040e6977b9a635c02da93d172baad94ce9") + add_versions("v1.79", "f1908501f6dc6db8a4d572c29259847f6f882684b10488d3a8d2da31744cd0a4") + add_versions("v1.78", "f70bbb17581ee2bd42fda526d9c3dc1a5165f3847ff047483d4d7980e166f9a3") + add_versions("v1.77", "c0dae830025d4a1a169df97409709f40d9dfa19f8fc96b550052224cbb238fa8") + add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc") + add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866") + + add_versions("git:v1.90.7-docking", "v1.90.7-docking") + add_versions("git:v1.90.6-docking", "v1.90.6-docking") + add_versions("git:v1.90.5-docking", "v1.90.5-docking") + add_versions("git:v1.90.4-docking", "v1.90.4-docking") + add_versions("git:v1.90.3-docking", "v1.90.3-docking") + add_versions("git:v1.90.2-docking", "v1.90.2-docking") + add_versions("git:v1.90.1-docking", "v1.90.1-docking") + add_versions("git:v1.90-docking", "v1.90-docking") + add_versions("git:v1.89.9-docking", "v1.89.9-docking") + add_versions("git:v1.89.8-docking", "v1.89.8-docking") + add_versions("git:v1.89.7-docking", "v1.89.7-docking") + add_versions("git:v1.89.6-docking", "823a1385a269d923d35b82b2f470f3ae1fa8b5a3") + add_versions("git:v1.89.5-docking", "0ea3b87bd63ecbf359585b7c235839146e84dedb") + add_versions("git:v1.89.4-docking", "9e30fb0ec1b44dc1b041db6bdd53b130b2a18509") + add_versions("git:v1.89.3-docking", "192196711a7d0d7c2d60454d42654cf090498a74") + add_versions("git:v1.89-docking", "94e850fd6ff9eceb98fda3147e3ffd4781ad2dc7") + add_versions("git:v1.88-docking", "9cd9c2eff99877a3f10a7f9c2a3a5b9c15ea36c6") + add_versions("git:v1.87-docking", "1ee252772ae9c0a971d06257bb5c89f628fa696a") + add_versions("git:v1.85-docking", "dc8c3618e8f8e2dada23daa1aa237626af341fd8") + add_versions("git:v1.83-docking", "80b5fb51edba2fd3dea76ec3e88153e2492243d1") add_configs("dx9", {description = "Enable the dx9 backend", default = false, type = "boolean"}) add_configs("dx10", {description = "Enable the dx10 backend", default = false, type = "boolean"}) @@ -132,9 +133,6 @@ package("imgui") if package:config("freetype") then package:add("deps", "freetype") end - if package:version_str():find("-docking", 1, true) then - package:set("urls", {"https://github.com/ocornut/imgui.git"}) - end end) on_install("macosx", "linux", "windows", "mingw", "android", "iphoneos", function (package) diff --git a/packages/o/onnxruntime/xmake.lua b/packages/o/onnxruntime/xmake.lua index 39bf0c724..b7858c474 100644 --- a/packages/o/onnxruntime/xmake.lua +++ b/packages/o/onnxruntime/xmake.lua @@ -53,7 +53,7 @@ package("onnxruntime") end end - on_load(function (package) + on_load(function (package) if package:config("gpu") then package:add("deps", "cuda", {configs = {utils = {"cudart", "nvrtc"}}}) From f7b851b181402837d3a598c785513d26c1e55d28 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 14:59:27 +0800 Subject: [PATCH 041/671] fix glog & folly (#4228) --- packages/g/glog/xmake.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/g/glog/xmake.lua b/packages/g/glog/xmake.lua index ef1dd1f81..7ba5a17ac 100644 --- a/packages/g/glog/xmake.lua +++ b/packages/g/glog/xmake.lua @@ -36,10 +36,6 @@ package("glog") package:add("deps", dep) end end - - if package:version():ge("0.7.0") then - package:add("defines", "GLOG_USE_GLOG_EXPORT") - end end) on_install(function (package) @@ -50,11 +46,18 @@ package("glog") table.insert(configs, "-DWITH_" .. config:upper() .. "=" .. (package:config(config) and "ON" or "OFF")) end + -- fix cmake try run if package:is_plat("mingw") then - -- fix cmake try run table.insert(configs, "-DHAVE_SYMBOLIZE_EXITCODE=ON") end + import("package.tools.cmake").install(package, configs) + + -- fix https://github.com/xmake-io/xmake-repo/discussions/4221 + if package:version() and package:version():ge("0.7.0") then + io.replace(path.join(package:installdir("include"), "glog/logging.h"), + "#define GLOG_LOGGING_H", "#define GLOG_LOGGING_H\n#define GLOG_USE_GLOG_EXPORT", {plain = true}) + end end) on_test(function (package) From b0a383831b8cbcdd5e7d64b490b0149fd96f07c3 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 18:05:24 +0800 Subject: [PATCH 042/671] Auto-update onnx to v1.16.1 (#4226) * Update onnx to v1.16.1 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/o/onnx/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/o/onnx/xmake.lua b/packages/o/onnx/xmake.lua index 364134130..ebdb62e7b 100644 --- a/packages/o/onnx/xmake.lua +++ b/packages/o/onnx/xmake.lua @@ -6,12 +6,13 @@ package("onnx") add_urls("https://github.com/onnx/onnx/archive/refs/tags/$(version).tar.gz", "https://github.com/onnx/onnx.git") + add_versions("v1.16.1", "0e6aa2c0a59bb2d90858ad0040ea1807117cc2f05b97702170f18e6cd6b66fb3") add_versions("v1.16.0", "0ce153e26ce2c00afca01c331a447d86fbf21b166b640551fe04258b4acfc6a4") add_versions("v1.15.0", "c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68") add_versions("v1.11.0", "a20f2d9df805b16ac75ab4da0a230d3d1c304127d719e5c66a4e6df514e7f6c0") add_versions("v1.12.0", "052ad3d5dad358a33606e0fc89483f8150bb0655c99b12a43aa58b5b7f0cc507") - add_patches("1.16.0", "patches/1.16.0/cmake-abseil.patch", "d8cad2b231ce01aa3263692f88293be3eaa2b380e021eb5288f4c7ea930c19cb") + add_patches(">=1.16.0", "patches/1.16.0/cmake-abseil.patch", "d8cad2b231ce01aa3263692f88293be3eaa2b380e021eb5288f4c7ea930c19cb") add_configs("exceptions", {description = "Enable exception handling", default = true, type = "boolean"}) add_configs("registration", {description = "Enable static registration for onnx operator schemas.", default = true, type = "boolean"}) From 8818161e51b86fadcc15ee85d970021f45ef0daa Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 3 Jun 2024 22:25:31 +0800 Subject: [PATCH 043/671] Update highway to 1.2.0 (#4232) --- packages/h/highway/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/highway/xmake.lua b/packages/h/highway/xmake.lua index 824e23711..1a83bb507 100644 --- a/packages/h/highway/xmake.lua +++ b/packages/h/highway/xmake.lua @@ -6,6 +6,7 @@ package("highway") add_urls("https://github.com/google/highway/archive/refs/tags/$(version).tar.gz", "https://github.com/google/highway.git") + add_versions("1.2.0", "7e0be78b8318e8bdbf6fa545d2ecb4c90f947df03f7aadc42c1967f019e63343") add_versions("1.1.0", "354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9") add_configs("contrib", {description = "Build SIMD-related utilities", default = false, type = "boolean"}) From f4e57048d66288f065185403c1e4d1ee78b85ab2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 3 Jun 2024 22:49:56 +0800 Subject: [PATCH 044/671] libremidi: fix kind --- packages/l/libremidi/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/l/libremidi/xmake.lua b/packages/l/libremidi/xmake.lua index 14d9d021a..a09f3f2f2 100644 --- a/packages/l/libremidi/xmake.lua +++ b/packages/l/libremidi/xmake.lua @@ -28,7 +28,7 @@ package("libremidi") on_load(function (package) if package:config("header_only") then - package:set("library", {headeronly = true}) + package:set("kind", "library", {headeronly = true}) package:add("defines", "LIBREMIDI_HEADER_ONLY=1") if package:config("jack") then package:add("defines", "LIBREMIDI_JACK=1") From b9fdcf71e60fc6b51a0e7d6db6a7f6d3923d8846 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 3 Jun 2024 22:58:35 +0800 Subject: [PATCH 045/671] edlib: add package (#4233) --- packages/e/edlib/xmake.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/e/edlib/xmake.lua diff --git a/packages/e/edlib/xmake.lua b/packages/e/edlib/xmake.lua new file mode 100644 index 000000000..572255cb7 --- /dev/null +++ b/packages/e/edlib/xmake.lua @@ -0,0 +1,28 @@ +package("edlib") + set_homepage("http://martinsos.github.io/edlib") + set_description("Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.") + set_license("MIT") + + add_urls("https://github.com/Martinsos/edlib/archive/refs/tags/$(version).tar.gz", + "https://github.com/Martinsos/edlib.git") + + add_versions("v1.2.7", "8767bc1b04a1a67282d57662e5702c4908996e96b1753b5520921ff189974621") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + add_deps("cmake") + + on_install(function (package) + local configs = {"-DBUILD_TESTING=OFF", "-DEDLIB_BUILD_EXAMPLES=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DEDLIB_BUILD_UTILITIES=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if package:config("shared") and package:is_plat("windows") then + package:add("defines", "EDLIB_SHARED") + end + end) + + on_test(function (package) + assert(package:has_cfuncs("edlibAlign", {includes = "edlib.h"})) + end) From 96eeba97263bd67d4b848ede5b55135e101f1de5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 3 Jun 2024 23:24:43 +0800 Subject: [PATCH 046/671] quill: update to 4.3.0 (#4234) * quill: update to 4.3.0 * reorder version --- packages/q/quill/xmake.lua | 71 +++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index 07abcefa4..4377ce8fa 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -1,23 +1,24 @@ package("quill") - set_homepage("https://github.com/odygrd/quill") set_description("Asynchronous Low Latency C++ Logging Library") + set_license("MIT") - set_urls("https://github.com/odygrd/quill/archive/refs/tags/v$(version).tar.gz", + set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") - add_versions("3.8.0", "d3e1b349c5d6904c9644e5b79ec65f21692e8094a3d75241a7fe071076eef4dd") - add_versions("3.6.0", "ba9dc3df262f2e65c57904580cc8407eba9a462001340c17bab7ae1dccddb4bd") - add_versions("2.8.0", "0461a6c314e3d882f3b9ada487ef1bf558925272509ee41a9fd25f7776db6075") - add_versions("2.9.0", "dec64c0fbb4bfbafe28fdeeeefac10206285bf2be4a42ec5dfb7987ca4ccb372") - add_versions("2.9.1", "921e053118136f63cebb2ca1d7e42456fd0bf9626facb755884709092753c054") - add_versions("3.3.1", "f929d54a115b45c32dd2acd1a9810336d35c31fde9f5581c51ad2b80f980d0d1") + add_versions("v4.3.0", "c97bf3bfac6dfb7ed77fa08d945a490e302ba07e405539fda61985b39750cb29") + add_versions("v3.8.0", "d3e1b349c5d6904c9644e5b79ec65f21692e8094a3d75241a7fe071076eef4dd") + add_versions("v3.6.0", "ba9dc3df262f2e65c57904580cc8407eba9a462001340c17bab7ae1dccddb4bd") + add_versions("v3.3.1", "f929d54a115b45c32dd2acd1a9810336d35c31fde9f5581c51ad2b80f980d0d1") + add_versions("v2.9.0", "dec64c0fbb4bfbafe28fdeeeefac10206285bf2be4a42ec5dfb7987ca4ccb372") + add_versions("v2.9.1", "921e053118136f63cebb2ca1d7e42456fd0bf9626facb755884709092753c054") + add_versions("v2.8.0", "0461a6c314e3d882f3b9ada487ef1bf558925272509ee41a9fd25f7776db6075") if is_plat("macosx") then add_extsources("brew::quill") end - add_configs("fmt_external", {description = "Use external fmt library instead of bundled.", default = false, type = "boolean"}) + add_configs("fmt_external", {description = "Use external fmt library instead of bundled.(deprecated after v4)", default = false, type = "boolean"}) add_configs("noexcept", {description = "Build without exceptions with -fno-exceptions flag", default = false, type = "boolean"}) if is_plat("mingw") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) @@ -30,30 +31,34 @@ package("quill") end on_load(function (package) - if package:config("fmt_external") then - package:add("deps", "fmt") - package:add("defines", "QUILL_FMT_EXTERNAL") + if package:version() and package:version():ge("4.0.0") then + package:set("kind", "library", {headeronly = true}) + else + if package:config("fmt_external") then + package:add("deps", "fmt") + package:add("defines", "QUILL_FMT_EXTERNAL") + end end end) on_install("windows", "linux", "macosx", "mingw", function (package) local configs = {"-DQUILL_ENABLE_INSTALL=ON"} - if package:config("shared") and package:is_plat("windows") then - table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") - end - if package:config("fmt_external") then - table.insert(configs, "-DQUILL_FMT_EXTERNAL=ON") - end - if package:config("noexcept") then - table.insert(configs, "-DQUILL_NO_EXCEPTIONS=ON") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DQUILL_NO_EXCEPTIONS=" .. (package:config("noexcept") and "ON" or "OFF")) + if package:version() and package:version():lt("4.0.0") then + if package:config("shared") and package:is_plat("windows") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + if package:config("fmt_external") then + table.insert(configs, "-DQUILL_FMT_EXTERNAL=ON") + end + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) end - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:check_cxxsnippets({test = [[ + local code = [[ #include void test() { @@ -67,5 +72,23 @@ package("quill") logger->init_backtrace(2, quill::LogLevel::Critical); } - ]]}, {configs = {languages = "c++17"}})) + ]] + if package:version() and package:version():ge("4.0.0") then + code = [[ + #include "quill/Backend.h" + #include "quill/Frontend.h" + #include "quill/LogMacros.h" + #include "quill/Logger.h" + #include "quill/sinks/ConsoleSink.h" + + void test() + { + quill::Backend::start(); + auto console_sink = quill::Frontend::create_or_get_sink("sink_id_1"); + quill::Logger* logger = quill::Frontend::create_or_get_logger("root", std::move(console_sink)); + LOG_INFO(logger, "This is a log info example {}", 123); + } + ]] + end + assert(package:check_cxxsnippets({test = code}, {configs = {languages = "c++17"}})) end) From e3022640e2a4e970b8fe6360566d48094d89673f Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 3 Jun 2024 23:38:28 +0800 Subject: [PATCH 047/671] add zip (#4231) * add zip * port zip * improve check * improve check * fix zip for windows --- packages/u/unzip/xmake.lua | 2 +- packages/z/zip/xmake.lua | 46 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 packages/z/zip/xmake.lua diff --git a/packages/u/unzip/xmake.lua b/packages/u/unzip/xmake.lua index 6fc732779..974b5b387 100644 --- a/packages/u/unzip/xmake.lua +++ b/packages/u/unzip/xmake.lua @@ -12,7 +12,7 @@ package("unzip") io.replace("win32/nt.c", "#include \"../unzip.h\"", "#include \"../unzip.h\"\n#ifdef CR\n#undef CR\n#endif", {plain = true}) io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") - includes("check_cfuncs.lua") + includes("@builtin/check") check_cfuncs("HAVE_LCHMOD", "lchmod", {includes = "sys/stat.h"}) target("unzip") set_kind("binary") diff --git a/packages/z/zip/xmake.lua b/packages/z/zip/xmake.lua new file mode 100644 index 000000000..520d3e3ea --- /dev/null +++ b/packages/z/zip/xmake.lua @@ -0,0 +1,46 @@ +package("zip") + set_kind("binary") + set_homepage("http://www.info-zip.org/Zip.html") + set_description("Info-ZIP zip utility") + + add_urls("https://github.com/LuaDist/zip.git") + add_versions("3.0", "f6cfe48f6bc5bf2d505a0e0eb265ce4cb238db89") + + add_deps("cmake") + + on_install("@windows", "@macosx", "@linux", function (package) + io.replace("zip.h", "#define __zip_h 1", [[#define __zip_h 1 + #if defined(WIN32) || defined(WINDLL) + # define WIN32_LEAN_AND_MEAN + # include + #endif + ]], {plain = true}) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + includes("@builtin/check") + check_cfuncs("HAVE_LCHMOD", "lchmod", {includes = "sys/stat.h"}) + target("zip") + set_kind("binary") + if not has_config("__HAVE_LCHMOD") then + add_defines("NO_LCHMOD") + end + add_files("crc32.c", "crypt.c", "deflate.c", + "fileio.c", "globals.c", "trees.c", "ttyio.c", "util.c", + "zip.c", "zipfile.c", "zipup.c") + if is_plat("windows") then + add_files("win32/*.c") + add_syslinks("user32", "advapi32") + add_defines("WIN32", "NO_ASM") + else + add_files("unix/unix.c") + add_defines("UNIX", "NO_OFF_T") + end + add_includedirs(".") + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + os.vrun("zip --help") + end) + From ddfa4d2bdcc66237021511125e30d5a794370059 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 4 Jun 2024 00:36:16 +0800 Subject: [PATCH 048/671] ade: add package (#4236) --- packages/a/ade/xmake.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/a/ade/xmake.lua diff --git a/packages/a/ade/xmake.lua b/packages/a/ade/xmake.lua new file mode 100644 index 000000000..ca20bc334 --- /dev/null +++ b/packages/a/ade/xmake.lua @@ -0,0 +1,23 @@ +package("ade") + set_homepage("https://github.com/opencv/ade") + set_description("ADE Framework is a graph construction, manipulation, and processing framework.") + set_license("Apache-2.0") + + add_urls("https://github.com/opencv/ade/archive/refs/tags/$(version).tar.gz", + "https://github.com/opencv/ade.git") + + add_versions("v0.1.2d", "edefba61a33d6cd4b78a9976cb3309c95212610a81ba6dade09882d1794198ff") + + add_deps("cmake") + + on_install(function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_WITH_STATIC_CRT=" .. (package:has_runtime("MT") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cxxtypes("ade::Graph", {configs = {languages = "c++11"}, includes = "ade/graph.hpp"})) + end) From d1f8698c4b973dd245a5544817da8c778812a192 Mon Sep 17 00:00:00 2001 From: huye Date: Tue, 4 Jun 2024 09:17:09 +0800 Subject: [PATCH 049/671] Transfer debugging mode to cmake configuration in libhv package (#4230) * Update xmake.lua Transfer debugging mode to cmake configuration in libhv package * try fix corss compilation on mingw * build mingw on windows only * Update xmake.lua --------- Co-authored-by: star9029 Co-authored-by: ruki --- packages/l/libhv/xmake.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/l/libhv/xmake.lua b/packages/l/libhv/xmake.lua index 1b615602b..530b428a9 100644 --- a/packages/l/libhv/xmake.lua +++ b/packages/l/libhv/xmake.lua @@ -1,5 +1,4 @@ package("libhv") - set_homepage("https://github.com/ithewei/libhv") set_description("Like libevent, libev, and libuv, libhv provides event-loop with non-blocking IO and timer, but simpler api and richer protocols.") @@ -29,7 +28,7 @@ package("libhv") add_configs("nghttp2", {description = "with nghttp2 library", default = false, type = "boolean"}) add_configs("openssl", {description = "with openssl library", default = false, type = "boolean"}) add_configs("mbedtls", {description = "with mbedtls library", default = false, type = "boolean"}) - add_configs("GNUTLS", {description="with gnutls library",default=false,type="boolean"}) + add_configs("gnutls", {description = "with gnutls library", default = false, type = "boolean"}) if is_plat("linux") then add_syslinks("pthread") @@ -52,17 +51,20 @@ package("libhv") elseif package:config("curl") then package:add("deps", "libcurl") elseif package:config("nghttp2") then - -- TODO + package:add("deps", "nghttp2") end + if not package:config("shared") then package:add("defines", "HV_STATICLIB") end end) - on_install("windows", "linux", "macosx", "android", "iphoneos", "mingw", function(package) + on_install("windows", "linux", "macosx", "android", "iphoneos", "mingw@windows", function(package) local configs = {"-DBUILD_EXAMPLES=OFF", "-DBUILD_UNITTEST=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON")) + for _, name in ipairs({"with_protocol", "with_http", "with_http_server", @@ -76,7 +78,7 @@ package("libhv") "enable_uds", "enable_windump", "use_multimap", - "WITH_GNUTLS"}) do + "with_gnutls"}) do local config_name = name:gsub("with_", ""):gsub("use_", ""):gsub("enable_", "") table.insert(configs, "-D" .. name:upper() .. "=" .. (package:config(config_name) and "ON" or "OFF")) end @@ -106,4 +108,3 @@ package("libhv") } ]]}, {configs = {languages = "c++11"}})) end) - From 877cdb64645074f682fd977fc325ac293594cf35 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 11:10:11 +0800 Subject: [PATCH 050/671] Update aws-crt-cpp to v0.26.11 (#4243) --- packages/a/aws-crt-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua index a312c242f..06e7b6173 100644 --- a/packages/a/aws-crt-cpp/xmake.lua +++ b/packages/a/aws-crt-cpp/xmake.lua @@ -6,6 +6,7 @@ package("aws-crt-cpp") add_urls("https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-crt-cpp.git") + add_versions("v0.26.11", "23acb2b14019182dd73fe6779ec266ee4d8937f19a99803da6407937fa22db7d") add_versions("v0.26.9", "5b5760d34fbbfcc971f561296e828de4c788750472fd9bd3ac20068a083620f2") add_versions("v0.26.8", "36ced4fb54c8eb7325b4576134e01f93bfaca2709565b5ad036d198d703e4c8f") add_versions("v0.26.4", "486113a556614b7b824e1aefec365a2261154fe06321b85601aefe2f65bd0706") From c4878cc63b8f380ed25a4211e44b0b63294e30af Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 11:10:14 +0800 Subject: [PATCH 051/671] Update duckdb to v1.0.0 (#4241) --- packages/d/duckdb/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/duckdb/xmake.lua b/packages/d/duckdb/xmake.lua index 2d315c5bf..3b84f1351 100644 --- a/packages/d/duckdb/xmake.lua +++ b/packages/d/duckdb/xmake.lua @@ -5,6 +5,7 @@ package("duckdb") add_urls("https://github.com/duckdb/duckdb/releases/download/$(version)/libduckdb-src.zip", "https://github.com/duckdb/duckdb.git") + add_versions("v1.0.0", "482c7f090cac4408eed5b02708b6a54168c1875c2c6d8042d8344edee3f70eb7") add_versions("v0.10.3", "f22ed5058188c81886dfdda80c6c46b7df2ed0a623a348c78ac8372451c84497") add_versions("v0.10.0", "385e27aa67712813e4a07389465c4c5c45c431d97cddd35713b8a306d2a86f2d") add_versions("v0.10.1", "70ec6ffefd9a04bf9fcdc1a4949611f9633f10f0e3b9cead1425b926a54d0f89") From 8c5663b1780cc0f7f7a2357e7b49d82acc9e7a19 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 11:10:17 +0800 Subject: [PATCH 052/671] Update etl to 20.38.16 (#4240) --- packages/e/etl/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/etl/xmake.lua b/packages/e/etl/xmake.lua index 7731e062e..e07266ee0 100644 --- a/packages/e/etl/xmake.lua +++ b/packages/e/etl/xmake.lua @@ -7,6 +7,7 @@ package("etl") add_urls("https://github.com/ETLCPP/etl/archive/refs/tags/$(version).tar.gz", "https://github.com/ETLCPP/etl.git") + add_versions("20.38.16", "6d05e33d6e7eb2c8d4654c77dcd083adc70da29aba808f471ba7c6e2b8fcbf03") add_versions("20.38.13", "e606083e189a8fe6211c30c8c579b60c29658a531b5cafbb511daab1a2861a69") add_versions("20.38.11", "c73b6b076ab59e02398a9f90a66198a9f8bf0cfa91af7be2eebefb3bb264ba83") add_versions("20.38.10", "562f9b5d9e6786350b09d87be9c5f030073e34d7bf0a975de3e91476ddd471a3") From b3aeec25113523a13803d8520fef03167e668420 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 11:10:19 +0800 Subject: [PATCH 053/671] Update samurai to v0.14.0 (#4239) --- packages/s/samurai/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/samurai/xmake.lua b/packages/s/samurai/xmake.lua index 0194d078b..8ee0825b2 100644 --- a/packages/s/samurai/xmake.lua +++ b/packages/s/samurai/xmake.lua @@ -7,6 +7,7 @@ package("samurai") add_urls("https://github.com/hpc-maths/samurai/archive/refs/tags/$(version).tar.gz", "https://github.com/hpc-maths/samurai.git") + add_versions("v0.14.0", "287d0526d58b56a653d6cd68085ad2b8e3cbc69153e4fa87bb256305b3726184") add_versions("v0.12.0", "0cd94bda528085e6261f7e94e69821f81fd55e36560903078beb3c1025372897") add_versions("v0.10.0", "06739ad6ddc6d62396669e8c0a3806a375c88f3a9345519ae1c1415666229c16") add_versions("v0.6.0", "bab96adac8e1553b79678a22de2248bec67c7c205b5fd35e9e1aaccaca41286e") From 022fdfd29dc6845f4004d46d5e4ebff626eb1df6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 20:12:14 +0800 Subject: [PATCH 054/671] Update gyp-next to v0.18.1 (#4242) --- packages/g/gyp-next/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/gyp-next/xmake.lua b/packages/g/gyp-next/xmake.lua index dbf0cb2df..531392889 100644 --- a/packages/g/gyp-next/xmake.lua +++ b/packages/g/gyp-next/xmake.lua @@ -7,6 +7,7 @@ package("gyp-next") add_urls("https://github.com/nodejs/gyp-next/archive/refs/tags/$(version).tar.gz", "https://github.com/nodejs/gyp-next.git") + add_versions("v0.18.1", "f9be5e64a992688b651d64c6f269a8a701b843e089c048fae0733e9eb01dd48e") add_versions("v0.18.0", "2c0e002843da6a854d937a93d6fad5993954a457b3ffc2031d8af2dcff42caba") add_versions("v0.16.2", "145d5719a88112ae2631a88556361da3b8780f4179a928c823ba3d18ab796464") add_versions("v0.16.1", "892fecef9ca3fa1eff8bd18b7bcec54c6e8a2203788c048d26bccb53d9fcf737") From 3c3e24c15ae568ac642409409abfed735274346d Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 4 Jun 2024 23:41:03 +0800 Subject: [PATCH 055/671] glshaderpp: add package (#4237) * glshaderpp: add package * add dep --- packages/g/glshaderpp/xmake.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/g/glshaderpp/xmake.lua diff --git a/packages/g/glshaderpp/xmake.lua b/packages/g/glshaderpp/xmake.lua new file mode 100644 index 000000000..8c3a3e8f8 --- /dev/null +++ b/packages/g/glshaderpp/xmake.lua @@ -0,0 +1,30 @@ +package("glshaderpp") + set_kind("library", {headeronly = true}) + set_homepage("https://gitlab-lepuy.iut.uca.fr/opengl/glshaderpp") + set_description("A lightweight header-only library to compile and link OpenGL GLSL shaders.") + set_license("LGPL-3.0-or-later") + + add_urls("https://gitlab-lepuy.iut.uca.fr/opengl/glshaderpp/-/archive/$(version)/glshaderpp-$(version).tar.bz2", + "https://gitlab-lepuy.iut.uca.fr/opengl/glshaderpp.git") + + add_versions("v1.0.0", "81b47b90e90d8be19d0421d67f4fc735d74d285a5f516b99ee7dc49d7933ecf6") + + add_deps("glew") + + on_install("linux", "macosx", "mingw", "windows", function (package) + os.cp("GLShaderPP/public/GLShaderPP", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + #include + #include + #include + + void test() { + GLShaderPP::CShaderException e("If you read this, GLShaderPP is happy :)", + GLShaderPP::CShaderException::ExceptionType::LinkError); + } + ]]}, {configs = {languages = "c++17"}})) + end) From 56bcea100d9a3beca4c75d6fcb6d43242f7c2d44 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 4 Jun 2024 23:49:41 +0800 Subject: [PATCH 056/671] add curl cli (#4244) * add curl cli * fix curl configs * fix deps * improve libcurl * fix base plat/arch --- packages/c/curl/xmake.lua | 17 ++++++++++++++ packages/l/libcurl/xmake.lua | 45 ++++++++++++++++++++---------------- 2 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 packages/c/curl/xmake.lua diff --git a/packages/c/curl/xmake.lua b/packages/c/curl/xmake.lua new file mode 100644 index 000000000..e49b56d59 --- /dev/null +++ b/packages/c/curl/xmake.lua @@ -0,0 +1,17 @@ +package("curl") + set_kind("binary") + set_base("libcurl") + + on_load(function (package) + package:base():plat_set(package:plat()) + package:base():arch_set(package:arch()) + package:base():script("load")(package) + end) + + on_install("@windows", "@macosx", "@linux", function (package) + package:base():script("install")(package) + end) + + on_test(function (package) + os.vrun("curl --version") + end) diff --git a/packages/l/libcurl/xmake.lua b/packages/l/libcurl/xmake.lua index 4bdecb2c7..3541df0d7 100644 --- a/packages/l/libcurl/xmake.lua +++ b/packages/l/libcurl/xmake.lua @@ -18,18 +18,8 @@ package("libcurl") add_patches("7.84.0", path.join(os.scriptdir(), "patches", "7.84.0", "sched.patch"), "e79f56f840cbc6996a153f19d9266bd46fe4154e6b494c8ee0478cb5b87662d3") add_patches("8.7.1", path.join(os.scriptdir(), "patches", "8.7.1", "android_armv7.patch"), "b172fd25063fcf4bce987b47a3d95d9d79bcf80f45e7e45dbf4aba72c685fb24") - add_deps("cmake") - - if is_plat("macosx", "iphoneos") then - add_frameworks("Security", "CoreFoundation", "SystemConfiguration") - elseif is_plat("linux") then - add_syslinks("pthread") - elseif is_plat("windows", "mingw") then - add_syslinks("advapi32", "crypt32", "wldap32", "winmm", "ws2_32", "user32") - end - add_configs("cares", {description = "Enable c-ares support.", default = false, type = "boolean"}) - add_configs("openssl", {description = "Enable OpenSSL for SSL/TLS.", default = is_plat("linux", "android", "cross"), type = "boolean"}) + add_configs("openssl", {description = "Enable OpenSSL for SSL/TLS.", default = false, type = "boolean"}) add_configs("mbedtls", {description = "Enable mbedTLS for SSL/TLS.", default = false, type = "boolean"}) add_configs("nghttp2", {description = "Use Nghttp2 library.", default = false, type = "boolean"}) add_configs("openldap", {description = "Use OpenLDAP library.", default = false, type = "boolean"}) @@ -40,20 +30,35 @@ package("libcurl") add_configs("libssh2", {description = "Use libSSH2 library.", default = false, type = "boolean"}) add_configs("libpsl", {description = "Use libpsl library.", default = false, type = "boolean"}) - if is_plat("mingw") and is_subhost("msys") then - add_extsources("pacman::curl") - elseif is_plat("linux") then - add_extsources("pacman::curl", "apt::libcurl4-gnutls-dev", "apt::libcurl4-nss-dev", "apt::libcurl4-openssl-dev") - elseif is_plat("macosx") then - add_extsources("brew::curl") - end - + -- we init all configurations in on_load, because package("curl") need it. on_load(function (package) + if package:is_plat("linux", "android", "cross") then + package:config_set("openssl", true) + end + + if package:is_plat("macosx", "iphoneos") then + package:add("frameworks", "Security", "CoreFoundation", "SystemConfiguration") + elseif package:is_plat("linux") then + package:add("syslinks", "pthread") + elseif package:is_plat("windows", "mingw") then + package:add("syslinks", "advapi32", "crypt32", "wldap32", "winmm", "ws2_32", "user32") + end + + if package:is_plat("mingw") and is_subhost("msys") then + package:add("extsources", "pacman::curl") + elseif package:is_plat("linux") then + package:add("extsources", "pacman::curl", "apt::libcurl4-gnutls-dev", "apt::libcurl4-nss-dev", "apt::libcurl4-openssl-dev") + elseif package:is_plat("macosx") then + package:add("extsources", "brew::curl") + end + if package:is_plat("windows", "mingw") then if not package:config("shared") then package:add("defines", "CURL_STATICLIB") end end + + package:add("deps", "cmake") local configdeps = {cares = "c-ares", openssl = "openssl", mbedtls = "mbedtls", @@ -68,7 +73,7 @@ package("libcurl") local has_deps = false for name, dep in pairs(configdeps) do if package:config(name) then - package:add("deps", dep) + package:add("deps", dep, {host = package:is_binary()}) has_deps = true end end From 70fd9ab5b2b6b4df24a2a1af21d4fa5a6c672526 Mon Sep 17 00:00:00 2001 From: sanqideshi Date: Wed, 5 Jun 2024 08:07:42 +0800 Subject: [PATCH 057/671] add vcpkg tool (#4219) * add vcpkg tool * del some lines * add mark_as_pathenv * edit * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: SanQi <1459998132@.qq.com> Co-authored-by: ruki --- packages/v/vcpkg/xmake.lua | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/v/vcpkg/xmake.lua diff --git a/packages/v/vcpkg/xmake.lua b/packages/v/vcpkg/xmake.lua new file mode 100644 index 000000000..64a4ed4bf --- /dev/null +++ b/packages/v/vcpkg/xmake.lua @@ -0,0 +1,26 @@ +package("vcpkg") + set_kind("binary") + set_homepage("https://github.com/microsoft/vcpkg") + set_description("Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.") + set_license("MIT") + + add_urls("https://github.com/microsoft/vcpkg/archive/refs/tags/$(version).tar.gz") + add_versions("2024.05.24", "3034e534d4ed13e6e6edad3c331c0e9e3280f579dd4ba86151aa1e2896b85d31") + + add_deps("zip", "unzip", "cmake", "ninja", "curl") + + on_install("@linux", "@macosx", "@windows", function(package) + if package:is_plat("windows") then + os.vrun("bootstrap-vcpkg.bat") + else + os.vrunv("./bootstrap-vcpkg.sh", {shell = true}) + end + os.cp(".", package:installdir()) + package:setenv("VCPKG_ROOT", ".") + package:addenv("PATH", ".") + package:mark_as_pathenv("VCPKG_ROOT") + end) + + on_test(function(package) + os.vrun("vcpkg --help") + end) From 38685dfb183bfaf56b232e3a2ff51e53c090cb2a Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 5 Jun 2024 09:52:15 +0800 Subject: [PATCH 058/671] Update tiny-optional to v1.2.1 (#4246) --- packages/t/tiny-optional/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tiny-optional/xmake.lua b/packages/t/tiny-optional/xmake.lua index d43871f2e..4aadab32f 100644 --- a/packages/t/tiny-optional/xmake.lua +++ b/packages/t/tiny-optional/xmake.lua @@ -7,6 +7,7 @@ package("tiny-optional") add_urls("https://github.com/Sedeniono/tiny-optional/archive/refs/tags/$(version).tar.gz", "https://github.com/Sedeniono/tiny-optional.git") + add_versions("v1.2.1", "0305d31c43ef8365befd7d022c13c431b913036d4c10c0c5419e9765077c5122") add_versions("v1.2.0", "d4ce47d0c9c4f89ab41e4e0b96d25bfb98c0cc02da3d7b312337e5e4e6e1c9e8") on_install("windows|!arm*", "linux|!arm*", "macosx|!arm*", "bsd|!arm*", "mingw|!arm*", "msys|!arm*", "android|!arm*", function (package) From dc367d6df1e478e2c4e4a12097f686a0c7a64b7c Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 5 Jun 2024 10:24:59 +0800 Subject: [PATCH 059/671] Update simdutf to v5.2.8 (#4249) --- packages/s/simdutf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdutf/xmake.lua b/packages/s/simdutf/xmake.lua index a099e6231..6d2451162 100644 --- a/packages/s/simdutf/xmake.lua +++ b/packages/s/simdutf/xmake.lua @@ -6,6 +6,7 @@ package("simdutf") add_urls("https://github.com/simdutf/simdutf/archive/refs/tags/$(version).tar.gz", "https://github.com/simdutf/simdutf.git") + add_versions("v5.2.8", "2706f1bef85a6d8598f82defd3848f1c5100e2e065c5d416d993118b53ea8d77") add_versions("v5.2.6", "ab9e56facf7cf05f4e9d062a0adef310fc6a0f82a8132e8ec1e1bb7ab5e234df") add_versions("v5.2.4", "36281d6489a4a8c2b5bfac2d41c03dce8fc89ec1cda15cc05c53d44f5ad30b4d") add_versions("v5.2.3", "dfa55d85c3ee51e9b52e55c02701b16f83dcf1921e1075b67f99b1036df5adb8") From 4e892899d3aa48bc3db55cd8fbcfac162e2b665a Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Wed, 5 Jun 2024 18:29:24 +0800 Subject: [PATCH 060/671] add windows support to workflow (#4252) * add windows support to workflow * Update xmake.lua --- packages/w/workflow/xmake.lua | 39 +++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/packages/w/workflow/xmake.lua b/packages/w/workflow/xmake.lua index f410a448e..60a0e8229 100644 --- a/packages/w/workflow/xmake.lua +++ b/packages/w/workflow/xmake.lua @@ -3,20 +3,30 @@ package("workflow") set_description("C++ Parallel Computing and Asynchronous Networking Framework") set_license("Apache-2.0") - add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz", - "https://github.com/sogou/workflow.git") - - add_versions("v0.10.6", "5701ef31518a7927e61b26cd6cc1d699cb43393bf1ffc77fa61e73e64d2dd28e") - add_versions("v0.10.7", "aa9806983f32174597549db4a129e2ee8a3d1f005923fcbb924906bc70c0e123") - add_versions("v0.10.8", "bb5654e8011822d4251a7a433cbe4c5ecfd2c65c8f997a8196685742d24bcaf0") - add_versions("v0.10.9", "10f695aeb5da87ae138e3bcd2fa10c18aac782b0da20f11b2fd0b7b091d06767") - add_versions("v0.11.1", "06968ed4e43f6676811b620d09eb5c32ac57252305e7e28def6efde8ef1ceb19") - add_versions("v0.11.2", "cc2d18ab2b292e2f0163ef67ef6976912e2a21c271396da0e2151ca8cd22abd3") - add_versions("v0.11.3", "af7adcdd8151f8e72247599a43c28aa849d61ed39e58058cfa80649d011575bc") - add_versions("v0.11.4", "844fd03db120141fa61600b26a4ef35716dc0e75d1e8c8018078eb385cf746a4") + if is_plat("windows") then + add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version)-win.zip") + add_versions("v0.10.10", "6758b1d46c4beadfccc88d3e9492bb99cfad26e643c141749aec790907092417") + else + add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz", + "https://github.com/sogou/workflow.git") + + add_versions("v0.10.6", "5701ef31518a7927e61b26cd6cc1d699cb43393bf1ffc77fa61e73e64d2dd28e") + add_versions("v0.10.7", "aa9806983f32174597549db4a129e2ee8a3d1f005923fcbb924906bc70c0e123") + add_versions("v0.10.8", "bb5654e8011822d4251a7a433cbe4c5ecfd2c65c8f997a8196685742d24bcaf0") + add_versions("v0.10.9", "10f695aeb5da87ae138e3bcd2fa10c18aac782b0da20f11b2fd0b7b091d06767") + add_versions("v0.11.1", "06968ed4e43f6676811b620d09eb5c32ac57252305e7e28def6efde8ef1ceb19") + add_versions("v0.11.2", "cc2d18ab2b292e2f0163ef67ef6976912e2a21c271396da0e2151ca8cd22abd3") + add_versions("v0.11.3", "af7adcdd8151f8e72247599a43c28aa849d61ed39e58058cfa80649d011575bc") + add_versions("v0.11.4", "844fd03db120141fa61600b26a4ef35716dc0e75d1e8c8018078eb385cf746a4") + end add_deps("openssl") + if is_plat("windows") then + add_deps("cmake") + add_syslinks("Mswsock") + end + if is_plat("linux") then add_syslinks("pthread", "dl") end @@ -29,6 +39,13 @@ package("workflow") import("package.tools.xmake").install(package, configs) end) + on_install("windows", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + on_test(function (package) assert(package:check_cxxsnippets({test = [[ #include From ee75d0dfd2c1ac7a6ba76f3c4a25e77541009dc7 Mon Sep 17 00:00:00 2001 From: exdal <63502313+exdal@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:31:02 +0300 Subject: [PATCH 061/671] add slang (#4138) * add slang * Add missing cmake dependency * add install platforms * use release source * Revert "use release source" This reverts commit 91339fe460165dd07ded0302b5eb711f71669fa6. * remove test and example * address reviews * bump version * bump version --------- Co-authored-by: star9029 --- packages/s/slang/xmake.lua | 53 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 packages/s/slang/xmake.lua diff --git a/packages/s/slang/xmake.lua b/packages/s/slang/xmake.lua new file mode 100644 index 000000000..ac60fe7ea --- /dev/null +++ b/packages/s/slang/xmake.lua @@ -0,0 +1,53 @@ +package("slang") + set_homepage("https://github.com/shader-slang/slang") + set_description("Making it easier to work with shaders") + set_license("MIT") + + add_urls("https://github.com/shader-slang/slang.git") + + add_versions("v2024.1.18", "efdbb954c57b89362e390f955d45f90e59d66878") + add_versions("v2024.1.17", "62b7219e715bd4c0f984bcd98c9767fb6422c78f") + + add_configs("shared", { description = "Build shared library", default = true, type = "boolean", readonly = true }) + add_configs("embed_stdlib_source", { description = "Embed stdlib source in the binary", default = true, type = "boolean" }) + add_configs("embed_stdlib", { description = "Build slang with an embedded version of the stdlib", default = false, type = "boolean" }) + add_configs("full_ir_validation", { description = "Enable full IR validation (SLOW!)", default = false, type = "boolean" }) + add_configs("gfx", { description = "Enable gfx targets", default = false, type = "boolean" }) + add_configs("slangd", { description = "Enable language server target", default = false, type = "boolean" }) + add_configs("slangc", { description = "Enable standalone compiler target", default = false, type = "boolean" }) + add_configs("slangrt", { description = "Enable runtime target", default = false, type = "boolean" }) + add_configs("slang_glslang", { description = "Enable glslang dependency and slang-glslang wrapper target", default = false, type = "boolean" }) + add_configs("slang_llvm_flavor", { description = "How to get or build slang-llvm (available options: FETCH_BINARY, USE_SYSTEM_LLVM, DISABLE)", default = "DISABLE", type = "string" }) + + add_deps("cmake") + + on_install("windows|x64", "macosx", "linux|x86_64", function (package) + local configs = {"-DSLANG_ENABLE_TESTS=OFF", "-DSLANG_ENABLE_EXAMPLES=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DSLANG_LIB_TYPE=" .. (package:config("shared") and "SHARED" or "STATIC")) + table.insert(configs, "-DSLANG_EMBED_STDLIB_SOURCE=" .. (package:config("embed_stdlib_source") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_EMBED_STDLIB=" .. (package:config("embed_stdlib") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_FULL_IR_VALIDATION=" .. (package:config("full_ir_validation") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_ASAN=" .. (package:config("asan") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_GFX=" .. (package:config("gfx") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_SLANGD=" .. (package:config("slangd") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_SLANGC=" .. (package:config("slangc") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_SLANGRT=" .. (package:config("slangrt") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_ENABLE_SLANG_GLSLANG=" .. (package:config("slang_glslang") and "ON" or "OFF")) + table.insert(configs, "-DSLANG_SLANG_LLVM_FLAVOR=" .. package:config("slang_llvm_flavor")) + + import("package.tools.cmake").install(package, configs) + package:addenv("PATH", "bin") + end) + + on_test(function (package) + assert(package:check_cxxsnippets({ test = [[ + #include + #include + + void test() { + Slang::ComPtr global_session; + slang::createGlobalSession(global_session.writeRef()); + } + ]] }, {configs = {languages = "c++17"}})) + end) From 48f9b4fff0b907b058c23df66f65f059dad0b108 Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 5 Jun 2024 20:36:39 +0800 Subject: [PATCH 062/671] add quirc package (#4251) * add quirc package * change version & add urls * add license * remove unuseful code & fix add_urls * fix windows shared --------- Co-authored-by: star9029 --- packages/q/quirc/xmake.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/q/quirc/xmake.lua diff --git a/packages/q/quirc/xmake.lua b/packages/q/quirc/xmake.lua new file mode 100644 index 000000000..13078f4f9 --- /dev/null +++ b/packages/q/quirc/xmake.lua @@ -0,0 +1,27 @@ +package("quirc") + set_homepage("https://github.com/dlbeer/quirc") + set_description("QR decoder library") + set_license("ISC") + + add_urls("https://github.com/dlbeer/quirc/archive/refs/tags/$(version).tar.gz", + "https://github.com/dlbeer/quirc.git") + + add_versions("v1.2", "73c12ea33d337ec38fb81218c7674f57dba7ec0570bddd5c7f7a977c0deb64c5") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.release", "mode.debug") + target("quirc") + set_kind("$(kind)") + add_files("lib/*.c") + add_headerfiles("lib/quirc.h") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("quirc_new", {includes = "quirc.h"})) + end) From a03d92e33fdf62e63e7eea1f54f8524e26ce41c4 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 5 Jun 2024 21:12:38 +0800 Subject: [PATCH 063/671] cpp-dump: update to 0.6.0 (#4253) --- packages/c/cpp-dump/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpp-dump/xmake.lua b/packages/c/cpp-dump/xmake.lua index d27b7ba05..03b137197 100644 --- a/packages/c/cpp-dump/xmake.lua +++ b/packages/c/cpp-dump/xmake.lua @@ -7,6 +7,7 @@ package("cpp-dump") add_urls("https://github.com/philip82148/cpp-dump/archive/refs/tags/$(version).tar.gz", "https://github.com/philip82148/cpp-dump.git") + add_versions("v0.6.0", "22bc5fafa22ac7c1e99db8824fdabec4af6baabed0c8b7cc80a0205dfb550414") add_versions("v0.5.0", "31fa8b03c9ee820525137be28f37b36e2abe7fd91df7d67681cb894db2230fe6") on_install(function (package) From 51cfa4ecf9c165934da7099ce2fa3065dfda4d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 5 Jun 2024 17:23:05 +0200 Subject: [PATCH 064/671] ffmpeg: Add dl syslinks (#4255) #4254 --- packages/f/ffmpeg/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index 7e924499c..794852dc5 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -57,9 +57,9 @@ package("ffmpeg") add_frameworks("AudioToolbox") end elseif is_plat("linux") then - add_syslinks("pthread") + add_syslinks("dl", "pthread") elseif is_plat("android") then - add_syslinks("android") + add_syslinks("dl", "android") end add_deps("nasm") From 60bcc033f905b1156b5cb3e63bc7d511f4c5a194 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 09:51:58 +0800 Subject: [PATCH 065/671] Update sonic-cpp to 1.0.1 (#4259) --- packages/s/sonic-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sonic-cpp/xmake.lua b/packages/s/sonic-cpp/xmake.lua index 59e9e99a0..b7b666379 100644 --- a/packages/s/sonic-cpp/xmake.lua +++ b/packages/s/sonic-cpp/xmake.lua @@ -5,6 +5,7 @@ package("sonic-cpp") set_license("Apache-2.0") add_urls("https://github.com/bytedance/sonic-cpp/archive/refs/tags/v$(version).zip") + add_versions("1.0.1", "4c892a72970df301b39416ee1f038d0573507f374391053ecd6e9a9c686c3d11") add_versions("1.0.0", "409441bfc8b8b9fea8641dc0a0cdfaeed784246066a5c49fc7d6e74c39999f7b") add_cxxflags("-march=haswell") From 18bcbd959c00d032c44f59e6eefa367aef127732 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 10:25:06 +0800 Subject: [PATCH 066/671] Update etl to 20.38.17 (#4260) --- packages/e/etl/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/etl/xmake.lua b/packages/e/etl/xmake.lua index e07266ee0..7c49b2bfc 100644 --- a/packages/e/etl/xmake.lua +++ b/packages/e/etl/xmake.lua @@ -7,6 +7,7 @@ package("etl") add_urls("https://github.com/ETLCPP/etl/archive/refs/tags/$(version).tar.gz", "https://github.com/ETLCPP/etl.git") + add_versions("20.38.17", "5b490aca3faad3796a48bf0980e74f2a67953967fad3c051a6d4981051cb0b9a") add_versions("20.38.16", "6d05e33d6e7eb2c8d4654c77dcd083adc70da29aba808f471ba7c6e2b8fcbf03") add_versions("20.38.13", "e606083e189a8fe6211c30c8c579b60c29658a531b5cafbb511daab1a2861a69") add_versions("20.38.11", "c73b6b076ab59e02398a9f90a66198a9f8bf0cfa91af7be2eebefb3bb264ba83") From 811a07b08c25cd5ff111f6e3a5dd5040cef0c05e Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 6 Jun 2024 12:12:36 +0800 Subject: [PATCH 067/671] Update glaze to 2.7.0 (#4261) --- packages/g/glaze/xmake.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/g/glaze/xmake.lua b/packages/g/glaze/xmake.lua index 388b445d2..3663a61df 100644 --- a/packages/g/glaze/xmake.lua +++ b/packages/g/glaze/xmake.lua @@ -6,13 +6,14 @@ package("glaze") add_urls("https://github.com/stephenberry/glaze/archive/refs/tags/$(version).tar.gz", "https://github.com/stephenberry/glaze.git") + add_versions("v2.7.0", "8e3ee2ba725137cd4f61bc9ceb74e2225dc22b970da1c5a43d2a6833115adbfc") add_versions("v2.6.4", "79aff3370c6fe79be8e1774c4fab3e450a10444b91c2aa15aeebf5f54efedc5d") add_versions("v2.5.3", "f4c5eb83c80f1caa0feaa831715e9982203908ea140242cb061aead161e2b09b") add_versions("v2.4.4", "98ef6af4209e0b98d449d6d414b7e0d69b7a79f78d1c9efeb9dfeca011c0600c") add_versions("v2.4.2", "2593617e874d6afc33158a68843c74d875e8e443b430aef826d69662459b280e") - add_versions("v1.3.5", "de5d59cb7f31193d45f67f25d8ced1499df50c0d926a1461432b87f2b2368817") - add_versions("v2.2.0", "1d6e36029a58bf8c4bdd035819e1ab02b87d8454dd80fa2f5d46c96a1e6d600c") add_versions("v2.3.1", "941bf3f8cea5b6a024895d37dceaaaa82071a9178af63e9935a1d9fd80caa451") + add_versions("v2.2.0", "1d6e36029a58bf8c4bdd035819e1ab02b87d8454dd80fa2f5d46c96a1e6d600c") + add_versions("v1.3.5", "de5d59cb7f31193d45f67f25d8ced1499df50c0d926a1461432b87f2b2368817") on_install("linux", function (package) os.cp("include", package:installdir()) @@ -21,14 +22,12 @@ package("glaze") on_test(function (package) assert(package:check_cxxsnippets({test = [[ #include - struct obj_t - { + struct obj_t { double x{}; float y{}; }; template <> - struct glz::meta - { + struct glz::meta { using T = obj_t; static constexpr auto value = object("x", &T::x); }; From 0f1667c69e8d9c8ecf57200c193fad91fd1ecadd Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 14:08:18 +0800 Subject: [PATCH 068/671] Auto-update moltenvk to v1.2.8 (#3540) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update moltenvk to v1.2.8 * Update macos_x86_64.yml * Update xmake.lua * Update macos_x86_64.yml * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: Jérôme Leclercq --- packages/m/moltenvk/xmake.lua | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/m/moltenvk/xmake.lua b/packages/m/moltenvk/xmake.lua index 9c30792d5..6b9904d2b 100644 --- a/packages/m/moltenvk/xmake.lua +++ b/packages/m/moltenvk/xmake.lua @@ -5,6 +5,7 @@ package("moltenvk") add_urls("https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/$(version).tar.gz", "https://github.com/KhronosGroup/MoltenVK.git") + add_versions("v1.2.8", "85beaf8abfcc54d9da0ff0257ae311abd9e7aa96e53da37e1c37d6bc04ac83cd") add_versions("v1.2.7", "3166edcfdca886b4be1a24a3c140f11f9a9e8e49878ea999e3580dfbf9fe4bec") add_versions("v1.2.0", "6e7af2dad0530b2b404480dbe437ca4670c6615cc2ec6cf6a20ed04d9d75e0bd") add_versions("v1.1.5", "2cdcb8dbf2acdcd8cbe70b109dadc05a901038c84970afbe4863e5e23f33deae") @@ -13,7 +14,18 @@ package("moltenvk") if is_plat("macosx") then add_extsources("brew::molten-vk") - end + end + + add_links("MoltenVKShaderConverter", "MoltenVK") + + if is_plat("macosx", "iphoneos") then + add_frameworks("Metal", "Foundation", "QuartzCore", "CoreGraphics", "IOSurface") + if is_plat("macosx") then + add_frameworks("IOKit", "AppKit") + else + add_frameworks("UIKit") + end + end on_fetch("macosx", function (package, opt) if opt.system then @@ -37,6 +49,11 @@ package("moltenvk") os.mv("Package/" .. conf .. "/MoltenVK/include", package:installdir()) os.mv("Package/" .. conf .. "/MoltenVK/dylib/" ..plat .. "/*", package:installdir("lib")) os.mv("Package/" .. conf .. "/MoltenVK/MoltenVK.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib")) + if package:config("shared") then + os.mv("Package/" .. conf .. "/MoltenVK/dynamic/dylib/" .. plat .. "/*.dylib", package:installdir("lib")) + else + os.mv("Package/" .. conf .. "/MoltenVK/static/MoltenVK.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib")) + end os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/Tools/*", package:installdir("bin")) os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/MoltenVKShaderConverter.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib")) os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/include/*.h", package:installdir("include")) From e8c4091850395b6c58e728d002fb3ff24184b37c Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 15:08:32 +0800 Subject: [PATCH 069/671] Update moltenvk to v1.2.9 (#4007) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérôme Leclercq --- packages/m/moltenvk/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/m/moltenvk/xmake.lua b/packages/m/moltenvk/xmake.lua index 6b9904d2b..b884ab759 100644 --- a/packages/m/moltenvk/xmake.lua +++ b/packages/m/moltenvk/xmake.lua @@ -5,6 +5,8 @@ package("moltenvk") add_urls("https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/$(version).tar.gz", "https://github.com/KhronosGroup/MoltenVK.git") + + add_versions("v1.2.9", "f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e") add_versions("v1.2.8", "85beaf8abfcc54d9da0ff0257ae311abd9e7aa96e53da37e1c37d6bc04ac83cd") add_versions("v1.2.7", "3166edcfdca886b4be1a24a3c140f11f9a9e8e49878ea999e3580dfbf9fe4bec") add_versions("v1.2.0", "6e7af2dad0530b2b404480dbe437ca4670c6615cc2ec6cf6a20ed04d9d75e0bd") From 6e7c4b3c6d10ad83b3f6d84dac7826132e31e08d Mon Sep 17 00:00:00 2001 From: jj683 <87266000+jj683@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:10:13 +0200 Subject: [PATCH 070/671] Use glog <0.7.0 for folly (#4265) --- packages/f/folly/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index d85214694..78e4232f2 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -32,7 +32,7 @@ package("folly") add_deps("cmake") add_deps("boost", {configs = {date_time = true, iostreams = true, context = true, filesystem = true, program_options = true, regex = true, system = true, thread = true}}) add_deps("libevent", {configs = {openssl = true}}) - add_deps("double-conversion", "gflags", "glog", "zlib", "fmt") + add_deps("double-conversion", "gflags", "glog <0.7.0", "zlib", "fmt") add_deps("bzip2", "lz4", "zstd", {optional = true}) if is_plat("linux") then add_syslinks("pthread") From 29999d386170d368b0474571f628106de5d33926 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 6 Jun 2024 21:55:45 +0800 Subject: [PATCH 071/671] blend2d: update to 0.11.1 (#4256) * blend2d: update to 0.11.1 * fix windows arm * add on_check --- packages/b/blend2d/xmake.lua | 45 ++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/packages/b/blend2d/xmake.lua b/packages/b/blend2d/xmake.lua index 7f7711c4e..243081e2a 100644 --- a/packages/b/blend2d/xmake.lua +++ b/packages/b/blend2d/xmake.lua @@ -3,29 +3,54 @@ package("blend2d") set_description("2D Vector Graphics Engine Powered by a JIT Compiler") set_license("zlib") - add_urls("https://github.com/blend2d/blend2d.git") - add_versions("2022.05.12", "84987c5f76c1b8f271e8556a4b87bcab78094c70") + set_urls("https://blend2d.com/download/blend2d-$(version).tar.gz", + "https://github.com/blend2d/blend2d.git") + + add_versions("0.11.1", "f46d61b6aa477fea1a353a41f5906d4e861817ae059ed22fc6ecdd50ff859dd2") + + add_configs("jit", {description = "Enable JIT compiler support", default = true, type = "boolean"}) add_deps("cmake") - add_deps("asmjit") - if is_plat("linux") then + if is_plat("linux", "bsd") then add_syslinks("pthread") end + on_check("windows", function (package) + import("core.tool.toolchain") + + local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + if msvc and package:is_arch("arm.*") then + local vs = msvc:config("vs") + assert(vs and tonumber(vs) >= 2022, "package(blend2d/arm): need vs >= 2022") + end + end) + on_load(function (package) - package:add("deps", "asmjit", {configs = {shared = package:config("shared")}}) + if package:config("jit") then + package:add("deps", "asmjit") + end if not package:config("shared") then package:add("defines", "BL_STATIC") end end) - on_install("windows", "macosx", "linux", function (package) - local configs = {"-DBLEND2D_TEST=OFF", "-DBLEND2D_NO_STDCXX=0"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + on_install("!iphoneos", function (package) + local configs = {} + if package:config("jit") then + table.insert(configs, "-DBLEND2D_EXTERNAL_ASMJIT=TRUE") + table.insert(configs, "-DBLEND2D_NO_JIT=OFF") + else + table.insert(configs, "-DBLEND2D_NO_JIT=ON") + end + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBLEND2D_STATIC=" .. (package:config("shared") and "FALSE" or "TRUE")) - io.replace("CMakeLists.txt", 'include("${ASMJIT_DIR}/CMakeLists.txt")', "", {plain = true}) - import("package.tools.cmake").install(package, configs, {packagedeps = "asmjit"}) + + local cxflags + if package:is_plat("windows") and package:is_arch("arm.*") then + cxflags = "-D__ARM_NEON" + end + import("package.tools.cmake").install(package, configs, {cxflags = cxflags}) end) on_test(function (package) From 08430a795267d8b4bc0b1f6c37884691d18c3ae3 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 6 Jun 2024 22:24:50 +0800 Subject: [PATCH 072/671] kdbindings: add package (#4266) --- packages/k/kdbindings/xmake.lua | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/k/kdbindings/xmake.lua diff --git a/packages/k/kdbindings/xmake.lua b/packages/k/kdbindings/xmake.lua new file mode 100644 index 000000000..7d77cf8cb --- /dev/null +++ b/packages/k/kdbindings/xmake.lua @@ -0,0 +1,29 @@ +package("kdbindings") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/KDAB/KDBindings") + set_description("Reactive programming & data binding in C++") + set_license("MIT") + + add_urls("https://github.com/KDAB/KDBindings/archive/refs/tags/$(version).tar.gz", + "https://github.com/KDAB/KDBindings.git") + + add_versions("v1.0.5", "4d001419809a719f8c966e9bc73f457180325655deca0a11c07c47ee112447a3") + + add_deps("cmake") + + on_install(function (package) + import("package.tools.cmake").install(package, { + "-DKDBindings_TESTS=OFF", + "-DKDBindings_EXAMPLES=OFF" + }) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + KDBindings::Signal signal; + signal.connect([](int arg1, int arg2) {}); + signal.emit(0, 1); + } + ]]}, {configs = {languages = "c++17"}, includes = "kdbindings/signal.h"})) + end) From 4db755ebf2e8e797760135c1bae40abc4560356a Mon Sep 17 00:00:00 2001 From: Sean Date: Thu, 6 Jun 2024 22:33:42 +0800 Subject: [PATCH 073/671] add reflect-cpp package (#4202) * add reflect-cpp package * Update xmake.lua update reflect-cpp package * Update xmake.lua * fix xmake.lua * switch to 0.10.0 * add patch * set yyjson as the default dependency & add on_check * fix on_check * fix on_check * fix on_check finally * fix on_check QAQ * Update xmake.lua --------- Co-authored-by: star9029 --- .../r/reflect-cpp/patches/0.10.0/cmake.patch | 41 ++++++++ packages/r/reflect-cpp/xmake.lua | 99 +++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 packages/r/reflect-cpp/patches/0.10.0/cmake.patch create mode 100644 packages/r/reflect-cpp/xmake.lua diff --git a/packages/r/reflect-cpp/patches/0.10.0/cmake.patch b/packages/r/reflect-cpp/patches/0.10.0/cmake.patch new file mode 100644 index 000000000..9205d33b5 --- /dev/null +++ b/packages/r/reflect-cpp/patches/0.10.0/cmake.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc26bcb..f1c1dcc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,15 +27,11 @@ project(reflectcpp) + + set(CMAKE_CXX_STANDARD 20) + +-if (REFLECTCPP_BUILD_SHARED) +- add_library(reflectcpp SHARED src/yyjson.c) +-else () +- add_library(reflectcpp STATIC src/yyjson.c) +-endif () ++add_library(reflectcpp INTERFACE) + +-target_compile_features(reflectcpp PUBLIC cxx_std_20) ++target_compile_features(reflectcpp INTERFACE cxx_std_20) + +-target_include_directories(reflectcpp PUBLIC $ $ ) ++target_include_directories(reflectcpp INTERFACE $ $ ) + + if (REFLECTCPP_BSON) + find_package(bson-1.0 CONFIG REQUIRED) +@@ -82,7 +78,7 @@ if (REFLECTCPP_YAML) + target_link_libraries(reflectcpp INTERFACE yaml-cpp::yaml-cpp) + endif () + +-target_compile_options(reflectcpp PRIVATE -Wall) ++ + + if (REFLECTCPP_BUILD_TESTS) + if (MSVC) +@@ -109,7 +105,7 @@ install( + file(GLOB_RECURSE RFL_HEADERS RELATIVE ${CMAKE_CURRENT_LIST_DIR} "${CMAKE_CURRENT_LIST_DIR}/include/*" ) + + target_sources(reflectcpp +- PUBLIC ++ INTERFACE + FILE_SET reflectcpp_headers + TYPE HEADERS + BASE_DIRS $ $ diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua new file mode 100644 index 000000000..1aa041dda --- /dev/null +++ b/packages/r/reflect-cpp/xmake.lua @@ -0,0 +1,99 @@ +package("reflect-cpp") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/getml/reflect-cpp") + set_description("A C++20 library for fast serialization, deserialization and validation using reflection. Supports JSON, BSON, CBOR, flexbuffers, msgpack, TOML, XML, YAML / msgpack.org[C++20]") + set_license("MIT") + + add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", + "https://github.com/getml/reflect-cpp.git") + + add_versions("v0.10.0", "d2c8876d993ddc8c57c5804e767786bdb46a2bdf1a6cd81f4b14f57b1552dfd7") + + add_patches("0.10.0", "patches/0.10.0/cmake.patch", "b8929c0a13bd4045cbdeea0127e08a784e2dc8c43209ca9f056fff4a3ab5c4d3") + + add_configs("bson", {description = "Enable Bson Support.", default = false, type = "boolean", readonly = true}) + add_configs("yyjson", {description = "Enable yyjson Support.", default = true, type = "boolean"}) + add_configs("cbor", {description = "Enable Cbor Support.", default = false, type = "boolean"}) + add_configs("flatbuffers", {description = "Enable Flexbuffers Support.", default = false, type = "boolean"}) + add_configs("msgpack", {description = "Enable Msgpack Support.", default = false, type = "boolean"}) + add_configs("xml", {description = "Enable Xml Support.", default = false, type = "boolean"}) + add_configs("toml", {description = "Enable Toml Support.", default = false, type = "boolean"}) + add_configs("yaml", {description = "Enable Yaml Support.", default = false, type = "boolean"}) + + add_deps("cmake") + + on_check(function (package) + if package:is_plat("windows") then + import("core.tool.toolchain") + + local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + if msvc then + local vs = msvc:config("vs") + assert(vs and tonumber(vs) >= 2022, "package(reflect-cpp): need vs >= 2022") + end + else + assert(package:check_cxxsnippets({test = [[ + #include + #include + #include + void test() { + constexpr std::string_view message = "Hello, C++20!"; + for (char c : std::views::filter(message, [](char c) { return std::islower(c); })) + std::cout << std::source_location::current().line() << ": " << c << '\n'; + } + ]]}, {configs = {languages = "c++20"}}), "package(reflect-cpp) Require at least C++20.") + end + end) + + on_load(function (package) + if package:config("yyjson") then + package:add("deps", "yyjson") + end + + if package:config("cbor") then + package:add("deps", "tinycbor") + end + + if package:config("flatbuffers") then + package:add("deps", "flatbuffers") + end + + if package:config("msgpack") then + package:add("deps", "msgpack-c") + end + + if package:config("xml") then + package:add("deps", "pugixml") + end + + if package:config("toml") then + package:add("deps", "tomlcpp") + end + + if package:config("yaml") then + package:add("deps", "yaml-cpp") + end + end) + + on_install(function (package) + import("package.tools.cmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + #include + struct Person { + std::string first_name; + std::string last_name; + int age; + }; + const auto homer = Person{.first_name = "Homer", + .last_name = "Simpson", + .age = 45}; + void test() { + const std::string json_string = rfl::json::write(homer); + auto homer2 = rfl::json::read(json_string).value(); + } + ]]}, {configs = {languages = "c++20"}})) + end) From 88411d8f218287400c56c882ef6a41aa5e4c3e05 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 6 Jun 2024 22:34:47 +0800 Subject: [PATCH 074/671] charls: add package (#4267) --- packages/c/charls/xmake.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/c/charls/xmake.lua diff --git a/packages/c/charls/xmake.lua b/packages/c/charls/xmake.lua new file mode 100644 index 000000000..cb60bdc02 --- /dev/null +++ b/packages/c/charls/xmake.lua @@ -0,0 +1,31 @@ +package("charls") + set_homepage("https://github.com/team-charls/charls") + set_description("CharLS, a C++ JPEG-LS library implementation") + set_license("BSD-3-Clause") + + add_urls("https://github.com/team-charls/charls/archive/refs/tags/$(version).tar.gz", + "https://github.com/team-charls/charls.git") + + add_versions("2.4.2", "d1c2c35664976f1e43fec7764d72755e6a50a80f38eca70fcc7553cad4fe19d9") + + add_deps("cmake") + + on_install(function (package) + local configs = { + "-DCHARLS_BUILD_TESTS=OFF", + "-DCHARLS_BUILD_AFL_FUZZ_TEST=OFF", + "-DCHARLS_BUILD_LIBFUZZER_FUZZ_TEST=OFF", + "-DCHARLS_BUILD_SAMPLES=OFF", + "-DCHARLS_INSTALL=ON", + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if not package:config("shared") then + package:add("defines", "CHARLS_STATIC") + end + end) + + on_test(function (package) + assert(package:has_cfuncs("charls_jpegls_encoder_create", {includes = "charls/charls.h"})) + end) From a4af6846a6eef5e822aee401d84c86ba6c696286 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 6 Jun 2024 22:51:43 +0800 Subject: [PATCH 075/671] sfl-library: update to 1.6.0 (#4269) --- packages/s/sfl-library/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sfl-library/xmake.lua b/packages/s/sfl-library/xmake.lua index 7f312e0f0..d207a8297 100644 --- a/packages/s/sfl-library/xmake.lua +++ b/packages/s/sfl-library/xmake.lua @@ -7,6 +7,7 @@ package("sfl-library") add_urls("https://github.com/slavenf/sfl-library/archive/refs/tags/$(version).tar.gz", "https://github.com/slavenf/sfl-library.git") + add_versions("1.6.0", "f5121d95c2f3922da4f1cec9bb6045d8733892ddc55ee3c47c99e761e5df5ec4") add_versions("1.5.0", "767d9b3627540071d2a80f18f034d80d6e9eaffc027876c7898c51aeebd3bf37") on_install(function (package) From 5d3b999986a3a01fc2ef2fccd3cf9f49816791a9 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Jun 2024 00:01:37 +0800 Subject: [PATCH 076/671] emhash: add package (#4270) --- packages/e/emhash/xmake.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/e/emhash/xmake.lua diff --git a/packages/e/emhash/xmake.lua b/packages/e/emhash/xmake.lua new file mode 100644 index 000000000..1560766a8 --- /dev/null +++ b/packages/e/emhash/xmake.lua @@ -0,0 +1,20 @@ +package("emhash") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/ktprime/emhash") + set_description("Fast and memory efficient c++ flat hash map/set") + set_license("MIT") + + add_urls("https://github.com/ktprime/emhash.git") + add_versions("2024.06.01", "3efa77ef32786a033b379071fe8af3dc705736ca") + + on_install(function (package) + os.cp("*.hpp", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + emhash5::HashMap m1(4); + } + ]]}, {configs = {languages = "c++11"}, includes = "hash_table5.hpp"})) + end) From 5cca6cf9b790711ccfb8057e95dad49dc4fb1906 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Jun 2024 06:57:15 +0800 Subject: [PATCH 077/671] dlfcn-win32: add package (#4268) --- packages/d/dlfcn-win32/xmake.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/d/dlfcn-win32/xmake.lua diff --git a/packages/d/dlfcn-win32/xmake.lua b/packages/d/dlfcn-win32/xmake.lua new file mode 100644 index 000000000..83e0bbe8b --- /dev/null +++ b/packages/d/dlfcn-win32/xmake.lua @@ -0,0 +1,25 @@ +package("dlfcn-win32") + set_homepage("https://github.com/dlfcn-win32/dlfcn-win32") + set_description("Official dlfcn-win32 repo") + set_license("MIT") + + add_urls("https://github.com/dlfcn-win32/dlfcn-win32/archive/refs/tags/$(version).tar.gz", + "https://github.com/dlfcn-win32/dlfcn-win32.git") + + add_versions("v1.4.1", "30a9f72bdf674857899eb7e553df1f0d362c5da2a576ae51f886e1171fbdb399") + + add_deps("cmake") + + on_install(function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if package:config("shared") then + package:add("defines", "DLFCN_WIN32_SHARED") + end + end) + + on_test(function (package) + assert(package:has_cfuncs("dlopen", {includes = "dlfcn.h"})) + end) From f5776dbb8a8935dbbae11f166fef74f1ca23a5cd Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 7 Jun 2024 07:00:13 +0800 Subject: [PATCH 078/671] boost: improve links (#4271) * boost: improve links * add asan support --- packages/b/boost/xmake.lua | 61 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index c1c757298..92c4c182c 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -114,18 +114,21 @@ package("boost") end return linkname end - -- we need the fixed link order - local sublibs = {log = {"log_setup", "log"}, - python = {"python", "numpy"}, - stacktrace = {"stacktrace_backtrace", "stacktrace_basic"}} - for _, libname in ipairs(libnames) do - local libs = sublibs[libname] - if libs then - for _, lib in ipairs(libs) do - package:add("links", get_linkname(package, lib)) + + if not package:is_plat("windows") then + -- we need the fixed link order + local sublibs = {log = {"log_setup", "log"}, + python = {"python", "numpy"}, + stacktrace = {"stacktrace_backtrace", "stacktrace_basic"}} + for _, libname in ipairs(libnames) do + local libs = sublibs[libname] + if libs then + for _, lib in ipairs(libs) do + package:add("links", get_linkname(package, lib)) + end + else + package:add("links", get_linkname(package, libname)) end - else - package:add("links", get_linkname(package, libname)) end end -- disable auto-link all libs @@ -281,8 +284,11 @@ package("boost") else table.insert(argv, "address-model=32") end - local cxxflags - local linkflags + + local cxxflags = {} + local linkflags = {} + table.join2(cxxflags, table.wrap(package:config("cxflags"))) + table.join2(cxxflags, table.wrap(package:config("cxxflags"))) if package:is_plat("windows") then local vs_runtime = package:config("vs_runtime") if package:config("shared") then @@ -293,14 +299,16 @@ package("boost") table.insert(argv, "runtime-link=shared") end table.insert(argv, "toolset=" .. build_toolset) - cxxflags = "-std:c++14" + table.insert(cxxflags, "-std:c++14") elseif package:is_plat("mingw") then table.insert(argv, "toolset=gcc") elseif package:is_plat("macosx") then table.insert(argv, "toolset=darwin") -- fix macosx arm64 build issue https://github.com/microsoft/vcpkg/pull/18529 - cxxflags = "-std=c++14 -arch " .. package:arch() + table.insert(cxxflags, "-std=c++14") + table.insert(cxxflags, "-arch") + table.insert(cxxflags, package:arch()) local xcode = package:toolchain("xcode") or import("core.tool.toolchain").load("xcode", {plat = package:plat(), arch = package:arch()}) if xcode:check() then local xcode_dir = xcode:config("xcode") @@ -308,30 +316,35 @@ package("boost") local target_minver = xcode:config("target_minver") if xcode_dir and xcode_sdkver then local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk" - cxxflags = cxxflags .. " -isysroot " .. xcode_sdkdir + table.insert(cxxflags, "-isysroot") + table.insert(cxxflags, xcode_sdkdir) end if target_minver then - cxxflags = cxxflags .. " -mmacosx-version-min=" .. target_minver + table.insert(cxxflags, "-mmacosx-version-min=" .. target_minver) end end else - cxxflags = "-std=c++14" + table.insert(cxxflags, "-std=c++14") if package:config("pic") ~= false then - cxxflags = cxxflags .. " -fPIC" + table.insert(cxxflags, "-fPIC") end end if package.has_runtime and package:has_runtime("c++_shared", "c++_static") then - cxxflags = (cxxflags or "") .. " -stdlib=libc++" - linkflags = (linkflags or "") .. " -stdlib=libc++" + table.insert(cxxflags, "-stdlib=libc++") + table.insert(linkflags, "-stdlib=libc++") if package:has_runtime("c++_static") then - linkflags = linkflags .. " -static-libstdc++" + table.insert(linkflags, "-static-libstdc++") end end + if package:config("asan") then + table.insert(cxxflags, "-fsanitize=address") + table.insert(linkflags, "-fsanitize=address") + end if cxxflags then - table.insert(argv, "cxxflags=" .. cxxflags) + table.insert(argv, "cxxflags=" .. table.concat(cxxflags, " ")) end if linkflags then - table.insert(argv, "linkflags=" .. linkflags) + table.insert(argv, "linkflags=" .. table.concat(linkflags, " ")) end for _, libname in ipairs(libnames) do if package:config("all") or package:config(libname) then From 39d6857ac51bfb65ac41f7b387aa7e13c63cf086 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Fri, 7 Jun 2024 08:01:48 +0800 Subject: [PATCH 079/671] update imgui to v 1.90.8 (#4272) --- packages/i/imgui/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 5b847c8f6..4b7838f7a 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -6,6 +6,7 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/ocornut/imgui.git", {alias = "git"}) + add_versions("v1.90.8", "f606b4fb406aa0f8dad36d4a9dd3d6f0fd39f5f0693e7468abc02d545fb505ae") add_versions("v1.90.7", "872574217643d4ad7e9e6df420bb8d9e0d468fb90641c2bf50fd61745e05de99") add_versions("v1.90.6", "70b4b05ac0938e82b4d5b8d59480d3e2ca63ca570dfb88c55023831f387237ad") add_versions("v1.90.5", "e94b48dba7311c85ba8e3e6fe7c734d76a0eed21b2b42c5180fd5706d1562241") @@ -38,6 +39,7 @@ package("imgui") add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc") add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866") + add_versions("git:v1.90.8-docking", "v1.90.8-docking") add_versions("git:v1.90.7-docking", "v1.90.7-docking") add_versions("git:v1.90.6-docking", "v1.90.6-docking") add_versions("git:v1.90.5-docking", "v1.90.5-docking") From 7ea0e9612986afb039c77e5e3b09298c722a416c Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 7 Jun 2024 09:54:19 +0800 Subject: [PATCH 080/671] Update ada to 2.8.0 (#4273) --- packages/a/ada/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index 17b9455ce..871ddd6af 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -6,6 +6,7 @@ package("ada") set_urls("https://github.com/ada-url/ada/archive/refs/tags/v$(version).tar.gz", "https://github.com/ada-url/ada.git") + add_versions("2.8.0", "83b77fb53d1a9eea22b1484472cea0215c50478c9ea2b4b44b0ba3b52e07c139") add_versions("2.7.8", "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75") add_versions("2.7.7", "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554") add_versions("2.7.6", "e2822783913c50b9f5c0f20b5259130a7bdc36e87aba1cc38a5de461fe45288f") From 129c8ccf8b9ba655042f927bfeda1030c4186b7c Mon Sep 17 00:00:00 2001 From: apocelipes Date: Fri, 7 Jun 2024 19:35:23 +0800 Subject: [PATCH 081/671] Update CImg to 3.3.6 (#4275) --- packages/c/cimg/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/c/cimg/xmake.lua b/packages/c/cimg/xmake.lua index dcdbfd26e..ada12ead8 100644 --- a/packages/c/cimg/xmake.lua +++ b/packages/c/cimg/xmake.lua @@ -8,6 +8,8 @@ package("cimg") return version:gsub("%v", "v.") end}) add_urls("https://github.com/greyclab/cimg.git") + + add_versions("v3.3.6", "7bb6621c38458152f3d1cae3f020e4ca6a314076cb7b4b5d6bbf324ad3d0ab88") add_versions("v3.2.6", "1fcca9a7a453aa278660c10d54c6db9b4c614b6a29250adeb231e95a0be209e7") if is_plat("windows") then From ed2b5151c9e799b8505310f99847da360780a834 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 8 Jun 2024 09:51:06 +0800 Subject: [PATCH 082/671] Update csvparser to 2.2.3 (#4283) --- packages/c/csvparser/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/csvparser/xmake.lua b/packages/c/csvparser/xmake.lua index a6b41c48f..00e3e9adb 100644 --- a/packages/c/csvparser/xmake.lua +++ b/packages/c/csvparser/xmake.lua @@ -4,6 +4,7 @@ package("csvparser") set_description("A modern C++ library for reading, writing, and analyzing CSV (and similar) files (by vincentlaucsb)") add_urls("https://github.com/vincentlaucsb/csv-parser/archive/refs/tags/$(version).zip") + add_versions("2.2.3", "83170169f2af38b171d7c3e127d9411fe381988a4b8910465f7d1c4c6169e815") add_versions("2.2.2", "e8fb8693680f2a0931ef28cb67a1ea007123201c74073fc588c18f5151e29cfd") add_versions("2.2.1", "96fd6a468f56fc157a11fcbc5cece6da952b06190837c46465d091eff674a813") add_versions("2.2.0", "b7744b28f3ac5f92c17379f323733cb8872ea48ef2347842604dc54285d60640") From 138c67de80bc3324130a0abb6de28f002352fd94 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 8 Jun 2024 15:03:06 +0800 Subject: [PATCH 083/671] Auto-update cppcheck to 2.14.1 (#4284) * Update cppcheck to 2.14.1 * Update xmake.lua * remove find_program --------- Co-authored-by: star9029 --- packages/c/cppcheck/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/c/cppcheck/xmake.lua b/packages/c/cppcheck/xmake.lua index 167c1c905..aa690bb22 100644 --- a/packages/c/cppcheck/xmake.lua +++ b/packages/c/cppcheck/xmake.lua @@ -4,18 +4,22 @@ package("cppcheck") set_description("A static analysis tool for C/C++ code") add_urls("https://github.com/danmar/cppcheck/archive/refs/tags/$(version).tar.gz") + add_versions("2.14.1", "22d1403fbc3158f35b5216d7b0a50bbaf0c80bf6663933a71f65cc4fc307ff3d") add_versions("2.13.4", "d6ea064ebab76c6aa000795440479767d8d814dd29405918df4c1bbfcd6cb86c") add_versions("2.13.0", "8229afe1dddc3ed893248b8a723b428dc221ea014fbc76e6289840857c03d450") add_deps("cmake") on_install("windows|x64", "macosx", "linux", "msys", function (package) - local configs = {} + io.replace("cmake/findDependencies.cmake", "find_program(LIBXML2_XMLLINT_EXECUTABLE xmllint)", "", {plain = true}) + + local configs = {"-DLIBXML2_XMLLINT_EXECUTABLE=OFF"} if package:is_plat("windows") then table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") end io.replace("cmake/compileroptions.cmake", "add_compile_options($<$>:/MD>)", "", {plain = true}) + io.replace("cmake/compileroptions.cmake", "add_compile_options($<$>:/MDd>)", "", {plain = true}) import("package.tools.cmake").install(package, configs) end) From fbdd11bfd2cdd80a040f20781f2c0949ed6d9240 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 8 Jun 2024 15:38:01 +0800 Subject: [PATCH 084/671] stdexec: support mingw (#4274) * stdexec: support windows & mingw * Update xmake.lua * Update xmake.lua --- packages/s/stdexec/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/s/stdexec/xmake.lua b/packages/s/stdexec/xmake.lua index 4b6bf0efa..edc4280f3 100644 --- a/packages/s/stdexec/xmake.lua +++ b/packages/s/stdexec/xmake.lua @@ -7,9 +7,13 @@ package("stdexec") add_versions("2024.03.08", "b3ba13a7b8c206371207196e08844fb7bc745438") + if is_plat("windows") then + add_cxxflags("/Zc:__cplusplus") + end + add_deps("cmake") - on_install("linux", "macosx", function (package) + on_install("linux", "macosx", "mingw", function (package) local configs = {"-DSTDEXEC_BUILD_EXAMPLES=OFF", "-DSTDEXEC_BUILD_TESTS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From e3a6987532a780117623445259e0277659161034 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 8 Jun 2024 16:05:10 +0800 Subject: [PATCH 085/671] bytepack: add package (#3090) * bytepack: add package * add check --- packages/b/bytepack/xmake.lua | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/b/bytepack/xmake.lua diff --git a/packages/b/bytepack/xmake.lua b/packages/b/bytepack/xmake.lua new file mode 100644 index 000000000..7c065b16f --- /dev/null +++ b/packages/b/bytepack/xmake.lua @@ -0,0 +1,34 @@ +package("bytepack") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/farukeryilmaz/bytepack") + set_description("C++ Binary Serialization Made Easy: Header-only, configurable endianness, cross-platform, no IDL, no exceptions, and no macros") + set_license("MIT") + + add_urls("https://github.com/farukeryilmaz/bytepack/archive/refs/tags/$(version).tar.gz", + "https://github.com/farukeryilmaz/bytepack.git") + + add_versions("v0.1.0", "7761cf51736d4e1a65ca69323182930967846eaed04adddfd316f59a5c2eb244") + + on_check(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + #include + void test() { + std::string s{"xmake"}; + std::ranges::reverse(s.begin(), s.end()); + } + ]]}, {configs = {languages = "c++20"}}), "package(bytepack) Require at least C++20.") + end) + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + bytepack::binary_stream serializationStream(64); + } + ]]}, {configs = {languages = "c++20"}})) + end) From dde7ad731a0eb18cd918564cf95f4335034bf9f7 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 8 Jun 2024 16:43:53 +0800 Subject: [PATCH 086/671] Update zig to 0.13.0 (#4288) --- packages/z/zig/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/z/zig/xmake.lua b/packages/z/zig/xmake.lua index f4adbea5d..0eaad435d 100644 --- a/packages/z/zig/xmake.lua +++ b/packages/z/zig/xmake.lua @@ -10,11 +10,13 @@ package("zig") add_versions("0.10.1", "b9b00477ec5fa1f1b89f35a7d2a58688e019910ab80a65eac2a7417162737656") add_versions("0.11.0", "c6ebf927bb13a707d74267474a9f553274e64906fd21bf1c75a20bde8cadf7b2") add_versions("0.12.0", "294e224c14fd0822cfb15a35cf39aa14bd9967867999bf8bdfe3db7ddec2a27f") + add_versions("0.13.0", "46fae219656545dfaf4dce12fb4e8685cec5b51d721beee9389ab4194d43394c") else set_urls("https://ziglang.org/download/$(version)/zig-macos-x86_64-$(version).tar.xz") add_versions("0.10.1", "02483550b89d2a3070c2ed003357fd6e6a3059707b8ee3fbc0c67f83ca898437") add_versions("0.11.0", "1c1c6b9a906b42baae73656e24e108fd8444bb50b6e8fd03e9e7a3f8b5f05686") add_versions("0.12.0", "4d411bf413e7667821324da248e8589278180dbc197f4f282b7dbb599a689311") + add_versions("0.13.0", "8b06ed1091b2269b700b3b07f8e3be3b833000841bae5aa6a09b1a8b4773effd") end elseif is_host("windows") then if os.arch() == "arm64" then @@ -22,32 +24,38 @@ package("zig") add_versions("0.10.1", "ece93b0d77b2ab03c40db99ef7ccbc63e0b6bd658af12b97898960f621305428") add_versions("0.11.0", "5d4bd13db5ecb0ddc749231e00f125c1d31087d708e9ff9b45c4f4e13e48c661") add_versions("0.12.0", "04c6b92689241ca7a8a59b5f12d2ca2820c09d5043c3c4808b7e93e41c7bf97b") + add_versions("0.13.0", "95ff88427af7ba2b4f312f45d2377ce7a033e5e3c620c8caaa396a9aba20efda") else set_urls("https://ziglang.org/download/$(version)/zig-windows-x86_64-$(version).zip") add_versions("0.10.1", "5768004e5e274c7969c3892e891596e51c5df2b422d798865471e05049988125") add_versions("0.11.0", "142caa3b804d86b4752556c9b6b039b7517a08afa3af842645c7e2dcd125f652") add_versions("0.12.0", "2199eb4c2000ddb1fba85ba78f1fcf9c1fb8b3e57658f6a627a8e513131893f5") + add_versions("0.13.0", "d859994725ef9402381e557c60bb57497215682e355204d754ee3df75ee3c158") end elseif is_host("linux") then if os.arch() == "i386" then set_urls("https://ziglang.org/download/$(version)/zig-linux-x86-$(version).tar.xz") add_versions("0.11.0", "7b0dc3e0e070ae0e0d2240b1892af6a1f9faac3516cae24e57f7a0e7b04662a8") add_versions("0.12.0", "fb752fceb88749a80d625a6efdb23bea8208962b5150d6d14c92d20efda629a5") + add_versions("0.13.0", "876159cc1e15efb571e61843b39a2327f8925951d48b9a7a03048c36f72180f7") elseif os.arch() == "arm64" then set_urls("https://ziglang.org/download/$(version)/zig-linux-aarch64-$(version).tar.xz") add_versions("0.10.1", "db0761664f5f22aa5bbd7442a1617dd696c076d5717ddefcc9d8b95278f71f5d") add_versions("0.11.0", "956eb095d8ba44ac6ebd27f7c9956e47d92937c103bf754745d0a39cdaa5d4c6") add_versions("0.12.0", "754f1029484079b7e0ca3b913a0a2f2a6afd5a28990cb224fe8845e72f09de63") + add_versions("0.13.0", "041ac42323837eb5624068acd8b00cd5777dac4cf91179e8dad7a7e90dd0c556") else set_urls("https://ziglang.org/download/$(version)/zig-linux-x86_64-$(version).tar.xz") add_versions("0.10.1", "6699f0e7293081b42428f32c9d9c983854094bd15fee5489f12c4cf4518cc380") add_versions("0.11.0", "2d00e789fec4f71790a6e7bf83ff91d564943c5ee843c5fd966efc474b423047") add_versions("0.12.0", "c7ae866b8a76a568e2d5cfd31fe89cdb629bdd161fdd5018b29a4a0a17045cad") + add_versions("0.13.0", "d45312e61ebcc48032b77bc4cf7fd6915c11fa16e4aad116b66c9468211230ea") end elseif is_host("bsd") then if os.arch() == "x86_64" then set_urls("https://ziglang.org/download/$(version)/zig-freebsd-x86_64-$(version).tar.xz") add_versions("0.11.0", "ea430327f9178377b79264a1d492868dcff056cd76d43a6fb00719203749e958") + add_versions("0.13.0", "adc1ffc9be56533b2f1c7191f9e435ad55db00414ff2829d951ef63d95aaad8c") end end From 41d2e339541a9d8febda7e629580d03873edfffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 8 Jun 2024 11:14:39 +0200 Subject: [PATCH 087/671] Boost: Better asan fix (#4279) --- packages/b/boost/xmake.lua | 50 +++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 92c4c182c..a6c51131d 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -1,5 +1,4 @@ package("boost") - set_homepage("https://www.boost.org/") set_description("Collection of portable C++ source libraries.") set_license("BSL-1.0") @@ -81,7 +80,7 @@ package("boost") end on_load(function (package) - function get_linkname(package, libname) + local function get_linkname(package, libname) local linkname if package:is_plat("windows") then linkname = (package:config("shared") and "boost_" or "libboost_") .. libname @@ -100,11 +99,11 @@ package("boost") if package:debug() then linkname = linkname .. "-gd" end + elseif package:config("asan") or vs_runtime == "MTd" then + linkname = linkname .. "-sgd" elseif vs_runtime == "MT" then linkname = linkname .. "-s" - elseif vs_runtime == "MTd" then - linkname = linkname .. "-sgd" - elseif vs_runtime == "MDd" then + elseif package:config("asan") or vs_runtime == "MDd" then linkname = linkname .. "-gd" end else @@ -115,20 +114,18 @@ package("boost") return linkname end - if not package:is_plat("windows") then - -- we need the fixed link order - local sublibs = {log = {"log_setup", "log"}, - python = {"python", "numpy"}, - stacktrace = {"stacktrace_backtrace", "stacktrace_basic"}} - for _, libname in ipairs(libnames) do - local libs = sublibs[libname] - if libs then - for _, lib in ipairs(libs) do - package:add("links", get_linkname(package, lib)) - end - else - package:add("links", get_linkname(package, libname)) + -- we need the fixed link order + local sublibs = {log = {"log_setup", "log"}, + python = {"python", "numpy"}, + stacktrace = {"stacktrace_backtrace", "stacktrace_basic"}} + for _, libname in ipairs(libnames) do + local libs = sublibs[libname] + if libs then + for _, lib in ipairs(libs) do + package:add("links", get_linkname(package, lib)) end + else + package:add("links", get_linkname(package, libname)) end end -- disable auto-link all libs @@ -147,7 +144,7 @@ package("boost") on_install("macosx", "linux", "windows", "bsd", "mingw", "cross", function (package) import("core.base.option") - function get_compiler(package, toolchain) + local function get_compiler(package, toolchain) local cxx = package:build_getenv("cxx") if package:is_plat("macosx") then -- we uses ld/clang++ for link stdc++ for shared libraries @@ -394,4 +391,19 @@ package("boost") } ]]}, {configs = {languages = "c++14"}})) end + + if package:config("filesystem") then + assert(package:check_cxxsnippets({test = [[ + #include + #include + static void test() { + boost::filesystem::path path("/path/to/directory"); + if (boost::filesystem::exists(path)) { + std::cout << "Directory exists" << std::endl; + } else { + std::cout << "Directory does not exist" << std::endl; + } + } + ]]}, {configs = {languages = "c++14"}})) + end end) From 20fca998c949c65e0697de9e8a57e4f44c9edbc5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 8 Jun 2024 18:09:00 +0800 Subject: [PATCH 088/671] sse2neon: add package (#4287) * sse2neon: add package * fix cross * disable cross --- packages/s/sse2neon/xmake.lua | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/s/sse2neon/xmake.lua diff --git a/packages/s/sse2neon/xmake.lua b/packages/s/sse2neon/xmake.lua new file mode 100644 index 000000000..7dba7d494 --- /dev/null +++ b/packages/s/sse2neon/xmake.lua @@ -0,0 +1,36 @@ +package("sse2neon") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/DLTcollab/sse2neon") + set_description("A translator from Intel SSE intrinsics to Arm/Aarch64 NEON implementation") + set_license("MIT") + + add_urls("https://github.com/DLTcollab/sse2neon/archive/refs/tags/$(version).tar.gz", + "https://github.com/DLTcollab/sse2neon.git") + + add_versions("v1.7.0", "cee6d54922dbc9d4fa57749e3e4b46161b7f435a22e592db9da008051806812a") + + if is_plat("windows") then + add_cxxflags("/Zc:preprocessor") + end + + on_check(function (package) + assert(package:is_arch("arm.*"), "package(sse2neon): only support arm") + if package:is_plat("windows") then + import("core.tool.toolchain") + + local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) + if msvc then + local vs = msvc:config("vs") + assert(vs and tonumber(vs) >= 2022, "package(sse2neon): need vs >= 2022") + end + end + end) + + on_install("!cross", function (package) + assert(package:is_arch("arm.*"), "package(sse2neon): only support arm") + os.vcp("sse2neon.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cxxincludes("sse2neon.h")) + end) From 1c2ba2073b0e933ea8a472c5e45d5fd378e885f4 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sat, 8 Jun 2024 22:53:39 +0800 Subject: [PATCH 089/671] fix build in gcc 13 (#4289) --- packages/c/crossguid/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/crossguid/xmake.lua b/packages/c/crossguid/xmake.lua index 36de59a33..55d139d22 100644 --- a/packages/c/crossguid/xmake.lua +++ b/packages/c/crossguid/xmake.lua @@ -19,6 +19,7 @@ package("crossguid") add_deps("cmake") on_install("windows", "linux", "macosx", "iphoneos", "android", "mingw", function (package) + io.replace(path.translate("include/crossguid/guid.hpp"), "#include ", "#include \n#include", { plain = true }) local configs = {"-DCROSSGUID_TESTS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) import("package.tools.cmake").install(package, configs, {buildir = "build"}) From 4881251867d3744a60d3c00022665407e3623e36 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 9 Jun 2024 00:21:01 +0800 Subject: [PATCH 090/671] quickjs: fix patch checksum (#4281) * quickjs: fix patch checksum * Update xmake.lua --- packages/q/quickjs/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/q/quickjs/xmake.lua b/packages/q/quickjs/xmake.lua index 2c784accb..60f05076b 100644 --- a/packages/q/quickjs/xmake.lua +++ b/packages/q/quickjs/xmake.lua @@ -8,7 +8,7 @@ package("quickjs") add_versions("2024.01.13", "d6c7d169de6fb2c90cd2bd2226ba9dafdef883ce") if is_plat("windows") then - add_patches("2024.01.13", "patches/2024.01.13/msvc.patch", "4e3b6a346a2b55455cba832d543876daba9f7fce6011ba9f858b2de31f0fd0e8") + add_patches("2024.01.13", "patches/2024.01.13/msvc.patch", "e793d03b7c4db3741cfa3565f8fb1f6337afb31df33f4123c4050d65ffdd28a1") add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true}) end From 87af5205e45ff5a7c1a2f26e67dcc18b3470db8c Mon Sep 17 00:00:00 2001 From: Maxime <672982+maximegmd@users.noreply.github.com> Date: Sun, 9 Jun 2024 03:00:50 +0200 Subject: [PATCH 091/671] dotnet 8.0.6 (#4293) * dotnet 8.0.6 * Update xmake.lua --- packages/d/dotnet/xmake.lua | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/d/dotnet/xmake.lua b/packages/d/dotnet/xmake.lua index e5f887a48..7d24c4766 100644 --- a/packages/d/dotnet/xmake.lua +++ b/packages/d/dotnet/xmake.lua @@ -8,7 +8,8 @@ package("dotnet") local versions = { ["7.0.4"] = "e2f99985-b54a-43a2-85cf-cfc9a1e0a307/171339e000ade0b6e10c3cb010ed45ba/dotnet-sdk-7.0.202-win-x64", ["7.0.15"] = "2133b143-9c4f-4daa-99b0-34fa6035d67b/193ede446d922eb833f1bfe0239be3fc/dotnet-sdk-7.0.405-win-x64", - ["8.0.1"] = "6902745c-34bd-4d66-8e84-d5b61a17dfb7/e61732b00f7e144e162d7e6914291f16/dotnet-sdk-8.0.101-win-x64" + ["8.0.1"] = "6902745c-34bd-4d66-8e84-d5b61a17dfb7/e61732b00f7e144e162d7e6914291f16/dotnet-sdk-8.0.101-win-x64", + ["8.0.6"] = "7ac2d880-2d57-4008-850e-4b42b829c354/e1c92cb3b6a85f53cab6fa55b14b49e3/dotnet-sdk-8.0.301-win-x64" } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).zip", {version = function (version) return versions[tostring(version)] @@ -17,11 +18,13 @@ package("dotnet") add_versions("7.0.4", "1cc74b279cffe42f757b3adeeeec87e351f0fb806016167ffb6b3842d4d6bcd5") add_versions("7.0.15", "a158307a32caee886e24a2cc5114c3fba230f8c6173a1b707dc112ff377607b7") add_versions("8.0.1", "2fa8eb34ce5a03a6fc606b35cfd6ff1d1ac36dfd35a4772d6a6ec1939de46244") + add_versions("8.0.6", "eb32b4332b10ad526ad64f58a6e904d16855e49bb38c51c863033c53ecea4a7d") elseif is_arch("arm64") then local versions = { ["7.0.4"] = "h52f31250-1961-4203-9f51-9b9afce0db15/129915360a0e0e6ee59e895efd389b0a/dotnet-sdk-7.0.202-win-arm64", ["7.0.15"] = "5079d3e3-3fa9-4ffa-92fc-bbf17e2d3543/634299784e4c6f7a1f5b06cf5070d505/dotnet-sdk-7.0.405-win-arm64", - ["8.0.1"] = "bfcfe7c7-d722-45b0-80df-663516a401ce/d7b91a51df647c710c96cde20aa8b100/dotnet-sdk-8.0.101-win-arm64" + ["8.0.1"] = "bfcfe7c7-d722-45b0-80df-663516a401ce/d7b91a51df647c710c96cde20aa8b100/dotnet-sdk-8.0.101-win-arm64", + ["8.0.6"] = "90961c76-55e1-406c-80b5-440306ac50cb/337ad62c9692c3e74e4e2b209f3a85f6/dotnet-sdk-8.0.301-win-arm64" } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).zip", {version = function (version) return versions[tostring(version)] @@ -30,11 +33,13 @@ package("dotnet") add_versions("7.0.4", "5b2d8d381fc52379d25f5ccfa0882476b6003060682abf19fd96151a08d4298b") add_versions("7.0.15", "272156f0cfc4752eaae580196eb0f3287c1c758c99a116a70062a2083cafa0bd") add_versions("8.0.1", "feca0648fa200fd19ea3cb00266a76488d76880243b5c57bf9ecf9d91892ddfe") + add_versions("8.0.6", "9e77515ecc64e4a891109cc5da2a7bf57f4d534e0654b36636ada9bae79e487a") else local versions = { ["7.0.4"] = "c7213e17-4955-4fae-a405-1b7101086daf/71963248a7de64c4b00219a8199e7429/dotnet-sdk-7.0.202-win-x86", ["7.0.15"] = "bf8a63f5-f029-4d0a-8027-975284829ad0/e1fb2ba0532d63c6cec0fb04987a91bf/dotnet-sdk-7.0.405-win-x86", - ["8.0.1"] = "059613f3-d3e9-4585-b8a9-3814e675b6d0/01150dbaaa7f392f103137bd325786b6/dotnet-sdk-8.0.101-win-x86" + ["8.0.1"] = "059613f3-d3e9-4585-b8a9-3814e675b6d0/01150dbaaa7f392f103137bd325786b6/dotnet-sdk-8.0.101-win-x86", + ["8.0.6"] = "8ffefb00-26bf-4dc0-bfd3-82003b4f122e/05aad9cf85a8456cdbe08b2b59da866e/dotnet-sdk-8.0.301-win-x86" } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).zip", {version = function (version) return versions[tostring(version)] @@ -43,13 +48,15 @@ package("dotnet") add_versions("7.0.4", "8541bc89a12dac90ba1d6a7c1b6875b9314fc8af04602210be07daa16cfd5e9a") add_versions("7.0.15", "77907f8db16228b04421bb8c63e89fa2c6d7e728c1e5cd0187b87d4aafa0acc0") add_versions("8.0.1", "af9feebee04bc25ac2a0f98dc37c8808da4a9c7586c55de8aafafab2d2ad8b98") + add_versions("8.0.6", "04029a8f88f395a03497ae4542712eaec6d651f9eb4dc5727143b6c54fa7bda2") end elseif is_host("linux") then if is_arch("x64", "x86_64") then local versions = { ["7.0.4"] = "bda88810-e1a6-4cf0-8139-7fd7fe7b2c7a/7a9ffa3e12e5f1c3d8b640e326c1eb14/dotnet-sdk-7.0.202-linux-x64", ["7.0.15"] = "5202b091-2406-445c-b40a-68a5b97c882b/b509f2a7a0eb61aea145b990b40b6d5b/dotnet-sdk-7.0.405-linux-x64", - ["8.0.1"] = "9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34/dotnet-sdk-8.0.101-linux-x64" + ["8.0.1"] = "9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34/dotnet-sdk-8.0.101-linux-x64", + ["8.0.6"] = "86497c4f-3dc8-4ee7-9f6a-9e0464059427/293d074c28bbfd9410f4db8e021fa290/dotnet-sdk-8.0.301-linux-x64", } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).tar.gz", {version = function (version) return versions[tostring(version)] @@ -58,11 +65,13 @@ package("dotnet") add_versions("7.0.4", "405f15e437582be260460f48eda9dfe613fd87b2557667f20d6ecfa34b09c221") add_versions("7.0.15", "db1f6226039313ceda561de803298fc6df0a0f34e1b214629225bb20e2c03e90") add_versions("8.0.1", "3c61ffcee8947e0ead6196799d058e671b00bc6b983983f2bde5d29f702de2fe") + add_versions("8.0.6", "d237cf0e8865f51eb9634df32a8bcfb1dd95dac95c0d16b5d599df867ab16c27") elseif is_arch("arm64", "arm64-v8a") then local versions = { ["7.0.4"] = "c1fd11b0-186a-4aa1-a578-bb1b6613886e/b67e1c9d6d90b1c99b23935273921fa1/dotnet-sdk-7.0.202-linux-arm64", ["7.0.15"] = "bdfe4e91-3a24-421f-881a-47b6d91404cb/cfe786933a6a7fd358b799af23542827/dotnet-sdk-7.0.405-linux-arm64", - ["8.0.1"] = "092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22/dotnet-sdk-8.0.101-linux-arm64" + ["8.0.1"] = "092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22/dotnet-sdk-8.0.101-linux-arm64", + ["8.0.6"] = "cd9decc0-f3ef-46d6-b7d1-348b757781ad/9ad92a8f4b805feb3d017731e78eca15/dotnet-sdk-8.0.301-linux-arm64", } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).tar.gz", {version = function (version) return versions[tostring(version)] @@ -71,13 +80,15 @@ package("dotnet") add_versions("7.0.4", "5a5d29f3f7515f6df888047eeb9571a2fa06b728a97e30536b1473d2abce0b32") add_versions("7.0.15", "83b18606c055b528856ad5642828627542d339510f33155ff126bb2522a5c68d") add_versions("8.0.1", "6e6d9c0d20e9b87247638eff4e66eccf04078ca956cecb9be53f155f44a2c508") + add_versions("8.0.6", "0e90d60a1759567fcfaf9b9efd1734603493a6ad562e40620e1d2df8ab120f8c") end elseif is_host("macosx") then if is_arch("x64", "x86_64") then local versions = { ["7.0.4"] = "d3fe9043-0ff4-4584-aacf-1ad41c47407b/7b84ed341359488cd0de21de1b4df6d0/dotnet-sdk-7.0.202-osx-x64", ["7.0.15"] = "77e1c2df-aaa1-44aa-abc5-ffca44b1dfc9/1fea5228f09398a885ca956d1b537f02/dotnet-sdk-7.0.405-osx-x64", - ["8.0.1"] = "c7f806d2-1483-4a52-893a-4de1054b0bff/a6f52ed50876c45f859192b6576a14d5/dotnet-sdk-8.0.101-osx-x64" + ["8.0.1"] = "c7f806d2-1483-4a52-893a-4de1054b0bff/a6f52ed50876c45f859192b6576a14d5/dotnet-sdk-8.0.101-osx-x64", + ["8.0.6"] = "6ef47a54-b1c6-4000-8df4-486f64464c2b/ae87b597b19312fa9f73b9f2f8c687bd/dotnet-sdk-8.0.301-osx-x64", } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).tar.gz", {version = function (version) return versions[tostring(version)] @@ -86,11 +97,13 @@ package("dotnet") add_versions("7.0.4", "1531bfa7bf384f8b5c433d87af170f7839b130ea9c20b617aaf41742a13eefa9") add_versions("7.0.15", "f8ff3c54f633e3f8dc0208c97b43a6ad53442a6139dbb11e6957129a7a20bf79") add_versions("8.0.1", "cad53a19dd0ad86c814bbf24f8449e068ffbc3749a285e41b7b6e6004fa3881f") + add_versions("8.0.6", "0bd66f52ddf92efdbed459362fb807b30360a1f854144c84789e12607a35ea75") elseif is_arch("arm64") then local versions = { ["7.0.4"] = "4402413a-ef81-4732-a0c0-38f11694b226/e205b8bf48d95902a6dbe1c3cccca272/dotnet-sdk-7.0.202-osx-arm64", ["7.0.15"] = "5bb0e0e4-2a8d-4aba-88ad-232e1f65c281/ee6d35f762d81965b4cf336edde1b318/dotnet-sdk-7.0.405-osx-arm64", - ["8.0.1"] = "ef083c06-7aee-4a4f-b18b-50c9a8990753/e206864e7910e81bbd9cb7e674ff1b4c/dotnet-sdk-8.0.101-osx-arm64" + ["8.0.1"] = "ef083c06-7aee-4a4f-b18b-50c9a8990753/e206864e7910e81bbd9cb7e674ff1b4c/dotnet-sdk-8.0.101-osx-arm64", + ["8.0.6"] = "c503e53c-0567-4604-b7a8-1d6e7a1357f5/53e78f56b01147a092c0cc273b443550/dotnet-sdk-8.0.301-osx-arm64", } set_urls("https://download.visualstudio.microsoft.com/download/pr/$(version).tar.gz", {version = function (version) return versions[tostring(version)] @@ -99,6 +112,7 @@ package("dotnet") add_versions("7.0.4", "7f8201d42d31d6985288d0e31a32aa3b1dff40fceb8cb202993c0b72883bcebb") add_versions("7.0.15", "b1b822bc2e7041f7ed6708ec8a41d417f6fa1c962b051681cf36a91d6929fefa") add_versions("8.0.1", "aa56166e43f19ab9a71bf1203a9028920f2f555d985f8f1fe0ed0fe221b109bd") + add_versions("8.0.6", "86a5a398a4f9c093a43687b93ac4c3a487b44e4193cc7155620a37dbc4476b87") end end From 4ed3376549512507176e4492807f5f537e189888 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 9 Jun 2024 10:34:03 +0800 Subject: [PATCH 092/671] Update tinygltf to v2.8.22 (#4295) --- packages/t/tinygltf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tinygltf/xmake.lua b/packages/t/tinygltf/xmake.lua index 6fcf5f67a..7637458d1 100644 --- a/packages/t/tinygltf/xmake.lua +++ b/packages/t/tinygltf/xmake.lua @@ -6,6 +6,7 @@ package("tinygltf") add_urls("https://github.com/syoyo/tinygltf/archive/refs/tags/$(version).tar.gz", "https://github.com/syoyo/tinygltf.git") + add_versions("v2.8.22", "97c3eb1080c1657cd749d0b49af189c6a867d5af30689c48d5e19521e7b5a070") add_versions("v2.8.21", "e567257d7addde58b0a483832cbaa5dd8f15e5bcaee6f023831e215d1a2c0502") add_versions("v2.5.0", "5d85bd556b60b1b69527189293cfa4902957d67fabb8582b6532f23a5ef27ec1") add_versions("v2.6.3", "f61e4a501baa7fbf31b18ea0f6815a59204ad0de281f7b04f0168f6bbd17c340") From c1e0e2264ae78e0d9d5cd5da5424e731826b12fc Mon Sep 17 00:00:00 2001 From: xiongyang Date: Sun, 9 Jun 2024 10:51:43 +0800 Subject: [PATCH 093/671] add nolzma and nozstd config option for boost.iostreams (#4292) * add nolzma and nozstd config option for boost.iostreams add nolzma and nozstd config default is true which will disable using zstd and xz if set as false it will add_deps xz/zstd then complie boost with the deps * rename nolzma nozstd options rename nolzma to lzma rename nozstd to zstd * fix code style and format * fix code style * Update xmake.lua --------- Co-authored-by: star9029 --- packages/b/boost/xmake.lua | 58 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index a6c51131d..f9bec2737 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -78,6 +78,8 @@ package("boost") for _, libname in ipairs(libnames) do add_configs(libname, { description = "Enable " .. libname .. " library.", default = (libname == "filesystem"), type = "boolean"}) end + add_configs("zstd", {description = "enable zstd for iostreams", default = false, type = "boolean"}) + add_configs("lzma", {description = "enable lzma for iostreams", default = false, type = "boolean"}) on_load(function (package) local function get_linkname(package, libname) @@ -139,6 +141,14 @@ package("boost") end package:add("deps", "python " .. package:config("pyver") .. ".x", {configs = {headeronly = true}}) end + if package:is_plat("linux") then + if package:config("zstd") then + package:add("deps", "zstd") + end + if package:config("lzma") then + package:add("deps", "xz") + end + end end) on_install("macosx", "linux", "windows", "bsd", "mingw", "cross", function (package) @@ -242,9 +252,23 @@ package("boost") end end + local function config_deppath(file, depname, rule) + local dep = package:dep(depname) + local info = dep:fetch({external = false}) + if info then + local usingstr = format("\nusing %s : : \"%s\" \"%s\" ;",rule, info.includedirs[1], info.linkdirs[1]) + file:write(usingstr) + end + end local file = io.open("user-config.jam", "w") if file then file:write(get_compiler(package, build_toolchain)) + if package:config("lzma") then + config_deppath(file, "xz", "lzma") + end + if package:config("zstd") then + config_deppath(file, "zstd", "zstd") + end file:close() end os.vrun("./b2 headers") @@ -260,8 +284,6 @@ package("boost") "-q", -- quit on first error "--layout=tagged-1.66", -- prevent -x64 suffix in case cmake can't find it "--user-config=user-config.jam", - "-sNO_LZMA=1", - "-sNO_ZSTD=1", "install", "threading=" .. (package:config("multi") and "multi" or "single"), "debug-symbols=" .. (package:debug() and "on" or "off"), @@ -270,6 +292,13 @@ package("boost") "runtime-debugging=" .. (package:is_debug() and "on" or "off") } + if not package:config("lzma") then + table.insert(argv, "-sNO_LZMA=1") + end + if not package:config("zstd") then + table.insert(argv, "-sNO_ZSTD=1") + end + if package:config("lto") then table.insert(argv, "lto=on") end @@ -406,4 +435,29 @@ package("boost") } ]]}, {configs = {languages = "c++14"}})) end + + if package:config("iostreams") then + if package:config("zstd") then + assert(package:check_cxxsnippets({test = [[ + #include + #include + static void test() { + boost::iostreams::filtering_ostream out; + out.push(boost::iostreams::zstd_compressor()); + return 0; + } + ]]}, {configs = {languages = "c++14"}})) + end + if package:config("lzma") then + assert(package:check_cxxsnippets({test = [[ + #include + #include + static void test() { + boost::iostreams::filtering_ostream out; + out.push(boost::iostreams::lzma_compressor()); + return 0; + } + ]]}, {configs = {languages = "c++14"}})) + end + end end) From 15bfb2798e68f77c7ec4b84eb952c07ce6256478 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 9 Jun 2024 11:08:18 +0800 Subject: [PATCH 094/671] Update msdfgen to v1.12 (#4298) --- packages/m/msdfgen/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/msdfgen/xmake.lua b/packages/m/msdfgen/xmake.lua index e21619a36..3435ed27f 100644 --- a/packages/m/msdfgen/xmake.lua +++ b/packages/m/msdfgen/xmake.lua @@ -6,6 +6,7 @@ package("msdfgen") add_urls("https://github.com/Chlumsky/msdfgen/archive/refs/tags/$(version).tar.gz", "https://github.com/Chlumsky/msdfgen.git") + add_versions("v1.12", "f058117496097217d12e4ea86adbff8467adaf6f12af793925d243b86b0c4f57") add_versions("v1.11", "fad74e33274f591e72511bc0546189e7aec439f2a512ef1b2fde243554d457cb") add_versions("v1.10", "2754d1687bfb80968d9c682e0c4c04c8fcf72df1421d076baf44ea0d87aa3662") From 5497e4a400db60722b222aa17bdfa5df210584d2 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 9 Jun 2024 11:08:21 +0800 Subject: [PATCH 095/671] Update aws-c-http to v0.8.2 (#4297) --- packages/a/aws-c-http/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-http/xmake.lua b/packages/a/aws-c-http/xmake.lua index fdc075a65..a47788313 100644 --- a/packages/a/aws-c-http/xmake.lua +++ b/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.8.2", "a76ba75e59e1ac169df3ec00c0d1c453db1a4db85ee8acd3282a85ee63d6b31c") add_versions("v0.8.1", "83fb47e2d7956469bb328f16dea96663e96f8f20dc60dc4e9676b82804588530") add_versions("v0.7.12", "0f92f295c96e10aa9c1e66ac73c038ee9d9c61e1be7551e721ee0dab9c89fc6f") From 1238e29dd223b98f38f863e308eb9855a3ee4fbc Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 9 Jun 2024 15:14:11 +0800 Subject: [PATCH 096/671] Create xmake.lua (#4301) --- packages/r/rapidhash/xmake.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/r/rapidhash/xmake.lua diff --git a/packages/r/rapidhash/xmake.lua b/packages/r/rapidhash/xmake.lua new file mode 100644 index 000000000..9458dcb01 --- /dev/null +++ b/packages/r/rapidhash/xmake.lua @@ -0,0 +1,15 @@ +package("rapidhash") + set_kind("library", {headeronly = true}) + set_description("Very fast, high quality, platform independant hashing algorithm.") + set_homepage("https://github.com/Nicoshev/rapidhash") + + add_urls("https://github.com/Nicoshev/rapidhash.git") + add_versions("2024.06.06", "e795829fedad966b627b316183901d2670a40af8") + + on_install(function(package) + os.cp("rapidhash.h", package:installdir("include")) + end) + + on_test(function(package) + assert(package:has_cxxfuncs("rapid_mum", {includes = "rapidhash.h"})) + end) From 8c6e286c51116d3be3f77fa679e0ec65f395b290 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Sun, 9 Jun 2024 21:55:25 +0800 Subject: [PATCH 097/671] Update go to 1.22.4 (#4305) --- packages/g/go/xmake.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/g/go/xmake.lua b/packages/g/go/xmake.lua index c6a1a6fde..cec62f12b 100644 --- a/packages/g/go/xmake.lua +++ b/packages/g/go/xmake.lua @@ -8,33 +8,40 @@ package("go") set_urls("https://go.dev/dl/go$(version).windows-amd64.zip") add_versions("1.17.6", "5bf8f87aec7edfc08e6bc845f1c30dba6de32b863f89ae46553ff4bbcc1d4954") add_versions("1.22.2", "8e581cf330f49d3266e936521a2d8263679ef7e2fc2cbbceb85659122d883596") + add_versions("1.22.4", "26321c4d945a0035d8a5bc4a1965b0df401ff8ceac66ce2daadabf9030419a98") else set_urls("https://go.dev/dl/go$(version).windows-386.zip") add_versions("1.17.6", "3809c4e40482ff047200c8b1e22a43a2c9c79b53ef540668d2b00f7228f093aa") add_versions("1.22.2", "651753c06df037020ef4d162c5b273452e9ba976ed17ae39e66ef7ee89d8147e") + add_versions("1.22.4", "aca4e2c37278a10f1c70dd0df142f7d66b50334fcee48978d409202d308d6d25") end elseif is_host("linux") then if os.arch() == "x86_64" then set_urls("https://go.dev/dl/go$(version).linux-amd64.tar.gz") add_versions("1.17.6", "231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2") add_versions("1.22.2", "5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17") + add_versions("1.22.4", "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d") elseif os.arch() == "i386" then set_urls("https://go.dev/dl/go$(version).linux-386.tar.gz") add_versions("1.17.6", "06c50fb0d44bb03dd4ea8795f9448379c5825d2765307b51f66905084c3ba541") add_versions("1.22.2", "586d9eb7fe0489ab297ad80dd06414997df487c5cf536c490ffeaa8d8f1807a7") + add_versions("1.22.4", "47a2a8d249a91eb8605c33bceec63aedda0441a43eac47b4721e3975ff916cec") elseif os.arch() == "arm64" then set_urls("https://go.dev/dl/go$(version).linux-arm64.tar.gz") add_versions("1.17.6", "82c1a033cce9bc1b47073fd6285233133040f0378439f3c4659fe77cc534622a") add_versions("1.22.2", "36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1") + add_versions("1.22.4", "a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771") end elseif is_host("macosx") then if os.arch() == "x86_64" then set_urls("https://go.dev/dl/go$(version).darwin-amd64.tar.gz") add_versions("1.17.6", "874bc6f95e07697380069a394a21e05576a18d60f4ba178646e1ebed8f8b1f89") add_versions("1.22.2", "33e7f63077b1c5bce4f1ecadd4d990cf229667c40bfb00686990c950911b7ab7") + add_versions("1.22.4", "c95967f50aa4ace34af0c236cbdb49a9a3e80ee2ad09d85775cb4462a5c19ed3") elseif os.arch() == "arm64" then set_urls("https://go.dev/dl/go$(version).darwin-arm64.tar.gz") add_versions("1.22.2", "660298be38648723e783ba0398e90431de1cb288c637880cdb124f39bd977f0d") + add_versions("1.22.4", "242b78dc4c8f3d5435d28a0d2cec9b4c1aa999b601fb8aa59fb4e5a1364bf827") end end @@ -47,5 +54,5 @@ package("go") end) on_test(function (package) - os.vrun("go help") + os.vrun("go env") end) From aa26c290d533484f9233c9db0edfd93761f30347 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sun, 9 Jun 2024 23:04:12 +0800 Subject: [PATCH 098/671] fix workflow windows add_urls arg (#4308) --- packages/w/workflow/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/w/workflow/xmake.lua b/packages/w/workflow/xmake.lua index 60a0e8229..3f87cf9dc 100644 --- a/packages/w/workflow/xmake.lua +++ b/packages/w/workflow/xmake.lua @@ -4,7 +4,8 @@ package("workflow") set_license("Apache-2.0") if is_plat("windows") then - add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version)-win.zip") + add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version)-win.zip", + "https://github.com/sogou/workflow.git") add_versions("v0.10.10", "6758b1d46c4beadfccc88d3e9492bb99cfad26e643c141749aec790907092417") else add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz", From b68044e44362beb0dec1a60dc79f792ad766f378 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sun, 9 Jun 2024 23:04:28 +0800 Subject: [PATCH 099/671] Update iguana to 1.0.5 (#4306) --- packages/i/iguana/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/iguana/xmake.lua b/packages/i/iguana/xmake.lua index 355d9f20c..f28fb6a3b 100644 --- a/packages/i/iguana/xmake.lua +++ b/packages/i/iguana/xmake.lua @@ -7,6 +7,7 @@ package("iguana") add_urls("https://github.com/qicosmos/iguana/archive/refs/tags/$(version).tar.gz", "https://github.com/qicosmos/iguana.git") + add_versions("1.0.5", "b7a7385c49574a60f9f6bf887c1addbc08f557a0117bf18cf7eec532ac2536b1") add_versions("1.0.4", "b584cd26e65902a14a3a349ebc480beb7b4502fd5a5ffa3cb7c6102d857958b1") add_versions("v1.0.3", "7dcb21a36bd64a63a9ea857f3563ac61e965c49ec60ad7b99a2bfb9192f3e4c3") From fad473758c75643c1a3bce614683cf1adc68859b Mon Sep 17 00:00:00 2001 From: xiongyang Date: Mon, 10 Jun 2024 00:09:23 +0800 Subject: [PATCH 100/671] remove void test return statement (#4309) --- packages/b/boost/xmake.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index f9bec2737..daa1b7e79 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -444,7 +444,6 @@ package("boost") static void test() { boost::iostreams::filtering_ostream out; out.push(boost::iostreams::zstd_compressor()); - return 0; } ]]}, {configs = {languages = "c++14"}})) end @@ -455,7 +454,6 @@ package("boost") static void test() { boost::iostreams::filtering_ostream out; out.push(boost::iostreams::lzma_compressor()); - return 0; } ]]}, {configs = {languages = "c++14"}})) end From a8ebff45e7df70daefb48ef8da8f6281962be881 Mon Sep 17 00:00:00 2001 From: fasiondog Date: Mon, 10 Jun 2024 09:30:45 +0800 Subject: [PATCH 101/671] upgrade flatbuffuers to 24.3.25 (#4312) * update cpp-httplib version, add macro definition at load time * No upgrade 0.14.0 * upgrade flatbuffers to v23.5.26 * upgrade pybind11 to 2.11.1 * add flatbuffers 24.3.25 --- packages/f/flatbuffers/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/flatbuffers/xmake.lua b/packages/f/flatbuffers/xmake.lua index fa57002ea..aa7ca19f8 100644 --- a/packages/f/flatbuffers/xmake.lua +++ b/packages/f/flatbuffers/xmake.lua @@ -10,6 +10,7 @@ package("flatbuffers") add_versions("v2.0.0", "ffd68aebdfb300c9e82582ea38bf4aa9ce65c77344c94d5047f3be754cc756ea") add_versions("v23.1.21", "48597d6a6f8ca67a02ae8d8494b3bfc9136eb93da60a538d5bfc024f7c564f97") add_versions("v23.5.26", "57bd580c0772fd1a726c34ab8bf05325293bc5f9c165060a898afa1feeeb95e1") + add_versions("v24.3.25", "e706f5eb6ca8f78e237bf3f7eccffa1c5ec9a96d3c1c938f08dc09aab1884528") add_deps("cmake") on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", "cross", function(package) From 1ff1c79a9071541a729b80a5c9a0db1a70ac8135 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 10 Jun 2024 09:56:09 +0800 Subject: [PATCH 102/671] Update expected-lite to v0.8.0 (#4315) --- packages/e/expected-lite/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/expected-lite/xmake.lua b/packages/e/expected-lite/xmake.lua index 4bf22dddd..03306fe33 100644 --- a/packages/e/expected-lite/xmake.lua +++ b/packages/e/expected-lite/xmake.lua @@ -7,6 +7,7 @@ package("expected-lite") add_urls("https://github.com/martinmoene/expected-lite/archive/refs/tags/$(version).tar.gz", "https://github.com/martinmoene/expected-lite.git") + add_versions("v0.8.0", "27649f30bd9d4fe7b193ab3eb6f78c64d0f585c24c085f340b4722b3d0b5e701") add_versions("v0.6.3", "b2f90d5f03f6423ec67cc3c06fd0c4e813ec10c4313062b875b37d17593b57b4") on_install(function (package) From 57064833edebae8e46dbc68ea487cb4cdbd4ea9c Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 10 Jun 2024 09:56:11 +0800 Subject: [PATCH 103/671] Update s2n-tls to v1.4.16 (#4314) --- packages/s/s2n-tls/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/s2n-tls/xmake.lua b/packages/s/s2n-tls/xmake.lua index 54f20bb67..fc9d6b702 100644 --- a/packages/s/s2n-tls/xmake.lua +++ b/packages/s/s2n-tls/xmake.lua @@ -6,6 +6,7 @@ package("s2n-tls") add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/s2n-tls.git") + add_versions("v1.4.16", "84fdbaa894c722bf13cac87b8579f494c1c2d66de642e5e6104638fddea76ad9") add_versions("v1.4.14", "90cd0b7b1e5ebc7e40ba5f810cc24a4d604aa534fac7260dee19a35678e38659") add_versions("v1.4.12", "d0769f27eb9e6b8fc98d3e8e3eb87ed71e10b08fade87893b293878d84faaceb") add_versions("v1.4.3", "e42551bdf6595f718e232eb98c4f0e37c7a284f29bfcbc09fa9c0a2145754ab9") From 0f354efc8d292c611a38e7eb5d4a402fc88c752d Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 10 Jun 2024 09:56:14 +0800 Subject: [PATCH 104/671] Update pdfhummus to v4.6.4 (#4313) --- packages/p/pdfhummus/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pdfhummus/xmake.lua b/packages/p/pdfhummus/xmake.lua index cde77230a..6187da7b2 100644 --- a/packages/p/pdfhummus/xmake.lua +++ b/packages/p/pdfhummus/xmake.lua @@ -6,6 +6,7 @@ package("pdfhummus") add_urls("https://github.com/galkahana/PDF-Writer/archive/refs/tags/$(version).tar.gz", "https://github.com/galkahana/PDF-Writer/archive/refs/tags/v$(version).tar.gz", "https://github.com/galkahana/PDF-Writer.git") + add_versions("v4.6.4", "93b5f1dc88fd67fdebde409e927e828dfbae02efa44936e89728622411c6a047") add_versions("v4.6.3", "3b5d9ba4b49d0380678e8172f27cdb8eda196ea448e7f1cdd79620066d082ab9") add_versions("v4.6.2", "0a36815ccc9d207028567f90039785c824b211169ba5da68de84d0c15455ab62") add_versions("v4.6.1", "6e95fcb26ec679fa12ce6638d35a591e80960b35956a142d9a80b9a8c80ca824") From c0bbd88db03872a947cef8865cc25a663bf8c45a Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 10 Jun 2024 14:53:59 +0800 Subject: [PATCH 105/671] Auto-update sqlcipher to 4.6.0 (#4258) * Update sqlcipher to 4.6.0 * Update xmake.lua * Update xmake.lua --------- Co-authored-by: c8ef --- packages/s/sqlcipher/xmake.lua | 3 ++- packages/t/tclsh/xmake.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/s/sqlcipher/xmake.lua b/packages/s/sqlcipher/xmake.lua index a524b5fec..deb3f44a4 100644 --- a/packages/s/sqlcipher/xmake.lua +++ b/packages/s/sqlcipher/xmake.lua @@ -4,6 +4,7 @@ package("sqlcipher") set_description("SQLCipher is a standalone fork of the SQLite database library that adds 256 bit AES encryption of database files and other security features") set_urls("https://github.com/sqlcipher/sqlcipher/archive/refs/tags/v$(version).tar.gz") + add_versions("4.6.0", "879fb030c36bc5138029af6aa3ae3f36c28c58e920af05ac7ca78a5915b2fa3c") add_versions("4.5.3", "5c9d672eba6be4d05a9a8170f70170e537ae735a09c3de444a8ad629b595d5e2") add_configs("encrypt", { description = "enable encrypt", default = true, type = "boolean"}) @@ -77,7 +78,7 @@ package("sqlcipher") os.cp("sqlite3ext.h", package:installdir("include")) end) - on_install("linux", "macosx", "android", "iphoneos", "cross", function (package) + on_install("linux", "macosx", "iphoneos", "cross", function (package) os.vrunv("./configure", {"--with-crypto-lib=none"}) import("package.tools.make").build(package, {"sqlite3.c"}) local configs = {} diff --git a/packages/t/tclsh/xmake.lua b/packages/t/tclsh/xmake.lua index 7daac2971..d8ff0a6e2 100644 --- a/packages/t/tclsh/xmake.lua +++ b/packages/t/tclsh/xmake.lua @@ -4,7 +4,7 @@ package("tclsh") set_description("The Tcl Core. (Mirror of core.tcl-lang.org) ") add_urls("https://github.com/tcltk/tcl.git") - add_versions("2023.03.14", "69fe4c9e803e72ef654111cbbf3ce184e63989d4") + add_versions("2024.06.07", "6accaa2544857f45554541a83fb4ef4cefa263d0") on_install("linux", "macosx", function (package) local configs = {} From 7bb44dd1beea4f94ffa892020c8f6117deff9b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 10 Jun 2024 13:08:27 +0200 Subject: [PATCH 106/671] libxml2: Add FreeBSD support (#4318) * libxml2: Add FreeBSD support * Update xmake.lua * Update xmake.lua --- packages/l/libxml2/xmake.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/l/libxml2/xmake.lua b/packages/l/libxml2/xmake.lua index 75c2e7896..87021ff88 100644 --- a/packages/l/libxml2/xmake.lua +++ b/packages/l/libxml2/xmake.lua @@ -1,5 +1,4 @@ package("libxml2") - set_homepage("http://xmlsoft.org/") set_description("The XML C parser and toolkit of Gnome.") set_license("MIT") @@ -22,7 +21,7 @@ package("libxml2") add_syslinks("m") end - on_load("windows", "macosx", "linux", "iphoneos", "android", function (package) + on_load("windows", "macosx", "linux", "iphoneos", "android", "bsd", function (package) if package:is_plat("windows") then if not package:config("shared") then package:add("defines", "LIBXML_STATIC") @@ -89,7 +88,7 @@ package("libxml2") end end) - on_install("macosx", "linux", "iphoneos", "android", function (package) + on_install("macosx", "linux", "iphoneos", "android@!windows", "bsd", function (package) import("package.tools.autoconf") local configs = {"--disable-dependency-tracking", "--without-lzma", From dac0fef1234fce02ec7eef13a7dcf74a3b620989 Mon Sep 17 00:00:00 2001 From: Altina Orion <139891033+Altina-oz@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:12:04 +0800 Subject: [PATCH 107/671] Update fetch.lua (#4316) replace \\ with / for linux compatibility --- packages/m/mkl/fetch.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/m/mkl/fetch.lua b/packages/m/mkl/fetch.lua index 41987c14e..40cfd73b4 100644 --- a/packages/m/mkl/fetch.lua +++ b/packages/m/mkl/fetch.lua @@ -6,7 +6,7 @@ function _find_package(package, opt) local suffix = (package:config("interface") == 32 and "lp64" or "ilp64") local paths = { "$(env MKL_ROOT)", - "$(env ONEAPI_ROOT)\\mkl\\latest" + "$(env ONEAPI_ROOT)/mkl/latest" } -- find library From e3ea284a14edde138097773cc25aba04d742087b Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:46:46 +0800 Subject: [PATCH 108/671] remove `*_static` option for `gdal` (#4320) --- packages/g/gdal/xmake.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 586fe9641..9a08a920c 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -11,7 +11,6 @@ package("gdal") add_deps("cmake") add_configs("apps", {description = "Build GDAL applications.", default = false, type = "boolean"}) add_configs("curl", {description = "Use CURL.", default = false, type = "boolean"}) - add_configs("curl_static", {description = "Use static build of CURL.", default = false, type = "boolean"}) add_configs("geos", {description = "Use GEOS.", default = false, type = "boolean"}) add_configs("gif", {description = "Use GIF.", default = false, type = "boolean"}) add_configs("iconv", {description = "Use Iconv.", default = false, type = "boolean"}) @@ -31,7 +30,6 @@ package("gdal") local configdeps = { curl = "libcurl", - curl_static = "libcurl", geos = "geos", gif = "giflib", iconv = "libiconv", @@ -45,11 +43,7 @@ package("gdal") for name, dep in pairs(configdeps) do if package:config(name) then - if name:match('^(.*)_static$') then - package:add("deps", dep, {configs = {shared = false}}) - else - package:add("deps", dep) - end + package:add("deps", dep) end end end) @@ -65,11 +59,11 @@ package("gdal") table.insert(configs, "-DBUILD_APPS=" .. (package:config("apps") and "ON" or "OFF")) local packagedeps = {"proj"} - if package:config("curl") or package:config("curl_static") then + if package:config("curl") then table.insert(packagedeps, "libcurl") table.insert(configs, "-DGDAL_USE_CURL=ON") - if package:config("curl_static") then + if not package:dep("libcurl"):config("shared") then table.insert(configs, "-DCURL_USE_STATIC_LIBS=ON") end end From dd4c8c569e61087fd86dc1f31c86d1554a65b08f Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 11 Jun 2024 08:53:27 +0800 Subject: [PATCH 109/671] verdict: add package (#4325) --- packages/v/verdict/xmake.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/v/verdict/xmake.lua diff --git a/packages/v/verdict/xmake.lua b/packages/v/verdict/xmake.lua new file mode 100644 index 000000000..c166f83db --- /dev/null +++ b/packages/v/verdict/xmake.lua @@ -0,0 +1,30 @@ +package("verdict") + set_homepage("https://github.com/sandialabs/verdict") + set_description("Compute quality functions of 2 and 3-dimensional regions.") + + add_urls("https://github.com/sandialabs/verdict/archive/refs/tags/$(version).tar.gz", + "https://github.com/sandialabs/verdict.git") + + add_versions("1.4.2", "225c8c5318f4b02e7215cefa61b5dc3f99e05147ad3fefe6ee5a3ee5b828964b") + + add_deps("cmake") + + on_install(function (package) + local configs = {"-DVERDICT_ENABLE_TESTING=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if package:config("shared") then + package:add("defines", "VERDICT_SHARED_LIB") + end + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + double coordinates[3][3]; + verdict::hex_edge_ratio(3, coordinates); + } + ]]}, {configs = {languages = "c++11"}})) + end) From ae4240f7d097bb35a3b3ffc1a8e7a22bf6d21558 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 11 Jun 2024 08:53:46 +0800 Subject: [PATCH 110/671] libuv: enable all platform (#4303) * libuv: enable all platform * use cmake * disable wasm * patch mingw on msys2 --- packages/l/libuv/xmake.lua | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/l/libuv/xmake.lua b/packages/l/libuv/xmake.lua index 7b732675c..680a2619f 100644 --- a/packages/l/libuv/xmake.lua +++ b/packages/l/libuv/xmake.lua @@ -1,11 +1,11 @@ package("libuv") - set_homepage("http://libuv.org/") set_description("A multi-platform support library with a focus on asynchronous I/O.") set_license("MIT") set_urls("https://github.com/libuv/libuv/archive/refs/tags/$(version).zip", "https://github.com/libuv/libuv.git") + add_versions("v1.46.0", "45953dc9b64db7f4f47561f9e4543b762c52adfe7c9b6f8e9efbc3b4dd7d3081") add_versions("v1.44.1", "d233a9c522a9f4afec47b0d12f302d93d114a9e3ea104150e65f55fd931518e6") add_versions("v1.42.0", "031130768b25ae18c4b9d4a94ba7734e2072b11c6fce3e554612c516c3241402") @@ -22,60 +22,60 @@ package("libuv") add_versions("v1.23.0", "ffa1aacc9e8374b01d1ff374b1e8f1e7d92431895d18f8e9d5e59a69a2a00c30") add_versions("v1.22.0", "1e8e51531732f8ef5867ae3a40370814ce2e4e627537e83ca519d40b424dced0") - if is_host("windows") then - add_deps("cmake") - else - add_deps("autoconf", "automake", "libtool", "pkg-config") - end - if is_plat("macosx", "iphoneos") then add_frameworks("CoreFoundation") - elseif is_plat("linux") then + elseif is_plat("linux", "bsd") then add_syslinks("pthread", "dl") elseif is_plat("windows", "mingw") then add_syslinks("advapi32", "iphlpapi", "psapi", "user32", "userenv", "ws2_32", "shell32", "ole32", "uuid", "dbghelp") end - on_load("windows", function (package) + on_load(function (package) local version = package:version() - if version:ge("1.45") then - package:add("links", package:config("shared") and "uv" or "libuv") + if version:ge("1.46.0") or is_host("windows") then + package:add("deps", "cmake") else - package:add("links", package:config("shared") and "uv" or "uv_a") - end - if package:config("shared") then - package:add("defines", "USING_UV_SHARED") + package:add("autoconf", "automake", "libtool", "pkg-config") end - if version:ge("1.40") and version:lt("1.44") then - package:add("linkdirs", path.join("lib", package:debug() and "Debug" or "Release")) + + if package:is_plat("windows") then + if version:ge("1.45") then + package:add("links", package:config("shared") and "uv" or "libuv") + else + package:add("links", package:config("shared") and "uv" or "uv_a") + end + if package:config("shared") then + package:add("defines", "USING_UV_SHARED") + end + if version:ge("1.40") and version:lt("1.44") then + package:add("linkdirs", path.join("lib", package:is_debug() and "Debug" or "Release")) + end end end) - on_install("windows", function (package) - local configs = {"-DLIBUV_BUILD_TESTS=OFF", "-DLIBUV_BUILD_BENCH=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DLIBUV_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) - import("package.tools.cmake").install(package, configs) - if package:version():lt("1.40") then - os.cp("include", package:installdir()) + on_install("!wasm", function (package) + if package:is_plat("mingw") then + io.replace("CMakeLists.txt", "CYGWIN OR MSYS", "FALSE", {plain = true}) end - end) - on_install("macosx", "linux", "android@linux,macosx", "mingw@linux,macosx", function (package) - local configs = {} - if package:config("shared") then - table.insert(configs, "--enable-shared=yes") + local version = package:version() + if version:ge("1.46.0") or is_host("windows") then + local configs = {"-DLIBUV_BUILD_TESTS=OFF", "-DLIBUV_BUILD_BENCH=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DLIBUV_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if version:lt("1.40") then + os.cp("include", package:installdir()) + end else - table.insert(configs, "--enable-shared=no") - end - if package:config("pic") ~= false then - table.insert(configs, "--with-pic") - end - if package:is_plat("iphoneos") and package:version():ge("1.40") and package:version():lt("1.44") then - -- fix CoreFoundation type definition - io.replace("src/unix/darwin.c", "!TARGET_OS_IPHONE", "1", {plain = true}) + local configs = {} + table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) + if package:is_plat("iphoneos") and version:ge("1.40") and version:lt("1.44") then + -- fix CoreFoundation type definition + io.replace("src/unix/darwin.c", "!TARGET_OS_IPHONE", "1", {plain = true}) + end + import("package.tools.autoconf").install(package, configs) end - import("package.tools.autoconf").install(package, configs) end) on_test(function (package) From 5a31cde15d3dcbc5686379927420ddf114ff1b0e Mon Sep 17 00:00:00 2001 From: Artem Dzhemesiuk Date: Tue, 11 Jun 2024 02:54:33 +0200 Subject: [PATCH 111/671] Add cpp-async package (#4323) * cpp-async: add package * Update xmake.lua * add check --------- Co-authored-by: star9029 --- packages/c/cpp-async/xmake.lua | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/c/cpp-async/xmake.lua diff --git a/packages/c/cpp-async/xmake.lua b/packages/c/cpp-async/xmake.lua new file mode 100644 index 000000000..c4c99a83d --- /dev/null +++ b/packages/c/cpp-async/xmake.lua @@ -0,0 +1,29 @@ +package("cpp-async") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/microsoft/cpp-async") + set_description("Support types and functions for C++20 coroutines") + set_license("MIT") + + add_urls("https://github.com/microsoft/cpp-async/archive/refs/tags/$(version).tar.gz", + "https://github.com/microsoft/cpp-async.git") + + add_versions("v1.1.0", "168681dfd999b7546d623f20d18072ce280502cf0bf3a829c2aec58741062a23") + + on_check(function (package) + assert(package:has_cxxincludes("coroutine", {configs = {languages = "c++20"}}), "package(cpp-async) Require at least C++20.") + end) + + on_install(function (package) + os.cp("include/async", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + #include + inline async::task do_async() + { + co_return; + } + ]]}, {configs = {languages = "c++20"}})) + end) From 141469c2ae90b4f59e272ff8f675f1f12883f76f Mon Sep 17 00:00:00 2001 From: fasiondog Date: Tue, 11 Jun 2024 09:07:46 +0800 Subject: [PATCH 112/671] upgrade nng to 1.8.0 (#4326) * update cpp-httplib version, add macro definition at load time * No upgrade 0.14.0 * upgrade flatbuffers to v23.5.26 * upgrade pybind11 to 2.11.1 * add flatbuffers 24.3.25 * upgrade nng to 1.8.0 --- packages/n/nng/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/nng/xmake.lua b/packages/n/nng/xmake.lua index 64648c600..d479aa10c 100644 --- a/packages/n/nng/xmake.lua +++ b/packages/n/nng/xmake.lua @@ -4,6 +4,7 @@ package("nng") set_description("NNG, like its predecessors nanomsg (and to some extent ZeroMQ), is a lightweight, broker-less library, offering a simple API to solve common recurring messaging problems.") add_urls("https://github.com/nanomsg/nng/archive/v$(version).zip") + add_versions("1.8.0", "48effcfd1acf31f6afcb1a92ecb4aa87f7993f5c54bf6587b0f4fb2606ce96d3") add_versions("1.7.3", "72b39c63ba6467f6ee70c218c291240ff5b189569c3b84e8e0647f5d4d3888ea") add_versions("1.5.2", "652ff3a2dbaeae194942205c369e9259e2b5cb5985d679d744cbfb95d1c807a3") add_versions("1.4.0", "43674bb15d0f3810cf3602d2662cc91b6576b914492710244125e32b29f546b8") From 51347e95cbd824e7ebbc3943e5e5c5f1cfd1743c Mon Sep 17 00:00:00 2001 From: Altina Orion <139891033+Altina-oz@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:14:44 +0800 Subject: [PATCH 113/671] Update TBB fetch.lua (#4317) * Update fetch.lua replace \\ with / for Linux path compatibility * Update fetch.lua * change outdated "intel64" flag to "x86_64" * Update fetch.lua --------- Co-authored-by: ruki --- packages/t/tbb/fetch.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/t/tbb/fetch.lua b/packages/t/tbb/fetch.lua index 3f4418432..ab0135bc9 100644 --- a/packages/t/tbb/fetch.lua +++ b/packages/t/tbb/fetch.lua @@ -1,11 +1,11 @@ import("lib.detect.find_path") import("lib.detect.find_library") -function _find_package_on_windows(package, opt) - local rdir = (package:is_arch("x64") and "intel64" or "ia32") +function _find_package(package, opt) + local rdir = (package:is_arch("x64", "x86_64") and "intel64" or "ia32") local paths = { "$(env TBB_ROOT)", - "$(env ONEAPI_ROOT)\\tbb\\latest" + "$(env ONEAPI_ROOT)/tbb/latest" } -- find includes and links @@ -22,7 +22,6 @@ function _find_package_on_windows(package, opt) if incpath then table.insert(result.includedirs, incpath) end - if #result.includedirs > 0 and #result.linkdirs > 0 then local version_file = path.join(incpath, "oneapi", "tbb", "version.h") if not os.isfile(version_file) then @@ -47,9 +46,8 @@ end function main(package, opt) if opt.system and package.find_package then local result - if package:is_plat("windows") then - result = _find_package_on_windows(package, opt) - end + result = _find_package(package, opt) + if not result then result = package:find_package("tbb", opt) end From e9e06e91591701e8aa652a4f5cb0eee506291c87 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 11 Jun 2024 09:54:15 +0800 Subject: [PATCH 114/671] Update meson to 1.4.1 (#4328) --- packages/m/meson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/meson/xmake.lua b/packages/m/meson/xmake.lua index 7998c12d8..f3d00c4f4 100644 --- a/packages/m/meson/xmake.lua +++ b/packages/m/meson/xmake.lua @@ -6,6 +6,7 @@ package("meson") add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz", "https://github.com/mesonbuild/meson.git") + add_versions("1.4.1", "1b8aad738a5f6ae64294cc8eaba9a82988c1c420204484ac02ef782e5bba5f49") add_versions("1.4.0", "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d") add_versions("1.3.2", "492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa") add_versions("1.3.1", "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7") From b8fe8398a417637df1424e02e91af596a3a64663 Mon Sep 17 00:00:00 2001 From: Altina Orion <139891033+Altina-oz@users.noreply.github.com> Date: Tue, 11 Jun 2024 13:46:29 +0800 Subject: [PATCH 115/671] onedpl add fetch.lua (#4324) * Update onedpl xmake.lua * Create fetch.lua * Update xmake.lua rc1 * Update xmake.lua /* MACROS DUE TO https://github.com/llvm/llvm-project/commit/3b9a1bb1af90db9472340ef2122d3855eb9ba3fc#diff-4c6821476cefc699b801f5fdbeda3341e3c64626dcf39a79621ea02031bdd50eL113 */ /* ALSO C.F. https://github.com/oneapi-src/oneDPL/issues/1602 */ /* AND THE USING OF _PSTL_... MACROS IS REMOVED FROM ONEDPL NOWADAYS*/ * Update xmake.lua typo * Update xmake.lua * bad ci ; try again ci on arch linux failed due to network error * Update xmake.lua * Refine config * refine fetch.lua remove unnecessary add_deps * Update xmake.lua * minor formatting refinement --- packages/o/onedpl/fetch.lua | 44 +++++++++++++++++++++++++++++++++++++ packages/o/onedpl/xmake.lua | 24 +++++++++++++++++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 packages/o/onedpl/fetch.lua diff --git a/packages/o/onedpl/fetch.lua b/packages/o/onedpl/fetch.lua new file mode 100644 index 000000000..7579d4b13 --- /dev/null +++ b/packages/o/onedpl/fetch.lua @@ -0,0 +1,44 @@ +import("lib.detect.find_path") +import("lib.detect.find_library") + +function _find_package(package, opt) + local paths = { + "$(env DPL_ROOT)", + "$(env ONEAPI_ROOT)/dpl/latest" + } + -- find library + local result = {links = {}, linkdirs = {}, includedirs = {}} + + -- find include + local includepath = find_path(path.join("oneapi", "dpl", "algorithm"), paths, {suffixes = "include"}) + if includepath then + table.insert(result.includedirs, includepath) + end + + if #result.includedirs > 0 then + local version_file = path.join(includepath, "oneapi", "dpl", "pstl", "onedpl_config.h") + if os.isfile(version_file) then + local content = io.readfile(version_file) + local major = content:match("ONEDPL_VERSION_MAJOR +(%d+)\n") + local minor = content:match("ONEDPL_VERSION_MINOR +(%d+)\n") + local patch = content:match("ONEDPL_VERSION_PATCH +(%d+)\n") + if patch then + result.version = format("%s.%s.%s", major, minor, patch) + else + result.version = format("%s.%s", major, minor) + end + end + + return result + end +end + +function main(package, opt) + if opt.system and package.find_package then + local result = _find_package(package, opt) + if not result then + result = package:find_package("onedpl", opt) + end + return result or false + end +end diff --git a/packages/o/onedpl/xmake.lua b/packages/o/onedpl/xmake.lua index 101141f53..928d91fa9 100644 --- a/packages/o/onedpl/xmake.lua +++ b/packages/o/onedpl/xmake.lua @@ -4,18 +4,37 @@ package("onedpl") set_homepage("https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-library.html") set_description("oneAPI DPC++ Library") + add_urls("https://github.com/oneapi-src/oneDPL/archive/refs/tags/oneDPL-$(version).tar.gz") add_urls("https://github.com/oneapi-src/oneDPL/archive/refs/tags/oneDPL-$(version)-release.tar.gz") add_versions("2021.6.1", "4995fe2ed2724b89cdb52c4b6c9af22e146b48d2561abdafdaaa06262dbd67c4") + add_versions("2022.5.0-rc1", "9180c60331ec5b307dd89a5d8bfcd096667985c6761c52322405d4b69193ed88") add_configs("backend", {description = "Choose threading backend.", default = "tbb", type = "string", values = {"tbb", "dpcpp", "dpcpp_only", "omp", "serial"}}) add_deps("cmake") + + on_fetch("fetch") on_load("windows", "linux", function (package) local backend = package:config("backend") - if backend == "tbb" or backend == "dpcpp" then + if backend == "tbb" then package:add("deps", "tbb") + package:add("defines", "ONEDPL_USE_TBB_BACKEND=1") + package:add("ldflags", "-ltbb") elseif backend == "omp" then package:add("deps", "openmp") + package:add("defines", "ONEDPL_USE_OPENMP_BACKEND=1") + elseif backend == "dpcpp" then + package:add("deps", "tbb") + package:add("ldflags", "-ltbb") + package:add("defines", "ONEDPL_USE_TBB_BACKEND=1") + package:add("defines", "ONEDPL_USE_DPCPP_BACKEND=1") + elseif backend == "dpcpp_only" then + package:add("defines", "ONEDPL_USE_TBB_BACKEND=0") + package:add("defines", "ONEDPL_USE_DPCPP_BACKEND=1") + elseif backend == "serial" then + package:add("defines", "ONEDPL_USE_OPENMP_BACKEND=0") + package:add("defines", "ONEDPL_USE_TBB_BACKEND=0") + package:add("defines", "ONEDPL_USE_DPCPP_BACKEND=0") end if package:is_plat("windows") then package:add("cxxflags", "/Zc:__cplusplus") @@ -24,6 +43,9 @@ package("onedpl") on_install("windows", "linux", function (package) io.replace("CMakeLists.txt", "add_subdirectory(test)", "", {plain = true}) + -- c.f. https://github.com/oneapi-src/oneDPL/issues/1602 and https://github.com/oneapi-src/oneDPL/commit/e25afef957b50536c5091ed23150fff10921b18f + io.replace("include/oneapi/dpl/pstl/algorithm_impl.h", "(_PSTL_UDR_PRESENT || _ONEDPL_UDR_PRESENT)", "_ONEDPL_UDR_PRESENT // _PSTL_UDR_PRESENT", {plain = true}) + io.replace("include/oneapi/dpl/pstl/numeric_impl.h", "(_PSTL_UDS_PRESENT || _ONEDPL_UDS_PRESENT)", "_ONEDPL_UDS_PRESENT // PSTL_UDS_PRESENT", {plain = true}) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DONEDPL_BACKEND=" .. package:config("backend")) From ebe5eef40b5bc8407aba92ea3162e276c8bec34c Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 11 Jun 2024 13:46:44 +0800 Subject: [PATCH 116/671] Update jsoncons to 0.176.0 (#4329) --- packages/j/jsoncons/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/j/jsoncons/xmake.lua b/packages/j/jsoncons/xmake.lua index 044033dc5..e9d9ad6cc 100644 --- a/packages/j/jsoncons/xmake.lua +++ b/packages/j/jsoncons/xmake.lua @@ -7,8 +7,9 @@ package("jsoncons") set_urls("https://github.com/danielaparker/jsoncons/archive/$(version).zip", "https://github.com/danielaparker/jsoncons.git") - add_versions("v0.158.0", "7ad7cc0e9c74df495dd16b818758ec2e2a5b7fef8f1852841087fd5e8bb6a6cb") + add_versions("v0.176.0", "71a618219b62a2bbcc46efac98696574581e343cd98ef33e5e1bd8db182005d9") add_versions("v0.170.2", "81ac768eecb8cf2613a09a9d081294895d7afd294b841166b4e1378f0acfdd6e") + add_versions("v0.158.0", "7ad7cc0e9c74df495dd16b818758ec2e2a5b7fef8f1852841087fd5e8bb6a6cb") on_install(function (package) os.cp("include", package:installdir()) From b83d4f9214f9160e04aaebe6e2ae0cf7d610b34e Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:44:12 +0200 Subject: [PATCH 117/671] vulkan-memory-allocator: support bsd (#4332) --- packages/v/vulkan-memory-allocator/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/v/vulkan-memory-allocator/xmake.lua b/packages/v/vulkan-memory-allocator/xmake.lua index 4ba51c1e8..c22bd95f6 100644 --- a/packages/v/vulkan-memory-allocator/xmake.lua +++ b/packages/v/vulkan-memory-allocator/xmake.lua @@ -11,7 +11,7 @@ package("vulkan-memory-allocator") add_deps("vulkan-headers") - on_install("windows", "linux", "mingw", "macosx", "iphoneos", "android", function (package) + on_install("windows", "linux", "mingw", "macosx", "iphoneos", "android", "bsd", function (package) os.cp("include/vk_mem_alloc.h", package:installdir("include")) end) From 07a84e8b5dcae8db8f557e9807b1bccb4b0b76f2 Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:57:56 +0200 Subject: [PATCH 118/671] chipmunk2d: support bsd (#4327) --- packages/c/chipmunk2d/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/c/chipmunk2d/xmake.lua b/packages/c/chipmunk2d/xmake.lua index ced073b5e..3298aaa35 100644 --- a/packages/c/chipmunk2d/xmake.lua +++ b/packages/c/chipmunk2d/xmake.lua @@ -24,6 +24,8 @@ package("chipmunk2d") if is_plat("linux") then add_syslinks("pthread", "m") + elseif is_plat("bsd") then + add_syslinks("pthread", "m") elseif is_plat("android") then add_syslinks("log", "m") end @@ -42,7 +44,7 @@ package("chipmunk2d") end end) - on_install("windows", "linux", "macosx", "iphoneos", "mingw", "android", "wasm", function (package) + on_install("windows", "linux", "macosx", "iphoneos", "mingw", "android", "wasm", "bsd",function (package) local configs = {"-DBUILD_DEMOS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) if package:config("shared") then From 0c7b81b46cf052bb7a18a11cd4f3a6cf9c279353 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Tue, 11 Jun 2024 17:30:44 +0800 Subject: [PATCH 119/671] update VulkanMemoryAllocator to v3.1.0 (#4334) --- packages/v/vulkan-memory-allocator/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vulkan-memory-allocator/xmake.lua b/packages/v/vulkan-memory-allocator/xmake.lua index c22bd95f6..a976c2bfb 100644 --- a/packages/v/vulkan-memory-allocator/xmake.lua +++ b/packages/v/vulkan-memory-allocator/xmake.lua @@ -8,6 +8,7 @@ package("vulkan-memory-allocator") "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git") add_versions("v3.0.0", 'dbb621a7a13fb70b8c34fef62fbe5128cc5193c7179c9edacead9f110df79a2f') add_versions("v3.0.1", '2a84762b2d10bf540b9dc1802a198aca8ad1f3d795a4ae144212c595696a360c') + add_versions("v3.1.0", 'ae134ecc37c55634f108e926f85d5d887b670360e77cd107affaf3a9539595f2') add_deps("vulkan-headers") From 81fbc1ca40cd028d19c6ffb705c40b7855cb3df8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 11 Jun 2024 22:05:57 +0800 Subject: [PATCH 120/671] chipmunk2d: improve syslinks --- packages/c/chipmunk2d/xmake.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/c/chipmunk2d/xmake.lua b/packages/c/chipmunk2d/xmake.lua index 3298aaa35..01769a76d 100644 --- a/packages/c/chipmunk2d/xmake.lua +++ b/packages/c/chipmunk2d/xmake.lua @@ -22,9 +22,7 @@ package("chipmunk2d") add_deps("cmake") - if is_plat("linux") then - add_syslinks("pthread", "m") - elseif is_plat("bsd") then + if is_plat("linux", "bsd") then add_syslinks("pthread", "m") elseif is_plat("android") then add_syslinks("log", "m") From c539dd9522ef9fb818f9f56dc8f47292b77fd39a Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:08:05 +0800 Subject: [PATCH 121/671] update ormpp to 0.1.3 (#4319) * update ormcpp to 0.1.3 * add check * Update xmake.lua --------- Co-authored-by: star9029 --- packages/o/ormpp/xmake.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/o/ormpp/xmake.lua b/packages/o/ormpp/xmake.lua index 2841cd47d..89fa98edf 100644 --- a/packages/o/ormpp/xmake.lua +++ b/packages/o/ormpp/xmake.lua @@ -1,5 +1,4 @@ package("ormpp") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/qicosmos/ormpp") set_description("modern C++ ORM, C++17, support mysql, postgresql,sqlite") @@ -8,6 +7,7 @@ package("ormpp") set_urls("https://github.com/qicosmos/ormpp/archive/refs/tags/$(version).tar.gz", "https://github.com/qicosmos/ormpp.git") + add_versions("0.1.3", "671f2f19965d630d7147f94dd12f4212a9cce58c5455f892f321f2243acb8ea4") add_versions("v0.1.2", "990e88eb176d996cdbbbdfa3e1522b48d135d809f14094771f8d6f02e94573c4") add_versions("v0.1.1", "a3c93599950a4c5822ebd0750ac7964c59c9b3f84f638525f01578bac6d898c2") @@ -15,6 +15,8 @@ package("ormpp") add_configs("postgresql", {description = "Using postgresql", default = false, type = "boolean"}) add_configs("sqlite3", {description = "Using sqlite3", default = false, type = "boolean"}) + add_deps("frozen", "iguana") + on_load(function(package) local configs = { mysql = "ORMPP_ENABLE_MYSQL", @@ -30,8 +32,6 @@ package("ormpp") end end) - add_deps("frozen", "iguana") - on_install(function (package) if package:version():ge("0.1.2") then os.vcp("ormpp/*", package:installdir("include")) @@ -47,6 +47,8 @@ package("ormpp") end assert(package:check_cxxsnippets({test = [[ + #include + #include using namespace ormpp; struct student { std::string name; @@ -54,6 +56,6 @@ package("ormpp") int id; }; REGISTER_AUTO_KEY(student, id) - REFLECTION_WITH_NAME(student, "t_student", id, name, age) - ]]}, {configs = {languages = languages}, includes = {"dbng.hpp"} })) + REFLECTION_WITH_NAME(student, "t_student", id, name, age) + ]]}, {configs = {languages = languages}})) end) From 8e705679160f02ad2afa2dd4ceb111d90dc9303e Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 11 Jun 2024 22:50:47 +0800 Subject: [PATCH 122/671] libuv: add 1.47.0 version (#4337) * libuv: add 1.47.0 version * add ndk api 21 check * Update xmake.lua * use package:toolchain --- packages/l/libuv/xmake.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/l/libuv/xmake.lua b/packages/l/libuv/xmake.lua index 680a2619f..59f6d723a 100644 --- a/packages/l/libuv/xmake.lua +++ b/packages/l/libuv/xmake.lua @@ -6,6 +6,7 @@ package("libuv") set_urls("https://github.com/libuv/libuv/archive/refs/tags/$(version).zip", "https://github.com/libuv/libuv.git") + add_versions("v1.47.0", "d50af7e6d72526db137e66fad812421c8a1cae09d146b0ec2bb9a22c5f23ba93") add_versions("v1.46.0", "45953dc9b64db7f4f47561f9e4543b762c52adfe7c9b6f8e9efbc3b4dd7d3081") add_versions("v1.44.1", "d233a9c522a9f4afec47b0d12f302d93d114a9e3ea104150e65f55fd931518e6") add_versions("v1.42.0", "031130768b25ae18c4b9d4a94ba7734e2072b11c6fce3e554612c516c3241402") @@ -30,6 +31,15 @@ package("libuv") add_syslinks("advapi32", "iphlpapi", "psapi", "user32", "userenv", "ws2_32", "shell32", "ole32", "uuid", "dbghelp") end + -- https://github.com/libuv/libuv/issues/3411 + on_check("android", function (package) + if package:version():ge("1.47.0") then + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libuv): need ndk api level >= 24 after v1.47.0") + end + end) + on_load(function (package) local version = package:version() if version:ge("1.46.0") or is_host("windows") then From 0e08fde070a7b90770072de3d604d9ae04c67ed1 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Wed, 12 Jun 2024 00:44:29 +0800 Subject: [PATCH 123/671] add libuv to 1.48.0 (#4245) Co-authored-by: star9029 --- packages/l/libuv/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libuv/xmake.lua b/packages/l/libuv/xmake.lua index 59f6d723a..705d3ede5 100644 --- a/packages/l/libuv/xmake.lua +++ b/packages/l/libuv/xmake.lua @@ -6,6 +6,7 @@ package("libuv") set_urls("https://github.com/libuv/libuv/archive/refs/tags/$(version).zip", "https://github.com/libuv/libuv.git") + add_versions("v1.48.0", "6dd637af0c23bee06b685a94e22f7e695f4ea7a9ab705485e32e658d4fd0125b") add_versions("v1.47.0", "d50af7e6d72526db137e66fad812421c8a1cae09d146b0ec2bb9a22c5f23ba93") add_versions("v1.46.0", "45953dc9b64db7f4f47561f9e4543b762c52adfe7c9b6f8e9efbc3b4dd7d3081") add_versions("v1.44.1", "d233a9c522a9f4afec47b0d12f302d93d114a9e3ea104150e65f55fd931518e6") From a4c24dbbcacf77a6a43dc6042bdfb83c31b1e7d7 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 02:22:45 +0800 Subject: [PATCH 124/671] Auto-update teascript to v0.14.0 (#4223) * Update teascript to v0.14.0 * patch macosx c++ * patch more code --------- Co-authored-by: star9029 --- .../t/teascript/patches/0.14.0/macosx.patch | 204 ++++++++++++++++++ packages/t/teascript/xmake.lua | 3 + 2 files changed, 207 insertions(+) create mode 100644 packages/t/teascript/patches/0.14.0/macosx.patch diff --git a/packages/t/teascript/patches/0.14.0/macosx.patch b/packages/t/teascript/patches/0.14.0/macosx.patch new file mode 100644 index 000000000..82ea5bd71 --- /dev/null +++ b/packages/t/teascript/patches/0.14.0/macosx.patch @@ -0,0 +1,204 @@ +diff --git a/include/teascript/StackMachine.hpp b/include/teascript/StackMachine.hpp +index 4a0af14..b714742 100644 +--- a/include/teascript/StackMachine.hpp ++++ b/include/teascript/StackMachine.hpp +@@ -558,7 +558,7 @@ private: + // TODO: Handle rContext.dialect.auto_define_unknown_identifiers on throw unknown_identifier + // TODO: can this be merged with ASTNode_Assign ? + try { +- mStack[s - 2] = rContext.SetValue( id.GetValue(), val, current_instr.payload.template GetValue() ); ++ mStack[s - 2] = rContext.SetValue( id.template GetValue(), val, current_instr.payload.template GetValue() ); + } catch( ... ) { + HandleException( std::current_exception() ); + run = false; +@@ -588,7 +588,7 @@ private: + continue; + } + try { +- mStack[s - 2] = rContext.AddValueObject( id.GetValue(), val.MakeShared() ); ++ mStack[s - 2] = rContext.AddValueObject( id.template GetValue(), val.MakeShared() ); + } catch( ... ) { + HandleException( std::current_exception() ); + run = false; +@@ -611,7 +611,7 @@ private: + val.Detach( true ); // make copy + } + try { +- mStack[s - 2] = rContext.AddValueObject( id.GetValue(), val.MakeShared().MakeConst() ); ++ mStack[s - 2] = rContext.AddValueObject( id.template GetValue(), val.MakeShared().MakeConst() ); + } catch( ... ) { + HandleException( std::current_exception() ); + run = false; +@@ -685,7 +685,7 @@ private: + auto &val = mStack[s - 1]; + auto const &id = mStack[s - 2]; + auto &obj = mStack[s - 3]; +- auto &tuple = obj.GetValue(); ++ auto &tuple = obj.template GetValue(); + bool const shared = current_instr.payload.template GetValue(); + + if( obj.IsConst() ) { +@@ -718,7 +718,7 @@ private: + } else { + auto &lhs = mStack.back(); + auto &rhs = current_instr.payload; +- auto &tuple = lhs.GetValue(); ++ auto &tuple = lhs.template GetValue(); + + std::size_t idx = static_cast(-1); + if( rhs.GetTypeInfo()->IsSame( TypeString ) ) { +@@ -741,7 +741,7 @@ private: + if( stack_error( 2 ) ) [[unlikely]] { + continue; + } else { +- auto param_count = mStack.back().GetValue(); ++ auto param_count = mStack.back().template GetValue(); + if( stack_error( param_count + 1 + 1 ) ) [[unlikely]] { + continue; + } +@@ -770,7 +770,7 @@ private: + continue; + } else { + auto const s = mStack.size(); +- auto param_count = mStack[s-2].GetValue(); ++ auto param_count = mStack[s-2].template GetValue(); + if( stack_error( param_count + 1 + 1 + 1 ) ) [[unlikely]] { + continue; + } +@@ -882,7 +882,7 @@ private: + run = false; + continue; + } +- auto &tuple = lhs.GetValue(); ++ auto &tuple = lhs.template GetValue(); + std::size_t idx = static_cast(-1); + if( rhs.GetTypeInfo()->IsSame( TypeString ) ) { + idx = tuple.IndexOfKey( rhs.template GetValue() ); +@@ -890,7 +890,7 @@ private: + idx = static_cast(rhs.GetAsInteger()); + } + if( idx == static_cast(-1) ) { +- HandleException( std::make_exception_ptr( exception::unknown_identifier( rhs.GetValue() ) ) ); ++ HandleException( std::make_exception_ptr( exception::unknown_identifier( rhs.template GetValue() ) ) ); + run = false; + continue; + } else if( not tuple.ContainsIdx( idx ) ) { +@@ -953,21 +953,21 @@ private: + + // get the sequence + auto &seq_val = mStack[s - 1]; +- if( not seq_val.GetTypeInfo()->IsSame() && not seq_val.GetTypeInfo()->IsSame() ) { ++ if( not seq_val.GetTypeInfo()->template IsSame() && not seq_val.GetTypeInfo()->template IsSame() ) { + HandleException( std::make_exception_ptr( exception::eval_error( "Forall loop can actually only iterate over an IntegerSequence/Tuple!" ) ) ); + run = false; + continue; + } + + //FIXME: if seq_val is a sequence already we should use a reference for in later versions it will be possible to manipulate it elsewhere in the loop. +- auto seq = seq_val.GetTypeInfo()->IsSame() +- ? IntegerSequence( 0LL, static_cast(seq_val.GetValue().Size() - 1), 1LL ) +- : seq_val.GetValue(); ++ auto seq = seq_val.GetTypeInfo()->template IsSame() ++ ? IntegerSequence( 0LL, static_cast(seq_val.template GetValue().Size() - 1), 1LL ) ++ : seq_val.template GetValue(); + seq.Reset(); + + // create the index variable + // TODO: add mDebugInfo SourceLocation! +- mStack[s - 2] = rContext.AddValueObject( mStack[s - 2].GetValue(), ValueObject( seq.Current(), ValueConfig(ValueShared, ValueMutable))); ++ mStack[s - 2] = rContext.AddValueObject( mStack[s - 2].template GetValue(), ValueObject( seq.Current(), ValueConfig(ValueShared, ValueMutable))); + + // store the seqeunce + mStack[s - 1] = ValueObject( std::move(seq), ValueConfig(ValueShared, ValueMutable)); +@@ -978,7 +978,7 @@ private: + continue; + } else { + auto const s = mStack.size(); +- auto &seq = mStack[s - 2].GetValue(); ++ auto &seq = mStack[s - 2].template GetValue(); + if( seq.Next() ) { + mStack[s - 3].AssignValue( seq.Current() ); + mStack.pop_back(); // clear previous result +@@ -999,11 +999,11 @@ private: + if( stack_error( 2 ) ) [[unlikely]] { + continue; + } else { +- auto param_count = mStack.back().GetValue(); ++ auto param_count = mStack.back().template GetValue(); + if( stack_error( param_count + 1 + 1 ) ) [[unlikely]] { + continue; + } +- auto func = mStack[ mStack.size() - (param_count + 1 + 1)].GetValue(); // copy is intended!! ++ auto func = mStack[ mStack.size() - (param_count + 1 + 1)].template GetValue(); // copy is intended!! + auto cfunc = std::dynamic_pointer_cast(func); + if( cfunc ) { + mCallStack.emplace_back( current_instr.payload.template GetValue(), mCurrent + 1, cfunc->GetProgram(), func ); +@@ -1089,7 +1089,7 @@ private: + continue; + } else { + // we need a working copy of the param count for decrement! +- mStack.emplace_back( mStack.back().GetValue() ); ++ mStack.emplace_back( mStack.back().template GetValue() ); + } + break; + case eTSVM_Instr::ParamSpecClean: +@@ -1097,7 +1097,7 @@ private: + if( stack_error( 3 ) ) [[unlikely]] { + continue; + } else { +- auto const left_params = mStack.back().GetValue(); ++ auto const left_params = mStack.back().template GetValue(); + if( left_params != 0 ) [[unlikely]] { + //NOTE: we need SourceLoc of the caller! But the caller is different for each call. + // Here we know that callstack is at least 2 (we and the caller). The ret address - 1 is the CallFunc instruction which might carry a source loc. +@@ -1106,7 +1106,7 @@ private: + run = false; + continue; + } else { +- auto orig_params = mStack[mStack.size() - 2].GetValue(); ++ auto orig_params = mStack[mStack.size() - 2].template GetValue(); + mStack.pop_back(); // working param count + mStack.pop_back(); // orig param count + while( orig_params > 0 ) { // each param +@@ -1123,7 +1123,7 @@ private: + continue; + } else { + auto const pos = mStack.size() - 2; +- auto param_count = mStack[pos].GetValue(); ++ auto param_count = mStack[pos].template GetValue(); + if( param_count < 1 ) [[unlikely]] { // huh? + //NOTE: we need SourceLoc of the caller! But the caller is different for each call. + // Here we know that callstack is at least 2 (we and the caller). The ret address - 1 is the CallFunc instruction which might carry a source loc. +@@ -1148,7 +1148,7 @@ private: + continue; + } else { + auto const pos = mStack.size() - 2; +- auto param_count = mStack[pos].GetValue(); ++ auto param_count = mStack[pos].template GetValue(); + if( param_count > 0 ) { // there are still parameters given by the caller. + // add current param to end (after the id) + mStack.push_back( std::move( mStack[pos - (1 + param_count)] ) ); +@@ -1261,12 +1261,12 @@ private: + { + std::size_t idx = static_cast(-1); + if( rId.GetTypeInfo()->IsSame( TypeString ) ) { +- idx = rTuple.IndexOfKey( rId.GetValue() ); ++ idx = rTuple.IndexOfKey( rId.template GetValue() ); + } else { + idx = static_cast(rId.GetAsInteger()); + } + if( idx == static_cast(-1) ) { +- HandleException( std::make_exception_ptr( exception::unknown_identifier( rId.GetValue() ) ) ); ++ HandleException( std::make_exception_ptr( exception::unknown_identifier( rId.template GetValue() ) ) ); + return idx; + } else if( not rTuple.ContainsIdx( idx ) ) { + HandleException( std::make_exception_ptr( exception::out_of_range() ) ); +@@ -1301,7 +1301,7 @@ private: + } + } + if( rId.GetTypeInfo()->IsSame( TypeString ) ) { +- std::string const &identifier = rId.GetValue(); ++ std::string const &identifier = rId.template GetValue(); + if( not rTuple.AppendKeyValue( identifier, as_const ? val.MakeShared().MakeConst() : val.MakeShared() ) ) { + HandleException( std::make_exception_ptr( exception::redefinition_of_variable( identifier ) ) ); + return idx; diff --git a/packages/t/teascript/xmake.lua b/packages/t/teascript/xmake.lua index 0427001e9..3664beffc 100644 --- a/packages/t/teascript/xmake.lua +++ b/packages/t/teascript/xmake.lua @@ -7,8 +7,11 @@ package("teascript") add_urls("https://github.com/Florian-Thake/TeaScript-Cpp-Library/archive/refs/tags/$(version).tar.gz", "https://github.com/Florian-Thake/TeaScript-Cpp-Library.git") + add_versions("v0.14.0", "9a6fd8eb3099dae092620f015b281ffbc22383969bedf08d54b62b6a2b0a0959") add_versions("v0.13.0", "7c8cc05a8775ee2c857278b5e353670bf02442b2fa3a411343e82b2b85eedced") + add_patches("0.14.0", "patches/0.14.0/macosx.patch", "cae068739506806679f63e316ca4368f5750954d3083e525ae457abf973d672b") + add_configs("fmt", {description = "Use fmt for printing.", default = true, type = "boolean"}) add_configs("toml++", {description = "Enable toml support.", default = true, type = "boolean"}) From fa4b02ef3101c68a61464f9a744401e3f4c46fc2 Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:34:20 +0200 Subject: [PATCH 125/671] openal-soft: support bsd (#4331) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * openal-soft: support bsd * Update xmake.lua --------- Co-authored-by: Jérôme Leclercq --- packages/o/openal-soft/xmake.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/o/openal-soft/xmake.lua b/packages/o/openal-soft/xmake.lua index 67ee3ee19..34b9043a6 100644 --- a/packages/o/openal-soft/xmake.lua +++ b/packages/o/openal-soft/xmake.lua @@ -18,6 +18,8 @@ package("openal-soft") add_extsources("pacman::openal") elseif is_plat("linux") then add_extsources("pacman::openal", "apt::libopenal-dev") + elseif is_plat("bsd") then + add_extsources("pkg::openal-soft") elseif is_plat("macosx") then add_extsources("brew::openal-soft") end @@ -31,6 +33,8 @@ package("openal-soft") add_syslinks("ole32", "shell32", "user32", "winmm", "kernel32") elseif is_plat("linux", "cross") then add_syslinks("dl", "pthread") + elseif is_plat("bsd", "cross") then + add_syslinks("pthread") elseif is_plat("android") then add_syslinks("dl", "OpenSLES") elseif is_plat("macosx", "iphoneos") then @@ -43,8 +47,8 @@ package("openal-soft") end end) - on_install("windows", "linux", "mingw", "macosx", "android", "iphoneos", "cross", function (package) - if is_plat("linux") and linuxos.name() == "fedora" then + on_install("windows", "linux", "mingw", "macosx", "android", "iphoneos", "cross", "bsd" , function (package) + if (package:is_plat("linux") and linuxos.name() == "fedora") or package:is_plat("bsd") then -- https://github.com/kcat/openal-soft/issues/864 io.replace("CMakeLists.txt", "if(HAVE_GCC_PROTECTED_VISIBILITY)", "if(0)", {plain = true}) end From dc70778192c48b3369470360d8070e483148f087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Tue, 11 Jun 2024 22:47:36 +0200 Subject: [PATCH 126/671] Add epoll-shim (#4338) * Add epoll-shim * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/e/epoll-shim/xmake.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/e/epoll-shim/xmake.lua diff --git a/packages/e/epoll-shim/xmake.lua b/packages/e/epoll-shim/xmake.lua new file mode 100644 index 000000000..6981b91f5 --- /dev/null +++ b/packages/e/epoll-shim/xmake.lua @@ -0,0 +1,27 @@ +package("epoll-shim") + set_homepage("https://github.com/jiixyj/epoll-shim") + set_description("small epoll implementation using kqueue; includes all features needed for libinput/libevdev") + set_license("MIT") + + add_urls("https://github.com/jiixyj/epoll-shim/archive/refs/tags/$(version).tar.gz", + "https://github.com/jiixyj/epoll-shim.git") + + add_versions("v0.0.20240608", "8f5125217e4a0eeb96ab01f9dfd56c38f85ac3e8f26ef2578e538e72e87862cb") + + add_deps("cmake") + + add_includedirs("include", "include/libepoll-shim") + + on_install("bsd", "macosx", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("epoll_create", {includes = "sys/epoll.h"})) + assert(package:has_cfuncs("eventfd", {includes = "sys/eventfd.h"})) + assert(package:has_cfuncs("signalfd", {includes = "sys/signalfd.h"})) + assert(package:has_cfuncs("timerfd_create", {includes = "sys/timerfd.h"})) + end) From 1b83d70ae83bd2babe3a3902b4132b2daaefa289 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 06:21:51 +0800 Subject: [PATCH 127/671] improve opencv (#4311) --- packages/o/opencv/xmake.lua | 74 ++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/packages/o/opencv/xmake.lua b/packages/o/opencv/xmake.lua index d537b523c..89ec056e3 100644 --- a/packages/o/opencv/xmake.lua +++ b/packages/o/opencv/xmake.lua @@ -6,6 +6,7 @@ package("opencv") add_urls("https://github.com/opencv/opencv/archive/$(version).tar.gz", "https://github.com/opencv/opencv.git") + add_versions("4.10.0", "b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9") add_versions("4.9.0", "ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c") add_versions("4.8.0", "cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd") add_versions("4.6.0", "1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277") @@ -17,6 +18,7 @@ package("opencv") add_versions("4.2.0", "9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec") add_versions("3.4.9", "b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a") + add_resources("4.10.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.10.0.tar.gz", "65597f8fb8dc2b876c1b45b928bbcc5f772ddbaf97539bf1b737623d0604cba1") add_resources("4.9.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.9.0.tar.gz", "8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae") add_resources("4.8.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.8.0.tar.gz", "b4aef0f25a22edcd7305df830fa926ca304ea9db65de6ccd02f6cfa5f3357dbb") add_resources("4.6.0", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.6.0.tar.gz", "1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7") @@ -80,13 +82,14 @@ package("opencv") elseif package:is_arch("arm64") then arch = "ARM64" end local linkdir = (package:config("shared") and "lib" or "staticlib") - local vs = import("core.tool.toolchain").load("msvc"):config("vs") + local vs = package:toolchain("msvc"):config("vs") local vc_ver = "vc13" if vs == "2015" then vc_ver = "vc14" elseif vs == "2017" then vc_ver = "vc15" elseif vs == "2019" then vc_ver = "vc16" elseif vs == "2022" then vc_ver = "vc17" end + package:add("linkdirs", linkdir) -- fix path for 4.9.0/vs2022 package:add("linkdirs", path.join(arch, vc_ver, linkdir)) elseif package:is_plat("mingw") then local arch = (package:is_arch("x86_64") and "x64" or "x86") @@ -112,7 +115,7 @@ package("opencv") package:add("deps", "gtk+3", {optional = true}) end end - if not package.is_built or package:is_built() then + if not package:is_precompiled() then package:add("deps", "cmake", "python 3.x", {kind = "binary"}) end @@ -121,6 +124,16 @@ package("opencv") end end) + if on_check then + on_check("windows|arm64", function (package) + if package:version() and package:version():lt("4.10.0") then + raise("current opencv version does not support windows/arm64!") + end + local vs = package:toolchain("msvc"):config("vs") + assert(tonumber(vs) >= 2022, "opencv requires Visual Studio 2022 and later for arm targets") + end) + end + on_install("linux", "macosx", "windows", "mingw@windows,msys", function (package) io.replace("cmake/OpenCVUtils.cmake", "if(PKG_CONFIG_FOUND OR PkgConfig_FOUND)", "if(NOT WIN32 AND (PKG_CONFIG_FOUND OR PkgConfig_FOUND))", {plain = true}) local configs = {"-DCMAKE_OSX_DEPLOYMENT_TARGET=", @@ -151,10 +164,8 @@ package("opencv") table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then - table.insert(configs, "-DBUILD_WITH_STATIC_CRT=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_WITH_STATIC_CRT=" .. (package:has_runtime("MT", "MTd") and "ON" or "OFF")) if package:is_arch("arm64") then - local vs = import("core.tool.toolchain").load("msvc"):config("vs") - assert(tonumber(vs) >= 2022, "opencv requires Visual Studio 2022 and later for arm targets") table.insert(configs, "-DCMAKE_SYSTEM_NAME=Windows") table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=ARM64") end @@ -169,14 +180,34 @@ package("opencv") local modulesdir = assert(find_path("modules", path.join(resourcedir, "*")), "modules not found!") table.insert(configs, "-DOPENCV_EXTRA_MODULES_PATH=" .. path.absolute(path.join(modulesdir, "modules"))) end - -- fix https://github.com/opencv/opencv/issues/22418 - if package:config("ffmpeg") and package:version() and package:version():le("4.6") then - io.replace("modules/videoio/src/ffmpeg_codecs.hpp", - "#include ", - "#include \n#include ", {plain = true}) + local shflags, ldflags + if package:config("ffmpeg") then + -- fix https://github.com/opencv/opencv/issues/22418 + if package:version() and package:version():le("4.6") then + io.replace("modules/videoio/src/ffmpeg_codecs.hpp", + "#include ", + "#include \n#include ", {plain = true}) + end + -- https://www.ffmpeg.org/platform.html#toc-Advanced-linking-configuration + if package:config("shared") and not package:is_plat("windows", "macosx", "iphoneos") then + ldflags = {"-Wl,-Bsymbolic"} + shflags = {"-Wl,-Bsymbolic"} + end end - import("package.tools.cmake").install(package, configs, {buildir = "bd"}) - for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", "opencv_img_hash", "opencv_videostab", "opencv_structured_light", "opencv_intensity_transform", "opencv_ccalib", "opencv_line_descriptor", "opencv_stereo", "opencv_dnn_objdetect", "opencv_dnn_superres", "opencv_fuzzy", "opencv_hfs", "opencv_rapid", "opencv_bgsegm", "opencv_bioinspired", "opencv_rgbd", "opencv_dpm", "opencv_aruco", "opencv_reg", "opencv_tracking", "opencv_datasets", "opencv_xfeatures2d", "opencv_shape", "opencv_barcode", "opencv_superres", "opencv_viz", "opencv_plot", "opencv_quality", "opencv_text", "opencv_cudaoptflow", "opencv_optflow", "opencv_ximgproc", "opencv_xobjdetect", "opencv_xphoto", "opencv_stitching", "opencv_ml", "opencv_photo", "opencv_cudaobjdetect", "opencv_cudalegacy", "opencv_cudabgsegm", "opencv_cudafeatures2d", "opencv_cudastereo", "opencv_cudaimgproc", "opencv_cudafilters", "opencv_cudaarithm", "opencv_cudawarping", "opencv_cudacodec", "opencv_cudev", "opencv_gapi", "opencv_objdetect", "opencv_highgui", "opencv_videoio", "opencv_video", "opencv_calib3d", "opencv_dnn", "opencv_features2d", "opencv_flann", "opencv_imgcodecs", "opencv_imgproc", "opencv_core"}) do + import("package.tools.cmake").install(package, configs, {buildir = "bd", shflags = shflags, ldflags = ldflags}) + for _, link in ipairs({"opencv_phase_unwrapping", "opencv_surface_matching", "opencv_saliency", + "opencv_wechat_qrcode", "opencv_mcc", "opencv_face", + "opencv_img_hash", "opencv_videostab", "opencv_structured_light", "opencv_intensity_transform", + "opencv_ccalib", "opencv_line_descriptor", "opencv_stereo", "opencv_dnn_objdetect", "opencv_dnn_superres", + "opencv_fuzzy", "opencv_hfs", "opencv_rapid", "opencv_bgsegm", "opencv_bioinspired", "opencv_rgbd", + "opencv_dpm", "opencv_aruco", "opencv_reg", "opencv_tracking", "opencv_datasets", "opencv_xfeatures2d", + "opencv_shape", "opencv_barcode", "opencv_superres", "opencv_viz", "opencv_plot", "opencv_quality", + "opencv_text", "opencv_cudaoptflow", "opencv_optflow", "opencv_ximgproc", "opencv_xobjdetect", + "opencv_xphoto", "opencv_stitching", "opencv_ml", "opencv_photo", "opencv_cudaobjdetect", "opencv_cudalegacy", + "opencv_cudabgsegm", "opencv_cudafeatures2d", "opencv_cudastereo", "opencv_cudaimgproc", "opencv_cudafilters", + "opencv_cudaarithm", "opencv_cudawarping", "opencv_cudacodec", "opencv_cudev", "opencv_gapi", "opencv_objdetect", + "opencv_highgui", "opencv_videoio", "opencv_video", "opencv_calib3d", "opencv_dnn", "opencv_features2d", + "opencv_flann", "opencv_imgcodecs", "opencv_imgproc", "opencv_core"}) do local reallink = link if package:is_plat("windows", "mingw") then reallink = reallink .. package:version():gsub("%.", "") @@ -190,7 +221,7 @@ package("opencv") elseif package:is_arch("arm64") then arch = "ARM64" end local linkdir = (package:config("shared") and "lib" or "staticlib") - local vs = import("core.tool.toolchain").load("msvc"):config("vs") + local vs = package:toolchain("msvc"):config("vs") local vc_ver = "vc13" if vs == "2015" then vc_ver = "vc14" elseif vs == "2017" then vc_ver = "vc15" @@ -199,11 +230,15 @@ package("opencv") end local installdir = package:installdir(arch, vc_ver) - for _, f in ipairs(os.files(path.join(installdir, linkdir, "*.lib"))) do + local libfiles = {} + table.join2(libfiles, os.files(path.join(package:installdir(), linkdir, "*.lib"))) + table.join2(libfiles, os.files(path.join(package:installdir(), arch, vc_ver, linkdir, "*.lib"))) + for _, f in ipairs(libfiles) do if not f:match("opencv_.+") then package:add("links", path.basename(f)) end end + package:addenv("PATH", "bin") -- fix path for 4.9.0/vs2022 package:addenv("PATH", path.join(arch, vc_ver, "bin")) elseif package:is_plat("mingw") then local arch = package:is_arch("x86_64") and "x64" or "x86" @@ -228,10 +263,13 @@ package("opencv") on_test(function (package) if not package:is_cross() then - if package:debug() and package:is_plat("windows", "mingw") then - os.vrun("opencv_versiond") - else - os.vrun("opencv_version") + -- FIXME, it will crash on action ci/2022/MD, but it works on local machine + if not package:has_runtime("MD", "MDd") then + if package:debug() and package:is_plat("windows", "mingw") then + os.vrun("opencv_versiond") + else + os.vrun("opencv_version") + end end end assert(package:check_cxxsnippets({test = [[ From 54ace3e62c0ac2b6bae1d82ee9dd7735d2ce91ea Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Wed, 12 Jun 2024 06:22:16 +0800 Subject: [PATCH 128/671] add option `rtree` for `sqlite3` (#4321) * set options to explicit * add option `rtree` for `sqlite3` * Update xmake.lua * fix typo --------- Co-authored-by: ruki --- packages/s/sqlite3/xmake.lua | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/s/sqlite3/xmake.lua b/packages/s/sqlite3/xmake.lua index 440fc204a..20e2d3d14 100644 --- a/packages/s/sqlite3/xmake.lua +++ b/packages/s/sqlite3/xmake.lua @@ -36,6 +36,13 @@ package("sqlite3") add_versions("3.45.0+300", "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531") add_versions("3.46.0+0", "6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d") + add_configs("explain_comments", { description = "Inserts comment text into the output of EXPLAIN.", default = true, type = "boolean"}) + add_configs("dbpage_vtab", { description = "Enable the SQLITE_DBPAGE virtual table.", default = true, type = "boolean"}) + add_configs("stmt_vtab", { description = "Enable the SQLITE_STMT virtual table logic.", default = true, type = "boolean"}) + add_configs("dbstat_vtab", { description = "Enable the dbstat virtual table.", default = true, type = "boolean"}) + add_configs("math_functions", { description = "Enable the built-in SQL math functions.", default = true, type = "boolean"}) + add_configs("rtree", { description = "Enable R-Tree.", default = false, type = "boolean"}) + if is_plat("macosx", "linux", "bsd") then add_syslinks("pthread", "dl") end @@ -44,11 +51,20 @@ package("sqlite3") local xmake_lua = [[ add_rules("mode.debug", "mode.release") set_encodings("utf-8") + + option("explain_comments", {default = false, defines = "SQLITE_ENABLE_EXPLAIN_COMMENTS"}) + option("dbpage_vtab", {default = false, defines = "SQLITE_ENABLE_DBPAGE_VTAB"}) + option("stmt_vtab", {default = false, defines = "SQLITE_ENABLE_STMTVTAB"}) + option("dbstat_vtab", {default = false, defines = "SQLITE_ENABLE_DBSTAT_VTAB"}) + option("math_functions", {default = false, defines = "SQLITE_ENABLE_MATH_FUNCTIONS"}) + option("rtree", {default = false, defines = "SQLITE_ENABLE_RTREE"}) + target("sqlite3") set_kind("$(kind)") add_files("sqlite3.c") add_headerfiles("sqlite3.h", "sqlite3ext.h") - add_defines("SQLITE_ENABLE_EXPLAIN_COMMENTS", "SQLITE_ENABLE_DBPAGE_VTAB", "SQLITE_ENABLE_STMTVTAB", "SQLITE_ENABLE_DBSTAT_VTAB", "SQLITE_ENABLE_MATH_FUNCTIONS") + add_options("explain_comments", "dbpage_vtab", "stmt_vtab", "dbstat_vtab", "math_functions", "rtree") + if is_kind("shared") and is_plat("windows") then add_defines("SQLITE_API=__declspec(dllexport)") end @@ -66,7 +82,15 @@ package("sqlite3") ]] end io.writefile("xmake.lua", xmake_lua) - import("package.tools.xmake").install(package) + + local configs = {} + for opt, value in pairs(package:configs()) do + if not package:extraconf("configs", opt, "builtin") then + configs[opt] = value + end + end + + import("package.tools.xmake").install(package, configs) package:addenv("PATH", "bin") end) From f7d03ca69bcd7d14560faa4749d3f2c52a3a9bf3 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 10:05:36 +0800 Subject: [PATCH 129/671] Update drogon to v1.9.5 (#4340) --- packages/d/drogon/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/drogon/xmake.lua b/packages/d/drogon/xmake.lua index a3c5b02f5..220050916 100644 --- a/packages/d/drogon/xmake.lua +++ b/packages/d/drogon/xmake.lua @@ -6,6 +6,7 @@ package("drogon") add_urls("https://github.com/an-tao/drogon/archive/refs/tags/$(version).tar.gz", "https://github.com/an-tao/drogon.git") + add_versions("v1.9.5", "ec17882835abeb0672db29cb36ab0c5523f144d5d8ff177861b8f5865803eaae") add_versions("v1.9.4", "b23d9d01d36fb1221298fcdbedcf7fd3e1b8b8821bf6fb8ed073c8b0c290d11d") add_versions("v1.9.3", "fb4ef351b3e4c06ed850cfbbf50c571502decb1738fb7d62a9d7d70077c9fc23") add_versions("v1.4.1", "ad794d7744b600240178348c15e216c919fe7a2bc196cf1239f129aee2af19c7") From 6f59a842b5f21dadde44b7160f80cdcbefa63a6c Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 22:41:07 +0800 Subject: [PATCH 130/671] update deploy ci --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 76518a09a..fa7f76b32 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy on: push: branches: - - master + - dev jobs: build: From a14a57f0ef04ee3daf283ef1a80a322fcf07c3ac Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Wed, 12 Jun 2024 10:08:48 +0800 Subject: [PATCH 131/671] Add support of `proj` on android (excluding `android@windows`) (#4310) * fix: remove unused dependency `openssl` for `proj` * add interface pre-defined macro * edit the limited platforms for `proj` * Update xmake.lua --------- Co-authored-by: ruki --- packages/p/proj/xmake.lua | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/p/proj/xmake.lua b/packages/p/proj/xmake.lua index e88a5909e..c6e078178 100644 --- a/packages/p/proj/xmake.lua +++ b/packages/p/proj/xmake.lua @@ -21,34 +21,26 @@ package("proj") add_syslinks("pthread") end - on_load("windows", "macosx", "linux", function (package) + on_load(function (package) if package:config("tiff") then package:add("deps", "libtiff") end if package:config("curl") then package:add("deps", "libcurl") - if package:is_plat("linux") then - package:add("deps", "openssl") - end end if package:config("apps") then package:addenv("PATH", "bin") end end) - on_install("windows", "macosx", "linux", function (package) + on_install("!wasm and (!android or android@!windows)", function (package) -- windows@arm64 cann't generate proj.db if package:is_plat("windows") and package:is_arch("arm64") then io.replace("CMakeLists.txt", "add_subdirectory(data)", "", {plain = true}) end - if package:config("curl") and package:is_plat("linux") then - io.replace("src/lib_proj.cmake", "${CURL_LIBRARIES}", "CURL::libcurl ssl crypto", {plain = true}) - else + if package:config("curl") and (package:version():le(9.4)) then io.replace("src/lib_proj.cmake", "${CURL_LIBRARIES}", "CURL::libcurl", {plain = true}) end - if package:is_plat("windows") and not package:config("shared") then - io.replace("src/proj.h", "#ifndef PROJ_DLL", "#define PROJ_DLL\n#ifndef PROJ_DLL", {plain = true}) - end local configs = {"-DNLOHMANN_JSON_ORIGIN=external", "-DBUILD_TESTING=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) @@ -56,14 +48,18 @@ package("proj") table.insert(configs, "-DENABLE_TIFF=" .. (package:config("tiff") and "ON" or "OFF")) table.insert(configs, "-DENABLE_CURL=" .. (package:config("curl") and "ON" or "OFF")) table.insert(configs, "-DBUILD_PROJSYNC=" .. (package:config("curl") and "ON" or "OFF")) - if package:config("curl") and package:is_plat("linux") then - import("package.tools.cmake").install(package, configs, {packagedeps = {"openssl"}}) - elseif package:config("curl") and package:is_plat("macosx") then + + if package:config("curl") and package:is_plat("macosx") then local exflags = {"-framework", "CoreFoundation", "-framework", "Security", "-framework", "SystemConfiguration"} import("package.tools.cmake").install(package, configs, {shflags = exflags, ldflags = exflags}) else import("package.tools.cmake").install(package, configs) end + + if not package:config("shared") then + -- public compile definitions in CMake + package:add("defines", "PROJ_DLL=") + end end) on_test(function (package) From 0c78ed8f1e54b3064ed8222f37bd64d885cba2f0 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 10:27:03 +0800 Subject: [PATCH 132/671] Update libsodium to 1.0.20 (#4342) --- packages/l/libsodium/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsodium/xmake.lua b/packages/l/libsodium/xmake.lua index e9c5e0770..caa768be6 100644 --- a/packages/l/libsodium/xmake.lua +++ b/packages/l/libsodium/xmake.lua @@ -7,6 +7,7 @@ package("libsodium") "https://github.com/jedisct1/libsodium/releases/download/$(version)-RELEASE/libsodium-$(version).tar.gz", "https://github.com/jedisct1/libsodium.git") + add_versions("1.0.20", "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19") add_versions("1.0.19", "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea") add_versions("1.0.18", "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1") From 4c86fbb6d238ecc0e687f04908915e38d50fa149 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Jun 2024 10:27:05 +0800 Subject: [PATCH 133/671] Update tiny-optional to v1.3.1 (#4341) --- packages/t/tiny-optional/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tiny-optional/xmake.lua b/packages/t/tiny-optional/xmake.lua index 4aadab32f..8500ad2e2 100644 --- a/packages/t/tiny-optional/xmake.lua +++ b/packages/t/tiny-optional/xmake.lua @@ -7,6 +7,7 @@ package("tiny-optional") add_urls("https://github.com/Sedeniono/tiny-optional/archive/refs/tags/$(version).tar.gz", "https://github.com/Sedeniono/tiny-optional.git") + add_versions("v1.3.1", "ae82a5116970c1c541bfaf73c9c99a61aa61031916a64cb069f776b0e893ff84") add_versions("v1.2.1", "0305d31c43ef8365befd7d022c13c431b913036d4c10c0c5419e9765077c5122") add_versions("v1.2.0", "d4ce47d0c9c4f89ab41e4e0b96d25bfb98c0cc02da3d7b312337e5e4e6e1c9e8") From ad28fa29b6a577efe937ed4a524f44725c445f10 Mon Sep 17 00:00:00 2001 From: c8ef Date: Wed, 12 Jun 2024 11:45:02 +0800 Subject: [PATCH 134/671] add liboqs package (#4343) * add liboqs package * Update xmake.lua * Update xmake.lua --- packages/l/liboqs/xmake.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/l/liboqs/xmake.lua diff --git a/packages/l/liboqs/xmake.lua b/packages/l/liboqs/xmake.lua new file mode 100644 index 000000000..0fb59541c --- /dev/null +++ b/packages/l/liboqs/xmake.lua @@ -0,0 +1,21 @@ +package("liboqs") + set_homepage("https://openquantumsafe.org") + set_description("C library for prototyping and experimenting with quantum-resistant cryptography") + + add_urls("https://github.com/open-quantum-safe/liboqs/archive/refs/tags/$(version).tar.gz", + "https://github.com/open-quantum-safe/liboqs.git") + + add_versions("0.10.1", "00ca8aba65cd8c8eac00ddf978f4cac9dd23bb039f357448b60b7e3eed8f02da") + + add_deps("cmake") + + on_install("linux", "macosx", function (package) + local configs = {"-DOQS_BUILD_ONLY_LIB=ON", "-DOQS_USE_OPENSSL=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("OQS_SIG_keypair", {includes = "oqs/oqs.h"})) + end) From d3aced0ce1b795d95aec0674819459658087f3f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 12 Jun 2024 10:24:05 +0200 Subject: [PATCH 135/671] Fix epoll-shim include dir (#4344) when reported by pkginfo, the epoll-shim include is not part of it --- packages/e/epoll-shim/xmake.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/e/epoll-shim/xmake.lua b/packages/e/epoll-shim/xmake.lua index 6981b91f5..81212d9a7 100644 --- a/packages/e/epoll-shim/xmake.lua +++ b/packages/e/epoll-shim/xmake.lua @@ -10,9 +10,8 @@ package("epoll-shim") add_deps("cmake") - add_includedirs("include", "include/libepoll-shim") - on_install("bsd", "macosx", function (package) + io.replace("CMakeLists.txt", [[set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/libepoll-shim")]], "", {plain = true}) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From 3bbfb16d12156e511e63b8bd2189e15ec93c25c4 Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:27:55 +0200 Subject: [PATCH 136/671] wayland: support bsd (#4333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wayland: support bsd * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * remove test code --------- Co-authored-by: Jérôme Leclercq --- packages/e/expat/xmake.lua | 4 ++-- packages/p/pkg-config/xmake.lua | 5 +++-- packages/w/wayland/xmake.lua | 35 ++++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/packages/e/expat/xmake.lua b/packages/e/expat/xmake.lua index 6b71ee429..c0fc84e60 100644 --- a/packages/e/expat/xmake.lua +++ b/packages/e/expat/xmake.lua @@ -1,5 +1,4 @@ package("expat") - set_homepage("https://libexpat.github.io") set_description("XML 1.0 parser") set_license("MIT") @@ -18,13 +17,14 @@ package("expat") add_configs("char_type", {description = "Character type to use", default = "char", type = "string", values = {"char", "ushort", "wchar_t"}}) add_deps("cmake") + on_load("windows", function (package) if not package:config("shared") then package:add("defines", "XML_STATIC") end end) - on_install("windows", "linux", "macosx", "android", "mingw", "cross", function (package) + on_install("windows", "linux", "macosx", "android", "mingw", "cross", "bsd", function (package) local configs = {"-DEXPAT_BUILD_EXAMPLES=OFF", "-DEXPAT_BUILD_TESTS=OFF", "-DEXPAT_BUILD_DOCS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DEXPAT_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) diff --git a/packages/p/pkg-config/xmake.lua b/packages/p/pkg-config/xmake.lua index 5b9151095..f357638c8 100644 --- a/packages/p/pkg-config/xmake.lua +++ b/packages/p/pkg-config/xmake.lua @@ -1,5 +1,4 @@ package("pkg-config") - set_kind("binary") set_homepage("https://freedesktop.org/wiki/Software/pkg-config/") set_description("A helper tool used when compiling applications and libraries.") @@ -19,7 +18,9 @@ package("pkg-config") if is_host("macosx") then table.insert(pcpath, "/usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig/" .. macos.version():major() .. '.' .. macos.version():minor()) end - import("package.tools.autoconf").install(package, {"--disable-debug", "--disable-host-tool", "--with-internal-glib", ["with-pc-path"] = table.concat(pcpath, ':')}) + -- see https://gitlab.freedesktop.org/pkg-config/pkg-config/-/issues/81 + local opt = {cflags = "-Wno-int-conversion"} + import("package.tools.autoconf").install(package, {"--disable-werror", "--disable-compile-warnings", "--disable-debug", "--disable-host-tool", "--with-internal-glib", ["with-pc-path"] = table.concat(pcpath, ':')}, opt) end) on_test(function (package) diff --git a/packages/w/wayland/xmake.lua b/packages/w/wayland/xmake.lua index 2851d86fd..5e9b88d1b 100644 --- a/packages/w/wayland/xmake.lua +++ b/packages/w/wayland/xmake.lua @@ -3,12 +3,14 @@ package("wayland") set_description("Wayland is a protocol for a compositor to talk to its clients as well as a C library implementation of that protocol.") set_license("MIT") - add_urls("https://wayland.freedesktop.org/releases/wayland-$(version).tar.xz") + add_urls("https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(version)/downloads/wayland-$(version).tar.xz") add_versions("1.18.0", "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d") add_versions("1.19.0", "baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15") + add_versions("1.23.0", "05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2") add_resources("1.18.0", "protocols", "https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz", "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7") add_resources("1.19.0", "protocols", "https://wayland.freedesktop.org/releases/wayland-protocols-1.21.tar.xz", "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5") + add_resources("1.23.0", "protocols", "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.36/downloads/wayland-protocols-1.36.tar.xz", "71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92") if is_plat("linux") then add_extsources("apt::libwayland-dev", "pacman::wayland") @@ -16,10 +18,13 @@ package("wayland") add_deps("meson", "ninja >=1.8.2", "libxml2", "libffi", "expat", "bison", "pkg-config") - on_install("linux", function (package) + if is_plat("bsd") then + add_deps("epoll-shim") + end + + on_install("linux", "bsd", function (package) -- imports import("package.tools.meson") - import("package.tools.autoconf") import("lib.detect.find_file") -- set environment variables @@ -42,15 +47,23 @@ package("wayland") -- install wayland-protocols local protocol = assert(package:resourcedir("protocols"), "wayland-protocols not found!") - local configfile = find_file("configure.ac", path.join(protocol, "**")) - os.cd(path.directory(configfile)) + local buildfile = find_file("meson.build", path.join(protocol, "**")) + if buildfile then + os.cd(path.directory(buildfile)) + meson.install(package, {"-Dtests=false"}, {envs = envs}) + else + import("package.tools.autoconf") + + local configfile = assert(find_file("configure.ac", path.join(protocol, "**"))) + os.cd(path.directory(configfile)) - envs = autoconf.buildenvs(package) - envs.LD_LIBRARY_PATH = path.joinenv(table.join(LD_LIBRARY_PATH, envs.LD_LIBRARY_PATH)) - envs.PKG_CONFIG_PATH = path.joinenv(table.join(PKG_CONFIG_PATH, envs.PKG_CONFIG_PATH)) - envs.ACLOCAL_PATH = path.joinenv(table.join(ACLOCAL_PATH, envs.ACLOCAL_PATH)) - envs.ACLOCAL = ACLOCAL - autoconf.install(package, {}, {envs = envs}) + envs = autoconf.buildenvs(package) + envs.LD_LIBRARY_PATH = path.joinenv(table.join(LD_LIBRARY_PATH, envs.LD_LIBRARY_PATH)) + envs.PKG_CONFIG_PATH = path.joinenv(table.join(PKG_CONFIG_PATH, envs.PKG_CONFIG_PATH)) + envs.ACLOCAL_PATH = path.joinenv(table.join(ACLOCAL_PATH, envs.ACLOCAL_PATH)) + envs.ACLOCAL = ACLOCAL + autoconf.install(package, {}, {envs = envs}) + end end) on_test(function (package) From 80a93bc5714cfb3392bc968fb33c9008e2521924 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 13 Jun 2024 00:54:15 +0800 Subject: [PATCH 137/671] fltk: improve deps (#4235) * fltk: improve deps * fix linux deps * fix deps * test 1.3.9 * fix libxfixes * Update xmake.lua * patch cmake * limit plat --- .../f/fltk/patches/1.3.9/cmake-fluid.patch | 20 ++++++ packages/f/fltk/xmake.lua | 71 +++++++++++-------- 2 files changed, 60 insertions(+), 31 deletions(-) create mode 100644 packages/f/fltk/patches/1.3.9/cmake-fluid.patch diff --git a/packages/f/fltk/patches/1.3.9/cmake-fluid.patch b/packages/f/fltk/patches/1.3.9/cmake-fluid.patch new file mode 100644 index 000000000..a120992cb --- /dev/null +++ b/packages/f/fltk/patches/1.3.9/cmake-fluid.patch @@ -0,0 +1,20 @@ +diff --git a/CMake/export.cmake b/CMake/export.cmake +index 6e8bc5d..e1983f3 100644 +--- a/CMake/export.cmake ++++ b/CMake/export.cmake +@@ -20,6 +20,7 @@ + ####################################################################### + + # Set the fluid executable path ++if (FLTK_BUILD_FLUID) + if (CMAKE_CROSSCOMPILING) + find_file(FLUID_PATH + NAMES fluid fluid.exe +@@ -37,6 +38,7 @@ else () + set (FLTK_FLUID_EXECUTABLE fluid) + set (FLUID fluid) # export + endif (CMAKE_CROSSCOMPILING) ++endif () + + add_subdirectory(src) + diff --git a/packages/f/fltk/xmake.lua b/packages/f/fltk/xmake.lua index 509a5d43a..4e8af841e 100644 --- a/packages/f/fltk/xmake.lua +++ b/packages/f/fltk/xmake.lua @@ -1,15 +1,22 @@ package("fltk") - set_homepage("https://www.fltk.org") set_description("Fast Light Toolkit") - set_urls("https://github.com/fltk/fltk/archive/d7985607d6dd8308f104d84c778080731fa23c9a.zip") - add_versions("1.4.0", "43d398ab068732cb1debd9a98d124e47c9da6f53cdf3e36f22868a54cca0c371") - add_deps("cmake") - if is_host("linux") then - add_configs("pango", {description = "Use pango for font support", default = false, type = "boolean"}) - add_configs("xft", {description = "Use libXft for font support", default = false, type = "boolean"}) + add_urls("https://www.fltk.org/pub/fltk/$(version)/fltk-$(version)-source.tar.bz2", {alias = "home"}) + add_urls("https://github.com/fltk/fltk/archive/refs/tags/release-$(version).tar.gz", {alias = "github"}) + add_urls("https://github.com/fltk/fltk.git") + + add_versions("home:1.3.9", "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2") + add_versions("github:1.3.9", "f30661851a61f1931eaaceb9ef4005584c85cb07fd7ffc38a645172b8e4eb3df") + + add_patches("1.3.9", "patches/1.3.9/cmake-fluid.patch", "06ee1e82a74651a0b4ba4b386e5e5436d8b95584330d02a8a2c53351210a9127") + + if is_plat("linux") then + add_configs("pango", {description = "Use pango for font support", default = false, type = "boolean"}) + add_configs("xft", {description = "Use libXft for font support", default = false, type = "boolean"}) end + add_configs("fluid", {description = "Build fluid", default = false, type = "boolean"}) + add_configs("forms", {description = "Build forms", default = false, type = "boolean"}) if is_plat("windows", "mingw") then add_syslinks("ws2_32", "comctl32", "gdi32", "oleaut32", "ole32", "uuid", "shell32", "advapi32", "comdlg32", "winspool", "user32", "kernel32", "odbc32") @@ -18,13 +25,19 @@ package("fltk") elseif is_plat("android") then add_syslinks("android") add_syslinks("dl") - else + elseif is_plat("linux") then add_syslinks("dl", "pthread") add_deps("libx11", "libxext", "libxinerama", "libxcursor", "libxrender", "libxfixes", "fontconfig") end + add_deps("cmake") + add_deps("zlib", "libpng", "libjpeg") + on_load(function (package) - if is_plat("linux") then + if package:is_plat("linux") then + if package:version() and package:version():eq("1.3.9") then + assert(package:config("fluid"), "Unsupported fluid on linux") + end if package:config("pango") then package:add("deps", "pango-1.0", "pangoxft-1.0", "gobject-2.0", "cairo", "pangocairo-1.0") end @@ -34,30 +47,26 @@ package("fltk") end end) - on_install("macosx", "windows", "mingw", "linux", "android", function (package) - local configs = {} + on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", "msys", function (package) + for _, file in ipairs(os.files("**.cxx")) do + io.replace(file, "", "", {plain = true}) + end + + local configs = { + "-DFLTK_BUILD_TEST=OFF", + "-DFLTK_BUILD_EXAMPLES=OFF", + "-DOPTION_USE_SYSTEM_LIBPNG=ON", + "-DOPTION_USE_SYSTEM_ZLIB=ON", + "-DOPTION_USE_SYSTEM_LIBJPEG=ON" + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DOPTION_BUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DFLTK_BUILD_TEST=OFF") + table.insert(configs, "-DFLTK_MSVC_RUNTIME_DLL=" .. (package:has_runtime("MD") and "ON" or "OFF")) + table.insert(configs, "-DFLTK_BUILD_FLUID=" .. (package:config("fluid") and "ON" or "OFF")) + table.insert(configs, "-DFLTK_BUILD_FORMS=" .. (package:config("forms") and "ON" or "OFF")) if package:is_plat("linux") then - table.insert(configs, "-DOPTION_USE_SYSTEM_LIBPNG=OFF") - table.insert(configs, "-DOPTION_USE_SYSTEM_ZLIB=OFF") - table.insert(configs, "-DOPTION_USE_SYSTEM_LIBJPEG=OFF") - if package:config("pango") then - table.insert(configs, "-DOPTION_USE_PANGO=ON") - else - table.insert(configs, "-DOPTION_USE_PANGO=OFF") - end - if package:config("xft") then - table.insert(configs, "-DOPTION_USE_XFT=ON") - else - table.insert(configs, "-DOPTION_USE_XFT=OFF") - end - end - if package:is_plat("android") then - table.insert(configs, "-DOPTION_USE_SYSTEM_LIBPNG=OFF") - table.insert(configs, "-DOPTION_USE_SYSTEM_ZLIB=OFF") - table.insert(configs, "-DOPTION_USE_SYSTEM_LIBJPEG=OFF") + table.insert(configs, "-DOPTION_USE_PANGO=" .. (package:config("pango") and "ON" or "OFF")) + table.insert(configs, "-DOPTION_USE_XFT=" .. (package:config("xft") and "ON" or "OFF")) end import("package.tools.cmake").install(package, configs) end) From cc3c9277c4ea9db71cf23ecb28f5ee959574b1a4 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 13 Jun 2024 00:58:03 +0800 Subject: [PATCH 138/671] fltk: fix fluid config assert --- packages/f/fltk/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/fltk/xmake.lua b/packages/f/fltk/xmake.lua index 4e8af841e..a96c89583 100644 --- a/packages/f/fltk/xmake.lua +++ b/packages/f/fltk/xmake.lua @@ -36,7 +36,7 @@ package("fltk") on_load(function (package) if package:is_plat("linux") then if package:version() and package:version():eq("1.3.9") then - assert(package:config("fluid"), "Unsupported fluid on linux") + assert(not package:config("fluid"), "package(fltk/1.3.9): Unsupported fluid on linux") end if package:config("pango") then package:add("deps", "pango-1.0", "pangoxft-1.0", "gobject-2.0", "cairo", "pangocairo-1.0") From 3ff147583100962eac01aed7fda651e7bf97cccc Mon Sep 17 00:00:00 2001 From: Yao Date: Thu, 13 Jun 2024 09:49:03 +0900 Subject: [PATCH 139/671] add bgfx build for ios and update to latest version (#4346) Co-authored-by: yao --- packages/b/bgfx/xmake.lua | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/b/bgfx/xmake.lua b/packages/b/bgfx/xmake.lua index 08258644c..37765eef0 100644 --- a/packages/b/bgfx/xmake.lua +++ b/packages/b/bgfx/xmake.lua @@ -8,13 +8,16 @@ package("bgfx") add_versions("7816", "5ecddbf4d51e2dda2a56ae8cafef4810e3a45d87") add_versions("8203", "484a5f0c25b53584a6b7fce0702a6bb580072d81") add_versions("8674", "f42134876038027667ef7e47c9a612dca1051ef2") + add_versions("8752", "61c770b0f5f57cf10547107974099e604358bf69") add_resources("7816", "bx", "https://github.com/bkaradzic/bx.git", "51f25ba638b9cb35eb2ac078f842a4bed0746d56") add_resources("8203", "bx", "https://github.com/bkaradzic/bx.git", "b9501348c596b68e5e655a8308df5c55f61ecd80") add_resources("8674", "bx", "https://github.com/bkaradzic/bx.git", "67dfdf34f642a4a807b75eb600f82f4f04027963") + add_resources("8752", "bx", "https://github.com/bkaradzic/bx.git", "0ec634e8fdf8c810f9911c686a8158088ae25379") add_resources("7816", "bimg", "https://github.com/bkaradzic/bimg.git", "8355d36befc90c1db82fca8e54f38bfb7eeb3530") add_resources("8203", "bimg", "https://github.com/bkaradzic/bimg.git", "663f724186e26caf46494e389ed82409106205fb") add_resources("8674", "bimg", "https://github.com/bkaradzic/bimg.git", "964a5b85483cdf59a30dc006e9bd8bbdde6cb2be") + add_resources("8752", "bimg", "https://github.com/bkaradzic/bimg.git", "61a7e9ebe7e33c821cf80b0542dcf23088446f5b") if is_plat("windows") then add_syslinks("user32", "gdi32", "psapi") @@ -22,6 +25,8 @@ package("bgfx") add_cxxflags("/Zc:__cplusplus") elseif is_plat("macosx") then add_frameworks("Metal", "QuartzCore", "Cocoa", "IOKit") + elseif is_plat("iphoneos") then + add_frameworks("OpenGLES", "CoreGraphics", "Metal", "QuartzCore", "UIKit") elseif is_plat("linux") then add_deps("libx11") add_syslinks("GL", "pthread", "dl") @@ -29,7 +34,7 @@ package("bgfx") add_deps("genie") - on_load("windows", "macosx", "linux", function (package) + on_load("windows", "macosx", "linux", "iphoneos", function (package) local suffix = package:debug() and "Debug" or "Release" for _, lib in ipairs({"bgfx", "bimg", "bx"}) do package:add("links", lib .. suffix) @@ -37,12 +42,14 @@ package("bgfx") package:add("defines", "BX_CONFIG_DEBUG=" .. (package:debug() and "1" or "0")) end) - on_install("windows|native", "macosx", "linux", function (package) + on_install("windows|native", "macosx", "linux", "iphoneos", function (package) local bxdir = package:resourcefile("bx") local bimgdir = package:resourcefile("bimg") local genie = is_host("windows") and "genie.exe" or "genie" - - local args = {"--with-tools"} + local args = {} + if is_plat("windows|native", "macosx", "linux") then + args = {"--with-tools"} + end if package:config("shared") then table.insert(args, "--with-shared-lib") end @@ -85,6 +92,12 @@ package("bgfx") configs = {"-C", ".build/projects/gmake-" .. target, "config=" .. mode:lower()} + elseif package:is_plat("iphoneos") then + target = "ios-arm64" + table.insert(args, "--gcc=" .. target) + configs = {"-C", + ".build/projects/gmake-" .. target, + "config=" .. mode:lower()} elseif package:is_plat("linux") then table.insert(args, "--gcc=linux-gcc") target = "linux" .. (package:is_arch("x86_64") and "64" or "32") .. "_gcc" @@ -92,15 +105,16 @@ package("bgfx") ".build/projects/gmake-linux", "config=" .. mode:lower() .. (package:is_arch("x86_64") and "64" or "32")} end - table.insert(args, "gmake") + table.insert(args, "gmake") + table.insert(args, "-j" .. os.cpuinfo("ncpu")) local envs = make.buildenvs(package) envs.BX_DIR = bxdir envs.BIMG_DIR = bimgdir os.vrunv(genie, args, {envs = envs}) make.build(package, configs) - if package:is_plat("macosx") then + if package:is_plat("macosx", "iphoneos") then os.trycp(".build/" .. target .. "/bin/*.a|*example*", package:installdir("lib")) os.trycp(".build/" .. target .. "/bin/*.dylib", package:installdir("lib")) os.trycp(".build/" .. target .. "/bin/*|*.*", package:installdir("bin")) @@ -118,5 +132,5 @@ package("bgfx") void test() { bgfx::init(); } - ]]}, {configs = {languages = "c++14"}, includes = "bgfx/bgfx.h"})) + ]]}, {configs = {languages = "c++17"}, includes = "bgfx/bgfx.h"})) end) From 9fa3d225a00159c0c907f50eea759addf57f8662 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 13 Jun 2024 09:53:14 +0800 Subject: [PATCH 140/671] Update reflect-cpp to v0.11.1 (#4347) --- packages/r/reflect-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 1aa041dda..3f4c9a437 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -7,6 +7,7 @@ package("reflect-cpp") add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/getml/reflect-cpp.git") + add_versions("v0.11.1", "e45f112fb3f14507a4aa53b99ae2d4ab6a4e7b2d5f04dd06fec00bf7faa7bbdc") add_versions("v0.10.0", "d2c8876d993ddc8c57c5804e767786bdb46a2bdf1a6cd81f4b14f57b1552dfd7") add_patches("0.10.0", "patches/0.10.0/cmake.patch", "b8929c0a13bd4045cbdeea0127e08a784e2dc8c43209ca9f056fff4a3ab5c4d3") From 7c3c922d9978d28e02ca093bc5804af359736341 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 13 Jun 2024 21:05:59 +0800 Subject: [PATCH 141/671] c-ares: add 1.29.0 version (#4345) * c-ares: add 1.29.0 version * patch macosx --- .../c-ares/patches/1.29.0/macosx-header.patch | 135 ++++++++++++++++++ packages/c/c-ares/xmake.lua | 28 ++-- 2 files changed, 150 insertions(+), 13 deletions(-) create mode 100644 packages/c/c-ares/patches/1.29.0/macosx-header.patch diff --git a/packages/c/c-ares/patches/1.29.0/macosx-header.patch b/packages/c/c-ares/patches/1.29.0/macosx-header.patch new file mode 100644 index 000000000..7c4d5694d --- /dev/null +++ b/packages/c/c-ares/patches/1.29.0/macosx-header.patch @@ -0,0 +1,135 @@ +diff --git a/src/lib/thirdparty/apple/dnsinfo.h b/src/lib/thirdparty/apple/dnsinfo.h +new file mode 100644 +index 0000000..e6a9ed1 +--- /dev/null ++++ b/src/lib/thirdparty/apple/dnsinfo.h +@@ -0,0 +1,128 @@ ++/* ++ * Copyright (c) 2004-2006, 2008, 2009, 2011-2013, 2015-2018 Apple Inc. All rights reserved. ++ * ++ * @APPLE_LICENSE_HEADER_START@ ++ * ++ * This file contains Original Code and/or Modifications of Original Code ++ * as defined in and that are subject to the Apple Public Source License ++ * Version 2.0 (the 'License'). You may not use this file except in ++ * compliance with the License. Please obtain a copy of the License at ++ * http://www.opensource.apple.com/apsl/ and read it before using this ++ * file. ++ * ++ * The Original Code and all software distributed under the License are ++ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER ++ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, ++ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. ++ * Please see the License for the specific language governing rights and ++ * limitations under the License. ++ * ++ * @APPLE_LICENSE_HEADER_END@ ++ */ ++ ++#ifndef __DNSINFO_H__ ++#define __DNSINFO_H__ ++ ++/* ++ * These routines provide access to the systems DNS configuration ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DNSINFO_VERSION 20170629 ++ ++#define DEFAULT_SEARCH_ORDER 200000 /* search order for the "default" resolver domain name */ ++ ++#define DNS_PTR(type, name) \ ++ union { \ ++ type name; \ ++ uint64_t _ ## name ## _p; \ ++ } ++ ++#define DNS_VAR(type, name) \ ++ type name ++ ++ ++#pragma pack(4) ++typedef struct { ++ struct in_addr address; ++ struct in_addr mask; ++} dns_sortaddr_t; ++#pragma pack() ++ ++ ++#pragma pack(4) ++typedef struct { ++ DNS_PTR(char *, domain); /* domain */ ++ DNS_VAR(int32_t, n_nameserver); /* # nameserver */ ++ DNS_PTR(struct sockaddr **, nameserver); ++ DNS_VAR(uint16_t, port); /* port (in host byte order) */ ++ DNS_VAR(int32_t, n_search); /* # search */ ++ DNS_PTR(char **, search); ++ DNS_VAR(int32_t, n_sortaddr); /* # sortaddr */ ++ DNS_PTR(dns_sortaddr_t **, sortaddr); ++ DNS_PTR(char *, options); /* options */ ++ DNS_VAR(uint32_t, timeout); /* timeout */ ++ DNS_VAR(uint32_t, search_order); /* search_order */ ++ DNS_VAR(uint32_t, if_index); ++ DNS_VAR(uint32_t, flags); ++ DNS_VAR(uint32_t, reach_flags); /* SCNetworkReachabilityFlags */ ++ DNS_VAR(uint32_t, service_identifier); ++ DNS_PTR(char *, cid); /* configuration identifer */ ++ DNS_PTR(char *, if_name); /* if_index interface name */ ++} dns_resolver_t; ++#pragma pack() ++ ++ ++#define DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS 0x0002 /* always requesting for A dns records in queries */ ++#define DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS 0x0004 /* always requesting for AAAA dns records in queries */ ++ ++#define DNS_RESOLVER_FLAGS_REQUEST_ALL_RECORDS \ ++ (DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS | DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS) ++ ++#define DNS_RESOLVER_FLAGS_SCOPED 0x1000 /* configuration is for scoped questions */ ++#define DNS_RESOLVER_FLAGS_SERVICE_SPECIFIC 0x2000 /* configuration is service-specific */ ++#define DNS_RESOLVER_FLAGS_SUPPLEMENTAL 0x4000 /* supplemental match configuration */ ++ ++ ++#pragma pack(4) ++typedef struct { ++ DNS_VAR(int32_t, n_resolver); /* resolver configurations */ ++ DNS_PTR(dns_resolver_t **, resolver); ++ DNS_VAR(int32_t, n_scoped_resolver); /* "scoped" resolver configurations */ ++ DNS_PTR(dns_resolver_t **, scoped_resolver); ++ DNS_VAR(uint64_t, generation); ++ DNS_VAR(int32_t, n_service_specific_resolver); ++ DNS_PTR(dns_resolver_t **, service_specific_resolver); ++ DNS_VAR(uint32_t, version); ++} dns_config_t; ++#pragma pack() ++ ++ ++__BEGIN_DECLS ++ ++/* ++ * DNS configuration access APIs ++ */ ++const char * ++dns_configuration_notify_key (void) API_AVAILABLE(macos(10.4), ios(2.0)); ++ ++dns_config_t * ++dns_configuration_copy (void) API_AVAILABLE(macos(10.4), ios(2.0)); ++ ++void ++dns_configuration_free (dns_config_t *config) API_AVAILABLE(macos(10.4), ios(2.0)); ++ ++void ++_dns_configuration_ack (dns_config_t *config, ++ const char *bundle_id) API_AVAILABLE(macos(10.8), ios(6.0)); ++ ++__END_DECLS ++ ++#endif /* __DNSINFO_H__ */ +\ No newline at end of file diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index 80f1b548b..cbf7a2243 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -1,12 +1,13 @@ package("c-ares") - set_homepage("https://c-ares.org/") set_description("A C library for asynchronous DNS requests") + set_license("MIT") add_urls("https://c-ares.org/download/c-ares-$(version).tar.gz") add_urls("https://github.com/c-ares/c-ares/releases/download/cares-$(version).tar.gz", {version = function (version) return version:gsub("%.", "_") .. "/c-ares-" .. version end}) + add_versions("1.29.0", "0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7") add_versions("1.28.1", "675a69fc54ddbf42e6830bc671eeb6cd89eeca43828eb413243fd2c0a760809d") add_versions("1.27.0", "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b") add_versions("1.16.1", "d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce") @@ -17,12 +18,11 @@ package("c-ares") add_versions("1.18.1", "1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf") add_versions("1.19.0", "bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3") - add_patches("1.18.1", - path.join(os.scriptdir(), "patches", "1.18.1", "guard-imported-lib.patch" ), - "3cb03453af9e1477cfe926b1c03b2e3fbb8200a72888b590439e69e2d4253609") - add_patches("1.18.1", - path.join(os.scriptdir(), "patches", "1.18.1", "skip-docs.patch" ), - "bbe389b4aab052c2e6845e87d1f56a8366bf18c944f5e5e6f05a2cf105dbe680") + add_patches("1.29.0", "patches/1.29.0/macosx-header.patch", "389c12e54d82f0e8d5dc38dc15bbade12592509627680498774159a0cb32faf2") + add_patches("1.18.1", "patches/1.18.1/guard-imported-lib.patch", "3cb03453af9e1477cfe926b1c03b2e3fbb8200a72888b590439e69e2d4253609") + add_patches("1.18.1", "patches/1.18.1/skip-docs.patch", "bbe389b4aab052c2e6845e87d1f56a8366bf18c944f5e5e6f05a2cf105dbe680") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) if is_plat("macosx") then add_syslinks("resolv") @@ -30,12 +30,14 @@ package("c-ares") add_deps("cmake") - on_install("linux", "macosx", "windows", function (package) - local configs = {"-DCARES_BUILD_TESTS=OFF", "-DCARES_BUILD_TOOLS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DCARES_SHARED=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DCARES_STATIC=" .. (package:config("shared") and "OFF" or "ON")) - if not package:config("shared") then + on_install(function (package) + local shared = package:config("shared") + local configs = {"-DCARES_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DCARES_SHARED=" .. (shared and "ON" or "OFF")) + table.insert(configs, "-DCARES_STATIC=" .. (shared and "OFF" or "ON")) + table.insert(configs, "-DCARES_BUILD_TOOLS=" .. (package:config("tools") and "ON" or "OFF")) + if not shared then package:add("defines", "CARES_STATICLIB") end import("package.tools.cmake").install(package, configs) From d162bf59109f3aa1aa84fb0b2ea52926fcbfa4b8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 13 Jun 2024 23:41:30 +0800 Subject: [PATCH 142/671] c-ares: add 1.30.0 version (#4350) --- packages/c/c-ares/xmake.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index cbf7a2243..7385876f9 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -4,9 +4,15 @@ package("c-ares") set_license("MIT") add_urls("https://c-ares.org/download/c-ares-$(version).tar.gz") - add_urls("https://github.com/c-ares/c-ares/releases/download/cares-$(version).tar.gz", {version = function (version) - return version:gsub("%.", "_") .. "/c-ares-" .. version + add_urls("https://github.com/c-ares/c-ares/releases/download/$(version).tar.gz", {version = function (version) + if version:ge("1.30.0") then + return "v" .. version .. "/c-ares-" .. version + else + return "cares-" .. version:gsub("%.", "_") .. "/c-ares-" .. version + end end}) + + add_versions("1.30.0", "4fea312112021bcef081203b1ea020109842feb58cd8a36a3d3f7e0d8bc1138c") add_versions("1.29.0", "0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7") add_versions("1.28.1", "675a69fc54ddbf42e6830bc671eeb6cd89eeca43828eb413243fd2c0a760809d") add_versions("1.27.0", "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b") From 3e4c192cad76b237f57c17e19f2116296f746ba0 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Jun 2024 00:13:23 +0800 Subject: [PATCH 143/671] mini: add package (#4351) --- packages/m/mini/xmake.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/m/mini/xmake.lua diff --git a/packages/m/mini/xmake.lua b/packages/m/mini/xmake.lua new file mode 100644 index 000000000..ea089bdb4 --- /dev/null +++ b/packages/m/mini/xmake.lua @@ -0,0 +1,22 @@ +package("mini") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/metayeti/mINI") + set_description("INI file reader and writer") + set_license("MIT") + + add_urls("https://github.com/metayeti/mINI/archive/refs/tags/$(version).tar.gz", + "https://github.com/metayeti/mINI.git") + + add_versions("0.9.15", "241e105ab074827ab8b40582aa7b04c6191f84b244603969965c0874ad4f942c") + + on_install(function (package) + os.cp("src/mini", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + mINI::INIFile file("myfile.ini"); + } + ]]}, {configs = {languages = "c++17"}, includes = "mini/ini.h"})) + end) From 5daf74dc4e4b8bf1a1f8c2bd9624d2598a956d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 13 Jun 2024 23:52:02 +0200 Subject: [PATCH 144/671] openal: remove pkg extsource pkg is not yet supported by xmake --- packages/o/openal-soft/xmake.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/o/openal-soft/xmake.lua b/packages/o/openal-soft/xmake.lua index 34b9043a6..446c0e544 100644 --- a/packages/o/openal-soft/xmake.lua +++ b/packages/o/openal-soft/xmake.lua @@ -18,8 +18,6 @@ package("openal-soft") add_extsources("pacman::openal") elseif is_plat("linux") then add_extsources("pacman::openal", "apt::libopenal-dev") - elseif is_plat("bsd") then - add_extsources("pkg::openal-soft") elseif is_plat("macosx") then add_extsources("brew::openal-soft") end From ddd9920a9caac72fcf9a9707256d37d0c3287f79 Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 14 Jun 2024 09:12:17 +0800 Subject: [PATCH 145/671] improve folly (#4348) * improve folly * Update xmake.lua * add back old version * add old patches --- packages/f/folly/xmake.lua | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 78e4232f2..19aecf100 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -19,6 +19,7 @@ package("folly") add_versions("2024.03.18", "037bd742b91e35e057d13bedcbdf55328e35805cf91f7bc1ca850a72ba974578") add_versions("2024.03.25", "3c57b0d1f1266e935aef1ed54535561fd2eeedc1aa946fbc46871e839014f74c") add_versions("2024.04.01", "f09e522c76a5f102c40c54726f6f255b0dc127c78f9c8c9ac117fc0f7ac284bb") + add_versions("2024.06.10", "27d7f825a9a3469b59a4f0a5ba2edac733407ea8dcc036e7ca9279d803ece1e9") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") @@ -38,13 +39,16 @@ package("folly") add_syslinks("pthread") end + on_load("linux", function (package) + package:add("deps", "libaio") + package:add("deps", "liburing") + end) + on_install("linux", "macosx", function (package) local configs = {"-DBUILD_TESTS=OFF", "-DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON", - "-DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON", - "-DLIBAIO_FOUND=OFF", "-DLIBURCU_FOUND=OFF", "-DBOOST_LINK_STATIC=ON", "-DCMAKE_CXX_STANDARD=17"} @@ -53,10 +57,14 @@ package("folly") if package:is_plat("windows") then table.insert(configs, "-DBoost_USE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) end + if not package:is_plat("linux") then + table.insert(configs, "-DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON") + table.insert(configs, "-DLIBAIO_FOUND=OFF") + end import("package.tools.cmake").install(package, configs) end) - on_test(function (package) + on_test("macosx", function (package) assert(package:check_cxxsnippets({test = [[ #include void test() { @@ -65,3 +73,14 @@ package("folly") } ]]}, {configs = {languages = "c++17"}, includes = "folly/CpuId.h"})) end) + + on_test("linux", function (package) + assert(package:check_cxxsnippets({test = [[ + #include "folly/experimental/io/IoUring.h" + #include "folly/experimental/io/AsyncIO.h" + void test() { + folly::AsyncIOOp asyncIOOp; + folly::IoUringOp ioUringOp; + } + ]]}, {configs = {languages = "c++17"}})) + end) From 7c6c64482e1af925b58b85bb674b74b0394cdb2d Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 14 Jun 2024 09:53:52 +0800 Subject: [PATCH 146/671] Update libsais to v2.8.3 (#4355) --- packages/l/libsais/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsais/xmake.lua b/packages/l/libsais/xmake.lua index 6f7e3779a..49125a39a 100644 --- a/packages/l/libsais/xmake.lua +++ b/packages/l/libsais/xmake.lua @@ -5,6 +5,7 @@ package("libsais") add_urls("https://github.com/IlyaGrebnov/libsais/archive/refs/tags/$(version).tar.gz", "https://github.com/IlyaGrebnov/libsais.git") + add_versions("v2.8.3", "9f407265f7c958da74ee8413ee1d18143e3040c453c1c829b10daaf5d37f7cda") add_versions("v2.8.2", "a17918936d6231cf6b019629d65ad7170f889bab5eb46c09b775dede7d890502") add_versions("v2.8.1", "01852e93305fe197d8f2ffdc32a856e78d6796aa3f40708325084c55b450747a") add_versions("v2.8.0", "71f608d1e2a28652e66076f42becc3bbd3e0c8a21ba11a4de226a51459e894a9") From 7f51e2d0f0ae253518a7d135aa469cf42a155f2e Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 14 Jun 2024 09:53:54 +0800 Subject: [PATCH 147/671] Update efsw to 1.4.0 (#4354) --- packages/e/efsw/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/efsw/xmake.lua b/packages/e/efsw/xmake.lua index 37a7432d2..d244f97d6 100644 --- a/packages/e/efsw/xmake.lua +++ b/packages/e/efsw/xmake.lua @@ -5,6 +5,7 @@ package("efsw") set_urls("https://github.com/SpartanJ/efsw/archive/refs/tags/$(version).tar.gz", "https://github.com/SpartanJ/efsw.git") + add_versions("1.4.0", "9eed5fc8471767faa44134f5379d4de02825e3756007dafa482fd1656e42bc4a") add_versions("1.3.1", "3c0efe023258712d25644977227f07cf7edf7e5dc00ffa8d88733f424fa6af86") add_versions("1.3.0", "e190b72f23d92c42e1a0dab9bb6354a56f75c7535fd1f3e3a10b1c317e05f8f6") add_versions("1.2.0", "66d8631deeb2af50511e84cae7e745134e6a22811c93246e39e7001af887a7db") From 5191b00489339e93c72e566a95e8182a5d2928f5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Jun 2024 10:06:41 +0800 Subject: [PATCH 148/671] godotcpp4: update to 4.2 (#4290) * godotcpp4: update to 4.2 * test 4.2 --- packages/g/godotcpp4/test/4.0.cpp | 27 +++++++++++++++ packages/g/godotcpp4/test/4.x.cpp | 24 ++++++++++++++ packages/g/godotcpp4/xmake.lua | 55 ++++++++++++------------------- 3 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 packages/g/godotcpp4/test/4.0.cpp create mode 100644 packages/g/godotcpp4/test/4.x.cpp diff --git a/packages/g/godotcpp4/test/4.0.cpp b/packages/g/godotcpp4/test/4.0.cpp new file mode 100644 index 000000000..90ee13f99 --- /dev/null +++ b/packages/g/godotcpp4/test/4.0.cpp @@ -0,0 +1,27 @@ +#include +#include +#include + +using namespace godot; + +class ExampleRef : public RefCounted { + GDCLASS(ExampleRef, RefCounted); + + protected: + static void _bind_methods() { + ClassDB::bind_method(D_METHOD("get_id"), &ExampleRef::get_id); + } + + public: + int get_id() { return 5; } +}; + +extern "C" { + GDExtensionBool GDE_EXPORT + example_library_init(const GDExtensionInterface *p_interface, + GDExtensionClassLibraryPtr p_library, + GDExtensionInitialization *r_initialization) { + ClassDB::register_class(); + return true; + } +} diff --git a/packages/g/godotcpp4/test/4.x.cpp b/packages/g/godotcpp4/test/4.x.cpp new file mode 100644 index 000000000..7474bacf0 --- /dev/null +++ b/packages/g/godotcpp4/test/4.x.cpp @@ -0,0 +1,24 @@ +#include +#include +#include + +using namespace godot; + +class ExampleRef : public RefCounted { + GDCLASS(ExampleRef, RefCounted); + + protected: + static void _bind_methods() { + ClassDB::bind_method(D_METHOD("get_id"), &ExampleRef::get_id); + } + + public: + int get_id() { return 5; } +}; + +extern "C" { + GDExtensionBool GDE_EXPORT example_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) { + godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization); + return init_obj.init(); + } +} diff --git a/packages/g/godotcpp4/xmake.lua b/packages/g/godotcpp4/xmake.lua index a03bbc4b0..bab1635e0 100644 --- a/packages/g/godotcpp4/xmake.lua +++ b/packages/g/godotcpp4/xmake.lua @@ -1,14 +1,22 @@ package("godotcpp4") - set_homepage("https://godotengine.org/") set_description("C++ bindings for the Godot 4 script API") + set_license("MIT") set_urls("https://github.com/godotengine/godot-cpp.git") + add_versions("4.2", "2b6eb6832e1dba2816229917dd2a6d54184e1bf4") + add_versions("4.1", "32becf6a13681119ad63b6d7cc4e816c9a0cc86b") add_versions("4.0", "9d1c396c54fc3bdfcc7da4f3abcb52b14f6cce8f") add_deps("scons") add_includedirs("gen/include", "include") + on_check("android", function (package) + if package:version():ge("4.1") then + raise("package(godotcpp4 >=4.1): only support ndk version 23.2.8568313") + end + end) + on_load(function(package) assert(not package:is_arch( "mips", @@ -29,7 +37,7 @@ package("godotcpp4") end) on_install("linux", "windows|x64", "windows|x86", "macosx", "iphoneos", "android", function(package) - if package:is_plat("windows") then + if package:is_plat("windows") and package:version():eq("4.0.0") then io.replace("tools/targets.py", "/MD", "/" .. package:config("vs_runtime"), {plain = true}) end @@ -58,40 +66,19 @@ package("godotcpp4") "debug_symbols=" .. (package:is_debug() and "yes" or "no") } + if package:is_plat("windows") then + table.insert(configs, "use_static_cpp=" .. (package:has_runtime("MT") and "yes" or "no")) + end + import("package.tools.scons").build(package, configs) - os.cp("bin/*." .. (package:is_plat("windows") and "lib" or "a"), package:installdir("lib")) - os.cp("include/godot_cpp", package:installdir("include")) - os.cp("gen/include/godot_cpp", path.join(package:installdir("gen"), "include", "godot_cpp")) - os.cp("gdextension/gdextension_interface.h", package:installdir("include")) + os.vcp("bin/*." .. (package:is_plat("windows") and "lib" or "a"), package:installdir("lib")) + os.vcp("include/godot_cpp", package:installdir("include")) + os.vcp("gen/include/godot_cpp", path.join(package:installdir("gen"), "include", "godot_cpp")) + os.vcp("gdextension/gdextension_interface.h", package:installdir("include")) end) on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - #include - #include - #include - using namespace godot; - - class ExampleRef : public RefCounted { - GDCLASS(ExampleRef, RefCounted); - - protected: - static void _bind_methods() { - ClassDB::bind_method(D_METHOD("get_id"), &ExampleRef::get_id); - } - - public: - int get_id() { return 5; } - }; - - extern "C" { - GDExtensionBool GDE_EXPORT - example_library_init(const GDExtensionInterface *p_interface, - GDExtensionClassLibraryPtr p_library, - GDExtensionInitialization *r_initialization) { - ClassDB::register_class(); - return true; - } - } - ]]}, {configs = {languages = "cxx17"}})) + local file = (package:version():eq("4.0") and "4.0.cpp" or "4.x.cpp") + local code = io.readfile(path.join(os.scriptdir(), "test", file)) + assert(package:check_cxxsnippets({test = code}, {configs = {languages = "cxx17"}})) end) From 101dc3d144301331fc6e526d1085b795fe2a72ed Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 14 Jun 2024 11:49:41 +0800 Subject: [PATCH 149/671] improve fizz (#4356) * improve fizz * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/f/fizz/xmake.lua | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index 25aaf684c..37d11f276 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -11,19 +11,29 @@ package("fizz") add_versions("2024.03.18", "f46799dda118ec5a35cf7533e00daf25e7b2d7c58f00b80ba6c0388b19190c6f") add_versions("2024.03.25", "bcf9c551719bc86318a77e2b13769d52679642b98728e645900485d7a90c0f8b") add_versions("2024.04.01", "caf2cf1ba8f6db66abbadf382fb3e0667888567c4ac0d8f74ec92e1fb27c3727") + add_versions("2024.06.10", "dabc77e2238383fb37c19327af8ab864ba030d32e98f49b23008075a7afb6e19") - add_deps("cmake", "folly", "libsodium") + add_deps("cmake", "folly", "libsodium", "liboqs") on_install("linux", "macosx", function (package) os.cd("fizz") local configs = {"-DBUILD_TESTS=OFF", "-DBUILD_EXAMPLES=OFF", - "-DCMAKE_CXX_STANDARD=17"} + "-DCMAKE_CXX_STANDARD=17", + "-DFIZZ_HAVE_OQS=TRUE"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cxxincludes("fizz/server/AsyncFizzServer.h", {configs = {languages = "c++17"}})) + assert(package:check_cxxsnippets({test = [[ + #include "fizz/experimental/crypto/exchange/OQSKeyExchange.h" + void test() { + auto clientKex = fizz::OQSClientKeyExchange(OQS_KEM_alg_kyber_768); + auto serverKex = fizz::OQSServerKeyExchange(OQS_KEM_alg_kyber_768); + clientKex.generateKeyPair(); + serverKex.generateKeyPair(); + } + ]]}, {configs = {languages = "c++17"}})) end) From 70d06838a9cc121de83a52e6f6b3de91cb7c4d91 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Jun 2024 21:08:17 +0800 Subject: [PATCH 150/671] tinycolormap: add package (#4358) --- packages/t/tinycolormap/xmake.lua | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/t/tinycolormap/xmake.lua diff --git a/packages/t/tinycolormap/xmake.lua b/packages/t/tinycolormap/xmake.lua new file mode 100644 index 000000000..a8255f51c --- /dev/null +++ b/packages/t/tinycolormap/xmake.lua @@ -0,0 +1,23 @@ +package("tinycolormap") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/yuki-koyama/tinycolormap") + set_description("A header-only, single-file library for colormaps written in C++11") + set_license("MIT") + + add_urls("https://github.com/yuki-koyama/tinycolormap/archive/refs/tags/$(version).tar.gz", + "https://github.com/yuki-koyama/tinycolormap.git") + + add_versions("v0.7.0", "5e03b6c35c658aa7273ca6fb38ef9df06f885a2429191059c8770d5ff8b65951") + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + double value = 0.75; + auto color = tinycolormap::GetColor(value, tinycolormap::ColormapType::Viridis); + } + ]]}, {configs = {languages = "c++11"}, includes = "tinycolormap.hpp"})) + end) From dd003157729ca2a7c75050424aad06cbf2e81f13 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Jun 2024 22:10:13 +0800 Subject: [PATCH 151/671] libmaxminddb: add package (#4357) * libmaxminddb: add package * add config tool * use 1.10.0 version --- packages/l/libmaxminddb/xmake.lua | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/l/libmaxminddb/xmake.lua diff --git a/packages/l/libmaxminddb/xmake.lua b/packages/l/libmaxminddb/xmake.lua new file mode 100644 index 000000000..a31ecdc92 --- /dev/null +++ b/packages/l/libmaxminddb/xmake.lua @@ -0,0 +1,32 @@ +package("libmaxminddb") + set_homepage("https://maxmind.github.io/libmaxminddb/") + set_description("C library for the MaxMind DB file format") + set_license("Apache-2.0") + + add_urls("https://github.com/maxmind/libmaxminddb/releases/download/$(version)/libmaxminddb-$(version).tar.gz", + "https://github.com/maxmind/libmaxminddb.git") + + add_versions("1.10.0", "5e6db72df423ae225bfe8897069f6def40faa8931f456b99d79b8b4d664c6671") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + if is_plat("windows", "mingw") then + add_syslinks("ws2_32") + end + + add_deps("cmake") + + on_install(function (package) + local configs = {"-DBUILD_TESTING=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") then + table.insert(configs, "-DMSVC_STATIC_RUNTIME=" .. (package:has_runtime("MT") and "ON" or "OFF")) + end + table.insert(configs, "-DMAXMINDDB_BUILD_BINARIES=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("MMDB_open", {includes = "maxminddb.h"})) + end) From b2d6e85d23e92d8b8aade0f5cf926075912e7e37 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 14 Jun 2024 22:17:51 +0800 Subject: [PATCH 152/671] antlr4-runtime: add package (#4359) * antlr4-runtime: add package * fix includedirs * fix links --- packages/a/antlr4-runtime/xmake.lua | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 packages/a/antlr4-runtime/xmake.lua diff --git a/packages/a/antlr4-runtime/xmake.lua b/packages/a/antlr4-runtime/xmake.lua new file mode 100644 index 000000000..f29af086a --- /dev/null +++ b/packages/a/antlr4-runtime/xmake.lua @@ -0,0 +1,50 @@ +package("antlr4-runtime") + set_homepage("http://antlr.org") + set_description("ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files.") + set_license("BSD-3-Clause") + + add_urls("https://github.com/antlr/antlr4/archive/refs/tags/$(version).tar.gz", + "https://github.com/antlr/antlr4.git") + + add_versions("4.13.1", "da20d487524d7f0a8b13f73a8dc326de7fc2e5775f5a49693c0a4e59c6b1410c") + + if is_plat("mingw") and is_subhost("msys") then + add_extsources("pacman::antlr4-runtime-cpp") + elseif is_plat("linux") then + add_extsources("pacman::antlr4-runtime", "apt::libantlr4-runtime-dev") + elseif is_plat("macosx") then + add_extsources("brew::antlr4-cpp-runtime") + end + + if is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + elseif is_plat("macosx") then + add_frameworks("CoreFoundation") + end + + add_includedirs("include", "include/antlr4-runtime") + + add_deps("cmake") + + on_install(function (package) + local configs = {"-DANTLR_BUILD_CPP_TESTS=OFF", "-DANTLR4_INSTALL=ON"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DANTLR_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DANTLR_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON")) + + os.cd("runtime/Cpp") + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>")]], "", {plain = true}) + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL")]], "", {plain = true}) + import("package.tools.cmake").install(package, configs) + if not package:config("shared") then + package:add("defines", "ANTLR4CPP_STATIC") + end + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + antlr4::ANTLRInputStream x; + } + ]]}, {configs = {languages = "c++17"}, includes = "antlr4-runtime/antlr4-runtime.h"})) + end) From 59cd8fd48ebdb858c29ef074fa7a6fe7be243b6a Mon Sep 17 00:00:00 2001 From: PumpkinXD <54535387+PumpkinXD@users.noreply.github.com> Date: Sat, 15 Jun 2024 07:08:26 +0800 Subject: [PATCH 153/671] Update cosmocc to version 3.4.0 (#4304) * Update cosmocc to version 3.4.0 * Update xmake.lua * test 3.3.6 * test 3.3.7 * test 3.3.8 * tets 3.3.9 * test 3.3.10 * 3.4.0 --------- Co-authored-by: star9029 --- packages/c/cosmocc/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/c/cosmocc/xmake.lua b/packages/c/cosmocc/xmake.lua index 0e4aedf2e..21fcce66e 100644 --- a/packages/c/cosmocc/xmake.lua +++ b/packages/c/cosmocc/xmake.lua @@ -5,9 +5,17 @@ package("cosmocc") add_urls("https://cosmo.zip/pub/cosmocc/cosmocc-$(version).zip", "https://github.com/xmake-mirror/cosmopolitan/releases/download/$(version)/cosmocc-$(version).zip") + add_versions("3.2.4", "d2fa6dbf6f987310494581deff5b915dbdc5ca701f20f7613bb0dcf1de2ee511") add_versions("3.3.2", "a695012ffbeac5e26e3c4a740debc15273f47e9a8bdc55e8b76a623154d5914b") add_versions("3.3.4", "98e5b361c525603f5296351e0c11820fd25908b52fe1ce8ff394d66b1537a259") + add_versions("3.3.5", "db78fd8d3f8706e9dff4be72bf71d37a3f12062f212f407e1c33bc4af3780dd0") + add_versions("3.3.6", "26e3449357f31b82489774ef5c2d502a711bb711d4faf99a5fd6c96328a1c205") + add_versions("3.3.7", "638c2c2d9ba968c240e296b3cf901ac60d3a6d9205eff68356673db47a94d836") + add_versions("3.3.8", "61208872dea249fb9621e950a15f438d2db70b0ca3aa3e91f5e8d0b078fc328d") + add_versions("3.3.9", "0a8a781710f58373077a91ca16a2fafc30a0bc3982fb9b9c5583f045833eca36") + add_versions("3.3.10", "00d61c1215667314f66e288c8285bae38cc6137fca083e5bba6c74e3a52439de") + add_versions("3.4.0", "475e24b84a18973312433f5280e267acbe1b4dac1b2e2ebb3cfce46051a8c08c") on_load("@windows|x64", function (package) package:add("deps", "msys2") From 2f92f8c3c5eda98355d42ff1bbe08ad9c9f8c01b Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 15 Jun 2024 07:51:34 +0800 Subject: [PATCH 154/671] lunasvg: support all platform (#4360) --- packages/l/lunasvg/xmake.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/l/lunasvg/xmake.lua b/packages/l/lunasvg/xmake.lua index 8b3c6cbaf..ba4ca3ab2 100644 --- a/packages/l/lunasvg/xmake.lua +++ b/packages/l/lunasvg/xmake.lua @@ -1,5 +1,4 @@ package("lunasvg") - set_homepage("https://github.com/sammycage/lunasvg") set_description("LunaSVG - SVG rendering library in C++") set_license("MIT") @@ -10,17 +9,15 @@ package("lunasvg") add_versions("v2.3.5", "350ff56aa1acdedefe2ad8a4241a9fb8f9b232868adc7bd36dfb3dbdd57e2e93") add_deps("cmake") - on_load("windows", function (package) - if package:config("shared") then - package:add("defines", "LUNASVG_SHARED") - end - end) - on_install("windows", "macosx", "linux", function (package) + on_install(function (package) local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) + if package:is_plat("windows") and package:config("shared") then + package:add("defines", "LUNASVG_SHARED") + end end) on_test(function (package) From ffed2eca0ef195b41de8741d8b6f6b74946456a5 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 15 Jun 2024 10:39:10 +0800 Subject: [PATCH 155/671] Update ngtcp2 to 1.6.0 (#4365) --- packages/n/ngtcp2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/ngtcp2/xmake.lua b/packages/n/ngtcp2/xmake.lua index a60d11ac6..e6cadedcc 100644 --- a/packages/n/ngtcp2/xmake.lua +++ b/packages/n/ngtcp2/xmake.lua @@ -4,6 +4,7 @@ package("ngtcp2") set_license("MIT") add_urls("https://github.com/ngtcp2/ngtcp2/releases/download/v$(version)/ngtcp2-$(version).tar.gz") + add_versions("1.6.0", "0c6f140268ef80a86b146714f7dc7c03a94699d019cd1815870ba222cb112bf0") add_versions("1.5.0", "fbd9c40848c235736377ba3fd0b8677a05d39e7c39406769588a6595dda5636f") add_versions("1.4.0", "163e26e6e7531b8bbcd7ec53d2c6b4ff3cb7d3654fde37b091e3174d37a8acd7") add_versions("1.3.0", "7d4244ac15a83a0f908ff810ba90a3fcd8352fb0020a6f9176e26507c9d3c3e4") From c55c7f79832d2f277fbf770b2aa613a9032a472a Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 15 Jun 2024 13:00:35 +0800 Subject: [PATCH 156/671] Update mvfst (#4362) * Update mvfst * Update xmake.lua * Update xmake.lua * Create shared.patch * Update xmake.lua * Update xmake.lua * Update shared.patch * Update xmake.lua * Delete packages/m/mvfst/patches/shared.patch * Update xmake.lua --- packages/m/mvfst/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index d872a68f6..60e575f32 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -10,6 +10,7 @@ package("mvfst") add_versions("2024.03.18", "7f42ad4b8da5646a24ba5e96101da914f77fe581abd686568d1dcd6492df0240") add_versions("2024.03.25", "293046511fb9395bdb09860f4c4202bcb848fed4cdd419d436506a07eeac66cd") add_versions("2024.04.01", "e39c4d7dd87520fcce6a3d5d398b5d03bd3e680186b9b0db23f02b502c6bcb1e") + add_versions("2024.06.10", "cc75889429a66463cc8e607ba09d584fb4e6d2e69b1127a538043b367c54a1ae") add_deps("cmake", "folly", "fizz") @@ -23,5 +24,5 @@ package("mvfst") end) on_test(function (package) - assert(package:has_cxxincludes("quic/QuicConstants.h", {configs = {languages = "c++17"}})) + assert(package:has_cxxfuncs("quic::isClientStream(0)", {includes = "quic/state/QuicStreamUtilities.h", configs = {languages = "c++17"}})) end) From b99851f378e183fb85bddef8c9b0ccdca0ecf05c Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 15 Jun 2024 14:09:03 +0800 Subject: [PATCH 157/671] Update cpptrace to v0.6.1 (#4366) --- packages/c/cpptrace/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index f2fea4f22..4c9045c58 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.6.1", "4bb478eedbe4b2c0093ef7af4f64795304850e03312e658076b25ef8d6019c75") add_versions("v0.6.0", "7c2996f03d15f61016bc81fe7fa5220b1cc42498333c5c0e699ad2f96b918b96") add_versions("v0.5.4", "bab0f76330f90c445216ccade1a3ff29c9c4bbd44805be34d52095cd95b02df4") add_versions("v0.5.2", "d148998e175b9c69ffb4383ab321a0d27487392e4eee3f39441d35b6856c8f78") From 9a42a80014ed125872c7d24c4ae4abeac6716a00 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 15 Jun 2024 14:09:06 +0800 Subject: [PATCH 158/671] Update cgltf to v1.14 (#4364) --- packages/c/cgltf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cgltf/xmake.lua b/packages/c/cgltf/xmake.lua index 303c2777c..62922922b 100644 --- a/packages/c/cgltf/xmake.lua +++ b/packages/c/cgltf/xmake.lua @@ -6,6 +6,7 @@ package("cgltf") add_urls("https://github.com/jkuhlmann/cgltf/archive/refs/tags/$(version).tar.gz", "https://github.com/jkuhlmann/cgltf.git") + add_versions("v1.14", "2f3c97a6b989943f50e7d7f228688f6558fe37b1411c13a350e3560d061707d8") add_versions("v1.13", "053d5320097334767486c6e33d01dd1b1c6224eac82aac2d720f4ec456d8c50b") on_install(function (package) From 42aff519125bd8e0c8ec51edce30878327e5a64b Mon Sep 17 00:00:00 2001 From: zerobut1 <68497251+zerobut1@users.noreply.github.com> Date: Sat, 15 Jun 2024 17:31:04 +0800 Subject: [PATCH 159/671] update vma-hpp version v3.1.0 (#4361) * update vma-hpp version * update vma-hpp v3.1.0 sha256 --- packages/v/vulkan-memory-allocator-hpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vulkan-memory-allocator-hpp/xmake.lua b/packages/v/vulkan-memory-allocator-hpp/xmake.lua index 537e6bb5e..dee108b2d 100644 --- a/packages/v/vulkan-memory-allocator-hpp/xmake.lua +++ b/packages/v/vulkan-memory-allocator-hpp/xmake.lua @@ -9,6 +9,7 @@ package("vulkan-memory-allocator-hpp") add_versions("v3.0.0", '2f062b1631af64519d09e7b319c2ba06d7de3c9c5589fb7109a3f4e341cee2b7') add_versions("v3.0.1-1", '0e0c374751d5ca6123d0ae0df756693f0674412d7c758ec4a39a5a9dcc412911') add_versions("v3.0.1-3", '66a3d4be3bc1404c844b5a36aadeb6b366878e7cf1efe899eb0a0095f3871aae') + add_versions("v3.1.0", 'f5cbce9b8efdb0de721f22b172c76184979e93ee45a008bfe515533d5d2e2d36') add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"}) add_configs("use_vulkanheaders", {description = "Use vulkan-headers package instead of vulkan-hpp.", default = false, type = "boolean"}) From 5c8b4ada7f29f8cc9496f748bbd338faac58f71d Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:21:53 +0200 Subject: [PATCH 160/671] joltphysics: support bsd and fix sse flags (#4330) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * joltphysics: support bsd * Update mingw_macos.yml * Update xmake.lua * test * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Add instruction sets flags * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update mingw_macos.yml --------- Co-authored-by: Jérôme Leclercq --- packages/j/joltphysics/xmake.lua | 79 ++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/packages/j/joltphysics/xmake.lua b/packages/j/joltphysics/xmake.lua index a89e49af9..708c05c71 100644 --- a/packages/j/joltphysics/xmake.lua +++ b/packages/j/joltphysics/xmake.lua @@ -12,6 +12,8 @@ package("joltphysics") add_versions("v3.0.1", "7ebb40bf2dddbcf0515984582aaa197ddd06e97581fd55b98cb64f91b243b8a6") add_versions("v3.0.0", "f8d756ae3471a32f2ee7e07475df2f7a34752f0fdd05e9a7ed2e7ce3dcdcd574") add_versions("v2.0.1", "96ae2e8691c4802e56bf2587da30f2cc86b8abe82a78bc2398065bd87dd718af") + -- patch for SSE instructions not enabled in 32bits mode + add_patches("v5.0.0", "https://github.com/jrouwe/JoltPhysics/commit/ebccdcbfae6b60e37480aa203d0781d26e437fbc.patch", "274f3a3ccbe2af8c1d94a66a96c894340764da2b447a13c43a665930c2d56337") -- patch for visibility attributes (fixes compilation in shared mode on GCC <13) add_patches("v4.0.0", "https://github.com/jrouwe/JoltPhysics/commit/b084d8f9054d78cb50bc851cc4db505462c4c634.patch", "a8f5da0bc5d4a1011771016be2ad1cdb00d4c40dd0909ef6ae4a1d1c95e8e251") -- patch for missing standard include (fixes Fedora compilation) @@ -29,7 +31,7 @@ package("joltphysics") add_configs("object_layer_bits", {description = "Number of bits to use in ObjectLayer. Can be 16 or 32.", default = "16", type = "string", values = {"16", "32"}}) add_configs("symbols", { description = "When turning this option on, the library will be compiled with debug symbols", default = false, type = "boolean" }) - if is_arch("x86", "x64", "x86_64") then + if is_arch("i386", "x86", "x64", "x86_64") then add_configs("inst_avx", { description = "Enable AVX CPU instructions (x86/x64 only)", default = false, type = "boolean" }) add_configs("inst_avx2", { description = "Enable AVX2 CPU instructions (x86/x64 only)", default = false, type = "boolean" }) add_configs("inst_avx512", { description = "Enable AVX512F+AVX512VL CPU instructions (x86/x64 only)", default = false, type = "boolean" }) @@ -74,9 +76,75 @@ package("joltphysics") if package:config("shared") then package:add("defines", "JPH_SHARED_LIBRARY") end + if package:is_arch("i386", "x86", "x64", "x86_64") then + -- add instruction sets (from https://github.com/jrouwe/JoltPhysics/blob/4cd52055e09160affcafa557b39520331bf0d034/Jolt/Jolt.cmake#L602) + if package:has_tool("cxx", "cl") then + if package:config("inst_avx512") then + package:add("cxxflags", "/arch:AVX512") + elseif package:config("inst_avx2") then + package:add("cxxflags", "/arch:AVX2") + elseif package:config("inst_avx") then + package:add("cxxflags", "/arch:AVX2") + end + else + if package:config("inst_avx512") then + package:add("cxxflags", "-mavx512f", "-mavx512vl", "-mavx512dq", "-mavx2", "-mbmi", "-mpopcnt", "-mlzcnt", "-mf16c") + elseif package:config("inst_avx2") then + package:add("cxxflags", "-mavx2", "-mbmi", "-mpopcnt", "-mlzcnt", "-mf16c") + elseif package:config("inst_avx") then + package:add("cxxflags", "-mavx", "-mpopcnt") + elseif package:config("inst_sse4_2") then + package:add("cxxflags", "-msse4.2", "-mpopcnt") + elseif package:config("inst_sse4_1") then + package:add("cxxflags", "-msse4.1") + else + package:add("cxxflags", "-msse2") + end + if package:config("inst_lzcnt") then + package:add("cxxflags", "-mlzcnt") + end + if package:config("inst_tzcnt") then + package:add("cxxflags", "-mbmi") + end + if package:config("inst_f16c") then + package:add("cxxflags", "-mf16c") + end + if package:config("inst_fmadd") and not package:config("cross_platform_deterministic") then + package:add("cxxflags", "-mfma") + end + package:add("cxxflags", "-mfpmath=sse") + end + if package:config("inst_avx512") then + package:add("defines", "JPH_USE_AVX512") + end + if package:config("inst_avx2") then + package:add("defines", "JPH_USE_AVX2") + end + if package:config("inst_avx") then + package:add("defines", "JPH_USE_AVX") + end + if package:config("inst_sse4_1") then + package:add("defines", "JPH_USE_SSE4_1") + end + if package:config("inst_sse4_2") then + package:add("defines", "JPH_USE_SSE4_2") + end + if package:config("inst_lzcnt") then + package:add("defines", "JPH_USE_LZCNT") + end + if package:config("inst_tzcnt") then + package:add("defines", "JPH_USE_TZCNT") + end + if package:config("inst_f16c") then + package:add("defines", "JPH_USE_F16C") + end + if package:config("inst_fmadd") and not package:config("cross_platform_deterministic") then + package:add("defines", "JPH_USE_FMADD") + end + end end) - on_install("windows", "mingw", "linux", "macosx", "iphoneos", "android", "wasm", function (package) + on_install("windows", "mingw", "linux", "macosx", "iphoneos", "android", "wasm", "bsd", function (package) -- Jolt CMakeLists had no install target/support for custom msvc runtime until 3.0.0 local version = package:version() if not version or version:ge("3.0.0") then @@ -107,7 +175,12 @@ package("joltphysics") table.insert(configs, "-DUSE_SSE4_1=" .. (package:config("inst_sse4_1") and "ON" or "OFF")) table.insert(configs, "-DUSE_SSE4_2=" .. (package:config("inst_sse4_2") and "ON" or "OFF")) table.insert(configs, "-DUSE_TZCNT=" .. (package:config("inst_tzcnt") and "ON" or "OFF")) - + -- https://github.com/jrouwe/JoltPhysics/issues/1133 + if package:is_plat("wasm") then + table.insert(configs, "-DEMSCRIPTEN_SYSTEM_PROCESSOR=" .. package:targetarch()) + elseif package:is_plat("mingw") or (package:is_plat("linux", "macosx", "cross") and package:is_cross()) then + table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=" .. package:targetarch()) + end import("package.tools.cmake").install(package, configs) else os.cp(path.join(os.scriptdir(), "port", "xmake.lua"), "xmake.lua") From a4d9acfe9786200aab998c7b74ce7c3baccfbecf Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 15 Jun 2024 23:58:21 +0800 Subject: [PATCH 161/671] update wangle to 06.10 (#4368) * update wangle to 06.10 * Update test * Update xmake.lua * Update xmake.lua --- packages/f/folly/xmake.lua | 3 +++ packages/w/wangle/xmake.lua | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 19aecf100..5fd91bead 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -38,6 +38,9 @@ package("folly") if is_plat("linux") then add_syslinks("pthread") end + if is_plat("macosx") then + add_syslinks("c++abi") + end on_load("linux", function (package) package:add("deps", "libaio") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index 4e8e67970..469b4370d 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -11,6 +11,7 @@ package("wangle") add_versions("2024.03.18", "578986898b3464ed9bd2e392a08d07604b68b2251322518c1f819c965eebe8f2") add_versions("2024.03.25", "3de926ff92e59f5185e89e5e9365925530e5e57fd70f8e5107938149ce2fe140") add_versions("2024.04.01", "c21c3616d3017bc7b72f6b2315f81be4fd9be4c0dc6e1fae0266ec545fbc5535") + add_versions("2024.06.10", "0328a481258a399a70ee2d003be8d482529b2f26e79ea2c218a32361051ea5be") add_deps("cmake", "folly", "fizz") @@ -25,5 +26,11 @@ package("wangle") end) on_test(function (package) - assert(package:has_cxxincludes("wangle/channel/AsyncSocketHandler.h", {configs = {languages = "c++17"}})) + assert(package:check_cxxsnippets({test = [[ + #include + #include "wangle/util/FilePoller.h" + void test() { + wangle::FilePoller poller(std::chrono::milliseconds(1)); + } + ]]}, {configs = {languages = "c++17"}})) end) From 13b95dff51f6f739488cd84dbf20c663b0710b80 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 16 Jun 2024 11:19:25 +0800 Subject: [PATCH 162/671] Update string-view-lite to v1.8.0 (#4376) --- packages/s/string-view-lite/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/string-view-lite/xmake.lua b/packages/s/string-view-lite/xmake.lua index 2a6b20575..8a6630500 100644 --- a/packages/s/string-view-lite/xmake.lua +++ b/packages/s/string-view-lite/xmake.lua @@ -7,6 +7,7 @@ package("string-view-lite") add_urls("https://github.com/martinmoene/string-view-lite/archive/refs/tags/$(version).tar.gz", "https://github.com/martinmoene/string-view-lite.git") + add_versions("v1.8.0", "9b38c32621eb1a81a7fa59427144309225c414a7bae522ab3a2d9ae239dd35be") add_versions("v1.7.0", "265eaec08c4555259b46f5b03004dbc0f7206384edfac1cd5a837efaa642e01c") add_deps("cmake") From fcdb5bdd345fa4c724a519f30d2ff986d25272b0 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 16 Jun 2024 11:19:30 +0800 Subject: [PATCH 163/671] Update onednn to v3.5 (#4372) --- packages/o/onednn/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onednn/xmake.lua b/packages/o/onednn/xmake.lua index 0550d361f..501cb2afa 100644 --- a/packages/o/onednn/xmake.lua +++ b/packages/o/onednn/xmake.lua @@ -6,6 +6,7 @@ package("onednn") add_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/$(version).tar.gz", "https://github.com/oneapi-src/oneDNN.git") + add_versions("v3.5", "8356aa9befde4d4ff93f1b016ac4310730b2de0cc0b8c6c7ce306690bc0d7b43") add_versions("v3.4.3", "b795dc07d0d83aaec531081e77d5fb2e503a143f4330eabe4f035d4117c191ae") add_versions("v3.4.2", "5131ac559a13daa6e2784d20ab24e4607e55aa6da973518086326a647d389425") add_versions("v3.4.1", "906559a25581b292352420721112e1656d21029b66e8597816f9e741fbcdeadb") From 7ef0e3ceb71cf242def0c29dbc31a6810474a4ef Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 16 Jun 2024 12:32:07 +0800 Subject: [PATCH 164/671] Update fbthrift to 06.10 (#4371) * Update xmake.lua * Update xmake.lua --- packages/f/fbthrift/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index ba9118fd5..741a33ef9 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -10,6 +10,7 @@ package("fbthrift") add_versions("2024.03.18", "e1d8d7cc0a718e3c18934ac198ee3ad63848b90e8a19d62b2b7d54f0c878089c") add_versions("2024.03.25", "2a325446cd3a149a892c0c6abcb0f6f6cf83b72266d83ad279d2fdd9340aeef2") add_versions("2024.04.01", "e408a973a59a37def97a8e0ec368ee9fa39c8d49c925ecf7335f1c0463c1a819") + add_versions("2024.06.10", "a71481f9621891a5094d93a7c49d630ae544a1f056a93811742df6469b95bf64") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") @@ -23,5 +24,5 @@ package("fbthrift") end) on_test(function (package) - assert(package:has_cxxincludes("thrift/lib/cpp2/async/HeaderClientChannel.h", {configs = {languages = "c++17"}})) + assert(package:has_cxxfuncs("apache::thrift::detail::validate_bool(0)", {includes = "thrift/lib/cpp2/protocol/Protocol.h", configs = {languages = "c++17"}})) end) From c76409b3a2ce2036dc5347ebe5161e62d8deafca Mon Sep 17 00:00:00 2001 From: apocelipes Date: Sun, 16 Jun 2024 16:54:59 +0800 Subject: [PATCH 165/671] Update CImg to 3.4.0 (#4377) --- packages/c/cimg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cimg/xmake.lua b/packages/c/cimg/xmake.lua index ada12ead8..9a17244d4 100644 --- a/packages/c/cimg/xmake.lua +++ b/packages/c/cimg/xmake.lua @@ -9,6 +9,7 @@ package("cimg") end}) add_urls("https://github.com/greyclab/cimg.git") + add_versions("v3.4.0", "987bddc3a98ec684c2ffc7968881adb2626f5b09c90e6102947b3c4acd0de931") add_versions("v3.3.6", "7bb6621c38458152f3d1cae3f020e4ca6a314076cb7b4b5d6bbf324ad3d0ab88") add_versions("v3.2.6", "1fcca9a7a453aa278660c10d54c6db9b4c614b6a29250adeb231e95a0be209e7") From a815ba49334cf0d2883d7174e2004fa857059c4c Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 16 Jun 2024 21:40:30 +0800 Subject: [PATCH 166/671] Update proxygen to 06.10 (#4378) * Update proxygen to 06.10 * Update xmake.lua * Update xmake.lua * migrate config --- packages/f/folly/xmake.lua | 17 ++++++++++++++--- packages/p/proxygen/xmake.lua | 10 +++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 5fd91bead..5072b934f 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -30,6 +30,10 @@ package("folly") add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end + add_configs("lzma", {description = "Support LZMA for compression", default = true, type = "boolean"}) + add_configs("libaio", {description = "Support compile with libaio", default = true, type = "boolean"}) + add_configs("liburing", {description = "Support compile with liburing", default = true, type = "boolean"}) + add_deps("cmake") add_deps("boost", {configs = {date_time = true, iostreams = true, context = true, filesystem = true, program_options = true, regex = true, system = true, thread = true}}) add_deps("libevent", {configs = {openssl = true}}) @@ -42,9 +46,16 @@ package("folly") add_syslinks("c++abi") end - on_load("linux", function (package) - package:add("deps", "libaio") - package:add("deps", "liburing") + on_load(function (package) + if package:config("lzma") then + package:add("deps", "xz") + end + if package:is_plat("linux") and package:config("libaio") then + package:add("deps", "libaio") + end + if package:is_plat("linux") and package:config("liburing") then + package:add("deps", "liburing") + end end) on_install("linux", "macosx", function (package) diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 0abcd037a..85d989d85 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -10,6 +10,7 @@ package("proxygen") add_versions("2024.03.18", "7731c5eea71f1ab3182a1a54329abae983ac63794f86768762a0136587dfd979") add_versions("2024.03.25", "b11c8da4dbcbbdde8d9504f2edd3eb537bdf959eccc07a8333d1936965437abc") add_versions("2024.04.01", "75b040c235fee853e8db90075620f56ee4aa69345eea9ab4f80aa35501fe2eff") + add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") @@ -23,5 +24,12 @@ package("proxygen") end) on_test(function (package) - assert(package:has_cxxincludes("proxygen/httpserver/ScopedHTTPServer.h", {configs = {languages = "c++17"}})) + assert(package:check_cxxsnippets({test = [[ + #include "proxygen/httpserver/HTTPServer.h" + void test() { + proxygen::HTTPServerOptions options; + options.threads = 4; + proxygen::HTTPServer server(std::move(options)); + } + ]]}, {configs = {languages = "c++17"}})) end) From e5bcf43d86d2d6e4586fa087b605b4179362a76a Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 16 Jun 2024 23:12:48 +0800 Subject: [PATCH 167/671] add pkg-config deps for ffmpeg (#4379) --- packages/f/ffmpeg/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index 794852dc5..eb993774d 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -63,6 +63,9 @@ package("ffmpeg") end add_deps("nasm") + if is_plat("linux", "macosx") then + add_deps("pkg-config") + end on_fetch("mingw", "linux", "macosx", function (package, opt) import("lib.detect.find_tool") From 73c1c991791e2c52cdb9122424aad60aabbcad16 Mon Sep 17 00:00:00 2001 From: Maxime <672982+maximegmd@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:38:46 +0200 Subject: [PATCH 168/671] I don't know anymore (#4380) --- packages/l/libuv/xmake.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/l/libuv/xmake.lua b/packages/l/libuv/xmake.lua index 705d3ede5..acc2e4a8b 100644 --- a/packages/l/libuv/xmake.lua +++ b/packages/l/libuv/xmake.lua @@ -33,13 +33,15 @@ package("libuv") end -- https://github.com/libuv/libuv/issues/3411 - on_check("android", function (package) - if package:version():ge("1.47.0") then - local ndk = package:toolchain("ndk") - local ndk_sdkver = ndk:config("ndk_sdkver") - assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libuv): need ndk api level >= 24 after v1.47.0") - end - end) + if on_check then + on_check("android", function (package) + if package:version():ge("1.47.0") then + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libuv): need ndk api level >= 24 after v1.47.0") + end + end) + end on_load(function (package) local version = package:version() From 17757122a9c675824ed45e97cb1c014159264aed Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 17 Jun 2024 10:32:31 +0800 Subject: [PATCH 169/671] Update dynareadout to 24.05 (#4382) --- packages/d/dynareadout/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/dynareadout/xmake.lua b/packages/d/dynareadout/xmake.lua index 696f7231e..375bb9bfa 100644 --- a/packages/d/dynareadout/xmake.lua +++ b/packages/d/dynareadout/xmake.lua @@ -5,6 +5,7 @@ package("dynareadout") add_urls("https://github.com/PucklaJ/dynareadout/archive/refs/tags/$(version).tar.gz", "https://github.com/PucklaJ/dynareadout.git") + add_versions("24.05", "86e045f23d1e1d3ed2e002774f8f04badc5c974c3441bdc07f3a82c5711328c9") add_versions("24.03", "d91feb2ebfa604b543dd6d98c3dd5aee5c489e6987159fef78dfcea1aad64bd5") add_versions("22.12", "2e430c718c610d4425e23d4c6c87fe4794bb8c76d3cc015988706dbf5027daa4") add_versions("23.01", "578080c734927cc925e7e91a52317bc3e710965071f1da50853b1e48f81a1c0f") From 467ef6aa5f4bf2b3b235491f21b47e7b859b6d49 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 17 Jun 2024 10:59:33 +0800 Subject: [PATCH 170/671] Update trantor to v1.5.19 (#4384) --- packages/t/trantor/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/trantor/xmake.lua b/packages/t/trantor/xmake.lua index b1e0d09f2..6e71cdfe2 100644 --- a/packages/t/trantor/xmake.lua +++ b/packages/t/trantor/xmake.lua @@ -6,6 +6,7 @@ package("trantor") add_urls("https://github.com/an-tao/trantor/archive/refs/tags/$(version).tar.gz", "https://github.com/an-tao/trantor.git") + add_versions("v1.5.19", "a2f55a98fd4b0737ba0e2cd77d2f237253e607b2047071be04a9ea76587bb608") add_versions("v1.5.18", "f8227eb5307671496db435736e0b856529afae420b148c60a2b36839d6738707") add_versions("v1.5.17", "10689dc1864a3fdb08cba824475996346a1bfb083575fd3d62858aaefa9044d9") add_versions("v1.3.0", "524589dc9258e1ace3b2f887b835cfbeccab3c5efc4ba94963c59f3528248d9b") From 3531b6c27ac441b50b51d795159a141e4060b938 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 17 Jun 2024 11:41:37 +0800 Subject: [PATCH 171/671] Update ittapi to v3.24.8 (#4385) --- packages/i/ittapi/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/ittapi/xmake.lua b/packages/i/ittapi/xmake.lua index 1a5f3d88d..e2551a177 100644 --- a/packages/i/ittapi/xmake.lua +++ b/packages/i/ittapi/xmake.lua @@ -6,6 +6,7 @@ package("ittapi") add_urls("https://github.com/intel/ittapi/archive/refs/tags/$(version).tar.gz", "https://github.com/intel/ittapi.git") + add_versions("v3.24.8", "4e57ece3286f3b902d17b1247710f0f6f9a370cc07d5e67631d3656ffac28d81") add_versions("v3.24.7", "2ff56c5c3f144b92e34af9bee451115f6076c9070ec92d361c3c07de8ff42649") add_versions("v3.24.6", "4e6cb42b6bd9e699e3dfbaf678e572f4292127dfee3312744137ac567064a26f") add_versions("v3.24.4", "f7341c563f228f4358b645fce526208c742fe13e61fc3ba2c777ba94d36e98f5") From 427f3c285f6d8b4bc1649abe2909702f3cfb0a91 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 17 Jun 2024 16:39:45 +0800 Subject: [PATCH 172/671] neco: add package (#4349) * neco: add package * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/n/neco/xmake.lua | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 packages/n/neco/xmake.lua diff --git a/packages/n/neco/xmake.lua b/packages/n/neco/xmake.lua new file mode 100644 index 000000000..a606be78d --- /dev/null +++ b/packages/n/neco/xmake.lua @@ -0,0 +1,54 @@ +package("neco") + set_homepage("https://github.com/tidwall/neco") + set_description("Concurrency library for C (coroutines)") + set_license("MIT") + + add_urls("https://github.com/tidwall/neco/archive/refs/tags/$(version).tar.gz", + "https://github.com/tidwall/neco.git") + + add_versions("v0.3.2", "ae3cefa6217428e992da0b30f254502b9974079dd9973eee9c482ea89df3fcef") + + if is_plat("linux", "bsd") then + add_syslinks("pthread", "dl") + elseif is_plat("mingw") then + add_syslinks("ws2_32", "wsock32") + end + + if on_check then + on_check("windows", function (package) + assert(package:has_cincludes("stdatomic.h", {configs = {languages = "c11"}}), + "package(neco) Require at least C11 and stdatomic.h") + end) + end + + on_install("linux", "mingw|x86_64", "windows", "bsd", "android", "iphoneos", function (package) + io.replace("neco.c", "#if defined(__linux__) && !defined(_GNU_SOURCE)", + "#if defined(__linux__) && !defined(_GNU_SOURCE) && !defined(__ANDROID__)", {plain = true}) + io.replace("neco.c", "&(int){1}", "(const char*)&(int){1}", {plain = true}) + if package:is_plat("linux") then + io.replace("neco.c", "#include ", "#include \n#include \n#include ", {plain = true}) + end + io.writefile("xmake.lua", [[ + add_rules("mode.release", "mode.debug") + set_warnings("none") + set_languages("c11") + target("neco") + set_kind("$(kind)") + add_files("neco.c") + add_headerfiles("neco.h") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + if is_plat("linux", "bsd") then + add_syslinks("pthread", "dl") + add_defines("_BSD_SOURCE") + elseif is_plat("windows", "mingw") then + add_syslinks("ws2_32", "wsock32") + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("neco_start", {includes = "neco.h"})) + end) From 94cc8cd4ebadb279ec895c59564c56df7df43285 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 17 Jun 2024 21:41:48 +0800 Subject: [PATCH 173/671] Update highs to v1.7.1 (#4383) --- packages/h/highs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/highs/xmake.lua b/packages/h/highs/xmake.lua index f8668c016..54f5c42f0 100644 --- a/packages/h/highs/xmake.lua +++ b/packages/h/highs/xmake.lua @@ -6,6 +6,7 @@ package("highs") add_urls("https://github.com/ERGO-Code/HiGHS/archive/refs/tags/$(version).tar.gz", "https://github.com/ERGO-Code/HiGHS.git") + add_versions("v1.7.1", "65c6f9fc2365ced42ee8eb2d209a0d3a7942cd59ff4bd20464e195c433f3a885") add_versions("v1.7.0", "d10175ad66e7f113ac5dc00c9d6650a620663a6884fbf2942d6eb7a3d854604f") add_versions("v1.5.3", "ce1a7d2f008e60cc69ab06f8b16831bd0fcd5f6002d3bbebae9d7a3513a1d01d") From 86fc7efaac147702d4b0142ebd00970b966af6e2 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 17 Jun 2024 21:41:53 +0800 Subject: [PATCH 174/671] Auto-update nghttp3 to v1.4.0 (#4363) * Update nghttp3 to v1.4.0 * add patch * enable all platform --------- Co-authored-by: star9029 --- .../nghttp3/patches/{ => 1.3.0}/vendor.patch | 0 packages/n/nghttp3/patches/1.4.0/vendor.patch | 28 +++++++++++++++++++ packages/n/nghttp3/xmake.lua | 15 +++++----- 3 files changed, 35 insertions(+), 8 deletions(-) rename packages/n/nghttp3/patches/{ => 1.3.0}/vendor.patch (100%) create mode 100644 packages/n/nghttp3/patches/1.4.0/vendor.patch diff --git a/packages/n/nghttp3/patches/vendor.patch b/packages/n/nghttp3/patches/1.3.0/vendor.patch similarity index 100% rename from packages/n/nghttp3/patches/vendor.patch rename to packages/n/nghttp3/patches/1.3.0/vendor.patch diff --git a/packages/n/nghttp3/patches/1.4.0/vendor.patch b/packages/n/nghttp3/patches/1.4.0/vendor.patch new file mode 100644 index 000000000..fafb28765 --- /dev/null +++ b/packages/n/nghttp3/patches/1.4.0/vendor.patch @@ -0,0 +1,28 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2196dd0..ea839e5 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -60,7 +60,6 @@ set(nghttp3_SOURCES + nghttp3_opl.c + nghttp3_objalloc.c + nghttp3_unreachable.c +- sfparse/sfparse.c + ) + + set(NGHTTP3_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") +@@ -90,6 +89,7 @@ install( + # Public shared library + if(ENABLE_SHARED_LIB) + add_library(nghttp3 SHARED ${nghttp3_SOURCES}) ++ target_link_libraries(nghttp3 sfparse) + set_target_properties(nghttp3 PROPERTIES + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} +@@ -106,6 +106,7 @@ endif() + if(ENABLE_STATIC_LIB) + # Public static library + add_library(nghttp3_static STATIC ${nghttp3_SOURCES}) ++ target_link_libraries(nghttp3_static sfparse) + set_target_properties(nghttp3_static PROPERTIES + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} diff --git a/packages/n/nghttp3/xmake.lua b/packages/n/nghttp3/xmake.lua index 17c68523f..a3dbfe257 100644 --- a/packages/n/nghttp3/xmake.lua +++ b/packages/n/nghttp3/xmake.lua @@ -6,19 +6,15 @@ package("nghttp3") add_urls("https://github.com/ngtcp2/nghttp3/archive/refs/tags/$(version).tar.gz", "https://github.com/ngtcp2/nghttp3.git") + add_versions("v1.4.0", "522c8952ccae1815f34425f0c8bc6d8a4660e72dada1b4e97b8223e4c459a84a") add_versions("v1.3.0", "a83c6a4f589ae777a5f967652969d99b3399a85971340b8de9bed79119a11f88") - add_patches("v1.3.0", "patches/vendor.patch", "51ab785328270b8df854283a8c20403c09813b0586eb84702a9c20241ff14980") + add_patches("1.4.0", "patches/1.4.0/vendor.patch", "a6d611938c797d721a0345c5c772a1405ae0d6587ae46e16c1b73c89090a5c08") + add_patches("1.3.0", "patches/1.3.0/vendor.patch", "51ab785328270b8df854283a8c20403c09813b0586eb84702a9c20241ff14980") add_deps("cmake", "sfparse") - on_load("windows", function (package) - if not package:config("shared") then - package:add("defines", "NGHTTP3_STATICLIB") - end - end) - - on_install("windows", "macosx", "linux", function (package) + on_install(function (package) local configs = {"-DENABLE_LIB_ONLY=ON", "-DBUILD_TESTING=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DENABLE_SHARED_LIB=" .. (package:config("shared") and "ON" or "OFF")) @@ -27,6 +23,9 @@ package("nghttp3") table.insert(configs, "-DENABLE_STATIC_CRT=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) end import("package.tools.cmake").install(package, configs, {packagedeps = "sfparse"}) + if not package:config("shared") then + package:add("defines", "NGHTTP3_STATICLIB") + end end) on_test(function (package) From cb4a9e7fc105daba6b8ae607b90bd6aad75351cf Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 17 Jun 2024 21:43:16 +0800 Subject: [PATCH 175/671] mathter: add package (#4388) * mathter: add package * add xsimd config --- packages/m/mathter/xmake.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/m/mathter/xmake.lua diff --git a/packages/m/mathter/xmake.lua b/packages/m/mathter/xmake.lua new file mode 100644 index 000000000..85d313015 --- /dev/null +++ b/packages/m/mathter/xmake.lua @@ -0,0 +1,33 @@ +package("mathter") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/petiaccja/Mathter") + set_description("A flexible and fast matrix, transform and geometry library.") + set_license("MIT") + + add_urls("https://github.com/petiaccja/Mathter/archive/refs/tags/$(version).tar.gz", + "https://github.com/petiaccja/Mathter.git") + + add_versions("v1.1.1", "510e6aa198cd7b207a44d319e4471021f207cba8c4d2d7e40086f1f042fe13ab") + + add_configs("xsimd", {description = "Uses XSimd for vectorization of math routines. Uses scalar fallback if turned off.", default = false, type = "boolean"}) + + on_load(function (package) + if package:config("xsimd") then + package:add("deps", "xsimd") + package:add("defines", "MATHTER_USE_XSIMD") + end + end) + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + using namespace mathter; + using Vec2 = Vector; + void test() { + Vec2 a = { 1, 2 }; + } + ]]}, {configs = {languages = "c++17"}, includes = "Mathter/Vector.hpp"})) + end) From 07042e61898a1f192c91bb61caf15738393fefe0 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 18 Jun 2024 09:32:18 +0800 Subject: [PATCH 176/671] fix directxtk (#4386) * fix directxtk * fix some errors * fix some errors --- packages/d/directxtk/xmake.lua | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/d/directxtk/xmake.lua b/packages/d/directxtk/xmake.lua index eb023a3f4..e1a272e66 100644 --- a/packages/d/directxtk/xmake.lua +++ b/packages/d/directxtk/xmake.lua @@ -1,7 +1,6 @@ package("directxtk") - set_homepage("https://github.com/microsoft/DirectXTK") - set_description("This package contains the \"DirectX Tool Kit\", a collection of helper classes for writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10, Xbox One, and Win32 desktop applications for Windows 7 Service Pack 1 or later.") + set_description("A collection of helper classes for writing Direct3D 11 C++ code For Windows.") set_urls("https://github.com/microsoft/DirectXTK/archive/$(version).zip", "https://github.com/microsoft/DirectXTK.git", @@ -19,12 +18,27 @@ package("directxtk") add_versions("21.11.0", "d25e634b0e225ae572f82d0d27c97051b0069c6813d7be12453039a504dffeb8") add_versions("24.2.0", "edb643b2444ff24925339cfb1bc9f76c671d5404a5549d32ecaa0d61bbab28c9") + add_deps("cmake") + + -- FIXME arm/MT met some link errors + if is_arch("arm.*") then + add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true}) + end + + if on_check then + on_check("windows", function (package) + local vs_sdkver = package:toolchain("msvc"):config("vs_sdkver") + if vs_sdkver then + local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*") + assert(tonumber(build_ver) >= 19041, "DirectXTK requires Windows SDK to be at least 10.0.19041.0") + end + end) + end + on_install("windows", function (package) local configs = {} - local vs_sdkver = import("core.tool.toolchain").load("msvc"):config("vs_sdkver") + local vs_sdkver = package:toolchain("msvc"):config("vs_sdkver") if vs_sdkver then - local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*") - assert(tonumber(build_ver) >= 19041, "DirectXTK requires Windows SDK to be at least 10.0.19041.0") table.insert(configs, "-DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=" .. vs_sdkver) table.insert(configs, "-DCMAKE_SYSTEM_VERSION=" .. vs_sdkver) end @@ -39,11 +53,9 @@ package("directxtk") on_test(function (package) assert(package:check_cxxsnippets({test = [[ - void test() - { + void test() { DirectX::SimpleMath::Vector3 eye(0.0f, 0.7f, 1.5f); DirectX::SimpleMath::Vector3 at(0.0f, -0.1f, 0.0f); - auto lookAt = DirectX::SimpleMath::Matrix::CreateLookAt(eye, at, DirectX::SimpleMath::Vector3::UnitY); } ]]}, {configs = {languages = "c++11"}, includes = { "windows.h", "SimpleMath.h" } })) From 27b8d29a249ef2e9f2e1e470f30cf31e62846bfb Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 18 Jun 2024 09:42:26 +0800 Subject: [PATCH 177/671] quickjs-ng: add package (#4389) * quickjs-ng: add package * add check stdatomic * fix bsd pthread * limit arch * fix typo --- packages/q/quickjs-ng/xmake.lua | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/q/quickjs-ng/xmake.lua diff --git a/packages/q/quickjs-ng/xmake.lua b/packages/q/quickjs-ng/xmake.lua new file mode 100644 index 000000000..374906685 --- /dev/null +++ b/packages/q/quickjs-ng/xmake.lua @@ -0,0 +1,40 @@ +package("quickjs-ng") + set_homepage("https://github.com/quickjs-ng/quickjs") + set_description("QuickJS, the Next Generation: a mighty JavaScript engine") + set_license("MIT") + + add_urls("https://github.com/quickjs-ng/quickjs/archive/refs/tags/$(version).tar.gz", + "https://github.com/quickjs-ng/quickjs.git") + + add_versions("v0.5.0", "41212a6fb84bfe07d61772c02513734b7a06465843ba8f76f1ce1e5df866f489") + + if is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + end + + add_deps("cmake") + + if on_check then + on_check("windows", function (package) + local msvc = package:toolchain("msvc") + if msvc then + local vs = msvc:config("vs") + assert(vs and tonumber(vs) >= 2022, "package(quickjs-ng): need vs >= 2022") + end + end) + end + + on_install("!iphoneos and !windows@x86", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DCONFIG_ASAN=" .. (package:config("asan") and "ON" or "OFF")) + if package:config("shared") and package:is_plat("windows") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("JS_NewRuntime", {includes = "quickjs.h"})) + end) From 6054d6ce4ffb79a0d45dc330d9ab63dfdd011bc2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 18 Jun 2024 14:31:10 +0800 Subject: [PATCH 178/671] rocket: add package (#4392) --- packages/r/rocket/xmake.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/r/rocket/xmake.lua diff --git a/packages/r/rocket/xmake.lua b/packages/r/rocket/xmake.lua new file mode 100644 index 000000000..5880e6f66 --- /dev/null +++ b/packages/r/rocket/xmake.lua @@ -0,0 +1,25 @@ +package("rocket") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/tripleslash/rocket") + set_description("Fast single header signal/slots library for C++") + + add_urls("https://github.com/tripleslash/rocket/archive/348869fcda83f8b8b521c7654f83fea07ebe7a0a.tar.gz", + "https://github.com/tripleslash/rocket.git") + + add_versions("2020.06.03", "de03b9c7f9b9478cfaa60683f95a7b0773dc0929d14e510c23f53b3804cc921f") + + on_install(function (package) + io.replace("rocket.hpp", "return thread_id != std::thread::id{}", "return !(thread_id == std::thread::id{})", {plain = true}) + io.replace("rocket.hpp", "&& thread_id != std::this_thread::get_id();", "&& !(thread_id == std::this_thread::get_id());", {plain = true}) + os.cp("rocket.hpp", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + rocket::signal thread_unsafe_signal; + rocket::thread_safe_signal thread_safe_signal; + thread_unsafe_signal.connect([]() {}); + } + ]]}, {configs = {languages = "c++17"}, includes = "rocket.hpp"})) + end) From f6ce744cdf7799e382aaa7c7fe0fe385e3f3fa97 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 18 Jun 2024 14:48:33 +0800 Subject: [PATCH 179/671] metall: add package --- packages/m/metall/xmake.lua | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 packages/m/metall/xmake.lua diff --git a/packages/m/metall/xmake.lua b/packages/m/metall/xmake.lua new file mode 100644 index 000000000..b60c81451 --- /dev/null +++ b/packages/m/metall/xmake.lua @@ -0,0 +1,37 @@ +package("metall") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/LLNL/metall") + set_description("Persistent memory allocator for data-centric analytics") + set_license("Apache-2.0") + + add_urls("https://github.com/LLNL/metall/archive/refs/tags/$(version).tar.gz", + "https://github.com/LLNL/metall.git") + + add_versions("v0.28", "770dedb7f8220c333688b232a22104ca9d8d5823e7a8a21152b58ef970eb85d0") + + if is_plat("linux", "bsd") then + add_syslinks("pthread") + end + + add_deps("cmake") + add_deps("boost") + + on_install(function (package) + import("package.tools.cmake").install(package, { + "-DJUST_INSTALL_METALL_HEADER=ON" + }) + end) + + on_test(function (package) + assert(package:has_cfuncs("metall_create", {includes = "metall/c_api/metall.h"})) + assert(package:check_cxxsnippets({test = [[ + #include + #include + using vector_t = boost::container::vector>; + void test() { + metall::manager manager(metall::open_only, "/tmp/dir"); + auto pvec = manager.find("vec").first; + pvec->push_back(10); + } + ]]}, {configs = {languages = "c++17"}})) + end) From 6ea59190676476e1f22c5d4f6e4ad08bf63d660d Mon Sep 17 00:00:00 2001 From: x <34228625+xixioba@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:20:37 +0800 Subject: [PATCH 180/671] Fix cpptrace linux build (#4394) add linux dl syslink --- packages/c/cpptrace/xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index 4c9045c58..686f64007 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -21,8 +21,11 @@ package("cpptrace") if is_plat("windows") then add_syslinks("dbghelp") - elseif is_plat("linux", "macosx") then + elseif is_plat("macosx") then add_deps("libdwarf") + elseif is_plat("linux") then + add_deps("libdwarf") + add_syslinks("dl") elseif is_plat("mingw") then add_deps("libdwarf") add_syslinks("dbghelp") From 157c5563b37aad3eb9f7f289a15cdc94d92a2602 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 18 Jun 2024 21:11:19 +0800 Subject: [PATCH 181/671] Revert "metall: add package" This reverts commit f6ce744cdf7799e382aaa7c7fe0fe385e3f3fa97. --- packages/m/metall/xmake.lua | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 packages/m/metall/xmake.lua diff --git a/packages/m/metall/xmake.lua b/packages/m/metall/xmake.lua deleted file mode 100644 index b60c81451..000000000 --- a/packages/m/metall/xmake.lua +++ /dev/null @@ -1,37 +0,0 @@ -package("metall") - set_kind("library", {headeronly = true}) - set_homepage("https://github.com/LLNL/metall") - set_description("Persistent memory allocator for data-centric analytics") - set_license("Apache-2.0") - - add_urls("https://github.com/LLNL/metall/archive/refs/tags/$(version).tar.gz", - "https://github.com/LLNL/metall.git") - - add_versions("v0.28", "770dedb7f8220c333688b232a22104ca9d8d5823e7a8a21152b58ef970eb85d0") - - if is_plat("linux", "bsd") then - add_syslinks("pthread") - end - - add_deps("cmake") - add_deps("boost") - - on_install(function (package) - import("package.tools.cmake").install(package, { - "-DJUST_INSTALL_METALL_HEADER=ON" - }) - end) - - on_test(function (package) - assert(package:has_cfuncs("metall_create", {includes = "metall/c_api/metall.h"})) - assert(package:check_cxxsnippets({test = [[ - #include - #include - using vector_t = boost::container::vector>; - void test() { - metall::manager manager(metall::open_only, "/tmp/dir"); - auto pvec = manager.find("vec").first; - pvec->push_back(10); - } - ]]}, {configs = {languages = "c++17"}})) - end) From 6ede0ce215fb40909bd8450882072ad9b795b715 Mon Sep 17 00:00:00 2001 From: c8ef Date: Wed, 19 Jun 2024 10:06:32 +0800 Subject: [PATCH 182/671] improve folly (#4381) * Create xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * add namespace * try different clang version * test problematic source * Update xmake.lua * rollback ubuntu_clang.yml * Delete packages/c/cachelib/xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * test * rollback test * Update xmake.lua --- packages/f/folly/xmake.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 5072b934f..26e155459 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -33,6 +33,7 @@ package("folly") add_configs("lzma", {description = "Support LZMA for compression", default = true, type = "boolean"}) add_configs("libaio", {description = "Support compile with libaio", default = true, type = "boolean"}) add_configs("liburing", {description = "Support compile with liburing", default = true, type = "boolean"}) + add_configs("libdwarf", {description = "Support compile with libdwarf", default = true, type = "boolean"}) add_deps("cmake") add_deps("boost", {configs = {date_time = true, iostreams = true, context = true, filesystem = true, program_options = true, regex = true, system = true, thread = true}}) @@ -56,11 +57,13 @@ package("folly") if package:is_plat("linux") and package:config("liburing") then package:add("deps", "liburing") end + if package:config("libdwarf") then + package:add("deps", "libdwarf") + end end) on_install("linux", "macosx", function (package) local configs = {"-DBUILD_TESTS=OFF", - "-DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON", "-DLIBURCU_FOUND=OFF", @@ -71,10 +74,6 @@ package("folly") if package:is_plat("windows") then table.insert(configs, "-DBoost_USE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) end - if not package:is_plat("linux") then - table.insert(configs, "-DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON") - table.insert(configs, "-DLIBAIO_FOUND=OFF") - end import("package.tools.cmake").install(package, configs) end) From e4ec219f70e07888bcd9461549807557c5ffddd2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 19 Jun 2024 10:16:41 +0800 Subject: [PATCH 183/671] msdfgen: fix typo --- packages/m/msdfgen/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/m/msdfgen/xmake.lua b/packages/m/msdfgen/xmake.lua index 3435ed27f..f712befdf 100644 --- a/packages/m/msdfgen/xmake.lua +++ b/packages/m/msdfgen/xmake.lua @@ -13,7 +13,7 @@ package("msdfgen") add_patches("v1.10", "https://github.com/Chlumsky/msdfgen/commit/839e0e86cb846e3ea0c0a3d5da97321fe81f91e4.patch", "8b8ab53b66b4b8c27d78c2e617795e9818c5ba72a7a7cb7a75bc416fe4bfb26c") add_configs("extensions", {description = "Build extensions library (requires freetype, libpng and tinyxml2)", default = false, type = "boolean"}) - add_configs("openmpp", {description = "Build with OpenMP support for multi-threaded code", default = false, type = "boolean"}) + add_configs("openmp", {description = "Build with OpenMP support for multi-threaded code", default = false, type = "boolean"}) add_configs("skia", {description = "Build with the Skia library", default = false, type = "boolean"}) add_configs("standalone", {description = "Build standalone executable", default = false, type = "boolean"}) From ca707cf4b0d4cf49d27f042d83a24022875a9198 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 19 Jun 2024 11:39:58 +0800 Subject: [PATCH 184/671] Update minizip-ng to 4.0.7 (#4398) --- packages/m/minizip-ng/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/minizip-ng/xmake.lua b/packages/m/minizip-ng/xmake.lua index 08d2672ff..98f4c6777 100644 --- a/packages/m/minizip-ng/xmake.lua +++ b/packages/m/minizip-ng/xmake.lua @@ -6,6 +6,7 @@ package("minizip-ng") add_urls("https://github.com/zlib-ng/minizip-ng/archive/refs/tags/$(version).tar.gz", "https://github.com/zlib-ng/minizip-ng.git") + add_versions("4.0.7", "a87f1f734f97095fe1ef0018217c149d53d0f78438bcb77af38adc21dff2dfbc") add_versions("4.0.6", "e96ed3866706a67dbed05bf035e26ef6b60f408e1381bf0fe9af17fe2c0abebc") add_versions("4.0.5", "9bb636474b8a4269280d32aca7de4501f5c24cc642c9b4225b4ed7b327f4ee73") add_versions("4.0.4", "955800fe39f9d830fcb84e60746952f6a48e41093ec7a233c63ad611b5fcfe9f") From 22450ff6835fccc667106cf29ab7a07bd87c8ebd Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 19 Jun 2024 11:40:02 +0800 Subject: [PATCH 185/671] Update c-ares to 1.31.0 (#4396) --- packages/c/c-ares/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index 7385876f9..e6a83807d 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -12,6 +12,7 @@ package("c-ares") end end}) + add_versions("1.31.0", "0167a33dba96ca8de29f3f598b1e6cabe531799269fd63d0153aa0e6f5efeabd") add_versions("1.30.0", "4fea312112021bcef081203b1ea020109842feb58cd8a36a3d3f7e0d8bc1138c") add_versions("1.29.0", "0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7") add_versions("1.28.1", "675a69fc54ddbf42e6830bc671eeb6cd89eeca43828eb413243fd2c0a760809d") From 75f5d0bbeca9dc10fa8fd35e707c8c064186525b Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 19 Jun 2024 20:52:41 +0800 Subject: [PATCH 186/671] quickjs-ng: fix install plat --- packages/q/quickjs-ng/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/q/quickjs-ng/xmake.lua b/packages/q/quickjs-ng/xmake.lua index 374906685..64a5f637f 100644 --- a/packages/q/quickjs-ng/xmake.lua +++ b/packages/q/quickjs-ng/xmake.lua @@ -24,7 +24,7 @@ package("quickjs-ng") end) end - on_install("!iphoneos and !windows@x86", function (package) + on_install("!iphoneos and windows|!x86", function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From 4a4017ccdcd3f9f47970f522f766c65cf2670779 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 19 Jun 2024 22:31:31 +0800 Subject: [PATCH 187/671] nsync: add package (#4403) * nsync: add package * add patch --- packages/n/nsync/patches/1.28.1/cmake.patch | 48 +++++++++++++++++++++ packages/n/nsync/xmake.lua | 37 ++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 packages/n/nsync/patches/1.28.1/cmake.patch create mode 100644 packages/n/nsync/xmake.lua diff --git a/packages/n/nsync/patches/1.28.1/cmake.patch b/packages/n/nsync/patches/1.28.1/cmake.patch new file mode 100644 index 000000000..bb84dd39d --- /dev/null +++ b/packages/n/nsync/patches/1.28.1/cmake.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 827ca29..cfd1b9c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,7 @@ else () + endif () + + # Some builds need position-independent code. +-set (CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + + # Allow nsync users to turn the tests on or off. + option (NSYNC_ENABLE_TESTS "Enable for building tests" ON) +@@ -90,7 +90,9 @@ endif () + # Pick the include directory for the operating system. + if ("${CMAKE_SYSTEM_NAME}X" STREQUAL "WindowsX") + include_directories ("${PROJECT_SOURCE_DIR}/platform/win32") +- set (NSYNC_CPP_FLAGS "/TP") ++ if (MSVC) ++ set (NSYNC_CPP_FLAGS "/TP") ++ endif() + + set (NSYNC_OS_SRC + ${NSYNC_POSIX_SRC} +@@ -125,7 +127,6 @@ elseif ("${CMAKE_SYSTEM_NAME}X" STREQUAL "DarwinX") + ${NSYNC_OS_CPP_SRC} + "platform/c++11/src/nsync_semaphore_mutex.cc" + "platform/posix/src/clock_gettime.c" +- "platform/posix/src/nsync_semaphore_mutex.c" + ) + elseif ("${CMAKE_SYSTEM_NAME}X" STREQUAL "LinuxX") + set (NSYNC_POSIX ON) +@@ -402,11 +403,13 @@ set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + + install (TARGETS nsync EXPORT nsync + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + install (TARGETS nsync_cpp EXPORT nsync_cpp OPTIONAL + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + set (NSYNC_INCLUDES + "public/nsync.h" diff --git a/packages/n/nsync/xmake.lua b/packages/n/nsync/xmake.lua new file mode 100644 index 000000000..3849326aa --- /dev/null +++ b/packages/n/nsync/xmake.lua @@ -0,0 +1,37 @@ +package("nsync") + set_homepage("https://github.com/google/nsync") + set_description("nsync is a C library that exports various synchronization primitives, such as mutexes") + set_license("Apache-2.0") + + add_urls("https://github.com/google/nsync/archive/refs/tags/$(version).tar.gz", + "https://github.com/google/nsync.git") + + add_versions("1.28.1", "0011fc00820088793b6a9ba97536173a25cffd3df2dc62616fb3a2824b3c43f5") + + add_patches("1.28.1", "patches/1.28.1/cmake.patch", "626a89a5a60884b7aaf44011494e7ba5dbfcdae9fcdb5afcef5b5d1f893b4600") + + if is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + end + + add_deps("cmake") + + on_install(function (package) + local configs = {"-DNSYNC_ENABLE_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:config("shared") and package:is_plat("windows") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("nsync_mu_init", {includes = "nsync.h"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + nsync::nsync_mu testing_mu; + nsync::nsync_mu_init (&testing_mu); + } + ]]}, {configs = {languages = "c++11"}, includes = "nsync.h"})) + end) From 886959c389a8fdd36630c1dc67de2ed407456d0b Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 19 Jun 2024 22:36:10 +0800 Subject: [PATCH 188/671] Update simsimd to v4.3.2 (#4375) --- packages/s/simsimd/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simsimd/xmake.lua b/packages/s/simsimd/xmake.lua index 97f896bba..e1c849506 100644 --- a/packages/s/simsimd/xmake.lua +++ b/packages/s/simsimd/xmake.lua @@ -7,6 +7,7 @@ package("simsimd") add_urls("https://github.com/ashvardanian/SimSIMD/archive/refs/tags/$(version).tar.gz", "https://github.com/ashvardanian/SimSIMD.git") + add_versions("v4.3.2", "0732603a0680a4b9c70abe0b59de011447ad7db0e0631c2f7c307c0135aa4d43") add_versions("v4.3.1", "d3c54c5b27f8bbb161c8523c47ddc98bfeb75cac17066c959f42ebe78c518b0f") add_versions("v3.9.0", "8e79b628ba89beebc7c4c853323db0e10ebb6f85bcda2641e1ebaf77cfbda7f9") From 1598d93a9b6bb0a2d70dbf2713e531be4d93f35b Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 20 Jun 2024 00:31:58 +0800 Subject: [PATCH 189/671] c4core: add package (#4405) --- .../c/c4core/patches/0.2.1/cmake-deps.patch | 29 ++++++++++ packages/c/c4core/xmake.lua | 56 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 packages/c/c4core/patches/0.2.1/cmake-deps.patch create mode 100644 packages/c/c4core/xmake.lua diff --git a/packages/c/c4core/patches/0.2.1/cmake-deps.patch b/packages/c/c4core/patches/0.2.1/cmake-deps.patch new file mode 100644 index 000000000..71e788cdc --- /dev/null +++ b/packages/c/c4core/patches/0.2.1/cmake-deps.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea146a8..31373e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -69,14 +69,12 @@ set(C4CORE_SRC_FILES + c4/windows_push.hpp + c4/c4core.natvis + # +- c4/ext/debugbreak/debugbreak.h + c4/ext/rng/rng.hpp + c4/ext/sg14/inplace_function.h + ) + if(C4CORE_WITH_FASTFLOAT) + list(APPEND C4CORE_SRC_FILES + c4/ext/fast_float.hpp +- c4/ext/fast_float_all.h + ) + endif() + set(C4CORE_AMALGAMATED ${C4CORE_SRC_DIR}/../src_singleheader/c4/c4core_all.hpp) +@@ -97,6 +95,9 @@ c4_add_library(c4core + ) + if(NOT C4CORE_WITH_FASTFLOAT) + target_compile_definitions(c4core PUBLIC -DC4CORE_NO_FAST_FLOAT) ++else() ++ find_package(FastFloat REQUIRED CONFIG) ++ target_link_libraries(c4core PUBLIC "FastFloat::fast_float") + endif() + if(C4CORE_NO_DEBUG_BREAK) + target_compile_definitions(c4core PUBLIC -DC4_NO_DEBUG_BREAK) diff --git a/packages/c/c4core/xmake.lua b/packages/c/c4core/xmake.lua new file mode 100644 index 000000000..3f3db7046 --- /dev/null +++ b/packages/c/c4core/xmake.lua @@ -0,0 +1,56 @@ +package("c4core") + set_homepage("https://github.com/biojppm/c4core") + set_description("C++ utilities") + set_license("MIT") + + add_urls("https://github.com/biojppm/c4core/releases/download/v$(version)/c4core-$(version)-src.zip", + "https://github.com/biojppm/c4core.git") + + add_versions("0.2.1", "81ff1c0d15e24da6d76fdd1b6fdd903fa23d0df7c82e564f993147a4dac88773") + + add_configs("fast_float", {description = "use fastfloat to parse floats", default = false, type = "boolean"}) + add_configs("debugbreak", {description = "use debug break in debug builds", default = false, type = "boolean"}) + + add_deps("cmake") + + on_load(function (package) + if package:config("fast_float") then + package:add("deps", "fast_float") + else + package:add("defines", "C4CORE_NO_FAST_FLOAT") + end + if package:config("debugbreak") then + package:add("deps", "debugbreak") + else + package:add("defines", "C4_NO_DEBUG_BREAK") + end + + if package:config("fast_float") or package:config("debugbreak") then + package:add("patches", "0.2.1", "patches/0.2.1/cmake-deps.patch", "92c0c6510cc3b8cbd10b575b5b9d0defa2a19d19f24c1618a73d4f4636da4c9b") + end + end) + + on_install(function (package) + if package:config("fast_float") then + io.replace("src/c4/ext/fast_float.hpp", "c4/ext/fast_float_all.h", "fast_float/fast_float.h", {plain = true}) + end + if package:config("debugbreak") then + io.replace("src/c4/error.hpp", "c4/ext/debugbreak/debugbreak.h", "debugbreak.h", {plain = true}) + end + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DC4CORE_WITH_FASTFLOAT=" .. (package:config("fast_float") and "ON" or "OFF")) + table.insert(configs, "-DC4CORE_NO_DEBUG_BREAK=" .. (package:config("debugbreak") and "OFF" or "ON")) + import("package.tools.cmake").install(package, configs, {packagedeps = "debugbreak"}) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + double value; + c4::from_chars("52.4354", &value); + } + ]]}, {configs = {languages = "c++11"}, includes = "c4/charconv.hpp"})) + end) From a4f293852601f9016d3414c00d33d9a93a436a1f Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 20 Jun 2024 09:52:00 +0800 Subject: [PATCH 190/671] Update aws-c-cal to v0.6.15 (#4407) --- packages/a/aws-c-cal/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-cal/xmake.lua b/packages/a/aws-c-cal/xmake.lua index 3509a9901..24c1d6d5e 100644 --- a/packages/a/aws-c-cal/xmake.lua +++ b/packages/a/aws-c-cal/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-cal") add_urls("https://github.com/awslabs/aws-c-cal/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-cal.git") + add_versions("v0.6.15", "67dda8049a59bbb70cdb166f46f741bc3a8443c86009a1ae4cb7842964a76e0d") add_versions("v0.6.14", "2326304b15bec45b212f6b738020c21afa41f9da295936687e103f9f2efb7b5e") add_versions("v0.6.12", "1ec1bc9a50df8d620f226480b420ec69d4fefd3792fb4e877aa7e350c2b174dc") add_versions("v0.6.11", "e1b0af88c14300e125e86ee010d4c731292851fff16cfb67eb6ba6036df2d648") From c3efa0f1abcf07558ad4374a275ed782e1535834 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 20 Jun 2024 22:40:42 +0800 Subject: [PATCH 191/671] crstl: add package (#4414) --- packages/c/crstl/xmake.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/c/crstl/xmake.lua diff --git a/packages/c/crstl/xmake.lua b/packages/c/crstl/xmake.lua new file mode 100644 index 000000000..f78cc4ea1 --- /dev/null +++ b/packages/c/crstl/xmake.lua @@ -0,0 +1,19 @@ +package("crstl") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/redorav/crstl") + set_description("STL whose aim is to compile fast, run fast, and be clear to read") + + add_urls("https://github.com/redorav/crstl.git") + add_versions("2024.06.04", "0c31b6c76ff74521b2f50b1643f8f3d207184c6c") + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + crstl::fixed_vector v; + } + ]]}, {configs = {languages = "c++11"}, includes = {"crstl/fixed_vector.h"}})) + end) From b377a0ac77e103a2c02271349688667d24980b45 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 20 Jun 2024 23:48:26 +0800 Subject: [PATCH 192/671] ada: fix version (#4415) --- packages/a/ada/xmake.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index 871ddd6af..dbe7dcc57 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -3,26 +3,26 @@ package("ada") set_description("WHATWG-compliant and fast URL parser written in modern C++") set_license("Apache-2.0") - set_urls("https://github.com/ada-url/ada/archive/refs/tags/v$(version).tar.gz", + set_urls("https://github.com/ada-url/ada/archive/refs/tags/$(version).tar.gz", "https://github.com/ada-url/ada.git") - add_versions("2.8.0", "83b77fb53d1a9eea22b1484472cea0215c50478c9ea2b4b44b0ba3b52e07c139") - add_versions("2.7.8", "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75") - add_versions("2.7.7", "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554") - add_versions("2.7.6", "e2822783913c50b9f5c0f20b5259130a7bdc36e87aba1cc38a5de461fe45288f") - add_versions("2.3.1", "298992ec0958979090566c7835ea60c14f5330d6372ee092ef6eee1d2e6ac079") - add_versions("2.4.0", "14624f1dfd966fee85272688064714172ff70e6e304a1e1850f352a07e4c6dc7") - add_versions("2.4.1", "e9359937e7aeb8e5889515c0a9e22cd5da50e9b053038eb092135a0e64888fe7") - - add_deps("cmake") + add_versions("v2.8.0", "83b77fb53d1a9eea22b1484472cea0215c50478c9ea2b4b44b0ba3b52e07c139") + add_versions("v2.7.8", "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75") + add_versions("v2.7.7", "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554") + add_versions("v2.7.6", "e2822783913c50b9f5c0f20b5259130a7bdc36e87aba1cc38a5de461fe45288f") + add_versions("v2.3.1", "298992ec0958979090566c7835ea60c14f5330d6372ee092ef6eee1d2e6ac079") + add_versions("v2.4.0", "14624f1dfd966fee85272688064714172ff70e6e304a1e1850f352a07e4c6dc7") + add_versions("v2.4.1", "e9359937e7aeb8e5889515c0a9e22cd5da50e9b053038eb092135a0e64888fe7") if is_plat("macosx") then add_extsources("brew::ada-url") end - on_install("windows", "linux", "macosx", "bsd", "mingw", "msys", "android", "iphoneos", "cross", function (package) + add_deps("cmake") + + on_install(function (package) local configs = {"-DBUILD_TESTING=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) io.replace("CMakeLists.txt", "add_subdirectory(singleheader)", "", {plain = true}) io.replace("CMakeLists.txt", "add_subdirectory(tools)", "", {plain = true}) From 2130d45406bfa9c9dba3d52cf01a707297225bbb Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 21 Jun 2024 10:08:23 +0800 Subject: [PATCH 193/671] Update cpp-sort to 1.16.0 (#4423) --- packages/c/cpp-sort/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpp-sort/xmake.lua b/packages/c/cpp-sort/xmake.lua index aa811372b..b9a4cc6b3 100644 --- a/packages/c/cpp-sort/xmake.lua +++ b/packages/c/cpp-sort/xmake.lua @@ -7,6 +7,7 @@ package("cpp-sort") add_urls("https://github.com/Morwenn/cpp-sort/archive/refs/tags/$(version).tar.gz", "https://github.com/Morwenn/cpp-sort.git") + add_versions("1.16.0", "54eb65de5655ce58719d45616f29e4b9060135b9cc8b526bcfc9f5434975ea8c") add_versions("1.10.0", "48951cac0051d48fee286c3bc02804975f9d83269d80c10dfc5589e76a542765") add_versions("1.11.0", "a53b3ea240d6f8d8ea9da0a7e0c8e313cf5e714daedf1617473ab34f111ffeec") add_versions("1.12.0", "70877c1993fa1e5eb53974ac30aeb713448c206344379f193dec8ee887c23998") From 8732906573ccd735dfa216e5d8754e9862e2b864 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 21 Jun 2024 10:08:25 +0800 Subject: [PATCH 194/671] Update mujs to 1.3.5 (#4422) --- packages/m/mujs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/mujs/xmake.lua b/packages/m/mujs/xmake.lua index c759a28a9..11c760551 100644 --- a/packages/m/mujs/xmake.lua +++ b/packages/m/mujs/xmake.lua @@ -6,6 +6,7 @@ package("mujs") add_urls("https://github.com/ccxvii/mujs/archive/refs/tags/$(version).tar.gz", "https://github.com/ccxvii/mujs.git") + add_versions("1.3.5", "78a311ae4224400774cb09ef5baa2633c26971513f8b931d3224a0eb85b13e0b") add_versions("1.3.4", "c015475880f6a382e706169c94371a7dd6cc22078832f6e0865af8289c2ef42b") if is_plat("linux", "bsd") then From 8304687e1adfcdd169f9eb145daee6a82b476be6 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 21 Jun 2024 10:08:28 +0800 Subject: [PATCH 195/671] Update c-blosc2 to v2.15.0 (#4421) --- packages/c/c-blosc2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-blosc2/xmake.lua b/packages/c/c-blosc2/xmake.lua index 2c460d9f9..6269d198c 100644 --- a/packages/c/c-blosc2/xmake.lua +++ b/packages/c/c-blosc2/xmake.lua @@ -6,6 +6,7 @@ package("c-blosc2") add_urls("https://github.com/Blosc/c-blosc2/archive/refs/tags/$(version).tar.gz", "https://github.com/Blosc/c-blosc2.git") + add_versions("v2.15.0", "1e7d9d099963ad0123ddd76b2b715b5aa1ea4b95c491d3a11508e487ebab7307") add_versions("v2.14.4", "b5533c79aacc9ac152c80760ed1295a6608938780c3e1eecd7e53ea72ad986b0") add_versions("v2.14.3", "2b94c2014ba455e8136e16bf0738ec64c246fcc1a77122d824257caf64aaf441") add_versions("v2.13.2", "f2adcd9615f138d1bb16dc27feadab1bb1eab01d77e5e2323d14ad4ca8c3ca21") From 2c425f77e21c6d44602df0ae49812dbbf762de15 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 21 Jun 2024 10:08:31 +0800 Subject: [PATCH 196/671] Update samurai to v0.16.0 (#4420) --- packages/s/samurai/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/samurai/xmake.lua b/packages/s/samurai/xmake.lua index 8ee0825b2..4d4128954 100644 --- a/packages/s/samurai/xmake.lua +++ b/packages/s/samurai/xmake.lua @@ -7,6 +7,7 @@ package("samurai") add_urls("https://github.com/hpc-maths/samurai/archive/refs/tags/$(version).tar.gz", "https://github.com/hpc-maths/samurai.git") + add_versions("v0.16.0", "61616de42557e5cd5e9483103fd640f94f3235354e42a22a0ec76520196059a5") add_versions("v0.14.0", "287d0526d58b56a653d6cd68085ad2b8e3cbc69153e4fa87bb256305b3726184") add_versions("v0.12.0", "0cd94bda528085e6261f7e94e69821f81fd55e36560903078beb3c1025372897") add_versions("v0.10.0", "06739ad6ddc6d62396669e8c0a3806a375c88f3a9345519ae1c1415666229c16") From 1fe90cea6c1e1b8b1d9b5bd1077050684036be46 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 21 Jun 2024 21:00:57 +0800 Subject: [PATCH 197/671] x265: fix syslinks (#4417) * x265: fix syslinks * fix typo --- packages/x/x265/xmake.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/x/x265/xmake.lua b/packages/x/x265/xmake.lua index 0d98310c2..93c4f6f14 100644 --- a/packages/x/x265/xmake.lua +++ b/packages/x/x265/xmake.lua @@ -14,6 +14,9 @@ package("x265") add_configs("hdr10_plus", {description = "Enable dynamic HDR10 compilation", default = false, type = "boolean"}) add_configs("svt_hevc", {description = "Enable SVT HEVC Encoder", default = false, type = "boolean"}) + if is_plat("linux") then + add_configs("numa", {description = "Enable libnuma", default = false, type = "boolean"}) + end add_deps("cmake") if is_plat("wasm") then @@ -36,11 +39,20 @@ package("x265") if package:is_plat("wasm") then io.replace("CMakeLists.txt", "X86 AND NOT X64", "FALSE") end + local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DENABLE_HDR10_PLUS=" .. (package:config("hdr10_plus") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SVT_HEVC=" .. (package:config("svt_hevc") and "ON" or "OFF")) table.insert(configs, "-DENABLE_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + + if package:config("numa") then + table.insert(configs, "-DENABLE_LIBNUMA=ON") + package:add("syslinks", "numa") + else + table.insert(configs, "-DENABLE_LIBNUMA=OFF") + end + if package:is_cross() and package:is_targetarch("arm.*") then table.insert(configs, "-DCROSS_COMPILE_ARM=ON") if not package:is_plat("android") then @@ -51,6 +63,7 @@ package("x265") if package:version() then table.insert(configs, "-DX265_LATEST_TAG=" .. package:version():rawstr()) end + import("package.tools.cmake").install(package, configs) if package:is_plat("windows") then -- fix x265.pc io.replace(path.join(package:installdir("lib", "pkgconfig"), "x265.pc"), "-lx265", "-lx265-static", {plain = true}) From 4415c769c73df03c29f0b83588e435b6b5fbba1a Mon Sep 17 00:00:00 2001 From: Altina Orion <139891033+Altina-oz@users.noreply.github.com> Date: Fri, 21 Jun 2024 21:01:30 +0800 Subject: [PATCH 198/671] Update MKL 2024.2.0 static libraries and headers on Win and Linux (#4426) --- packages/m/mkl/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/m/mkl/xmake.lua b/packages/m/mkl/xmake.lua index ebaa5f428..db3a4dc35 100644 --- a/packages/m/mkl/xmake.lua +++ b/packages/m/mkl/xmake.lua @@ -19,6 +19,8 @@ package("mkl") add_resources("2023.2.0+49496", "headers", "https://anaconda.org/intel/mkl-include/2023.2.0/download/win-64/mkl-include-2023.2.0-intel_49496.tar.bz2", "daa93c899e6c7627232fa60e67a2b6079cd29752e8ba1251ae895a57e51defa7") add_versions("2024.1.0+692", "6431647057cd8757a464a3f6ab2099139e059d04446f04443afd2570febe42bf") add_resources("2024.1.0+692", "headers","https://anaconda.org/intel/mkl-include/2024.1.0/download/win-64/mkl-include-2024.1.0-intel_692.tar.bz2","28229844aa6c19870531452e5805ab876da4a5df896a9e753e6b481da2d389cb") + add_versions("2024.2.0+661", "e760103a484d5132f0af35e58ccad7b576536d38744141e776f3ad1673adc455") + add_resources("2024.2.0+661", "headers","https://anaconda.org/intel/mkl-include/2024.2.0/download/win-64/mkl-include-2024.2.0-intel_661.tar.bz2","34f5cc20b6d2ab7c82f301b108fa2ac48e1f6c0acd8ad166897fb53184d5c93e") elseif is_arch("x86") then add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version) local mv = version:split("%+") @@ -34,6 +36,8 @@ package("mkl") add_resources("2023.2.0+49496", "headers", "https://anaconda.org/intel/mkl-include/2023.2.0/download/win-32/mkl-include-2023.2.0-intel_49496.tar.bz2", "0ed907ecc2eaae0ed8c280814392b5b80cc19df78838d9688273a12bd72c7bf8") add_versions("2024.1.0+692", "7a8622f23a27fa487f08653645b6dc3f46b10f5b60ea2b90377812571730d0d9") add_resources("2024.1.0+692", "headers","https://anaconda.org/intel/mkl-include/2024.1.0/download/win-32/mkl-include-2024.1.0-intel_692.tar.bz2","8994e1c5b5599934e83eb964a136be98dc5a6355f3f5b35cab44cdc0e8b970dd") + add_versions("2024.2.0+661", "0a126754b76cf41e9fbc10e7cb70d69018059a2a413560938184b7886bced28b") + add_resources("2024.2.0+661", "headers","https://anaconda.org/intel/mkl-include/2024.2.0/download/win-32/mkl-include-2024.2.0-intel_661.tar.bz2","431feac62519a0d65c85e801d7329cb7caa66ced53a0b4d26f15420d06d1717d") end elseif is_plat("macosx") and is_arch("x86_64") then add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version) @@ -64,6 +68,8 @@ package("mkl") add_resources("2023.2.0+49495", "headers", "https://anaconda.org/intel/mkl-include/2023.2.0/download/linux-64/mkl-include-2023.2.0-intel_49495.tar.bz2", "0dfb6ca3c17d99641f20877579c78155cf95aa0b22363bcc91b1d57df4646318") add_versions("2024.1.0+691", "be8833b094253d51abe49de418f7db2260f4c8f32514969a4a2eabaadc5d55c2") add_resources("2024.1.0+691", "headers", "https://anaconda.org/intel/mkl-include/2024.1.0/download/linux-64/mkl-include-2024.1.0-intel_691.tar.bz2", "e36b2e74f5c28ff91565abe47a09dc246c9cf725e0d05b5fb08813b4073ea68b") + add_versions("2024.2.0+663", "7ee44680030cf187c430a34051ccf37a2c697ad82b62fb0508dfe7a94d7e27f7") + add_resources("2024.2.0+663", "headers", "https://anaconda.org/intel/mkl-include/2024.2.0/download/linux-64/mkl-include-2024.2.0-intel_663.tar.bz2", "2e29ca36f199bafed778230b054256593c2d572aeb050389fd87355ba0466d13") elseif is_arch("i386") then add_urls("https://anaconda.org/intel/mkl-static/$(version).tar.bz2", {version = function (version) local mv = version:split("%+") @@ -79,6 +85,8 @@ package("mkl") add_resources("2023.2.0+49495", "headers", "https://anaconda.org/intel/mkl-include/2023.2.0/download/linux-32/mkl-include-2023.2.0-intel_49495.tar.bz2", "b4433c6839bb7f48951b2dcf409dec7306aee3649c539ee0513d8bfb1a1ea283") add_versions("2024.1.0+691", "8bd52f73844edc59fe925fa9edef66a7158e502df7c06ddc532d1b370df4fb7d") add_resources("2024.1.0+691", "headers", "https://anaconda.org/intel/mkl-include/2024.1.0/download/linux-32/mkl-include-2024.1.0-intel_691.tar.bz2", "88529f8bea2498e88b2cf8dc7aa3735f46f348cf5047006dfc6455f8e2bbdd30") + add_versions("2024.2.0+663", "505eea9981643dac10f342eca80603982365f6b598e6435e07c9d5385622f578") + add_resources("2024.2.0+663", "headers", "https://anaconda.org/intel/mkl-include/2024.2.0/download/linux-32/mkl-include-2024.2.0-intel_663.tar.bz2", "d97e655707590ba38d1240a4f9be3f60df2bc82f3ab5f7b16cf2735d4d9ba401") end end From 76a49c7cf88282007fe54adfba4cc3345e5ad408 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 21 Jun 2024 22:22:34 +0800 Subject: [PATCH 199/671] cmdparser: add package (#4428) --- packages/c/cmdparser/xmake.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/c/cmdparser/xmake.lua diff --git a/packages/c/cmdparser/xmake.lua b/packages/c/cmdparser/xmake.lua new file mode 100644 index 000000000..a05cfe0ea --- /dev/null +++ b/packages/c/cmdparser/xmake.lua @@ -0,0 +1,21 @@ +package("cmdparser") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/FlorianRappl/CmdParser") + set_description("A simple and lightweight command line parser using C++11.") + set_license("MIT") + + add_urls("https://github.com/FlorianRappl/CmdParser.git") + + add_versions("2024.02.13", "0c28173f7914c0e47ff12b48f556baa8a5dd0721") + + on_install(function (package) + os.cp("cmdparser.hpp", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test(int argc, char** argv) { + cli::Parser parser(argc, argv); + } + ]]}, {configs = {languages = "c++11"}, includes = {"cmdparser.hpp"}})) + end) From e2f5ba073a03d6599dd5e3fb493be95521c3ce4a Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Fri, 21 Jun 2024 15:27:35 +0100 Subject: [PATCH 200/671] cdt: add package (#4418) * cdt: add package * cdt: set macosx shared to true * cdt: add license * cdt: one line add_headerfiles * cdt: use cmake * cdt: add CDT_USE_AS_COMPILED_LIBRARY --- packages/c/cdt/xmake.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/c/cdt/xmake.lua diff --git a/packages/c/cdt/xmake.lua b/packages/c/cdt/xmake.lua new file mode 100644 index 000000000..e489031ba --- /dev/null +++ b/packages/c/cdt/xmake.lua @@ -0,0 +1,33 @@ +package("cdt") + set_homepage("https://artem-ogre.github.io/CDT/") + set_description("Constrained Delaunay Triangulation (C++)") + set_license("MPL-2.0") + + add_urls("https://github.com/artem-ogre/CDT/archive/refs/tags/$(version).tar.gz", + "https://github.com/artem-ogre/CDT.git") + + add_versions("1.4.1", "86df99eb5f02a73eeb8c6ea45765eed0d7f206e8d4d9f6479f77e3c590ae5bb3") + + add_deps("cmake") + + on_install(function (package) + os.cd("CDT") + local configs = {"-DCDT_USE_AS_COMPILED_LIBRARY=ON"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + using namespace CDT; + void test() { + auto cdt = Triangulation{}; + cdt.insertVertices({ + {0.0, 1e38}, + {1.0, 1e38}, + }); + } + ]]}, {configs = {languages = "cxx17"}})) + end) From 20f09872ce057169a504209d2eec14f883b99a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 22 Jun 2024 00:03:04 +0200 Subject: [PATCH 201/671] Update sentry-native to 0.7.6 (#4432) --- packages/s/sentry-native/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sentry-native/xmake.lua b/packages/s/sentry-native/xmake.lua index 00f704328..600136ce5 100644 --- a/packages/s/sentry-native/xmake.lua +++ b/packages/s/sentry-native/xmake.lua @@ -5,6 +5,7 @@ package("sentry-native") set_urls("https://github.com/getsentry/sentry-native/releases/download/$(version)/sentry-native.zip", "https://github.com/getsentry/sentry-native.git") + add_versions("0.7.6", "42180ad933a3a2bd86a1649ed0f1a41df20e783ce17c5cb1f86775f7caf06bc1") add_versions("0.7.5", "d9f1b44753fae3e9462aa1e6fd3021cb0ff2f51c1a1fa02b34510e3bc311f429") add_versions("0.7.2", "afb44d5cc4e0ec5f2e8068132c68256959188f6bf015e1837e7cc687014b9c70") add_versions("0.7.1", "c450a064b0dbb1883a355455db2b6469abef59c04686a53719384bbc7ff507d3") From 79c6519bb739e9a991ae822ccd5723eb4d494567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 22 Jun 2024 00:03:07 +0200 Subject: [PATCH 202/671] Auto-update libsdl to 2.30.4 (#4431) * Update libsdl to 2.30.4 * Update xmake.lua --- packages/l/libsdl/xmake.lua | 2 ++ packages/w/wayland/xmake.lua | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/l/libsdl/xmake.lua b/packages/l/libsdl/xmake.lua index 134235118..4aeb05f50 100644 --- a/packages/l/libsdl/xmake.lua +++ b/packages/l/libsdl/xmake.lua @@ -40,6 +40,7 @@ package("libsdl") add_versions("archive:2.30.1", "c15ded54e9f32f8a1f9ed3e3dc072837a320ed23c5d0e95b7c18ecbe05c1187b") add_versions("archive:2.30.2", "09a822abf6e97f80d09cf9c46115faebb3476b0d56c1c035aec8ec3f88382ae7") add_versions("archive:2.30.3", "c5d78a9e0346c6695f03df8ba25e5e111a1e23c8aefa8372a1c5a0dd79acaf10") + add_versions("archive:2.30.4", "292d5e2f897aa3acb6b365b605c3249c92916fbe7eba4a2e57573ada3855d7cb") add_versions("github:2.0.8", "release-2.0.8") add_versions("github:2.0.12", "release-2.0.12") add_versions("github:2.0.14", "release-2.0.14") @@ -65,6 +66,7 @@ package("libsdl") add_versions("github:2.30.1", "release-2.30.1") add_versions("github:2.30.2", "release-2.30.2") add_versions("github:2.30.3", "release-2.30.3") + add_versions("github:2.30.4", "release-2.30.4") add_patches("2.30.0", path.join(os.scriptdir(), "patches", "2.30.0", "fix_mingw.patch"), "ab54eebc2e58d88653b257bc5b48a232c5fb0e6fad5d63661b6388215a7b0cd0") diff --git a/packages/w/wayland/xmake.lua b/packages/w/wayland/xmake.lua index 5e9b88d1b..a53529ac5 100644 --- a/packages/w/wayland/xmake.lua +++ b/packages/w/wayland/xmake.lua @@ -47,7 +47,7 @@ package("wayland") -- install wayland-protocols local protocol = assert(package:resourcedir("protocols"), "wayland-protocols not found!") - local buildfile = find_file("meson.build", path.join(protocol, "**")) + local buildfile = find_file("meson.build", path.join(protocol, "*")) if buildfile then os.cd(path.directory(buildfile)) meson.install(package, {"-Dtests=false"}, {envs = envs}) From 28320e7af1447c1ccd6f33a6f675d92a4b0df4e7 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 22 Jun 2024 09:06:46 +0800 Subject: [PATCH 203/671] lsquic: improve patch (#4429) --- packages/l/ls-hpack/xmake.lua | 2 -- packages/l/lsquic/patches/4.0.8/cmake.patch | 34 +++++++++++++++++++++ packages/l/lsquic/xmake.lua | 10 +++--- 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 packages/l/lsquic/patches/4.0.8/cmake.patch diff --git a/packages/l/ls-hpack/xmake.lua b/packages/l/ls-hpack/xmake.lua index b9d804e5a..edfc8d18a 100644 --- a/packages/l/ls-hpack/xmake.lua +++ b/packages/l/ls-hpack/xmake.lua @@ -14,8 +14,6 @@ package("ls-hpack") io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") - set_symbols("none") - add_requires("xxhash") add_packages("xxhash") diff --git a/packages/l/lsquic/patches/4.0.8/cmake.patch b/packages/l/lsquic/patches/4.0.8/cmake.patch new file mode 100644 index 000000000..2ac66cfe8 --- /dev/null +++ b/packages/l/lsquic/patches/4.0.8/cmake.patch @@ -0,0 +1,34 @@ +diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt +index fe6307e..9873e62 100644 +--- a/src/liblsquic/CMakeLists.txt ++++ b/src/liblsquic/CMakeLists.txt +@@ -1,6 +1,5 @@ + # Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc. See LICENSE. + SET(lsquic_STAT_SRCS +- ls-qpack/lsqpack.c + lsquic_adaptive_cc.c + lsquic_alarmset.c + lsquic_arr.c +@@ -102,7 +101,6 @@ ELSE() + INCLUDE_DIRECTORIES(../lshpack) + SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS} + lsquic_xxhash.c +- ../lshpack/lshpack.c + ) + ENDIF() + +@@ -133,12 +131,13 @@ IF(LSQUIC_SHARED_LIB) + ELSE() + add_library(lsquic STATIC ${lsquic_STAT_SRCS}) + ENDIF() +- ++target_link_libraries(lsquic PRIVATE ls-hpack ls-qpack) + target_include_directories( + lsquic PUBLIC $) + + install(TARGETS lsquic + EXPORT lsquic-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) diff --git a/packages/l/lsquic/xmake.lua b/packages/l/lsquic/xmake.lua index 9ee82315d..fdc787471 100644 --- a/packages/l/lsquic/xmake.lua +++ b/packages/l/lsquic/xmake.lua @@ -8,6 +8,8 @@ package("lsquic") add_versions("v4.0.8", "f18ff2fa0addc1c51833304b3d3ff0979ecf5f53f54f96bcd3442a40cfcd440b") + add_patches(">=4.0.8", "patches/4.0.8/cmake.patch", "c9b8412fbd7df511dee4d57ea5dfa50bc527e015fc808270235b91abfd9baa89") + add_configs("fiu", {description = "Use Fault Injection in Userspace (FIU)", default = false, type = "boolean"}) add_deps("cmake") @@ -29,9 +31,6 @@ package("lsquic") -- https://github.com/litespeedtech/lsquic/issues/433 package:add("defines", "WIN32", "WIN32_LEAN_AND_MEAN") end - - io.replace("src/liblsquic/CMakeLists.txt", "ls-qpack/lsqpack.c", "", {plain = true}) - io.replace("src/liblsquic/CMakeLists.txt", "../lshpack/lshpack.c", "", {plain = true}) io.replace("CMakeLists.txt", "-WX", "", {plain = true}) local boringssl = package:dep("boringssl") @@ -49,9 +48,10 @@ package("lsquic") table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DLSQUIC_SHARED_LIB=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DLSQUIC_FIU=" .. (package:config("fiu") and "ON" or "OFF")) + if package:is_plat("windows") then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") + end import("package.tools.cmake").install(package, configs, opt) - - os.vcp(path.join(package:buildir(), "**.dll"), package:installdir("bin")) end) on_test(function (package) From cca34fde961994151a78fa706c514c5e046bebe2 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Jun 2024 09:55:48 +0800 Subject: [PATCH 204/671] Update cpptrace to v0.6.2 (#4435) --- packages/c/cpptrace/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index 686f64007..91baaa88e 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.6.2", "02a0540b5b1be0788565f48b065b456d3eab81ae2323a50e75ed36449a0143ed") add_versions("v0.6.1", "4bb478eedbe4b2c0093ef7af4f64795304850e03312e658076b25ef8d6019c75") add_versions("v0.6.0", "7c2996f03d15f61016bc81fe7fa5220b1cc42498333c5c0e699ad2f96b918b96") add_versions("v0.5.4", "bab0f76330f90c445216ccade1a3ff29c9c4bbd44805be34d52095cd95b02df4") From 79e3e51178d20dc5fb5a989b8c0c86b413096670 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Jun 2024 09:55:51 +0800 Subject: [PATCH 205/671] Update fribidi to 1.0.15 (#4434) --- packages/f/fribidi/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fribidi/xmake.lua b/packages/f/fribidi/xmake.lua index 6866b3514..b5279cb12 100644 --- a/packages/f/fribidi/xmake.lua +++ b/packages/f/fribidi/xmake.lua @@ -5,6 +5,7 @@ package("fribidi") set_license("LGPL-2.1") add_urls("https://github.com/fribidi/fribidi/releases/download/v$(version)/fribidi-$(version).tar.xz") + add_versions("1.0.15", "0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587") add_versions("1.0.14", "76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a") add_versions("1.0.10", "7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01") add_versions("1.0.11", "30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d") From 80955b5615537760e456add068e33c2ae3539deb Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Jun 2024 09:55:53 +0800 Subject: [PATCH 206/671] Update mathter to v1.1.2 (#4433) --- packages/m/mathter/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/mathter/xmake.lua b/packages/m/mathter/xmake.lua index 85d313015..bc6be799d 100644 --- a/packages/m/mathter/xmake.lua +++ b/packages/m/mathter/xmake.lua @@ -7,6 +7,7 @@ package("mathter") add_urls("https://github.com/petiaccja/Mathter/archive/refs/tags/$(version).tar.gz", "https://github.com/petiaccja/Mathter.git") + add_versions("v1.1.2", "9e6d03295d28e8792721fedca5d53955d4057d1550e51491408353b6181e6c6d") add_versions("v1.1.1", "510e6aa198cd7b207a44d319e4471021f207cba8c4d2d7e40086f1f042fe13ab") add_configs("xsimd", {description = "Uses XSimd for vectorization of math routines. Uses scalar fallback if turned off.", default = false, type = "boolean"}) From 505f63b3bcc908ff1790a88f60974cef1152b749 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Jun 2024 10:23:45 +0800 Subject: [PATCH 207/671] Update lsquic to v4.0.9 (#4424) Co-authored-by: star9029 --- packages/l/lsquic/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/lsquic/xmake.lua b/packages/l/lsquic/xmake.lua index fdc787471..c4fe8502f 100644 --- a/packages/l/lsquic/xmake.lua +++ b/packages/l/lsquic/xmake.lua @@ -6,6 +6,7 @@ package("lsquic") add_urls("https://github.com/litespeedtech/lsquic/archive/refs/tags/$(version).tar.gz", "https://github.com/litespeedtech/lsquic.git") + add_versions("v4.0.9", "bebb6e687138368d89ff3f67768692ac55b06925d63b011d000ce134b6ec98f1") add_versions("v4.0.8", "f18ff2fa0addc1c51833304b3d3ff0979ecf5f53f54f96bcd3442a40cfcd440b") add_patches(">=4.0.8", "patches/4.0.8/cmake.patch", "c9b8412fbd7df511dee4d57ea5dfa50bc527e015fc808270235b91abfd9baa89") From fbadad8547d4aa02c6891de7d43abbd6cdf2bf60 Mon Sep 17 00:00:00 2001 From: Runge <50059102+RungeCC@users.noreply.github.com> Date: Sun, 23 Jun 2024 14:00:22 +0800 Subject: [PATCH 208/671] Add header only package `matchit` (#4441) * [add] headeronly package matchit * [fmt] format matchit/xmake.lua; adopt 4 spaces indentation * [fix]: the followings: - fix incorrect sha256 of v1.0.1 - fix failure due to try to download trunk version through release * [fmt] reformat matchit/xmake.lua * [fix]: address reviewer's suggestions - remove trunk version - install through cmake * Update xmake.lua --------- Co-authored-by: star9029 --- packages/m/matchit/xmake.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/m/matchit/xmake.lua diff --git a/packages/m/matchit/xmake.lua b/packages/m/matchit/xmake.lua new file mode 100644 index 000000000..db4637aa4 --- /dev/null +++ b/packages/m/matchit/xmake.lua @@ -0,0 +1,31 @@ +package("matchit") + set_kind("library", {headeronly = true}) + set_homepage("https://bowenfu.github.io/matchit.cpp/") + set_description("A lightweight single-header pattern-matching library for C++17 with macro-free APIs.") + set_license("Apache-2.0") + + add_urls("https://github.com/BowenFu/matchit.cpp/archive/refs/tags/$(version).tar.gz", + "https://github.com/BowenFu/matchit.cpp.git") + + add_versions("v1.0.1", "2860cb85febf37220f75cef5b499148bafc9f5541fe1298e11b0c169bb3f31ac") + + add_deps("cmake") + + on_install(function (package) + import("package.tools.cmake").install(package, {"-DBUILD_TESTING=OFF"}) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + constexpr int32_t gcd(int32_t a, int32_t b) { + using namespace matchit; + return match(a, b)( + pattern | ds(_, 0) = [&] { return a >= 0 ? a : -a; }, + pattern | _ = [&] { return gcd(b, a%b); } + ); + } + void test() { + static_assert(gcd(12, 6) == 6); + } + ]]}, {configs = {languages = "c++17"}, includes = "matchit.h"})) + end) From c0f61ec2cb4bee54325140b9d419a1928ee3bc9c Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Sun, 23 Jun 2024 07:26:03 +0100 Subject: [PATCH 209/671] libnest2d & polyclipping: add packages (#4440) * libnest2d & polyclipping: add packages * libnest2d: use boost instead * libnest2d: copy limits from boost * libnest2d: copy limits from nlopt * libnest2d: use cxx14 * libnest2d: use boost 1.72.0 * libnest2d: try with boost geometry * libnest2d: use cxx14 * libnest2d: set test cxx to 14 --- packages/l/libnest2d/port/xmake.lua | 15 ++++++++++++++ packages/l/libnest2d/xmake.lua | 31 +++++++++++++++++++++++++++++ packages/p/polyclipping/xmake.lua | 29 +++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 packages/l/libnest2d/port/xmake.lua create mode 100644 packages/l/libnest2d/xmake.lua create mode 100644 packages/p/polyclipping/xmake.lua diff --git a/packages/l/libnest2d/port/xmake.lua b/packages/l/libnest2d/port/xmake.lua new file mode 100644 index 000000000..ff3fc6f28 --- /dev/null +++ b/packages/l/libnest2d/port/xmake.lua @@ -0,0 +1,15 @@ +add_rules("mode.debug", "mode.release") + +add_requires("nlopt", "polyclipping", "boost") + +target("libnest2d") + set_kind("$(kind)") + set_languages("cxx14") + add_packages("nlopt", "polyclipping", "boost") + + add_files("src/*.cpp") + add_headerfiles("include/(**.hpp)") + + add_defines("LIBNEST2D_GEOMETRIES_clipper", "LIBNEST2D_OPTIMIZER_nlopt") + + add_includedirs("include", {public = true}) diff --git a/packages/l/libnest2d/xmake.lua b/packages/l/libnest2d/xmake.lua new file mode 100644 index 000000000..ee309cf32 --- /dev/null +++ b/packages/l/libnest2d/xmake.lua @@ -0,0 +1,31 @@ +package("libnest2d") + set_homepage("https://github.com/tamasmeszaros/libnest2d") + set_description("2D irregular bin packaging and nesting library written in modern C++") + set_license("LGPL-3.0") + + add_urls("https://github.com/tamasmeszaros/libnest2d.git") + add_versions("2022.11.16", "663daa69e1d7478669f714218e27681edbc96640") + + add_deps("nlopt", "polyclipping", "boost") + + on_load(function (package) + package:add("defines", "LIBNEST2D_GEOMETRIES_clipper") + package:add("defines", "LIBNEST2D_OPTIMIZER_nlopt") + end) + + on_install("linux", "windows", "macosx", function (package) + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + local configs = {} + import("package.tools.xmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + + void test() { + using namespace libnest2d; + Degrees deg(180); + } + ]]}, {configs = {languages = "cxx14"}})) + end) diff --git a/packages/p/polyclipping/xmake.lua b/packages/p/polyclipping/xmake.lua new file mode 100644 index 000000000..0017b9fec --- /dev/null +++ b/packages/p/polyclipping/xmake.lua @@ -0,0 +1,29 @@ +package("polyclipping") + set_homepage("https://sourceforge.net/projects/polyclipping") + set_description("Polygon and line clipping and offsetting library") + set_license("BSL-1.0") + + add_urls("https://sourceforge.net/projects/polyclipping/files/clipper_ver$(version).zip") + add_versions("6.4.2", "a14320d82194807c4480ce59c98aa71cd4175a5156645c4e2b3edd330b930627") + + on_install(function (package) + local configs = {} + io.writefile("xmake.lua", [[ + add_rules("mode.release", "mode.debug") + target("polyclipping") + set_kind("$(kind)") + set_languages("cxx11") + add_files("cpp/*.cpp") + add_headerfiles("cpp/(*.hpp)") + ]]) + import("package.tools.xmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + ClipperLib::Clipper clipper; + } + ]]}, {configs = {languages = "cxx11"}})) + end) From 23c019049555e7df011e9896ea6150f2e4e8de32 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 23 Jun 2024 14:28:42 +0800 Subject: [PATCH 210/671] update folly related to 06.17 (#4439) * update folly related to 06.17 * Add files via upload * Update xmake.lua * Delete packages/m/mvfst/shared.patch * patch --- .github/workflows/fedora.yml | 4 +--- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 1 + packages/m/mvfst/patches/shared.patch | 20 ++++++++++++++++++++ packages/m/mvfst/xmake.lua | 3 +++ packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 8 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 packages/m/mvfst/patches/shared.patch diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml index 94de85c5c..c15c8a644 100644 --- a/.github/workflows/fedora.yml +++ b/.github/workflows/fedora.yml @@ -41,6 +41,4 @@ jobs: env: XMAKE_ROOT: y run: | - xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -j1 - - + xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -j4 diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index 741a33ef9..994ab0671 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -11,6 +11,7 @@ package("fbthrift") add_versions("2024.03.25", "2a325446cd3a149a892c0c6abcb0f6f6cf83b72266d83ad279d2fdd9340aeef2") add_versions("2024.04.01", "e408a973a59a37def97a8e0ec368ee9fa39c8d49c925ecf7335f1c0463c1a819") add_versions("2024.06.10", "a71481f9621891a5094d93a7c49d630ae544a1f056a93811742df6469b95bf64") + add_versions("2024.06.17", "bfacfe477c1152df43a1681c31801f337ef7f67bc85507e09340abdd146cca7f") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index 37d11f276..d4d6e4840 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -12,6 +12,7 @@ package("fizz") add_versions("2024.03.25", "bcf9c551719bc86318a77e2b13769d52679642b98728e645900485d7a90c0f8b") add_versions("2024.04.01", "caf2cf1ba8f6db66abbadf382fb3e0667888567c4ac0d8f74ec92e1fb27c3727") add_versions("2024.06.10", "dabc77e2238383fb37c19327af8ab864ba030d32e98f49b23008075a7afb6e19") + add_versions("2024.06.17", "46e9d1b782a51b2c063390dc1161f26f2c77ef7a94ff8ccc4bdc272697cad8bb") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 26e155459..9616f30f2 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -20,6 +20,7 @@ package("folly") add_versions("2024.03.25", "3c57b0d1f1266e935aef1ed54535561fd2eeedc1aa946fbc46871e839014f74c") add_versions("2024.04.01", "f09e522c76a5f102c40c54726f6f255b0dc127c78f9c8c9ac117fc0f7ac284bb") add_versions("2024.06.10", "27d7f825a9a3469b59a4f0a5ba2edac733407ea8dcc036e7ca9279d803ece1e9") + add_versions("2024.06.17", "a26cda1cf5f9914f2ff05b5f8e4062d73f5a1ff71ee1911e734dc758313f6d30") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") diff --git a/packages/m/mvfst/patches/shared.patch b/packages/m/mvfst/patches/shared.patch new file mode 100644 index 000000000..a50f9754d --- /dev/null +++ b/packages/m/mvfst/patches/shared.patch @@ -0,0 +1,20 @@ +diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt +index e3b0d5d9d..d86f50ee7 100644 +--- a/quic/state/CMakeLists.txt ++++ b/quic/state/CMakeLists.txt +@@ -151,6 +151,7 @@ add_dependencies( + mvfst_codec + mvfst_codec_types + mvfst_state_machine ++ mvfst_flowcontrol + ) + + target_link_libraries( +@@ -160,6 +161,7 @@ target_link_libraries( + mvfst_codec + mvfst_codec_types + mvfst_state_machine ++ mvfst_flowcontrol + ) + + diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 60e575f32..814c29678 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -11,6 +11,9 @@ package("mvfst") add_versions("2024.03.25", "293046511fb9395bdb09860f4c4202bcb848fed4cdd419d436506a07eeac66cd") add_versions("2024.04.01", "e39c4d7dd87520fcce6a3d5d398b5d03bd3e680186b9b0db23f02b502c6bcb1e") add_versions("2024.06.10", "cc75889429a66463cc8e607ba09d584fb4e6d2e69b1127a538043b367c54a1ae") + add_versions("2024.06.17", "748c744dae967a0ac25c89a6c7ccf62da2a4974ab45644d395fb7bc8f2e96dc1") + + add_patches("2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") add_deps("cmake", "folly", "fizz") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 85d989d85..76cd7288a 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -11,6 +11,7 @@ package("proxygen") add_versions("2024.03.25", "b11c8da4dbcbbdde8d9504f2edd3eb537bdf959eccc07a8333d1936965437abc") add_versions("2024.04.01", "75b040c235fee853e8db90075620f56ee4aa69345eea9ab4f80aa35501fe2eff") add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4") + add_versions("2024.06.17", "ab45c56c705d4c47595f3118cbaa2641be2bcd26c4d3b43e49e0c743a7272089") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index 469b4370d..7c2a47c88 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -12,6 +12,7 @@ package("wangle") add_versions("2024.03.25", "3de926ff92e59f5185e89e5e9365925530e5e57fd70f8e5107938149ce2fe140") add_versions("2024.04.01", "c21c3616d3017bc7b72f6b2315f81be4fd9be4c0dc6e1fae0266ec545fbc5535") add_versions("2024.06.10", "0328a481258a399a70ee2d003be8d482529b2f26e79ea2c218a32361051ea5be") + add_versions("2024.06.17", "9d3e2349be6f8462243beebc1245f8d82808734060d9e3d9c0cf45bbda3c1f70") add_deps("cmake", "folly", "fizz") From 02784f8e8468374b3414e7c770544255f94082ff Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 23 Jun 2024 16:04:36 +0800 Subject: [PATCH 211/671] libnest2d & polyclipping: fix windows shared --- packages/l/libnest2d/port/xmake.lua | 4 ++++ packages/l/libnest2d/xmake.lua | 10 +++------- packages/p/polyclipping/xmake.lua | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/l/libnest2d/port/xmake.lua b/packages/l/libnest2d/port/xmake.lua index ff3fc6f28..a833418ba 100644 --- a/packages/l/libnest2d/port/xmake.lua +++ b/packages/l/libnest2d/port/xmake.lua @@ -13,3 +13,7 @@ target("libnest2d") add_defines("LIBNEST2D_GEOMETRIES_clipper", "LIBNEST2D_OPTIMIZER_nlopt") add_includedirs("include", {public = true}) + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end diff --git a/packages/l/libnest2d/xmake.lua b/packages/l/libnest2d/xmake.lua index ee309cf32..e76250889 100644 --- a/packages/l/libnest2d/xmake.lua +++ b/packages/l/libnest2d/xmake.lua @@ -6,17 +6,13 @@ package("libnest2d") add_urls("https://github.com/tamasmeszaros/libnest2d.git") add_versions("2022.11.16", "663daa69e1d7478669f714218e27681edbc96640") - add_deps("nlopt", "polyclipping", "boost") + add_defines("LIBNEST2D_GEOMETRIES_clipper", "LIBNEST2D_OPTIMIZER_nlopt") - on_load(function (package) - package:add("defines", "LIBNEST2D_GEOMETRIES_clipper") - package:add("defines", "LIBNEST2D_OPTIMIZER_nlopt") - end) + add_deps("nlopt", "polyclipping", "boost") on_install("linux", "windows", "macosx", function (package) os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") - local configs = {} - import("package.tools.xmake").install(package, configs) + import("package.tools.xmake").install(package) end) on_test(function (package) diff --git a/packages/p/polyclipping/xmake.lua b/packages/p/polyclipping/xmake.lua index 0017b9fec..04614a366 100644 --- a/packages/p/polyclipping/xmake.lua +++ b/packages/p/polyclipping/xmake.lua @@ -7,7 +7,6 @@ package("polyclipping") add_versions("6.4.2", "a14320d82194807c4480ce59c98aa71cd4175a5156645c4e2b3edd330b930627") on_install(function (package) - local configs = {} io.writefile("xmake.lua", [[ add_rules("mode.release", "mode.debug") target("polyclipping") @@ -15,8 +14,11 @@ package("polyclipping") set_languages("cxx11") add_files("cpp/*.cpp") add_headerfiles("cpp/(*.hpp)") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end ]]) - import("package.tools.xmake").install(package, configs) + import("package.tools.xmake").install(package) end) on_test(function (package) From 81753e24d5b557bfadc4e574f7a32ce99c49eff7 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 23 Jun 2024 23:44:43 +0800 Subject: [PATCH 212/671] bredis: add package (#4438) * bredis: add package * fix syslinks * fix test --- packages/b/bredis/xmake.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/b/bredis/xmake.lua diff --git a/packages/b/bredis/xmake.lua b/packages/b/bredis/xmake.lua new file mode 100644 index 000000000..01c12a7cc --- /dev/null +++ b/packages/b/bredis/xmake.lua @@ -0,0 +1,28 @@ +package("bredis") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/basiliscos/cpp-bredis") + set_description("Boost::ASIO low-level redis client (connector)") + set_license("MIT") + + add_urls("https://github.com/basiliscos/cpp-bredis/archive/refs/tags/$(version).tar.gz", + "https://github.com/basiliscos/cpp-bredis.git") + + add_versions("v0.12", "c5a6aa58835d5ef8cd97c4ae7e677f6237ef4ee01ae4a609293e2351c01db6cc") + + add_deps("boost") + + if is_plat("windows", "mingw") then + add_syslinks("ws2_32") + end + + on_install("macosx", "linux", "windows", "bsd", "mingw", "cross", function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + bredis::bredis_category x; + } + ]]}, {configs = {languages = "c++11"}, includes = "bredis/Connection.hpp"})) + end) From b159f9649e0a0ea8db3e988aac237ccc67fb6fc0 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 24 Jun 2024 10:06:27 +0800 Subject: [PATCH 213/671] Update emmylua_debugger to 1.8.1 (#4447) --- packages/e/emmylua_debugger/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/emmylua_debugger/xmake.lua b/packages/e/emmylua_debugger/xmake.lua index a9276db0b..ddbfefcfc 100644 --- a/packages/e/emmylua_debugger/xmake.lua +++ b/packages/e/emmylua_debugger/xmake.lua @@ -6,6 +6,7 @@ package("emmylua_debugger") add_urls("https://github.com/EmmyLua/EmmyLuaDebugger/archive/refs/tags/$(version).tar.gz", "https://github.com/EmmyLua/EmmyLuaDebugger.git") + add_versions("1.8.1", "0dbbfefe798425323bd1f531463675460fce3418d73ef29b495e7369f8c76475") add_versions("1.8.0", "21e5ba1c82e4386cd8ad4f8c76511d70319b899b414d29ecdaba35649325d2ee") add_versions("1.7.1", "8757d372c146d9995b6e506d42f511422bcb1dc8bacbc3ea1a5868ebfb30015f") add_versions("1.6.3", "4e10cf1c729fc58f72880895e63618cb91d186ff3b55f270cdaa089a2f8b20bc") From cb096bd55ad2f166fc8ccef6826383cef36af466 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 24 Jun 2024 10:06:30 +0800 Subject: [PATCH 214/671] Update thorvg to v0.13.8 (#4445) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index 25cb606b0..d0ca71917 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.13.8", "ce49929a94d1686d4f1436da6ef5fa7a8439901c22b5fa0879d7d5879b8ba2bd") add_versions("v0.13.6", "f24fd3647e1a309dec00f6455b32258c0dd0e0dbd1133233169467571f188bad") add_versions("v0.13.5", "977ed74c3846c9a6acd5765aff776745d40e3c91507b22e51177d59c69afd198") add_versions("v0.13.2", "03b5dbb4c73ff221a4bd7243cc0ad377aecff4c3077f5a57ee2902e4122d3218") From 0dc2992591300e230c8903ca8bd3f295b47abeb8 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 24 Jun 2024 10:06:33 +0800 Subject: [PATCH 215/671] Update cppcheck to 2.14.2 (#4444) --- packages/c/cppcheck/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cppcheck/xmake.lua b/packages/c/cppcheck/xmake.lua index aa690bb22..7996839ee 100644 --- a/packages/c/cppcheck/xmake.lua +++ b/packages/c/cppcheck/xmake.lua @@ -4,6 +4,7 @@ package("cppcheck") set_description("A static analysis tool for C/C++ code") add_urls("https://github.com/danmar/cppcheck/archive/refs/tags/$(version).tar.gz") + add_versions("2.14.2", "9c3acea5f489336bd83a8ea33917a9a04a80c56d874bf270287e7de27acf2d00") add_versions("2.14.1", "22d1403fbc3158f35b5216d7b0a50bbaf0c80bf6663933a71f65cc4fc307ff3d") add_versions("2.13.4", "d6ea064ebab76c6aa000795440479767d8d814dd29405918df4c1bbfcd6cb86c") add_versions("2.13.0", "8229afe1dddc3ed893248b8a723b428dc221ea014fbc76e6289840857c03d450") From 939a4b6befa62b4b3d76ee6de0fecda7fbf2dfaf Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 24 Jun 2024 10:27:41 +0800 Subject: [PATCH 216/671] Update simdjson to v3.9.4 (#4448) --- packages/s/simdjson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdjson/xmake.lua b/packages/s/simdjson/xmake.lua index f18da6a04..151d40fee 100644 --- a/packages/s/simdjson/xmake.lua +++ b/packages/s/simdjson/xmake.lua @@ -6,6 +6,7 @@ package("simdjson") add_urls("https://github.com/simdjson/simdjson/archive/refs/tags/$(version).tar.gz", "https://github.com/simdjson/simdjson.git") + add_versions("v3.9.4", "9bf13be00fa1e1c5891a90dbc39b983e09972f0972a8956c20a9974cedfcca2f") add_versions("v3.9.3", "2e3d10abcde543d3dd8eba9297522cafdcebdd1db4f51b28f3bc95bf1d6ad23c") add_versions("v3.9.2", "79fbe700f4ac3dd69c4f08275af58399daabd612bca0c0465aea959c60256651") add_versions("v3.9.1", "a4b6e7cd83176e0ccb107ce38521da40a8df41c2d3c90566f2a0af05b0cd05c4") From 619f703a2dffca53de2a15c7193c236af6727791 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 24 Jun 2024 10:55:20 +0800 Subject: [PATCH 217/671] try enable more feature of boost (#4443) * try enable more feature of boost * Update xmake.lua * Update xmake.lua * ident adjust --- packages/b/boost/xmake.lua | 54 +++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index daa1b7e79..8a4ddd773 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -41,37 +41,41 @@ package("boost") end add_configs("pyver", {description = "python version x.y, etc. 3.10", default = "3.10"}) - local libnames = {"fiber", - "coroutine", - "context", - "regex", - "system", + local libnames = {"atomic", + "charconv", + "chrono", + "cobalt", "container", + "context", + "contract", + "coroutine", + "date_time", "exception", - "timer", - "atomic", + "fiber", + "filesystem", "graph", - "serialization", - "random", - "wave", - "date_time", - "locale", - "iostreams", - "program_options", - "test", - "chrono", - "contract", "graph_parallel", + "headers", + "iostreams", "json", + "locale", "log", - "thread", - "filesystem", "math", "mpi", "nowide", + "program_options", "python", + "random", + "regex", + "serialization", "stacktrace", - "type_erasure"} + "system", + "test", + "thread", + "timer", + "type_erasure", + "url", + "wave"} add_configs("all", { description = "Enable all library modules support.", default = false, type = "boolean"}) add_configs("multi", { description = "Enable multi-thread support.", default = true, type = "boolean"}) @@ -412,6 +416,14 @@ package("boost") } ]]}, {configs = {languages = "c++14"}})) + assert(package:check_cxxsnippets({test = [[ + #include + static void test() { + boost::unordered_map map; + map["2"] = 2; + } + ]]}, {configs = {languages = "c++14"}})) + if package:config("date_time") then assert(package:check_cxxsnippets({test = [[ #include @@ -455,7 +467,7 @@ package("boost") boost::iostreams::filtering_ostream out; out.push(boost::iostreams::lzma_compressor()); } - ]]}, {configs = {languages = "c++14"}})) + ]]}, {configs = {languages = "c++14"}})) end end end) From af3270b5cbaec0f97802e683f815f59fef40d6e3 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 24 Jun 2024 19:49:37 +0800 Subject: [PATCH 218/671] Update libassert to 2.1.0 (#4449) * Update libassert to 2.1.0 * Update xmake.lua * Update xmake.lua * patch --- packages/l/libassert/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/l/libassert/xmake.lua b/packages/l/libassert/xmake.lua index 8bbddd207..c52104295 100644 --- a/packages/l/libassert/xmake.lua +++ b/packages/l/libassert/xmake.lua @@ -6,12 +6,15 @@ package("libassert") add_urls("https://github.com/jeremy-rifkin/libassert/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/libassert.git") + add_versions("v2.1.0", "e42405b49cde017c44c78aacac35c6e03564532838709031e73d10ab71f5363d") add_versions("v2.0.2", "4a0b52e6523bdde0116231a67583131ea1a84bb574076fad939fc13fc7490443") add_versions("v2.0.1", "405a44c14c5e40de5b81b01538ba12ef9d7c1f57e2c29f81b929e7e179847d4c") add_versions("v2.0.0", "d4b2da2179a94637b34d18813a814531a1eceb0ddc6dd6db6098050dd638f4a1") add_versions("v1.2.2", "68206b43bc4803357ba7d366574b4631bd327c46ab76ddef6ff9366784fa6b3c") add_versions("v1.2", "332f96181f4bdbd95ef5fcd6484782ba2d89b50fd5189bc2a33fd524962f6771") + add_patches("v2.1.0", "https://github.com/jeremy-rifkin/libassert/commit/aff047da702316b10219a967f78da352f847b8d0.patch", "acdf2e1c7529774be581e7dbab3bbca828743bba8b8f9d6ac9dd4585b2245c58") + add_configs("decompose", {description = "Enables expression decomposition of && and || (this prevents short circuiting)", default = false, type = "boolean"}) add_configs("lowercase", {description = "Enables assert alias for ASSERT", default = false, type = "boolean"}) add_configs("magic_enum", {description = "Use the MagicEnum library to print better diagnostics for enum classes", default = true, type = "boolean"}) From 570c9dfab7fafab1515cf3cd1c9fa76a68ef195a Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 24 Jun 2024 21:57:38 +0800 Subject: [PATCH 219/671] cppp-reiconv: fix install (#4451) --- .../c/cppp-reiconv/patches/2.1.0/cmake.patch | 49 +++++++++++++++++++ packages/c/cppp-reiconv/xmake.lua | 38 +++++++------- 2 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 packages/c/cppp-reiconv/patches/2.1.0/cmake.patch diff --git a/packages/c/cppp-reiconv/patches/2.1.0/cmake.patch b/packages/c/cppp-reiconv/patches/2.1.0/cmake.patch new file mode 100644 index 000000000..4acf2212c --- /dev/null +++ b/packages/c/cppp-reiconv/patches/2.1.0/cmake.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d3c761..0689164 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ if(MSVC) + endif() + + # Generate header file for build +-if(WIN32) ++if(WIN32 AND BUILD_SHARED_LIBS) + set(DLL_VARIABLE "__declspec(dllexport)") + elseif(HAVE_VISIBILITY) + set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))") +@@ -59,7 +59,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/cppp/reiconv.hpp.in" "${outp + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/libcppp-reiconv.rc.in" "${CMAKE_BINARY_DIR}/windows/libcppp-reiconv.rc") + + # Generate header file for install +-if(WIN32) ++if(WIN32 AND BUILD_SHARED_LIBS) + set(DLL_VARIABLE "__declspec(dllimport)") + else() + set(DLL_VARIABLE "") +@@ -83,7 +83,7 @@ cppp_build_library(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/lib/iconv.cpp" T + + # Include test suite. + include("tests/tests.cmake") +- ++if (NOT BUILD_SHARED_LIBS) + # Install + # Static + # PERMISSIONS 0644 +@@ -94,7 +94,7 @@ install(TARGETS libcppp-reiconv.static + ARCHIVE DESTINATION "${install_staticdir}" + RUNTIME DESTINATION "${install_bindir}" + INCLUDES DESTINATION "${install_includedir}" ) +- ++else() + # Shared + # PERMISSIONS 0755 + install(TARGETS libcppp-reiconv.shared +@@ -105,7 +105,7 @@ install(TARGETS libcppp-reiconv.shared + ARCHIVE DESTINATION "${install_staticdir}" + RUNTIME DESTINATION "${install_bindir}" + INCLUDES DESTINATION "${install_includedir}" ) +- ++endif() + # Includes + # install includes + # PERMISSIONS 0644 diff --git a/packages/c/cppp-reiconv/xmake.lua b/packages/c/cppp-reiconv/xmake.lua index b43cbd986..cb8b19189 100644 --- a/packages/c/cppp-reiconv/xmake.lua +++ b/packages/c/cppp-reiconv/xmake.lua @@ -1,39 +1,39 @@ package("cppp-reiconv") - set_homepage("https://github.com/cppp-project/cppp-reiconv") set_description("A character set conversion library based on GNU LIBICONV.") + set_license("LGPL-3.0") - add_urls("https://github.com/cppp-project/cppp-reiconv/releases/download/$(version)/cppp-reiconv-$(version).zip") + add_urls("https://github.com/cppp-project/cppp-reiconv/releases/download/$(version)/cppp-reiconv-$(version).zip", + "https://github.com/cppp-project/cppp-reiconv.git") add_versions("v2.1.0", "3e539785a437843793c5ce2f8a72cb08f2b543cba11635b06db25cfc6d9cc3a4") + add_patches("2.1.0", "patches/2.1.0/cmake.patch", "21bd2fcb5874f8774af1360aaac51073b67bf4c754096f0fe162d66632c1b7f9") + add_deps("cmake", "python") on_install(function (package) - local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + local configs = {"-DENABLE_TEST=OFF", "-DENABLE_EXTRA=ON"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DENABLE_EXTRA=ON") - table.insert(configs, "-DENABLE_TEST=OFF") import("package.tools.cmake").install(package, configs) end) on_test(function (package) assert(package:check_cxxsnippets({test = [[ - #include - #include - #include - using namespace cppp::base::reiconv; + #include + #include + #include + using namespace cppp::base::reiconv; - void test() - { - iconv_t cd = iconv_open("UTF-8", "UTF-8"); - if (cd == (iconv_t)(-1)) + void test() { - abort(); + iconv_t cd = iconv_open("UTF-8", "UTF-8"); + if (cd == (iconv_t)(-1)) + { + abort(); + } + iconv_close(cd); } - iconv_close(cd); - } - ]]}, {configs = {languages = "c++14"}})) + ]]}, {configs = {languages = "c++14"}})) end) - From faff95e7f3937e21d79ca51b90ddbbaf78d7f959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 24 Jun 2024 17:49:30 +0200 Subject: [PATCH 220/671] libsdl: Add support of x11 and wayland on FreeBSD (#4452) * libsdl: Add support of x11 and wayland on FreeBSD * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Try to add BSD support for x11 * Update xmake.lua * Update xmake.lua --- packages/l/libpthread-stubs/xmake.lua | 4 +--- packages/l/libsdl/xmake.lua | 12 ++++++------ packages/l/libx11/xmake.lua | 10 ++++++---- packages/l/libxau/xmake.lua | 4 ++-- packages/l/libxcb/xmake.lua | 4 ++-- packages/l/libxdmcp/xmake.lua | 5 ++--- packages/l/libxext/xmake.lua | 5 ++--- packages/u/util-macros/xmake.lua | 3 +-- packages/x/xcb-proto/xmake.lua | 5 ++--- packages/x/xorgproto/xmake.lua | 5 ++--- packages/x/xtrans/xmake.lua | 5 ++--- 11 files changed, 28 insertions(+), 34 deletions(-) diff --git a/packages/l/libpthread-stubs/xmake.lua b/packages/l/libpthread-stubs/xmake.lua index c40662862..20a73c1d4 100644 --- a/packages/l/libpthread-stubs/xmake.lua +++ b/packages/l/libpthread-stubs/xmake.lua @@ -1,5 +1,4 @@ package("libpthread-stubs") - set_homepage("https://www.x.org/") set_description("X.Org: pthread-stubs.pc") @@ -10,7 +9,7 @@ package("libpthread-stubs") add_deps("pkg-config") - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) import("package.tools.autoconf").install(package) end) @@ -18,4 +17,3 @@ package("libpthread-stubs") local envs = {PKG_CONFIG_PATH = path.join(package:installdir(), "lib", "pkgconfig")} os.vrunv("pkg-config", {"--exists", "pthread-stubs"}, {envs = envs}) end) - diff --git a/packages/l/libsdl/xmake.lua b/packages/l/libsdl/xmake.lua index 4aeb05f50..8d3410b68 100644 --- a/packages/l/libsdl/xmake.lua +++ b/packages/l/libsdl/xmake.lua @@ -1,6 +1,7 @@ package("libsdl") set_homepage("https://www.libsdl.org/") set_description("Simple DirectMedia Layer") + set_license("zlib") if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::SDL2") @@ -10,11 +11,10 @@ package("libsdl") add_extsources("brew::sdl2") end - set_license("zlib") - add_urls("https://www.libsdl.org/release/SDL2-$(version).zip", "https://github.com/libsdl-org/SDL/releases/download/release-$(version)/SDL2-$(version).zip", { alias = "archive" }) add_urls("https://github.com/libsdl-org/SDL.git", { alias = "github" }) + add_versions("archive:2.0.8", "e6a7c71154c3001e318ba7ed4b98582de72ff970aca05abc9f45f7cbdc9088cb") add_versions("archive:2.0.12", "476e84d6fcbc499cd1f4a2d3fd05a924abc165b5d0e0d53522c9604fe5a021aa") add_versions("archive:2.0.14", "2c1e870d74e13dfdae870600bfcb6862a5eab4ea5b915144aff8d75a0f9bf046") @@ -80,7 +80,7 @@ package("libsdl") add_configs("sdlmain", {description = "Use SDL_main entry point", default = true, type = "boolean"}) end - if is_plat("linux") then + if is_plat("linux", "bsd") then add_configs("x11", {description = "Enables X11 support (requires it on the system)", default = true, type = "boolean"}) add_configs("wayland", {description = "Enables Wayland support", default = true, type = "boolean"}) @@ -104,10 +104,10 @@ package("libsdl") package:add("defines", "SDL_MAIN_HANDLED") end package:add("components", "lib") - if package:is_plat("linux") and (package:config("x11") or package:config("with_x")) then + if package:is_plat("linux", "bsd") and (package:config("x11") or package:config("with_x")) then package:add("deps", "libxext", {private = true}) end - if package:is_plat("linux") and package:config("wayland") then + if package:is_plat("linux", "bsd") and package:config("wayland") then package:add("deps", "wayland", {private = true}) end end) @@ -207,7 +207,7 @@ package("libsdl") table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DSDL_TEST=OFF") local opt - if package:is_plat("linux", "cross") then + if package:is_plat("linux", "bsd", "cross") then local includedirs = {} for _, depname in ipairs({"libxext", "libx11", "xorgproto"}) do local dep = package:dep(depname) diff --git a/packages/l/libx11/xmake.lua b/packages/l/libx11/xmake.lua index b0d40b34f..b1a5af485 100644 --- a/packages/l/libx11/xmake.lua +++ b/packages/l/libx11/xmake.lua @@ -1,5 +1,4 @@ package("libx11") - set_homepage("https://www.x.org/") set_description("X.Org: Core X11 protocol client library") @@ -11,15 +10,18 @@ package("libx11") add_versions("1.8.7", "793ebebf569f12c864b77401798d38814b51790fce206e01a431e5feb982e20b") if is_plat("linux") then - add_syslinks("dl") add_extsources("apt::libx11-dev", "pacman::libx11") elseif is_plat("macosx") then add_extsources("brew::libx11") end + if is_plat("linux", "bsd") then + add_syslinks("dl") + end + add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"}) - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "util-macros", "xtrans", "libxcb", "xorgproto") end if is_plat("macosx") then @@ -27,7 +29,7 @@ package("libx11") add_deps("gnu-sed") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/l/libxau/xmake.lua b/packages/l/libxau/xmake.lua index 82e93b0f6..cb3e6e60e 100644 --- a/packages/l/libxau/xmake.lua +++ b/packages/l/libxau/xmake.lua @@ -11,11 +11,11 @@ package("libxau") add_extsources("apt::libxau-dev", "pacman::libxau") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "util-macros", "xorgproto") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/l/libxcb/xmake.lua b/packages/l/libxcb/xmake.lua index 2ecd5b42c..5c04209fb 100644 --- a/packages/l/libxcb/xmake.lua +++ b/packages/l/libxcb/xmake.lua @@ -46,7 +46,7 @@ package("libxcb") add_extsources("apt::libxcb1-dev", "pacman::libxcb") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "python 3.x", {kind = "binary"}) add_deps("xcb-proto", "libpthread-stubs", "libxau", "libxdmcp") end @@ -59,7 +59,7 @@ package("libxcb") end end) - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/l/libxdmcp/xmake.lua b/packages/l/libxdmcp/xmake.lua index 8f8359a9e..bf0aa016e 100644 --- a/packages/l/libxdmcp/xmake.lua +++ b/packages/l/libxdmcp/xmake.lua @@ -1,5 +1,4 @@ package("libxdmcp") - set_homepage("https://www.x.org/") set_description("X.Org: X Display Manager Control Protocol library") @@ -11,11 +10,11 @@ package("libxdmcp") add_extsources("apt::libxdmcp-dev", "pacman::libxmdcp") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "xorgproto") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/l/libxext/xmake.lua b/packages/l/libxext/xmake.lua index e1e1acbab..f7d71691e 100644 --- a/packages/l/libxext/xmake.lua +++ b/packages/l/libxext/xmake.lua @@ -1,5 +1,4 @@ package("libxext") - set_homepage("https://www.x.org/") set_description("X.Org: Library for common extensions to the X11 protocol") @@ -11,11 +10,11 @@ package("libxext") add_extsources("apt::libxext-dev") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "libx11", "xorgproto") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/u/util-macros/xmake.lua b/packages/u/util-macros/xmake.lua index ae511f549..0cd6ee05b 100644 --- a/packages/u/util-macros/xmake.lua +++ b/packages/u/util-macros/xmake.lua @@ -1,5 +1,4 @@ package("util-macros") - set_homepage("https://www.x.org/") set_description("X.Org: Set of autoconf macros used to build other xorg packages") @@ -14,7 +13,7 @@ package("util-macros") add_deps("pkg-config") - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var")} import("package.tools.autoconf").install(package, configs) diff --git a/packages/x/xcb-proto/xmake.lua b/packages/x/xcb-proto/xmake.lua index 430d6b69c..a0f094079 100644 --- a/packages/x/xcb-proto/xmake.lua +++ b/packages/x/xcb-proto/xmake.lua @@ -1,5 +1,4 @@ package("xcb-proto") - set_homepage("https://www.x.org/") set_description("X.Org: XML-XCB protocol descriptions for libxcb code generation") @@ -10,11 +9,11 @@ package("xcb-proto") add_versions("1.14.1", "85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd") add_versions("1.16.0", "d9c7f010b1105fc3858bf07b5169b2dd8e7493c6652b1fe45f3321d874f291d7") - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "python 3.x", {kind = "binary"}) end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-silent-rules", diff --git a/packages/x/xorgproto/xmake.lua b/packages/x/xorgproto/xmake.lua index 1d794e600..b95e4b14f 100644 --- a/packages/x/xorgproto/xmake.lua +++ b/packages/x/xorgproto/xmake.lua @@ -1,5 +1,4 @@ package("xorgproto") - set_kind("library", {headeronly = true}) set_homepage("https://www.x.org/") set_description("X.Org: Protocol Headers") @@ -13,11 +12,11 @@ package("xorgproto") add_extsources("apt::x11proto-dev", "pkgconfig::xproto") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "util-macros") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", diff --git a/packages/x/xtrans/xmake.lua b/packages/x/xtrans/xmake.lua index 39bae6920..e570af41a 100644 --- a/packages/x/xtrans/xmake.lua +++ b/packages/x/xtrans/xmake.lua @@ -1,5 +1,4 @@ package("xtrans") - set_homepage("https://www.x.org/") set_description("X.Org: X Network Transport layer shared code") @@ -11,11 +10,11 @@ package("xtrans") add_extsources("apt::xtrans-dev", "pacman::xtrans") end - if is_plat("macosx", "linux") then + if is_plat("macosx", "linux", "bsd") then add_deps("pkg-config", "util-macros", "xorgproto") end - on_install("macosx", "linux", function (package) + on_install("macosx", "linux", "bsd", function (package) local configs = {"--sysconfdir=" .. package:installdir("etc"), "--localstatedir=" .. package:installdir("var"), "--disable-dependency-tracking", From d940be54b52a73bf8a3ebb57a8bbd4ee8cb7ac07 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 25 Jun 2024 00:40:54 +0800 Subject: [PATCH 221/671] xorstr: add package (#4453) * xorstr: add package * limit plat --- packages/x/xorstr/xmake.lua | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/x/xorstr/xmake.lua diff --git a/packages/x/xorstr/xmake.lua b/packages/x/xorstr/xmake.lua new file mode 100644 index 000000000..42d1e9699 --- /dev/null +++ b/packages/x/xorstr/xmake.lua @@ -0,0 +1,24 @@ +package("xorstr") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/JustasMasiulis/xorstr") + set_description("heavily vectorized c++17 compile time string encryption.") + set_license("Apache-2.0") + + add_urls("https://github.com/JustasMasiulis/xorstr/archive/8ab293225374e16cbae9a54b6a1bed3ee0bf9681.tar.gz", + "https://github.com/JustasMasiulis/xorstr.git") + + add_versions("2021.11.19", "b52220a50c33f8b13e6aaa2fcd14f31a44d96ba721b014ab921c30b5e3cb61eb") + + on_install("!cross and !wasm and mingw|!i386", function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #define JM_XORSTR_DISABLE_AVX_INTRINSICS + #include + void test() { + xorstr_("hello world"); + } + ]]}, {configs = {languages = "c++17"}})) + end) From 99082b66e5e67126bf0e24704d1f212ce106d071 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 25 Jun 2024 00:50:21 +0800 Subject: [PATCH 222/671] cxxgraph: add v4.1.0 (#4437) * cxxgraph: add v4.1.0 * add check for wasm --- packages/c/cxxgraph/xmake.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/c/cxxgraph/xmake.lua b/packages/c/cxxgraph/xmake.lua index b5e81eed9..683ff980d 100644 --- a/packages/c/cxxgraph/xmake.lua +++ b/packages/c/cxxgraph/xmake.lua @@ -7,16 +7,16 @@ package("cxxgraph") add_urls("https://github.com/ZigRazor/CXXGraph/archive/refs/tags/$(version).tar.gz", "https://github.com/ZigRazor/CXXGraph.git") + add_versions("v4.1.0", "1f6601abfcb692f35bfe14f2a34b2302f70213a257b0f7d541a110d6bd460040") add_versions("v3.1.0", "54838d0d35a6f2685cf45e50e888146aef3c1a10fbbdddb939b3985c7953087a") if on_check then - on_check("windows", function (package) - import("core.tool.toolchain") - - local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - if msvc then - local vs = msvc:config("vs") + on_check("windows", "wasm", function (package) + if package:is_plat("windows") then + local vs = package:toolchain("msvc"):config("vs") assert(vs and tonumber(vs) >= 2022, "package(cxxgraph): need vs >= 2022") + elseif package:is_plat("wasm") then + assert(not package:version("4.1.0"), "package(cxxgraph/4.1.0): Unsupported platform") end end) end From b0592de58fb9f7a285fcc6f4f7de29fc4607b31b Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 25 Jun 2024 07:41:13 +0800 Subject: [PATCH 223/671] pahomqttc: fix syslinks (#4454) * pahomqttc: fix syslinks * add openssl config * improve defines * improve xmake.lua * improve license * fix mingw syslinks * improve links * improve test * fix links on non-windows --- packages/p/pahomqttc/xmake.lua | 66 ++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 10 deletions(-) diff --git a/packages/p/pahomqttc/xmake.lua b/packages/p/pahomqttc/xmake.lua index d5e740fbd..cc60b2d7b 100644 --- a/packages/p/pahomqttc/xmake.lua +++ b/packages/p/pahomqttc/xmake.lua @@ -1,25 +1,71 @@ package("pahomqttc") set_homepage("https://github.com/eclipse/paho.mqtt.c") set_description("Eclipse Paho MQTT C Client Library") - set_license("MIT") + set_license("EPL-2.0") add_urls("https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/$(version).zip", "https://github.com/eclipse/paho.mqtt.c.git") add_versions("v1.3.13", "5ba7c7ab7ebb1499938fa2e358e6c1f9a926b270f2bf082acf89d59b4771a132") + add_configs("uuid", {description = "Flag that defines whether libuuid or a custom uuid implementation should be used", default = false, type = "boolean"}) + add_configs("openssl", {description = "Flag that defines whether to build ssl-enabled binaries too.", default = false, type = "boolean"}) + add_configs("high_performance", {description = "Enable tracing and heap tracking", default = false, type = "boolean"}) + add_configs("asynchronous", {description = "Use asynchronous", default = false, type = "boolean"}) + + if is_plat("windows", "mingw") then + add_syslinks("ws2_32", "advapi32", "rpcrt4", "crypt32") + elseif is_plat("linux") then + add_syslinks("dl", "pthread", "rt") + elseif is_plat("android") then + add_syslinks("dl") + elseif is_plat("bsd") then + add_syslinks("compat", "pthread") + end + add_deps("cmake") - on_install("windows", "linux", "macosx", function (package) - local configs = {"-DPAHO_BUILD_SAMPLES=FALSE", - "-DPAHO_WITH_SSL=FALSE", - "-DPAHO_BUILD_DOCUMENTATION=FALSE"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + on_load(function (package) + if package:config("uuid") then + package:add("deps", "uuid") + end + if package:config("openssl") then + package:add("deps", "openssl") + end + + if package:config("shared") and package:is_plat("windows") then + package:add("defines", "PAHO_MQTT_IMPORTS") + end + -- paho-mqtt3[a|c][-static] + local links = "paho-mqtt3" .. (package:config("asynchronous") and "a" or "c") + if package:is_plat("windows", "mingw") and (not package:config("shared")) then + links = links .. "-static" + end + package:add("links", links) + end) + + on_install("!wasm", function (package) + local configs = { + "-DPAHO_BUILD_SAMPLES=FALSE", + "-DPAHO_ENABLE_TESTING=OFF", + "-DPAHO_ENABLE_CPACK=OFF", + "-DPAHO_BUILD_DOCUMENTATION=FALSE", + } + local shared = package:config("shared") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DPAHO_BUILD_SHARED=" .. (shared and "TRUE" or "FALSE")) + table.insert(configs, "-DPAHO_BUILD_STATIC=" .. (shared and "FALSE" or "TRUE")) + + table.insert(configs, "-DPAHO_WITH_SSL=" .. (package:config("openssl") and "TRUE" or "FALSE")) + table.insert(configs, "-DPAHO_WITH_LIBUUID=" .. (package:config("uuid") and "TRUE" or "FALSE")) + table.insert(configs, "-DPAHO_HIGH_PERFORMANCE=" .. (package:config("high_performance") and "TRUE" or "FALSE")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cfuncs("MQTTClient_connect", {includes = "MQTTClient.h"})) - end) -package_end() \ No newline at end of file + if package:config("asynchronous") then + assert(package:has_cfuncs("MQTTAsync_connect", {includes = "MQTTAsync.h"})) + else + assert(package:has_cfuncs("MQTTClient_connect", {includes = "MQTTClient.h"})) + end + end) From c9afdcdcb229f0cd60004fde816058fca3841bee Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 25 Jun 2024 10:18:01 +0800 Subject: [PATCH 224/671] Update re-flex to v4.4.0 (#4460) --- packages/r/re-flex/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/re-flex/xmake.lua b/packages/r/re-flex/xmake.lua index c150785f8..9dfbcd1e5 100644 --- a/packages/r/re-flex/xmake.lua +++ b/packages/r/re-flex/xmake.lua @@ -6,6 +6,7 @@ package("re-flex") add_urls("https://github.com/Genivia/RE-flex/archive/refs/tags/$(version).tar.gz", "https://github.com/Genivia/RE-flex.git") + add_versions("v4.4.0", "3b34d0c88f91db6b5387355a64a84bfa6464d90fb182aab05c367605db28d2e8") add_versions("v4.3.0", "1658c1be9fa95bf948a657d75d2cef0df81b614bc6052284935774d4d8551d95") on_install(function (package) From 52fc22c5c8e1cc36248822cb2e6f21fd3ccd983a Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 25 Jun 2024 10:18:04 +0800 Subject: [PATCH 225/671] Update aws-c-io to v0.14.9 (#4459) --- packages/a/aws-c-io/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-io/xmake.lua b/packages/a/aws-c-io/xmake.lua index 8c274a9ad..acb4daad6 100644 --- a/packages/a/aws-c-io/xmake.lua +++ b/packages/a/aws-c-io/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-io") add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-io.git") + add_versions("v0.14.9", "3a3b7236f70209ac12b5bafa7dd81b75cc68b691a0aa0686d6d3b7e4bbe5fbc9") add_versions("v0.14.8", "d50e21fdbd5170a4071fe067ef4ce297b02cb058ad47e118305e25f6e07d9cf0") add_versions("v0.14.7", "ecf1f660d7d43913aa8a416be6a2027101ce87c3b241344342d608335b4df7d4") add_versions("v0.14.6", "bb3af305af748185b1c7b17afa343e54f2d494ccff397402f1b17041b0967865") From 7f493ece71b73f93e9c32aca6918b2d09995e6d5 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 25 Jun 2024 10:38:42 +0800 Subject: [PATCH 226/671] Auto-update nsync to 1.29.1 (#4458) * Update nsync to 1.29.1 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/n/nsync/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/n/nsync/xmake.lua b/packages/n/nsync/xmake.lua index 3849326aa..2b0bef301 100644 --- a/packages/n/nsync/xmake.lua +++ b/packages/n/nsync/xmake.lua @@ -6,9 +6,10 @@ package("nsync") add_urls("https://github.com/google/nsync/archive/refs/tags/$(version).tar.gz", "https://github.com/google/nsync.git") + add_versions("1.29.1", "3045a8922171430426b695edf794053182d245f6a382ddcc59ef4a6190848e98") add_versions("1.28.1", "0011fc00820088793b6a9ba97536173a25cffd3df2dc62616fb3a2824b3c43f5") - add_patches("1.28.1", "patches/1.28.1/cmake.patch", "626a89a5a60884b7aaf44011494e7ba5dbfcdae9fcdb5afcef5b5d1f893b4600") + add_patches(">=1.28.1", "patches/1.28.1/cmake.patch", "626a89a5a60884b7aaf44011494e7ba5dbfcdae9fcdb5afcef5b5d1f893b4600") if is_plat("linux", "bsd") then add_syslinks("m", "pthread") From 02a43cbcf39442a42d037e26bd8c2ae1e5aabf96 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 25 Jun 2024 13:08:42 +0800 Subject: [PATCH 227/671] Update toml11 to v4.0.1 (#4457) --- packages/t/toml11/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/toml11/xmake.lua b/packages/t/toml11/xmake.lua index 7ffbc46f1..6d1e456a9 100644 --- a/packages/t/toml11/xmake.lua +++ b/packages/t/toml11/xmake.lua @@ -7,6 +7,7 @@ package("toml11") add_urls("https://github.com/ToruNiina/toml11/archive/refs/tags/$(version).tar.gz", "https://github.com/ToruNiina/toml11.git") + add_versions("v4.0.1", "96965cb00ca7757c611c169cd5a6fb15736eab1cd1c1a88aaa62ad9851d926aa") add_versions("v3.8.1", "6a3d20080ecca5ea42102c078d3415bef80920f6c4ea2258e87572876af77849") add_versions("v3.7.0", "a0b6bec77c0e418eea7d270a4437510884f2fe8f61e7ab121729624f04c4b58e") From 4de726001a9fa4a0a3b3b63701cd8e6b40396064 Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 25 Jun 2024 14:32:21 +0800 Subject: [PATCH 228/671] [folly related] update to 06.24 (#4462) --- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 1 + packages/m/mvfst/xmake.lua | 3 ++- packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index 994ab0671..b16ef576d 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -12,6 +12,7 @@ package("fbthrift") add_versions("2024.04.01", "e408a973a59a37def97a8e0ec368ee9fa39c8d49c925ecf7335f1c0463c1a819") add_versions("2024.06.10", "a71481f9621891a5094d93a7c49d630ae544a1f056a93811742df6469b95bf64") add_versions("2024.06.17", "bfacfe477c1152df43a1681c31801f337ef7f67bc85507e09340abdd146cca7f") + add_versions("2024.06.24", "78bbc48d1dfa8948580b780b3e827b4562102d2b9ca87db11b5a03ba277ac0e5") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index d4d6e4840..487182720 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -13,6 +13,7 @@ package("fizz") add_versions("2024.04.01", "caf2cf1ba8f6db66abbadf382fb3e0667888567c4ac0d8f74ec92e1fb27c3727") add_versions("2024.06.10", "dabc77e2238383fb37c19327af8ab864ba030d32e98f49b23008075a7afb6e19") add_versions("2024.06.17", "46e9d1b782a51b2c063390dc1161f26f2c77ef7a94ff8ccc4bdc272697cad8bb") + add_versions("2024.06.24", "b5fd5fb3fe1cf20519ea91d6a0127505596f8c74c82cde9d54ea6ae92df86a50") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 9616f30f2..2219ec7ab 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -21,6 +21,7 @@ package("folly") add_versions("2024.04.01", "f09e522c76a5f102c40c54726f6f255b0dc127c78f9c8c9ac117fc0f7ac284bb") add_versions("2024.06.10", "27d7f825a9a3469b59a4f0a5ba2edac733407ea8dcc036e7ca9279d803ece1e9") add_versions("2024.06.17", "a26cda1cf5f9914f2ff05b5f8e4062d73f5a1ff71ee1911e734dc758313f6d30") + add_versions("2024.06.24", "05ce0aed45c3a8125334438564364fbf32cd0d80b2a58c010cc821f5f16def50") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 814c29678..8ec874c72 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -12,8 +12,9 @@ package("mvfst") add_versions("2024.04.01", "e39c4d7dd87520fcce6a3d5d398b5d03bd3e680186b9b0db23f02b502c6bcb1e") add_versions("2024.06.10", "cc75889429a66463cc8e607ba09d584fb4e6d2e69b1127a538043b367c54a1ae") add_versions("2024.06.17", "748c744dae967a0ac25c89a6c7ccf62da2a4974ab45644d395fb7bc8f2e96dc1") + add_versions("2024.06.24", "0a8c9bf9c9e1e293e56c0bd05e60606b2b299245510442a2e9af01519c040041") - add_patches("2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") + add_patches(">=2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") add_deps("cmake", "folly", "fizz") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 76cd7288a..252810b4b 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -12,6 +12,7 @@ package("proxygen") add_versions("2024.04.01", "75b040c235fee853e8db90075620f56ee4aa69345eea9ab4f80aa35501fe2eff") add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4") add_versions("2024.06.17", "ab45c56c705d4c47595f3118cbaa2641be2bcd26c4d3b43e49e0c743a7272089") + add_versions("2024.06.24", "4087de735334ba50f1e9c8df7c2040718d3c1ba9f9da102db5bbb7328a56b94a") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index 7c2a47c88..011cbf1d2 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -13,6 +13,7 @@ package("wangle") add_versions("2024.04.01", "c21c3616d3017bc7b72f6b2315f81be4fd9be4c0dc6e1fae0266ec545fbc5535") add_versions("2024.06.10", "0328a481258a399a70ee2d003be8d482529b2f26e79ea2c218a32361051ea5be") add_versions("2024.06.17", "9d3e2349be6f8462243beebc1245f8d82808734060d9e3d9c0cf45bbda3c1f70") + add_versions("2024.06.24", "a4e83d477ef3c8c208f30a811772f0d551e0728f42f45bf647a82f3b82d60baf") add_deps("cmake", "folly", "fizz") From e81e21e7c12ae8950747d26a24a19bc6c11c333e Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 25 Jun 2024 21:37:23 +0800 Subject: [PATCH 229/671] reflect-cpp: fix deps (#4466) * reflect-cpp: fix deps * fix wasm * remove find_package on wasm --- .../r/reflect-cpp/patches/0.11.1/cmake.patch | 46 +++++++++++++++++++ packages/r/reflect-cpp/xmake.lua | 24 ++++++---- packages/y/yyjson/xmake.lua | 46 +++++++++++++------ 3 files changed, 93 insertions(+), 23 deletions(-) create mode 100644 packages/r/reflect-cpp/patches/0.11.1/cmake.patch diff --git a/packages/r/reflect-cpp/patches/0.11.1/cmake.patch b/packages/r/reflect-cpp/patches/0.11.1/cmake.patch new file mode 100644 index 000000000..00f72b126 --- /dev/null +++ b/packages/r/reflect-cpp/patches/0.11.1/cmake.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e537c90..ea16a73 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,20 +38,16 @@ if(REFLECTCPP_USE_BUNDLED_DEPENDENCIES) + add_library(reflectcpp STATIC src/yyjson.c) + endif() + else() +- if (REFLECTCPP_BUILD_SHARED) +- add_library(reflectcpp SHARED) +- else() +- add_library(reflectcpp STATIC) +- endif() ++ add_library(reflectcpp INTERFACE) + endif() + + set_target_properties(reflectcpp PROPERTIES LINKER_LANGUAGE CXX) +-target_compile_features(reflectcpp PUBLIC cxx_std_20) ++target_compile_features(reflectcpp INTERFACE cxx_std_20) + + if(REFLECTCPP_USE_BUNDLED_DEPENDENCIES) + target_include_directories(reflectcpp PUBLIC $ $ $) + else() +- target_include_directories(reflectcpp PUBLIC $ $ ) ++ target_include_directories(reflectcpp INTERFACE $ $ ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DREFLECTCPP_NO_BUNDLED_DEPENDENCIES") + find_package(ctre CONFIG REQUIRED) + find_package(yyjson CONFIG REQUIRED) +@@ -103,7 +99,7 @@ if (REFLECTCPP_YAML OR REFLECTCPP_BUILD_BENCHMARKS) + target_link_libraries(reflectcpp INTERFACE yaml-cpp::yaml-cpp) + endif () + +-target_compile_options(reflectcpp PRIVATE -Wall) ++# target_compile_options(reflectcpp PRIVATE -Wall) + + if (REFLECTCPP_BUILD_TESTS) + if (MSVC) +@@ -137,7 +133,7 @@ install( + file(GLOB_RECURSE RFL_HEADERS RELATIVE ${CMAKE_CURRENT_LIST_DIR} "${CMAKE_CURRENT_LIST_DIR}/include/*" ) + + target_sources(reflectcpp +- PUBLIC ++ INTERFACE + FILE_SET reflectcpp_headers + TYPE HEADERS + BASE_DIRS $ $ diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 3f4c9a437..a8b65ba7e 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -10,6 +10,7 @@ package("reflect-cpp") add_versions("v0.11.1", "e45f112fb3f14507a4aa53b99ae2d4ab6a4e7b2d5f04dd06fec00bf7faa7bbdc") add_versions("v0.10.0", "d2c8876d993ddc8c57c5804e767786bdb46a2bdf1a6cd81f4b14f57b1552dfd7") + add_patches("0.11.1", "patches/0.11.1/cmake.patch", "a43ae2c6de455054ab860adfb309da7bd376c31c493c8bab0ebe07aae0805205") add_patches("0.10.0", "patches/0.10.0/cmake.patch", "b8929c0a13bd4045cbdeea0127e08a784e2dc8c43209ca9f056fff4a3ab5c4d3") add_configs("bson", {description = "Enable Bson Support.", default = false, type = "boolean", readonly = true}) @@ -25,13 +26,8 @@ package("reflect-cpp") on_check(function (package) if package:is_plat("windows") then - import("core.tool.toolchain") - - local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - if msvc then - local vs = msvc:config("vs") - assert(vs and tonumber(vs) >= 2022, "package(reflect-cpp): need vs >= 2022") - end + local vs = package:toolchain("msvc"):config("vs") + assert(vs and tonumber(vs) >= 2022, "package(reflect-cpp): need vs >= 2022") else assert(package:check_cxxsnippets({test = [[ #include @@ -74,10 +70,22 @@ package("reflect-cpp") if package:config("yaml") then package:add("deps", "yaml-cpp") end + + local version = package:version() + if version and version:ge("0.11.1") then + package:add("deps", "ctre") + package:add("defines", "REFLECTCPP_NO_BUNDLED_DEPENDENCIES") + end end) on_install(function (package) - import("package.tools.cmake").install(package) + local version = package:version() + if version and version:ge("0.11.1") and package:is_plat("wasm") then + io.replace("CMakeLists.txt", "find_package(ctre CONFIG REQUIRED)", "", {plain = true}) + io.replace("CMakeLists.txt", "find_package(yyjson CONFIG REQUIRED)", "", {plain = true}) + io.replace("CMakeLists.txt", "target_link_libraries(reflectcpp INTERFACE yyjson::yyjson)", "", {plain = true}) + end + import("package.tools.cmake").install(package, {"-DREFLECTCPP_USE_BUNDLED_DEPENDENCIES=OFF"}) end) on_test(function (package) diff --git a/packages/y/yyjson/xmake.lua b/packages/y/yyjson/xmake.lua index 19b82c411..a8252e2b4 100644 --- a/packages/y/yyjson/xmake.lua +++ b/packages/y/yyjson/xmake.lua @@ -1,10 +1,11 @@ package("yyjson") - set_homepage("https://github.com/ibireme/yyjson") set_description("The fastest JSON library in C.") + set_license("MIT") add_urls("https://github.com/ibireme/yyjson/archive/$(version).tar.gz", "https://github.com/ibireme/yyjson.git") + add_versions("0.9.0", "59902bea55585d870fd7681eabe6091fbfd1a8776d1950f859d2dbbd510c74bd") add_versions("0.8.0", "b2e39ac4c65f9050820c6779e6f7dd3c0d3fed9c6667f91caec0badbedce00f3") add_versions("0.5.1", "b484d40b4e20cc3174a6fdc160d0f20f961417f9cb3f6dc1cf6555fffa8359f3") @@ -13,22 +14,37 @@ package("yyjson") add_versions("0.3.0", "f5ad3e3be40f0307a732c2b8aff9a1ba6014a6b346f3ec0b128459607748e990") add_versions("0.2.0", "43aacdc6bc3876dc1322200c74031b56d8d7838c04e46ca8a8e52e37ea6128da") + on_load(function (package) + local version = package:version() + if version and version:ge("0.9.0") then + package:add("deps", "cmake") + end + end) + on_install(function (package) - io.writefile("xmake.lua", [[ - add_rules("mode.debug", "mode.release") - target("yyjson") - set_kind("$(kind)") - add_files("src/*.c") - add_headerfiles("src/*.h") - if is_kind("shared") and is_plat("windows") then - add_defines("YYJSON_EXPORTS") - end - ]]) - local configs = {} - if package:config("shared") then - configs.kind = "shared" + local version = package:version() + if version and version:ge("0.9.0") then + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + + if package:config("shared") and package:is_plat("windows") then + package:add("defines", "YYJSON_IMPORTS") + end + else + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("yyjson") + set_kind("$(kind)") + add_files("src/*.c") + add_headerfiles("src/*.h") + if is_kind("shared") and is_plat("windows") then + add_defines("YYJSON_EXPORTS") + end + ]]) + import("package.tools.xmake").install(package) end - import("package.tools.xmake").install(package, configs) end) on_test(function (package) From 48e1d08b8e2271524df6f8e850e293612120a62c Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 26 Jun 2024 07:54:19 +0800 Subject: [PATCH 230/671] pahomqttcpp: improve configs (#4455) * pahomqttcpp: improve configs * fix dep config * fix pahomqttc lib with shared --- packages/p/pahomqttc/xmake.lua | 9 ++++--- packages/p/pahomqttcpp/xmake.lua | 45 ++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/packages/p/pahomqttc/xmake.lua b/packages/p/pahomqttc/xmake.lua index cc60b2d7b..57360bf74 100644 --- a/packages/p/pahomqttc/xmake.lua +++ b/packages/p/pahomqttc/xmake.lua @@ -29,15 +29,16 @@ package("pahomqttc") if package:config("uuid") then package:add("deps", "uuid") end - if package:config("openssl") then - package:add("deps", "openssl") - end if package:config("shared") and package:is_plat("windows") then package:add("defines", "PAHO_MQTT_IMPORTS") end - -- paho-mqtt3[a|c][-static] + -- paho-mqtt3[a|c][s][-static] local links = "paho-mqtt3" .. (package:config("asynchronous") and "a" or "c") + if package:config("openssl") then + links = links .. "s" + package:add("deps", "openssl") + end if package:is_plat("windows", "mingw") and (not package:config("shared")) then links = links .. "-static" end diff --git a/packages/p/pahomqttcpp/xmake.lua b/packages/p/pahomqttcpp/xmake.lua index 801a76120..f7e724b25 100644 --- a/packages/p/pahomqttcpp/xmake.lua +++ b/packages/p/pahomqttcpp/xmake.lua @@ -1,7 +1,7 @@ package("pahomqttcpp") set_homepage("https://github.com/eclipse/paho.mqtt.cpp") set_description("Eclipse Paho MQTT C++ Client Library") - set_license("EPL v1.0") + set_license("EPL-2.0") add_urls("https://github.com/eclipse/paho.mqtt.cpp/archive/refs/tags/$(version).zip", "https://github.com/eclipse/paho.mqtt.cpp.git") @@ -9,29 +9,34 @@ package("pahomqttcpp") add_versions("v1.3.2", "e01f43cf0ba35efa666503c7adb2786d4a6f7fe6eb44ce5311ac4785a0ce8a98") add_versions("v1.2.0", "90c4d8ae4f56bb706120fddcc5937cd0a0360b6f39d5cd5574a5846c0f923473") - add_deps("cmake") - add_deps("pahomqttc") - - on_install("windows", "linux", "macosx", function (package) - - local configs = {"-DPAHO_WITH_SSL=FALSE"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + add_configs("openssl", {description = "Flag that defines whether to build ssl-enabled binaries too.", default = false, type = "boolean"}) - if package:is_plat("windows") then - local pahomqttc = package:dep("pahomqttc"):fetch() + add_deps("cmake") - local includedirs = pahomqttc.includedirs or pahomqttc.sysincludedirs - if includedirs and #includedirs > 0 then - table.insert(configs, "-DPAHO_MQTT_C_INCLUDE_DIRS=" .. table.concat(includedirs, " ")) - end + on_load(function (package) + if package:config("openssl") then + package:add("deps", "openssl") + end - local libfiles = pahomqttc.libfiles - if libfiles then - table.insert(configs, "-DPAHO_MQTT_C_LIBRARIES=" .. table.concat(libfiles, " ")) + local opt = {configs = {asynchronous = true}} + if package:config("shared") and package:is_plat("windows", "mingw") then + opt.configs.shared = true + if package:is_plat("windows") then + package:add("defines", "PAHO_MQTTPP_IMPORTS") end end - + + package:add("deps", "pahomqttc", opt) + end) + + on_install("!wasm", function (package) + local configs = {} + local shared = package:config("shared") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DPAHO_BUILD_SHARED=" .. (shared and "TRUE" or "FALSE")) + table.insert(configs, "-DPAHO_BUILD_STATIC=" .. (shared and "FALSE" or "TRUE")) + + table.insert(configs, "-DPAHO_WITH_SSL=" .. (package:config("openssl") and "TRUE" or "FALSE")) import("package.tools.cmake").install(package, configs) end) @@ -43,4 +48,4 @@ package("pahomqttcpp") cli.connect(); } ]]}, {configs = {languages = "c++11"}})) - end) + end) From 15198c3b7d8abbf48089a5b1376a79ae35c2c0b7 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 26 Jun 2024 10:01:48 +0800 Subject: [PATCH 231/671] Update blosc to v1.21.6 (#4472) --- packages/b/blosc/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/blosc/xmake.lua b/packages/b/blosc/xmake.lua index f4e8e8c98..f8a8b2e40 100644 --- a/packages/b/blosc/xmake.lua +++ b/packages/b/blosc/xmake.lua @@ -6,6 +6,7 @@ package("blosc") add_urls("https://github.com/Blosc/c-blosc/archive/refs/tags/$(version).tar.gz", "https://github.com/Blosc/c-blosc.git") + add_versions("v1.21.6", "9fcd60301aae28f97f1301b735f966cc19e7c49b6b4321b839b4579a0c156f38") add_versions("v1.21.5", "32e61961bbf81ffea6ff30e9d70fca36c86178afd3e3cfa13376adec8c687509") add_versions("v1.21.4", "e72bd03827b8564bbb3dc3ea0d0e689b4863871ce3861d946f2efd7a186ecf3e") add_versions("v1.21.1", "f387149eab24efa01c308e4cba0f59f64ccae57292ec9c794002232f7903b55b") From 8263b439fcdfe774d276d87db004d333703b1bc6 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 26 Jun 2024 10:01:50 +0800 Subject: [PATCH 232/671] Update lightgbm to 4.4.0 (#4471) --- packages/l/lightgbm/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/lightgbm/xmake.lua b/packages/l/lightgbm/xmake.lua index ba3a4b182..3ee54df84 100644 --- a/packages/l/lightgbm/xmake.lua +++ b/packages/l/lightgbm/xmake.lua @@ -4,6 +4,7 @@ package("lightgbm") set_license("MIT") add_urls("https://github.com/microsoft/LightGBM/releases/download/v$(version)/lightgbm-$(version).tar.gz") + add_versions("4.4.0", "9e8a7640911481134e60987d5d1e1cd157f430c3b4b38de8d36fc55c302bc299") add_versions("4.3.0", "006f5784a9bcee43e5a7e943dc4f02de1ba2ee7a7af1ee5f190d383f3b6c9ebe") add_versions("4.2.0", "8a4d051df2ab2218998a16f7712e843ee9e96d8b09ffbfcc18533da127e0da02") add_versions("3.3.2", "5d25d16e77c844c297ece2044df57651139bc3c8ad8c4108916374267ac68b64") From 2368ddef623c6ca122d1d5b4fdfce12b291fbe4b Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 26 Jun 2024 10:01:53 +0800 Subject: [PATCH 233/671] Update ucx to 1.17.0 (#4470) --- packages/u/ucx/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/u/ucx/xmake.lua b/packages/u/ucx/xmake.lua index ec4657dc9..1fed26f95 100644 --- a/packages/u/ucx/xmake.lua +++ b/packages/u/ucx/xmake.lua @@ -5,6 +5,7 @@ package("ucx") set_license("BSD-3-Clause") add_urls("https://github.com/openucx/ucx/releases/download/v$(version)/ucx-$(version).tar.gz") + add_versions("1.17.0", "34658e282f99f89ce7a991c542e9727552734ac6ad408c52f22b4c2653b04276") add_versions("1.16.0", "f73770d3b583c91aba5fb07557e655ead0786e057018bfe42f0ebe8716e9d28c") add_versions("1.15.0", "4b202087076bc1c98f9249144f0c277a8ea88ad4ca6f404f94baa9cb3aebda6d") add_versions("1.11.0", "b7189b69fe0e16e3c03784ef674e45687a9c520750bd74a45125c460ede37647") From 8a2363f7ae508819dcc7f18ea1bbfc9004c861aa Mon Sep 17 00:00:00 2001 From: Tianlan Zhou Date: Wed, 26 Jun 2024 10:45:33 +0800 Subject: [PATCH 234/671] directxshadercompiler: Bump to v1.8.2405 (#4467) --- packages/d/directxshadercompiler/xmake.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/d/directxshadercompiler/xmake.lua b/packages/d/directxshadercompiler/xmake.lua index 0c8fcc7b3..cbdcb529e 100644 --- a/packages/d/directxshadercompiler/xmake.lua +++ b/packages/d/directxshadercompiler/xmake.lua @@ -8,19 +8,22 @@ package("directxshadercompiler") ["1.6.2104"] = "2021_04-20", ["1.6.2106"] = "2021_07_01", ["1.7.2212"] = "2022_12_16", - ["1.8.2403"] = "2024_03_07"} - if is_plat("windows") then + ["1.8.2403"] = "2024_03_07", + ["1.8.2405"] = "2024_05_24"} + if is_plat("windows") then add_urls("https://github.com/microsoft/DirectXShaderCompiler/releases/download/v$(version).zip", {version = function (version) return version .. "/dxc_" .. date[tostring(version)] end}) add_versions("1.5.2010", "b691f63778f470ebeb94874426779b2f60685fc8711adf1b1f9f01535d9b67f8") add_versions("1.6.2104", "ee5e96d58134957443ded04be132e2e19240c534d7602e3ab8fd5adc5156014a") add_versions("1.6.2106", "053b2d90c227cae84e7ce636bc4f7c25acd224c31c11a324885acbf5dd8b7aac") add_versions("1.7.2212", "ed77c7775fcf1e117bec8b5bb4de6735af101b733d3920dda083496dceef130f") add_versions("1.8.2403", "7a916a49b3ca81d803ca1bcd1ae859e7f317ce2fcf875bd34147aa2c57d1e392") - elseif is_plat("linux") and is_arch("x86_64") then + add_versions("1.8.2405", "8d2656e9523e7b3b7c41159237d74f89cc98034056f61f568b8841da0449c965") + elseif is_plat("linux") and is_arch("x86_64") then add_urls("https://github.com/microsoft/DirectXShaderCompiler.git") add_versions("v1.7.2212", "f2643f8699299ab4e77421952e9c24f7483b46896d9f4cc6b4790b22c90d2ff0") add_versions("v1.8.2403", "4211ea2cffc3575cf58556ebbc31c64adb73b1b8f68e47456c2048b60de4a24c") - + add_versions("v1.8.2405", "0a084148b6b87e6c8fb73540b6c7bf2c3b64db8af06f7dae3aa237830e575ff6") + add_patches("v1.7.2212", path.join(os.scriptdir(), "patches", "disable_go_bindings.patch"), "2337f4f94d4c27c3caf0e6b0f00efd1bee719f79c0bb3b0d7e74c2859546c73a") add_extsources("pacman::directx-shader-compiler") From 00fc015b484a9ee0a3035e7f81f3b0f9b9c5e5ef Mon Sep 17 00:00:00 2001 From: c8ef Date: Wed, 26 Jun 2024 14:48:57 +0800 Subject: [PATCH 235/671] add fatal package (#4475) * add fatal package * add fatal package * test plat --- packages/f/fatal/xmake.lua | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/f/fatal/xmake.lua diff --git a/packages/f/fatal/xmake.lua b/packages/f/fatal/xmake.lua new file mode 100644 index 000000000..ef3cde548 --- /dev/null +++ b/packages/f/fatal/xmake.lua @@ -0,0 +1,24 @@ +package("fatal") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/facebook/fatal") + set_description("Fatal is a library for fast prototyping software in modern C++.") + set_license("BSD") + + add_urls("https://github.com/facebook/fatal/releases/download/v$(version).00/fatal-v$(version).00.zip", + "https://github.com/facebook/fatal.git") + + add_versions("2024.06.24", "9b134c46eec2a1fc38cfbfef13de11f7b252ded6d789d2460956d43b89719a8b") + + on_install(function (package) + os.cp("fatal", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include "fatal/type/array.h" + void test() { + using arr_t = fatal::c_array; + arr_t arr{{'b', 'a', 'r'}}; + } + ]]}, {configs = {languages = "c++17"}})) + end) From 8e2999c6ba3fc31d167da9a57de948f6dc1e0315 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Wed, 26 Jun 2024 21:58:19 +0800 Subject: [PATCH 236/671] add event trace config for mimalloc (#4464) * add event trace config for mimalloc * Update xmake.lua --- packages/m/mimalloc/xmake.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/m/mimalloc/xmake.lua b/packages/m/mimalloc/xmake.lua index 1abb1f0c1..33a7d479b 100644 --- a/packages/m/mimalloc/xmake.lua +++ b/packages/m/mimalloc/xmake.lua @@ -23,7 +23,10 @@ package("mimalloc") add_configs("secure", {description = "Use a secured version of mimalloc", default = false, type = "boolean"}) add_configs("rltgenrandom", {description = "Use a RtlGenRandom instead of BCrypt", default = false, type = "boolean"}) - + if is_plat("windows") then + add_configs("etw", {description = "Enable Event tracing for Windows", default = false, type = "boolean"}) + end + add_deps("cmake") if is_plat("windows") then @@ -45,6 +48,8 @@ package("mimalloc") table.insert(configs, "-DMI_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON")) table.insert(configs, "-DMI_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DMI_SECURE=" .. (package:config("secure") and "ON" or "OFF")) + table.insert(configs, "-DMI_TRACK_ETW=" .. (package:config("etw") and "ON" or "OFF")) + --x64:mimalloc-redirect.lib/dll x86:mimalloc-redirect32.lib/dll if package:version():le("2.0.1") and package:config("shared") and package:is_plat("windows") and package:is_arch("x86") then io.replace("CMakeLists.txt", "-redirect.", "-redirect32.", {plain = true}) From d583d25e52299e3de5546100910540a0b38e2c76 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 26 Jun 2024 22:18:04 +0800 Subject: [PATCH 237/671] Auto-update pahomqttcpp to v1.4.0 (#4446) * Update pahomqttcpp to v1.4.0 * test 1.3.2 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/p/pahomqttcpp/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/p/pahomqttcpp/xmake.lua b/packages/p/pahomqttcpp/xmake.lua index f7e724b25..cc3c2e3ea 100644 --- a/packages/p/pahomqttcpp/xmake.lua +++ b/packages/p/pahomqttcpp/xmake.lua @@ -6,6 +6,7 @@ package("pahomqttcpp") add_urls("https://github.com/eclipse/paho.mqtt.cpp/archive/refs/tags/$(version).zip", "https://github.com/eclipse/paho.mqtt.cpp.git") + add_versions("v1.4.0", "c165960f64322de21697eb06efdca3d74cce90f45ff5ff0efdd968708e13ba0c") add_versions("v1.3.2", "e01f43cf0ba35efa666503c7adb2786d4a6f7fe6eb44ce5311ac4785a0ce8a98") add_versions("v1.2.0", "90c4d8ae4f56bb706120fddcc5937cd0a0360b6f39d5cd5574a5846c0f923473") @@ -19,7 +20,7 @@ package("pahomqttcpp") end local opt = {configs = {asynchronous = true}} - if package:config("shared") and package:is_plat("windows", "mingw") then + if package:config("shared") then opt.configs.shared = true if package:is_plat("windows") then package:add("defines", "PAHO_MQTTPP_IMPORTS") From c472fa46878c967676b1f4ecf5d6a15ca446e193 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:31:33 +0800 Subject: [PATCH 238/671] add cpp-channel (#4478) * add cpp-channel * Update xmake.lua * Update xmake.lua --------- Co-authored-by: heheda123123 Co-authored-by: star9029 --- packages/c/cpp-channel/xmake.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/c/cpp-channel/xmake.lua diff --git a/packages/c/cpp-channel/xmake.lua b/packages/c/cpp-channel/xmake.lua new file mode 100644 index 000000000..41e1ab788 --- /dev/null +++ b/packages/c/cpp-channel/xmake.lua @@ -0,0 +1,22 @@ +package("cpp-channel") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/andreiavrammsd/cpp-channel") + set_description("Thread-safe container for sharing data between threads") + set_license("MIT") + + add_urls("https://github.com/andreiavrammsd/cpp-channel/archive/refs/tags/$(version).zip", + "https://github.com/andreiavrammsd/cpp-channel.git") + + add_versions("v0.8.2", "36f234c40d59b90356d37b558a8918a86b128030ad5d42d8c6a627cfe81c8624") + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + msd::channel chan; + } + ]]}, {configs = {languages = "c++11"}, includes = "msd/channel.hpp"})) + end) From 5cb6fb3d3acabec84f53527783b3197a2bc306c5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 26 Jun 2024 23:42:01 +0800 Subject: [PATCH 239/671] ucx: improve pacth (#4481) * ucx: improve pacth * Update xmake.lua --- .../ucx/patches/1.16.0/unused_variable.patch | 31 +++++++++++++++++++ packages/u/ucx/xmake.lua | 12 +++---- 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 packages/u/ucx/patches/1.16.0/unused_variable.patch diff --git a/packages/u/ucx/patches/1.16.0/unused_variable.patch b/packages/u/ucx/patches/1.16.0/unused_variable.patch new file mode 100644 index 000000000..2dcec3121 --- /dev/null +++ b/packages/u/ucx/patches/1.16.0/unused_variable.patch @@ -0,0 +1,31 @@ +From 98496827bef6f4619a4a8058443f61ef78b8ab72 Mon Sep 17 00:00:00 2001 +From: Roie Danino +Date: Wed, 7 Feb 2024 14:23:45 +0200 +Subject: [PATCH] UCM/PTMALLOC286: added UCS_V_UNUSED attribute to nfences + which might be unused in release + +--- + src/ucm/ptmalloc286/malloc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/ucm/ptmalloc286/malloc.c b/src/ucm/ptmalloc286/malloc.c +index e1779967885..45c1aaf8ff3 100644 +--- a/src/ucm/ptmalloc286/malloc.c ++++ b/src/ucm/ptmalloc286/malloc.c +@@ -526,6 +526,7 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP + #endif + + #include ++#include + + /* Version identifier to allow people to support multiple versions */ + #ifndef DLMALLOC_VERSION +@@ -3997,7 +3998,7 @@ static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) { + msegmentptr ss = (msegmentptr)(chunk2mem(sp)); + mchunkptr tnext = chunk_plus_offset(sp, ssize); + mchunkptr p = tnext; +- int nfences = 0; ++ int UCS_V_UNUSED nfences = 0; + + /* reset top to new space */ + init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE); diff --git a/packages/u/ucx/xmake.lua b/packages/u/ucx/xmake.lua index 1fed26f95..1de95cd3c 100644 --- a/packages/u/ucx/xmake.lua +++ b/packages/u/ucx/xmake.lua @@ -1,27 +1,27 @@ package("ucx") - set_homepage("https://openucx.org/") set_description("Unified Communication X") set_license("BSD-3-Clause") - add_urls("https://github.com/openucx/ucx/releases/download/v$(version)/ucx-$(version).tar.gz") + add_urls("https://github.com/openucx/ucx/releases/download/v$(version)/ucx-$(version).tar.gz", + "https://github.com/openucx/ucx.git") + add_versions("1.17.0", "34658e282f99f89ce7a991c542e9727552734ac6ad408c52f22b4c2653b04276") add_versions("1.16.0", "f73770d3b583c91aba5fb07557e655ead0786e057018bfe42f0ebe8716e9d28c") add_versions("1.15.0", "4b202087076bc1c98f9249144f0c277a8ea88ad4ca6f404f94baa9cb3aebda6d") add_versions("1.11.0", "b7189b69fe0e16e3c03784ef674e45687a9c520750bd74a45125c460ede37647") + add_patches("1.16.0", "patches/1.16.0/unused_variable.patch", "dd40219cf1989cd42ea19f334ea5c3e4e57736bcbad62fa6741f00a1bb89f0fc") + add_configs("cuda", {description = "Enable CUDA support.", default = false, type = "boolean"}) - on_load("linux", function (package) + on_load(function (package) if package:config("cuda") then package:add("deps", "cuda") end end) on_install("linux", function (package) - -- Already fixed in the upstream, please remove it in the next release. - -- https://github.com/openucx/ucx/commit/98496827bef6f4619a4a8058443f61ef78b8ab72 - io.replace("src/ucm/ptmalloc286/malloc.c", "int nfences = 0;", "int __attribute__((unused)) nfences = 0;") local configs = {"--disable-doxygen-doc", "--without-go", "--without-java", "--without-rte", "--without-fuse3", "--without-gdrcopy", "--without-rdmacm", "--without-knem", "--without-xpmem", "--without-ugni"} if package:config("cuda") then local cuda = package:dep("cuda"):fetch() From c3bc970b7a7d28781c2a5448fe8f78f0646a2aba Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 27 Jun 2024 00:26:36 +0800 Subject: [PATCH 240/671] libmspack: support all platform (#4404) --- packages/l/libmspack/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/l/libmspack/xmake.lua b/packages/l/libmspack/xmake.lua index 5f4b7a4dc..701df23a4 100644 --- a/packages/l/libmspack/xmake.lua +++ b/packages/l/libmspack/xmake.lua @@ -1,15 +1,15 @@ package("libmspack") - set_homepage("https://www.cabextract.org.uk/libmspack/") set_description("libmspack is a portable library for some loosely related Microsoft compression formats.") set_license("LGPL-2.0") add_urls("https://github.com/kyz/libmspack/archive/refs/tags/$(version).zip", "https://github.com/kyz/libmspack.git") + add_versions("v1.11", "88f8395ff4630d600a0973d7c8c011c21877b80439be5d6cc840afd02f54da20") add_versions("v0.10.1alpha", "d51e3b0d42afef91939fb282f7712e0b81c243ffe0aaacafc977d384408b4ab1") - on_install("windows", "macosx", "linux", function (package) + on_install(function (package) os.cd("libmspack/mspack") io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") @@ -19,7 +19,7 @@ package("libmspack") add_files("*.c|debug.c") add_includedirs(".") add_headerfiles("mspack.h") - if is_plat("windows") and is_kind("shared") then + if is_plat("windows", "mingw") and is_kind("shared") then add_files("mspack.def") end ]]) From 306434589536cf0ee99eaa19a20868b75810d687 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:26:19 +0800 Subject: [PATCH 241/671] update libtorch (#4367) * update libtorch * disable Werror --- packages/l/libtorch/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/l/libtorch/xmake.lua b/packages/l/libtorch/xmake.lua index c93a89076..e5a05dec1 100644 --- a/packages/l/libtorch/xmake.lua +++ b/packages/l/libtorch/xmake.lua @@ -15,6 +15,7 @@ package("libtorch") add_versions("v2.1.0", "7bcf7da3a268b435777fe87c7794c382f444e86d") add_versions("v2.1.2", "a8e7c98cb95ff97bb30a728c6b2a1ce6bff946eb") add_versions("v2.2.2", "39901f229520a5256505ec24782f716ee7ddc843") + add_versions("v2.3.1", "63d5e9221bedd1546b7d364b5ce4171547db12a9") add_patches("1.9.x", "patches/1.9.0/gcc11.patch", "4191bb3296f18f040c230d7c5364fb160871962d6278e4ae0f8bc481f27d8e4b") add_patches("1.11.0", "patches/1.11.0/gcc11.patch", "1404b0bc6ce7433ecdc59d3412e3d9ed507bb5fd2cd59134a254d7d4a8d73012") @@ -120,6 +121,7 @@ package("libtorch") -- some patches to the third-party cmake files io.replace("cmake/MiscCheck.cmake", "if(UNIX)", "if(TRUE)", {plain = true}) io.replace("third_party/fbgemm/CMakeLists.txt", "PRIVATE FBGEMM_STATIC", "PUBLIC FBGEMM_STATIC", {plain = true}) + io.replace("third_party/fbgemm/CMakeLists.txt", "-Werror", "", {plain = true}) io.replace("third_party/protobuf/cmake/install.cmake", "install%(DIRECTORY.-%)", "") if package:is_plat("windows") then if package:config("vs_runtime"):startswith("MD") then From 6133794977801820f751dbf37c25a2c081745416 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:19:56 +0800 Subject: [PATCH 242/671] update libigl (#4482) --- packages/l/libigl/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/l/libigl/xmake.lua b/packages/l/libigl/xmake.lua index e94de4871..498d31b19 100644 --- a/packages/l/libigl/xmake.lua +++ b/packages/l/libigl/xmake.lua @@ -4,11 +4,12 @@ package("libigl") set_description("Simple C++ geometry processing library.") set_license("MPL-2.0") - add_urls("https://github.com/libigl/libigl/archive/$(version).tar.gz", + add_urls("https://github.com/libigl/libigl/archive/refs/tags/$(version).tar.gz", "https://github.com/libigl/libigl.git") add_versions("v2.2.0", "b336e548d718536956e2d6958a0624bc76d50be99039454072ecdc5cf1b2ede5") add_versions("v2.3.0", "9d6de3bdb9c1cfc61a0a0616fd96d14ef8465995600328c196fa672ee4579b70") add_versions("v2.4.0", "f3f53ee6f1e9a6c529378c6b0439cd2cfc0e30b2178b483fe6bea169ce6deb22") + add_versions("v2.5.0", "1d9d8c3a3a6a269cf22612bbe24d7fd1c5f84838231d299d712969ad294f945f") add_resources("2.x", "libigl_imgui", "https://github.com/libigl/libigl-imgui.git", "7e1053e750b0f4c129b046f4e455243cb7f804f3") From 8bd9497c35b955faa160214cdbb41840b3ef1940 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 27 Jun 2024 11:20:53 +0800 Subject: [PATCH 243/671] reflect-cpp: remove cmake install (#4483) * reflect-cpp: remove cmake install * Update xmake.lua * Update xmake.lua --- packages/r/reflect-cpp/xmake.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index a8b65ba7e..823b7992e 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -22,8 +22,6 @@ package("reflect-cpp") add_configs("toml", {description = "Enable Toml Support.", default = false, type = "boolean"}) add_configs("yaml", {description = "Enable Yaml Support.", default = false, type = "boolean"}) - add_deps("cmake") - on_check(function (package) if package:is_plat("windows") then local vs = package:toolchain("msvc"):config("vs") @@ -75,17 +73,19 @@ package("reflect-cpp") if version and version:ge("0.11.1") then package:add("deps", "ctre") package:add("defines", "REFLECTCPP_NO_BUNDLED_DEPENDENCIES") + else + package:add("deps", "cmake") end end) on_install(function (package) local version = package:version() - if version and version:ge("0.11.1") and package:is_plat("wasm") then - io.replace("CMakeLists.txt", "find_package(ctre CONFIG REQUIRED)", "", {plain = true}) - io.replace("CMakeLists.txt", "find_package(yyjson CONFIG REQUIRED)", "", {plain = true}) - io.replace("CMakeLists.txt", "target_link_libraries(reflectcpp INTERFACE yyjson::yyjson)", "", {plain = true}) + if version and version:lt("0.11.1") then + import("package.tools.cmake").install(package, {"-DREFLECTCPP_USE_BUNDLED_DEPENDENCIES=OFF"}) + else + os.rm("include/thirdparty") + os.cp("include", package:installdir()) end - import("package.tools.cmake").install(package, {"-DREFLECTCPP_USE_BUNDLED_DEPENDENCIES=OFF"}) end) on_test(function (package) From 84f6cefdff3501dbe4953b732d04813e351ee809 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 27 Jun 2024 21:59:30 +0800 Subject: [PATCH 244/671] 11zip: add package (#4488) --- packages/1/11zip/port/xmake.lua | 17 +++++++++++++++++ packages/1/11zip/xmake.lua | 28 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 packages/1/11zip/port/xmake.lua create mode 100644 packages/1/11zip/xmake.lua diff --git a/packages/1/11zip/port/xmake.lua b/packages/1/11zip/port/xmake.lua new file mode 100644 index 000000000..b1138a6c0 --- /dev/null +++ b/packages/1/11zip/port/xmake.lua @@ -0,0 +1,17 @@ +add_rules("mode.debug", "mode.release") + +add_requires("minizip-ng") +add_packages("minizip-ng") + +target("11zip") + set_kind("$(kind)") + set_languages("c++17") + add_files("src/*.cpp") + remove_files("src/elzip_fs_fallback.cpp") + add_includedirs("include", "include/elzip") + + add_headerfiles("include/(**.hpp)") + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end diff --git a/packages/1/11zip/xmake.lua b/packages/1/11zip/xmake.lua new file mode 100644 index 000000000..dfb674190 --- /dev/null +++ b/packages/1/11zip/xmake.lua @@ -0,0 +1,28 @@ +package("11zip") + set_homepage("https://github.com/Sygmei/11Zip") + set_description("Dead simple zipping / unzipping C++ Lib") + set_license("MIT") + + add_urls("https://github.com/Sygmei/11Zip/archive/516e161d5c96aa8f2603fb30b10b7770a87332c2.tar.gz", + "https://github.com/Sygmei/11Zip.git") + + add_versions("2023.05.10", "9e4052571c73ecd8e328fa9e8399f606604baa3373103d2e7dddb75019330ee0") + + add_includedirs("include", "include/elzip") + + add_deps("minizip-ng") + + on_install("macosx", "android", "linux", "windows", "mingw", function (package) + io.replace("src/unzipper.cpp", "unzLocateFile(zipFile_, filename.data(), nullptr)", "unzLocateFile(zipFile_, filename.data(), 0)", {plain = true}) + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + std::string zipname; + elz::extractZip(zipname); + } + ]]}, {configs = {languages = "c++17"}, includes = "elzip/elzip.hpp"})) + end) From 19172c862b04b6e65a05ee25f565ba202ed73875 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Thu, 27 Jun 2024 22:04:56 +0800 Subject: [PATCH 245/671] add obfuscate (#4489) Co-authored-by: heheda123123 --- packages/o/obfuscate/xmake.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/o/obfuscate/xmake.lua diff --git a/packages/o/obfuscate/xmake.lua b/packages/o/obfuscate/xmake.lua new file mode 100644 index 000000000..ee7a8def1 --- /dev/null +++ b/packages/o/obfuscate/xmake.lua @@ -0,0 +1,19 @@ +package("obfuscate") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/adamyaxley/Obfuscate") + set_description("Guaranteed compile-time string literal obfuscation header-only library for C++14") + + add_urls("https://github.com/adamyaxley/Obfuscate.git") + add_versions("2024.02.11", "e65173d617983ce6b714c9ade5a6dbf3503c9a96") + + on_install(function (package) + os.cp("obfuscate.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + AY_OBFUSCATE("Hello World"); + } + ]]}, {configs = {languages = "cxx14"}, includes = "obfuscate.h"})) + end) From 99022980ea1ec1958a2707f4a0ef84e84acb4409 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 27 Jun 2024 22:05:52 +0800 Subject: [PATCH 246/671] obfuscate: add license --- packages/o/obfuscate/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/obfuscate/xmake.lua b/packages/o/obfuscate/xmake.lua index ee7a8def1..c92db7595 100644 --- a/packages/o/obfuscate/xmake.lua +++ b/packages/o/obfuscate/xmake.lua @@ -2,6 +2,7 @@ package("obfuscate") set_kind("library", {headeronly = true}) set_homepage("https://github.com/adamyaxley/Obfuscate") set_description("Guaranteed compile-time string literal obfuscation header-only library for C++14") + set_license("Unlicense") add_urls("https://github.com/adamyaxley/Obfuscate.git") add_versions("2024.02.11", "e65173d617983ce6b714c9ade5a6dbf3503c9a96") From 68a51878cda8346a0bd54694bf5394b45ca90412 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 27 Jun 2024 22:22:35 +0800 Subject: [PATCH 247/671] boost: fix llvm toolchain (#4490) * boost: fix llvm toolchain * fix vs_toolset --- packages/b/boost/xmake.lua | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 8a4ddd773..8340919f6 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -247,6 +247,9 @@ package("boost") if package:has_tool("cxx", "clang_cl") then build_toolset = "clang-win" build_toolchain = package:toolchain("clang-cl") + elseif package:has_tool("cxx", "clang") then + build_toolset = "clang-win" + build_toolchain = package:toolchain("clang") or package:toolchain("llvm") elseif package:has_tool("cxx", "cl") then build_toolset = "msvc" build_toolchain = package:toolchain("msvc") @@ -388,14 +391,16 @@ package("boost") if package:is_plat("windows") and package:version():le("1.85.0") then local vs_toolset = build_toolchain:config("vs_toolset") - local vs_toolset_ver = import("core.base.semver").new(vs_toolset) - local minor = vs_toolset_ver:minor() - if minor and minor >= 40 then - io.replace("tools/build/src/engine/config_toolset.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/engine/build.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/engine/guess_toolset.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/tools/intel-win.jam", "14.3", "14.4", {plain = true}) - io.replace("tools/build/src/tools/msvc.jam", "14.3", "14.4", {plain = true}) + if vs_toolset then + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + if minor and minor >= 40 then + io.replace("tools/build/src/engine/config_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/build.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/engine/guess_toolset.bat", "vc143", "vc144", {plain = true}) + io.replace("tools/build/src/tools/intel-win.jam", "14.3", "14.4", {plain = true}) + io.replace("tools/build/src/tools/msvc.jam", "14.3", "14.4", {plain = true}) + end end end local ok = os.execv("./b2", argv, {envs = runenvs, try = true, stdout = "boost-log.txt"}) From aa328dcfc972d80e3145357944256fb5b549be3d Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Thu, 27 Jun 2024 23:22:06 +0800 Subject: [PATCH 248/671] update pybind11, libjpeg-turbo, zstd, lyra (#4487) * update pybind11 * update libjpeg-turbo * update zstd * update lyra * pybind11 require native python * try fix libjpeg-turbo --- packages/l/libjpeg-turbo/xmake.lua | 6 +++++- packages/l/lyra/xmake.lua | 3 ++- packages/p/pybind11/xmake.lua | 5 +++-- packages/z/zstd/xmake.lua | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/l/libjpeg-turbo/xmake.lua b/packages/l/libjpeg-turbo/xmake.lua index a89e3beda..2b6e96431 100644 --- a/packages/l/libjpeg-turbo/xmake.lua +++ b/packages/l/libjpeg-turbo/xmake.lua @@ -4,7 +4,7 @@ package("libjpeg-turbo") set_description("A JPEG image codec that uses SIMD instructions (MMX, SSE2, AVX2, Neon, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, Arm, and PowerPC systems.") set_license("BSD-3-Clause") - add_urls("https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$(version).tar.gz", + add_urls("https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(version).tar.gz", "https://github.com/libjpeg-turbo/libjpeg-turbo.git") add_versions("2.0.5", "b3090cd37b5a8b3e4dbd30a1311b3989a894e5d3c668f14cbc6739d77c9402b7") add_versions("2.0.6", "005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371") @@ -15,6 +15,7 @@ package("libjpeg-turbo") add_versions("2.1.3", "dbda0c685942aa3ea908496592491e5ec8160d2cf1ec9d5fd5470e50768e7859") add_versions("2.1.4", "a78b05c0d8427a90eb5b4eb08af25309770c8379592bb0b8a863373128e6143f") add_versions("3.0.1", "5b9bbca2b2a87c6632c821799438d358e27004ab528abf798533c15d50b39f82") + add_versions("3.0.3", "a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21") add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}}) @@ -29,6 +30,9 @@ package("libjpeg-turbo") end) on_install("windows", "linux", "macosx", "android", "mingw", function (package) + io.replace("sharedlib/CMakeLists.txt", "string(REGEX REPLACE \"/MT\" \"/MD\"", "#", {plain = true}) + io.replace("sharedlib/CMakeLists.txt", "set(CMAKE_MSVC_RUNTIME_LIBRARY", "#", {plain = true}) + io.replace("sharedlib/CMakeLists.txt", "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD", "", {plain = true}) if package:is_plat("windows") and not package:config("shared") then io.replace("release/libjpeg.pc.in", "-ljpeg", "-ljpeg-static", {plain = true}) io.replace("release/libturbojpeg.pc.in", "-lturbojpeg", "-lturbojpeg-static", {plain = true}) diff --git a/packages/l/lyra/xmake.lua b/packages/l/lyra/xmake.lua index c826b8b0b..fb4cc7f88 100644 --- a/packages/l/lyra/xmake.lua +++ b/packages/l/lyra/xmake.lua @@ -4,10 +4,11 @@ package("lyra") set_description("A simple to use, composable, command line parser for C++ 11 and beyond") set_license("BSL-1.0") - add_urls("https://github.com/bfgroup/Lyra/archive/$(version).tar.gz", + add_urls("https://github.com/bfgroup/Lyra/archive/refs/tags/$(version).tar.gz", "https://github.com/bfgroup/Lyra.git") add_versions("1.5.1", "11ccdfc6f776b9a2ebe987d9b4e492981f88f3642546fd1c2e1115741863cae0") add_versions("1.6", "919e92a9c02fea3f365a3a7bdccd8b306311a28a7f2044dac8e7651106d7b644") + add_versions("1.6.1", "a93f247ed89eba11ca36eb24c4f8ba7be636bf24e74aaaa8e1066e0954bec7e3") on_install(function (package) os.cp("include", package:installdir()) diff --git a/packages/p/pybind11/xmake.lua b/packages/p/pybind11/xmake.lua index 50648e4c5..07476de8b 100644 --- a/packages/p/pybind11/xmake.lua +++ b/packages/p/pybind11/xmake.lua @@ -5,7 +5,7 @@ package("pybind11") set_description("Seamless operability between C++11 and Python.") set_license("BSD-3-Clause") - add_urls("https://github.com/pybind/pybind11/archive/$(version).zip", + add_urls("https://github.com/pybind/pybind11/archive/refs/tags/$(version).zip", "https://github.com/pybind/pybind11.git") add_versions("v2.5.0", "1859f121837f6c41b0c6223d617b85a63f2f72132bae3135a2aa290582d61520") add_versions("v2.6.2", "0bdb5fd9616fcfa20918d043501883bf912502843d5afc5bc7329a8bceb157b3") @@ -15,9 +15,10 @@ package("pybind11") add_versions("v2.9.2", "d1646e6f70d8a3acb2ddd85ce1ed543b5dd579c68b8fb8e9638282af20edead8") add_versions("v2.10.0", "225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19") add_versions("v2.12.0", "411f77380c43798506b39ec594fc7f2b532a13c4db674fcf2b1ca344efaefb68") + add_versions("v2.13.1", "a3c9ea1225cb731b257f2759a0c12164db8409c207ea5cf851d4b95679dda072") add_deps("cmake", "python 3.x") - on_install("windows", "macosx", "linux", function (package) + on_install("windows|native", "macosx", "linux", function (package) import("package.tools.cmake").install(package, {"-DPYBIND11_TEST=OFF"}) end) diff --git a/packages/z/zstd/xmake.lua b/packages/z/zstd/xmake.lua index 856c46ee2..7b2c6cbb9 100644 --- a/packages/z/zstd/xmake.lua +++ b/packages/z/zstd/xmake.lua @@ -4,12 +4,13 @@ package("zstd") set_description("Zstandard - Fast real-time compression algorithm") set_license("BSD-3-Clause") - set_urls("https://github.com/facebook/zstd/archive/$(version).tar.gz", + set_urls("https://github.com/facebook/zstd/archive/refs/tags/$(version).tar.gz", "https://github.com/facebook/zstd.git") add_versions("v1.4.5", "734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2") add_versions("v1.5.0", "0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867") add_versions("v1.5.2", "f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e") add_versions("v1.5.5", "98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1") + add_versions("v1.5.6", "30f35f71c1203369dc979ecde0400ffea93c27391bfd2ac5a9715d2173d92ff7") on_load("windows", function (package) if package:config("shared") then From ca14c1025715f25651b7de5999474ec3501ba3ad Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 28 Jun 2024 03:29:11 +0800 Subject: [PATCH 249/671] add npcap_sdk (#4492) * add npcap * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: heheda123123 Co-authored-by: ruki --- packages/n/npcap_sdk/xmake.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/n/npcap_sdk/xmake.lua diff --git a/packages/n/npcap_sdk/xmake.lua b/packages/n/npcap_sdk/xmake.lua new file mode 100644 index 000000000..9b604f31b --- /dev/null +++ b/packages/n/npcap_sdk/xmake.lua @@ -0,0 +1,21 @@ +package("npcap_sdk") + set_homepage("https://npcap.com/") + set_description("Npcap is the Nmap Project's packet capture (and sending) library for Microsoft Windows.") + + set_urls("https://npcap.com/dist/npcap-sdk-$(version).zip") + add_versions("1.13", "dad1f2bf1b02b787be08ca4862f99e39a876c1f274bac4ac0cedc9bbc58f94fd") + + on_install("windows", function (package) + os.cp("Include", package:installdir()) + if package:is_arch("arm64") then + os.cp("Lib/ARM64/*", package:installdir("lib")) + elseif package:is_arch("x86") then + os.cp("Lib/*.lib", package:installdir("lib")) + else + os.cp("Lib/x64/*.lib", package:installdir("lib")) + end + end) + + on_test(function (package) + assert(package:has_cfuncs("PacketGetVersion", {includes = "Packet32.h"})) + end) From 04f52571a2ed0a8d1a0beb139e5eda5a6214d52e Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 28 Jun 2024 03:30:45 +0800 Subject: [PATCH 250/671] add winlamb (#4491) * add winlamb * Update xmake.lua * Update xmake.lua --------- Co-authored-by: heheda123123 Co-authored-by: ruki --- packages/w/winlamb/xmake.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/w/winlamb/xmake.lua diff --git a/packages/w/winlamb/xmake.lua b/packages/w/winlamb/xmake.lua new file mode 100644 index 000000000..c44bba65a --- /dev/null +++ b/packages/w/winlamb/xmake.lua @@ -0,0 +1,33 @@ +package("winlamb") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/rodrigocfd/winlamb") + set_description("A lightweight modern C++11 library for Win32 API, using lambdas to handle Windows messages.") + set_license("MIT") + + add_urls("https://github.com/rodrigocfd/winlamb.git") + add_versions("2023.07.07", "3db0753b91074be6e0097ebb8f719dc4045510de") + + on_install("windows", function (package) + os.cp("*", path.join(package:installdir("include"), "winlamb")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + class My_Window : public wl::window_main { + public: + My_Window(); + }; + RUN(My_Window) + My_Window::My_Window() { + setup.wndClassEx.lpszClassName = L"SOME_CLASS_NAME"; // class name to be registered + setup.title = L"This is my window"; + setup.style |= WS_MINIMIZEBOX; + + on_message(WM_CREATE, [this](wl::wm::create p) -> LRESULT + { + set_text(L"A new title for the window"); + return 0; + }); + } + ]]}, {configs = {languages = "cxx11"}, includes = "winlamb/window_main.h"})) + end) From cf2fd767cfb2fdfec4dbf7feab1c4f93e03007df Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 28 Jun 2024 10:13:06 +0800 Subject: [PATCH 251/671] Update b2 to 5.2.1 (#4499) --- packages/b/b2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/b2/xmake.lua b/packages/b/b2/xmake.lua index 3c13e708a..34bda23a3 100644 --- a/packages/b/b2/xmake.lua +++ b/packages/b/b2/xmake.lua @@ -6,6 +6,7 @@ package("b2") set_license("BSL-1.0") add_urls("https://github.com/bfgroup/b2/releases/download/$(version)/b2-$(version).zip") + add_versions("5.2.1", "493102f1dd3f50f2892ce61ee91bd362720ab3fd38fa2ea6912bb2c09da9faa3") add_versions("5.1.0", "2bf9618a0baa132d22fdfebf6b40436329172e3ca4b7b8a33e06ed97cd603dad") add_versions("5.0.1", "5d3b98c63ed4d0f6114f660bd4eca5df32afa332310878b35c0d0faa04a3b6dd") add_versions("5.0.0", "d5f280f466b80b694ccb9696413375522d16e6f811918daeb44a917d5bd6c7b5") From 8b1ca8a66f3a32acfd7f2ce7dd0f7c2193d81a93 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 28 Jun 2024 10:13:08 +0800 Subject: [PATCH 252/671] Update arduinojson to v7.1.0 (#4498) --- packages/a/arduinojson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/arduinojson/xmake.lua b/packages/a/arduinojson/xmake.lua index 8a3567318..a8452d486 100644 --- a/packages/a/arduinojson/xmake.lua +++ b/packages/a/arduinojson/xmake.lua @@ -7,6 +7,7 @@ package("arduinojson") add_urls("https://github.com/bblanchon/ArduinoJson/archive/refs/tags/$(version).tar.gz", "https://github.com/bblanchon/ArduinoJson.git") + add_versions("v7.1.0", "74bc745527a274bcab85c6498de77da749627113c4921ccbcaf83daa7ac35dee") add_versions("v7.0.4", "98ca14d98e9f1e8978ce5ad3ca0eeda3d22419d17586c60f299f369078929917") add_versions("v7.0.3", "6da2d069e0caa0c829444912ee13e78bdf9cc600be632428a164c92e69528000") add_versions("v6.21.4", "9551af9282372f6e64cf4009fc43be7f2df6eb96fe9c0aab44d4eed217d09747") From 5c9aa0268cea41633349a52eebabf8a40f4fbd0c Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 28 Jun 2024 10:13:11 +0800 Subject: [PATCH 253/671] Update libsais to v2.8.4 (#4497) --- packages/l/libsais/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsais/xmake.lua b/packages/l/libsais/xmake.lua index 49125a39a..f74c1d2f2 100644 --- a/packages/l/libsais/xmake.lua +++ b/packages/l/libsais/xmake.lua @@ -5,6 +5,7 @@ package("libsais") add_urls("https://github.com/IlyaGrebnov/libsais/archive/refs/tags/$(version).tar.gz", "https://github.com/IlyaGrebnov/libsais.git") + add_versions("v2.8.4", "6de93b078a89ea85ee03916a7a9cfb1003a9946dee9d1e780a97c84d80b49476") add_versions("v2.8.3", "9f407265f7c958da74ee8413ee1d18143e3040c453c1c829b10daaf5d37f7cda") add_versions("v2.8.2", "a17918936d6231cf6b019629d65ad7170f889bab5eb46c09b775dede7d890502") add_versions("v2.8.1", "01852e93305fe197d8f2ffdc32a856e78d6796aa3f40708325084c55b450747a") From f43a7d006150e49a6955dbe9e5063933ba0e1354 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:49:28 +0800 Subject: [PATCH 254/671] update ptex, qoi (#4495) * update ptex * update qoi --- packages/p/ptex/xmake.lua | 3 ++- packages/q/qoi/xmake.lua | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/p/ptex/xmake.lua b/packages/p/ptex/xmake.lua index 1846fe4e4..cab6ba3b5 100644 --- a/packages/p/ptex/xmake.lua +++ b/packages/p/ptex/xmake.lua @@ -4,11 +4,12 @@ package("ptex") set_description("Per-Face Texture Mapping for Production Rendering") set_license("BSD-3-Clause") - add_urls("https://github.com/wdas/ptex/archive/$(version).tar.gz", + add_urls("https://github.com/wdas/ptex/archive/refs/tags/$(version).tar.gz", "https://github.com/wdas/ptex.git") add_versions("v2.3.2", "30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b") add_versions("v2.4.1", "664253b84121251fee2961977fe7cf336b71cd846dc235cd0f4e54a0c566084e") add_versions("v2.4.2", "c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1") + add_versions("v2.4.3", "435aa2ee1781ff24859bd282b7616bfaeb86ca10604b13d085ada8aa7602ad27") add_deps("zlib") if is_plat("linux") then diff --git a/packages/q/qoi/xmake.lua b/packages/q/qoi/xmake.lua index 0e8f1e603..98a1ad6d0 100644 --- a/packages/q/qoi/xmake.lua +++ b/packages/q/qoi/xmake.lua @@ -8,6 +8,7 @@ package("qoi") add_urls("https://github.com/phoboslab/qoi.git") add_versions("2021.12.22", "44fe081388c60e7618f49486865b992e08ce4de4") add_versions("2022.11.17", "660839cb2c51d6b5f62221f8ef98662fd40e42d2") + add_versions("2024.03.18", "bf7b41c2ff3f24a2031193b62aa76d35e8842b5a") on_install(function (package) os.cp("qoi.h", package:installdir("include")) From 08b13485a7a3b817c8bd2ef345f56f2273a154eb Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 28 Jun 2024 13:59:51 +0800 Subject: [PATCH 255/671] update lua (#4500) --- packages/l/lua/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/l/lua/xmake.lua b/packages/l/lua/xmake.lua index 7ec1432c9..70cdf463b 100644 --- a/packages/l/lua/xmake.lua +++ b/packages/l/lua/xmake.lua @@ -8,6 +8,7 @@ package("lua") end}) add_urls("https://github.com/lua/lua.git") + add_versions("v5.4.7", "9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30") add_versions("v5.4.6", "7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88") add_versions("v5.4.4", "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61") add_versions("v5.4.3", "f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb") @@ -15,8 +16,8 @@ package("lua") add_versions("v5.4.1", "4ba786c3705eb9db6567af29c91a01b81f1c0ac3124fdbf6cd94bdd9e53cca7d") add_versions("v5.3.6", "fc5fd69bb8736323f026672b1b7235da613d7177e72558893a0bdcd320466d60") add_versions("v5.2.3", "13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d") - add_versions("v5.1.1", "c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0") add_versions("v5.1.5", "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333") + add_versions("v5.1.1", "c5daeed0a75d8e4dd2328b7c7a69888247868154acbda69110e97d4a6e17d1f0") if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::lua", "pacman::lua51") From 96bd7844e0e35cb4ae1cd66a2e4f7d1e99db1c7d Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:00:23 +0800 Subject: [PATCH 256/671] add yalantinglibs (#4501) * add yalantinglibs * Update xmake.lua * Update xmake.lua --- packages/y/yalantinglibs/xmake.lua | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 packages/y/yalantinglibs/xmake.lua diff --git a/packages/y/yalantinglibs/xmake.lua b/packages/y/yalantinglibs/xmake.lua new file mode 100644 index 000000000..7b9b5ac7d --- /dev/null +++ b/packages/y/yalantinglibs/xmake.lua @@ -0,0 +1,39 @@ +package("yalantinglibs") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/alibaba/yalantinglibs") + set_description("A collection of modern C++ libraries") + set_license("Apache-2.0") + + set_urls("https://github.com/alibaba/yalantinglibs/archive/refs/tags/$(version).zip", + "https://github.com/alibaba/yalantinglibs.git") + + add_versions("0.3.4", "88ba1ae2aa828383e51af95dbd029f90d16d5428d868739c8c91de3f31bed70b") + add_configs("ssl", {description = "Enable SSL", default = false, type = "boolean"}) + + add_deps("asio", "async_simple") + + on_load(function (package) + if package:config("ssl")then + package:add("deps", "openssl3") + end + end) + + on_install("linux", "macos", "windows", function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include "ylt/struct_pack.hpp" + struct person { + int64_t id; + std::string name; + int age; + double salary; + }; + void test() { + person person1{.id = 1, .name = "hello struct pack", .age = 20, .salary = 1024.42}; + std::vector buffer = struct_pack::serialize(person1); + } + ]]}, {configs = {languages = "c++20"}})) + end) From f3799e873415ffaa5f5e1a60ca60466970f9a9c4 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:01:26 +0800 Subject: [PATCH 257/671] Add pcapplusplus (#4493) * add pcapplusplus * add pcapplusplus * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: heheda123123 Co-authored-by: ruki --- packages/p/pcapplusplus/xmake.lua | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packages/p/pcapplusplus/xmake.lua diff --git a/packages/p/pcapplusplus/xmake.lua b/packages/p/pcapplusplus/xmake.lua new file mode 100644 index 000000000..f144facf6 --- /dev/null +++ b/packages/p/pcapplusplus/xmake.lua @@ -0,0 +1,35 @@ +package("pcapplusplus") + set_homepage("https://github.com/seladb/PcapPlusPlus") + set_description("PcapPlusPlus is a multiplatform C++ library for capturing, parsing and crafting of network packets.") + + set_urls("https://github.com/seladb/PcapPlusPlus/archive/refs/tags/$(version).zip", + "https://github.com/seladb/PcapPlusPlus.git") + + add_versions("v23.09", "f2b92d817df6138363be0d144a61716f8ecc43216f0008135da2e0e15727d35a") + + add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) + + add_deps("cmake") + if is_plat("windows") then + add_syslinks("ws2_32") + add_deps("npcap_sdk") + end + + on_install("windows", function (package) + local configs = {} + table.insert(configs, "-DPCAPPP_BUILD_EXAMPLES=OFF") + table.insert(configs, "-DPCAPPP_BUILD_TESTS=OFF") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include "pcapplusplus/IPv4Layer.h" + #include "pcapplusplus/Packet.h" + #include "pcapplusplus/PcapFileDevice.h" + void test() { + pcpp::PcapFileReaderDevice reader("1_packet.pcap"); + } + ]]}, {configs = {languages = "c++17"}})) + end) From 48a7261601ad92bf222bac6ec07ba338b69cf2e6 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 28 Jun 2024 21:09:42 +0800 Subject: [PATCH 258/671] Auto-update ade to v0.1.2 (#4474) * Update ade to v0.1.2 * patch mingw --------- Co-authored-by: star9029 --- .../a/ade/patches/0.1.2/cmake-mingw.patch | 27 +++++++++++++++++++ packages/a/ade/xmake.lua | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 packages/a/ade/patches/0.1.2/cmake-mingw.patch diff --git a/packages/a/ade/patches/0.1.2/cmake-mingw.patch b/packages/a/ade/patches/0.1.2/cmake-mingw.patch new file mode 100644 index 000000000..ee672d64a --- /dev/null +++ b/packages/a/ade/patches/0.1.2/cmake-mingw.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af78061..8aba951 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,13 +39,15 @@ function(add_security_flags target) + target_compile_options( ${target} PRIVATE -fstack-protector-strong) + endif() + elseif(WIN32) +- target_compile_options( ${target} PRIVATE /GS /DynamicBase) +- if(BUILD_WITH_STATIC_CRT) +- target_compile_options( ${target} PRIVATE "/MT") +- endif() +- if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") +- # These options for 32 bit builds only +- target_compile_options( ${target} PRIVATE /SAFESEH /NXCOMPAT ) ++ if (MSVC) ++ target_compile_options( ${target} PRIVATE /GS /DynamicBase) ++ if(BUILD_WITH_STATIC_CRT) ++ target_compile_options( ${target} PRIVATE "/MT") ++ endif() ++ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") ++ # These options for 32 bit builds only ++ target_compile_options( ${target} PRIVATE /SAFESEH /NXCOMPAT ) ++ endif() + endif() + endif() + endfunction() diff --git a/packages/a/ade/xmake.lua b/packages/a/ade/xmake.lua index ca20bc334..860ebef66 100644 --- a/packages/a/ade/xmake.lua +++ b/packages/a/ade/xmake.lua @@ -7,6 +7,9 @@ package("ade") "https://github.com/opencv/ade.git") add_versions("v0.1.2d", "edefba61a33d6cd4b78a9976cb3309c95212610a81ba6dade09882d1794198ff") + add_versions("v0.1.2", "ac2e6a4acbe6e0b0942418687ec37c6cd55dcaec5112c7ca09abefe6ee539499") + + add_patches("0.1.2", "patches/0.1.2/cmake-mingw.patch", "59ac0ed938b82090e97de6dee358ba683b371908c3063b4d10146999a30eaaaa") add_deps("cmake") @@ -19,5 +22,9 @@ package("ade") end) on_test(function (package) - assert(package:has_cxxtypes("ade::Graph", {configs = {languages = "c++11"}, includes = "ade/graph.hpp"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + ade::Graph x; + } + ]]}, {configs = {languages = "c++11"}, includes = "ade/graph.hpp"})) end) From 1a33bbd2fd37b1f773482c62bfbcbcece0ee9f25 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 28 Jun 2024 21:23:06 +0800 Subject: [PATCH 259/671] update asio2 to 2.9 (#4400) * update asio2 to 2.9 * Update xmake.lua * Update xmake.lua * Update xmake.lua * improve xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 --- .../a/asio2/patches/2.9/remove-const.patch | 22 +++++++++++++++++++ packages/a/asio2/xmake.lua | 11 ++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 packages/a/asio2/patches/2.9/remove-const.patch diff --git a/packages/a/asio2/patches/2.9/remove-const.patch b/packages/a/asio2/patches/2.9/remove-const.patch new file mode 100644 index 000000000..66bc64def --- /dev/null +++ b/packages/a/asio2/patches/2.9/remove-const.patch @@ -0,0 +1,22 @@ +From 34bb2c023d60d22e4b1a31750d9b649d7729209e Mon Sep 17 00:00:00 2001 +From: xpxz <97490782+heheda123123@users.noreply.github.com> +Date: Wed, 19 Jun 2024 14:08:48 +0800 +Subject: [PATCH] remove const in set_to_text_limit + +--- + include/asio2/http/detail/flex_body.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/asio2/http/detail/flex_body.hpp b/include/asio2/http/detail/flex_body.hpp +index 491f5b8a..18e682db 100644 +--- a/include/asio2/http/detail/flex_body.hpp ++++ b/include/asio2/http/detail/flex_body.hpp +@@ -136,7 +136,7 @@ class basic_flex_body::value_type + inline bool is_text() const noexcept { return !is_file(); } + inline bool is_file() const noexcept { return file_.is_open(); } + +- inline void set_to_text_limit(std::uint64_t v) const noexcept ++ inline void set_to_text_limit(std::uint64_t v) noexcept + { + this->to_text_limit_ = v; + } diff --git a/packages/a/asio2/xmake.lua b/packages/a/asio2/xmake.lua index cfe70a9f2..d34f931a3 100644 --- a/packages/a/asio2/xmake.lua +++ b/packages/a/asio2/xmake.lua @@ -1,17 +1,20 @@ package("asio2") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/zhllxt/asio2") set_description("Header only c++ network library, based on asio, support tcp,udp,http,websocket,rpc,ssl,icmp,serial_port.") set_license("BSL-1.0") - add_urls("https://github.com/zhllxt/asio2.git") - add_versions("2023.05.09", "ac8c79964d79020091e38fcbb4ae9dccccb3b03c") + add_urls("https://github.com/zhllxt/asio2/archive/refs/tags/$(version).zip", + "https://github.com/zhllxt/asio2.git") + + add_versions("v2.9", "3ce0b41300954ffc13948bd51af6430e324b1c28e26d2eb5a83e775cf38c12b4") + + add_patches("2.9", "patches/2.9/remove-const.patch", "6326f333ab2d0484c23bb3cd9cfd5a565030b5525d083677565a693f5f8803b6") add_deps("asio", "cereal", "fmt", "openssl3") add_deps("spdlog", { configs = { header_only = false, fmt_external = true } }) - on_install("windows", "linux", "macosx", "mingw", "bsd", function (package) + on_install("windows", "linux", "macosx", "mingw", "bsd", "cross", function (package) os.cp(path.join("include", "*"), package:installdir("include")) end) From e8b1f9fe370c82b1e4cce13b623cfd7731d2d9d9 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 28 Jun 2024 23:05:59 +0800 Subject: [PATCH 260/671] Auto-update freeglut to v3.6.0 (#4496) * Update freeglut to v3.6.0 * improve xmake.lua * disable android --------- Co-authored-by: star9029 --- packages/f/freeglut/xmake.lua | 53 ++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/packages/f/freeglut/xmake.lua b/packages/f/freeglut/xmake.lua index 241d247cd..be62e57d5 100644 --- a/packages/f/freeglut/xmake.lua +++ b/packages/f/freeglut/xmake.lua @@ -1,14 +1,15 @@ package("freeglut") - set_homepage("http://freeglut.sourceforge.net") - set_description("A free-software/open-source alternative to the OpenGL Utility Toolkit (GLUT) library.") + set_description("Free implementation of the OpenGL Utility Toolkit (GLUT)") set_license("MIT") - add_urls("https://github.com/FreeGLUTProject/freeglut/archive/refs/tags/$(version).zip", + add_urls("https://github.com/freeglut/freeglut/releases/download/v$(version)/freeglut-$(version).tar.gz", "https://github.com/FreeGLUTProject/freeglut.git") - add_versions("v3.4.0", "8aed768c71dd5ec0676216bc25e23fa928cc628c82e54ecca261385ccfcee93a") - add_patches("v3.4.0", path.join(os.scriptdir(), "patches", "3.4.0", "arm64.patch"), "a96b538e218ca478c7678aad62b724226dcdf11371da58d1287b95dbe241d00e") + add_versions("3.6.0", "9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52") + add_versions("3.4.0", "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec") + + add_patches("3.4.0", "patches/3.4.0/arm64.patch", "a96b538e218ca478c7678aad62b724226dcdf11371da58d1287b95dbe241d00e") add_deps("cmake") @@ -18,7 +19,17 @@ package("freeglut") end add_deps("glu", "opengl", {optional = true}) - on_load("windows", function (package) + if on_check then + on_check("windows", function (package) + local msvc = package:toolchain("msvc") + if msvc and package:is_arch("arm.*") then + local vs = msvc:config("vs") + assert(vs and tonumber(vs) >= 2022, "package(freeglut): requires Visual Studio 2022 and later for arm targets") + end + end) + end + + on_load("windows", "mingw", function (package) if not package:config("shared") then package:add("defines", "FREEGLUT_STATIC=1") end @@ -32,8 +43,9 @@ package("freeglut") end end) - on_install("linux", "windows", function (package) + on_install("linux", "windows", "mingw", function (package) local configs = {"-DFREEGLUT_BUILD_DEMOS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) if package:config("shared") then table.insert(configs, "-DFREEGLUT_BUILD_SHARED_LIBS=ON") table.insert(configs, "-DFREEGLUT_BUILD_STATIC_LIBS=OFF") @@ -41,27 +53,30 @@ package("freeglut") table.insert(configs, "-DFREEGLUT_BUILD_SHARED_LIBS=OFF") table.insert(configs, "-DFREEGLUT_BUILD_STATIC_LIBS=ON") end + + local opt = {} + opt.cxflags = {} if package:is_plat("windows") then if package:config("shared") then - table.insert(configs, "-DCMAKE_C_FLAGS=-DFREEGLUT_LIB_PRAGMAS=0") + table.insert(opt.cxflags, "-DFREEGLUT_LIB_PRAGMAS=0") else - table.insert(configs, "-DCMAKE_C_FLAGS=-DFREEGLUT_LIB_PRAGMAS=0 -DFREEGLUT_STATIC=1") + table.insert(opt.cxflags, "-DFREEGLUT_LIB_PRAGMAS=0") + table.insert(opt.cxflags, "-DFREEGLUT_STATIC=1") end if package:is_arch("arm64") then - local vs = import("core.tool.toolchain").load("msvc"):config("vs") - assert(tonumber(vs) >= 2022, "freeglut requires Visual Studio 2022 and later for arm targets") - table.insert(configs, "-DCMAKE_SYSTEM_NAME=Windows") - table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=ARM64") + local vs = package:toolchain("msvc"):config("vs") + if vs then + assert(tonumber(vs) >= 2022, "package(freeglut): requires Visual Studio 2022 and later for arm targets") + table.insert(configs, "-DCMAKE_SYSTEM_NAME=Windows") + table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=ARM64") + end end end - if package:config("pic") ~= false then - table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") - end if package:is_plat("linux") then - import("package.tools.cmake").install(package, configs, {packagedeps = {"libxi", "libxxf86vm", "libxrandr", "libxrender"}}) - else - import("package.tools.cmake").install(package, configs) + opt.packagedeps = {"libxi", "libxxf86vm", "libxrandr", "libxrender"} end + + import("package.tools.cmake").install(package, configs, opt) os.trycp(path.join("include", "GL", "glut.h"), package:installdir("include", "GL")) end) From 3cf9919a0a533bdfffa91af5cc5b6c6a6434536c Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Sat, 29 Jun 2024 08:50:24 +0800 Subject: [PATCH 261/671] add wjakob_filesystem (#4506) --- packages/w/wjakob_filesystem/xmake.lua | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/w/wjakob_filesystem/xmake.lua diff --git a/packages/w/wjakob_filesystem/xmake.lua b/packages/w/wjakob_filesystem/xmake.lua new file mode 100644 index 000000000..bebc0b146 --- /dev/null +++ b/packages/w/wjakob_filesystem/xmake.lua @@ -0,0 +1,24 @@ +package("wjakob_filesystem") + + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/wjakob/filesystem") + set_description("A tiny self-contained path manipulation library for C++") + set_license("BSD-3-Clause") + + add_urls("https://github.com/wjakob/filesystem.git") + add_versions("2021.10.28", "c5f9de30142453eb3c6fe991e82dfc2583373116") + + on_install(function (package) + os.cp("filesystem", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + filesystem::path path1{"dir1"}; + filesystem::path path2{"dir2"}; + auto path3 = path1 / path2; + } + ]]}, {configs = {languages = "c++11"}})) + end) From a4812838bc41a5e875bf2530c0cf581fabbc6f96 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 29 Jun 2024 09:52:46 +0800 Subject: [PATCH 262/671] Update nativefiledialog-extended to v1.2.0 (#4507) --- packages/n/nativefiledialog-extended/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/nativefiledialog-extended/xmake.lua b/packages/n/nativefiledialog-extended/xmake.lua index ed855446a..17225f90d 100644 --- a/packages/n/nativefiledialog-extended/xmake.lua +++ b/packages/n/nativefiledialog-extended/xmake.lua @@ -5,6 +5,7 @@ package("nativefiledialog-extended") add_urls("https://github.com/btzy/nativefiledialog-extended/archive/refs/tags/$(version).zip", "https://github.com/btzy/nativefiledialog-extended.git") + add_versions("v1.2.0", "27dc13320816392d0d9905c60645aa684784c7c2559d656b504021edd40f07ed") add_versions("v1.1.1", "7003001d36235db2c2062cd992e61c59c77a5ad3ca5e5ed8175e56502513886e") add_versions("v1.1.0", "5827d17b6bddc8881406013f419c534e8459b38f34c2f266d9c1da8a7a7464bc") add_versions("v1.0.2", "1d2c4c50fb1e3ad8caa5ad9c3df54725c3a49a6d4a21d773a20b93ebeb5780f1") From ad5eeb5d118fd1f82514f81f0a139c01a240c5d2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 29 Jun 2024 15:04:27 +0800 Subject: [PATCH 263/671] mapbox_polylabel: add package (#4511) --- packages/m/mapbox_geometry/xmake.lua | 10 +++------- packages/m/mapbox_polylabel/xmake.lua | 25 +++++++++++++++++++++++++ packages/m/mapbox_variant/xmake.lua | 5 +++-- 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 packages/m/mapbox_polylabel/xmake.lua diff --git a/packages/m/mapbox_geometry/xmake.lua b/packages/m/mapbox_geometry/xmake.lua index aa3c89c7a..1e33d6a6e 100644 --- a/packages/m/mapbox_geometry/xmake.lua +++ b/packages/m/mapbox_geometry/xmake.lua @@ -1,5 +1,4 @@ package("mapbox_geometry") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/mapbox/geometry.hpp") set_description("Provides header-only, generic C++ interfaces for geometry types, geometry collections, and features.") @@ -7,8 +6,10 @@ package("mapbox_geometry") add_urls("https://github.com/mapbox/geometry.hpp/archive/refs/tags/v$(version).zip", "https://github.com/mapbox/geometry.hpp.git") + add_versions("1.1.0", "dc9203db94eda6b5377b96edeb4b53109cbf3d29e714d1d50c5cb598f2b39ab4") add_versions("2.0.3", "64d1005d4ee9931ac162b853cfb4a7c8a8bda9992ba83211386a6b40955bcc49") + add_patches("1.1.0", path.join(os.scriptdir(), "patches", "1.1.0", "pragma.patch"), "235a89eb4d78874bb8e3e49c95317c540511f33a67dec80a41c6984df7ff20c5") add_patches("2.0.3", path.join(os.scriptdir(), "patches", "2.0.3", "pragma.patch"), "235a89eb4d78874bb8e3e49c95317c540511f33a67dec80a41c6984df7ff20c5") @@ -24,12 +25,7 @@ package("mapbox_geometry") add_rules("utils.install.cmake_importfiles") add_rules("utils.install.pkgconfig_importfiles") ]]) - - local configs = {} - if package:config("shared") then - configs.kind = "shared" - end - import("package.tools.xmake").install(package, config) + import("package.tools.xmake").install(package) end) on_test(function (package) diff --git a/packages/m/mapbox_polylabel/xmake.lua b/packages/m/mapbox_polylabel/xmake.lua new file mode 100644 index 000000000..9dbbfe6be --- /dev/null +++ b/packages/m/mapbox_polylabel/xmake.lua @@ -0,0 +1,25 @@ +package("mapbox_polylabel") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/mapbox/polylabel") + set_description("A fast algorithm for finding the pole of inaccessibility of a polygon (in JavaScript and C++)") + set_license("ISC") + + add_urls("https://github.com/mapbox/polylabel/archive/refs/tags/$(version).tar.gz", + "https://github.com/mapbox/polylabel.git") + + add_versions("v2.0.0", "9aba4320c6cb5a8e9a8d44feb0d68b79b3127bdcb759a26aca92ac637668d7b9") + + add_deps("mapbox_geometry") + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + mapbox::geometry::polygon polygon; + mapbox::geometry::point p = mapbox::polylabel(polygon, 1.0); + } + ]]}, {configs = {languages = "c++14"}, includes = {"mapbox/polylabel.hpp"}})) + end) diff --git a/packages/m/mapbox_variant/xmake.lua b/packages/m/mapbox_variant/xmake.lua index e663c14ac..1f084a98e 100644 --- a/packages/m/mapbox_variant/xmake.lua +++ b/packages/m/mapbox_variant/xmake.lua @@ -1,13 +1,14 @@ package("mapbox_variant") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/mapbox/variant") set_description("C++11/C++14 Variant") set_license("BSD") - set_urls("https://github.com/mapbox/variant/archive/refs/tags/$(version).tar.gz", + set_urls("https://github.com/mapbox/variant/archive/f87fcbda9daf13fba47a6a889696b0ad23fc098d.tar.gz", + "https://github.com/mapbox/variant/archive/refs/tags/$(version).tar.gz", "https://github.com/mapbox/variant.git") + add_versions("2020.12.02", "1c158fb10da5605060950eb8d2a87a3313d29e558576e35fd445653d863a0103") add_versions("v1.2.0", "7059f4420d504c4bc96f8a462a0f6d029c5be914ba55cc030a0a773366dd7bc8") on_install(function (package) From 3960355cf88ab0733cd25582deb912d3e2fce672 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 29 Jun 2024 15:04:55 +0800 Subject: [PATCH 264/671] update yoga to 3.1.0 (#4510) * update yoga to 3.1.0 * add check --------- Co-authored-by: star9029 --- packages/y/yoga/xmake.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/y/yoga/xmake.lua b/packages/y/yoga/xmake.lua index b3efbba62..c4016f8c8 100644 --- a/packages/y/yoga/xmake.lua +++ b/packages/y/yoga/xmake.lua @@ -6,6 +6,7 @@ package("yoga") add_urls("https://github.com/facebook/yoga/archive/refs/tags/$(version).tar.gz", "https://github.com/facebook/yoga.git") + add_versions("v3.1.0", "06ff9e6df9b2388a0c6ef8db55ba9bc2ae75e716e967cd12cf18785f6379159e") add_versions("v3.0.4", "ef3ce5106eed03ab2e40dcfe5b868936a647c5f02b7ffd89ffaa5882dca3ef7f") add_versions("v3.0.3", "0ae44f7d30f8130cdf63e91293e11e34803afbfd12482fe4ef786435fc7fa8e7") add_versions("v3.0.2", "73a81c51d9ceb5b95cd3abcafeb4c840041801d59f5048dacce91fbaab0cc6f9") @@ -16,6 +17,18 @@ package("yoga") add_deps("cmake") + if on_check then + on_check(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + constexpr double f64v = 19880124.0; + constexpr auto u64v = std::bit_cast(f64v); + } + ]]}, {configs = {languages = "c++20"}}), "package(yoga) Require at least C++20.") + end) + end + on_install(function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) From 9be01cdcee6d60e41710ff2fa72cba49c948b0dd Mon Sep 17 00:00:00 2001 From: 359156687 <39145798+33671@users.noreply.github.com> Date: Sat, 29 Jun 2024 15:05:11 +0800 Subject: [PATCH 265/671] update libopus to 1.5.2 (#4509) * update libopus to 1.5.2 * fix crt --------- Co-authored-by: star9029 --- packages/l/libopus/xmake.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/l/libopus/xmake.lua b/packages/l/libopus/xmake.lua index 68dc0ef94..722998837 100644 --- a/packages/l/libopus/xmake.lua +++ b/packages/l/libopus/xmake.lua @@ -1,5 +1,4 @@ package("libopus") - set_homepage("https://opus-codec.org") set_description("Modern audio compression for the internet.") @@ -9,15 +8,18 @@ package("libopus") "https://github.com/xiph/opus.git", {alias = "github"}) + add_versions("home:1.5.2", "65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1") add_versions("home:1.5.1", "b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85") add_versions("home:1.5", "d8230bbeb99e6d558645aaad25d79de8f4f28fdcc55f8af230050586d62c4f2c") add_versions("home:1.4", "c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f") add_versions("home:1.3.1", "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d") + add_versions("github:1.5.2", "9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404") add_versions("github:1.5.1", "7ce44ef3d335a3268f26be7d53bb3bed7205b34eaf80bf92a99e69d490afe9d9") add_versions("github:1.5", "d7de528957dde0ba40e9dec9e25b679232bfaf19fb6a02ed8358845007d7075e") add_versions("github:1.4", "659e6b223e42a51b0a898632b9a5f406ccd5c2e00aa526ddd1264789774b94e5") add_versions("github:1.3.1", "4834a8944c33a7ecab5cad9454eeabe4680ca1842cb8f5a2437572dbf636de8f") + add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "cmake.patch"), "79fba5086d7747d0441f7f156b88e932b662e2d2ccd825279a5a396a2840d3a2") add_configs("avx", { description = "AVX supported", default = true, type = "boolean" }) @@ -30,6 +32,9 @@ package("libopus") add_deps("cmake") on_install("windows", "linux", "macosx", "iphoneos", "mingw", "android", "wasm", function (package) + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>")]], "", {plain = true}) + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL")]], "", {plain = true}) + local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From ebb85145336a8eb70e750203259401ee350c358b Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 29 Jun 2024 15:05:25 +0800 Subject: [PATCH 266/671] yalantinglibs: improve package (#4508) * yalantinglibs: improve package * limit plat --- packages/y/yalantinglibs/xmake.lua | 52 +++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/packages/y/yalantinglibs/xmake.lua b/packages/y/yalantinglibs/xmake.lua index 7b9b5ac7d..650e93e06 100644 --- a/packages/y/yalantinglibs/xmake.lua +++ b/packages/y/yalantinglibs/xmake.lua @@ -4,22 +4,58 @@ package("yalantinglibs") set_description("A collection of modern C++ libraries") set_license("Apache-2.0") - set_urls("https://github.com/alibaba/yalantinglibs/archive/refs/tags/$(version).zip", + set_urls("https://github.com/alibaba/yalantinglibs/archive/refs/tags/$(version).tar.gz", "https://github.com/alibaba/yalantinglibs.git") - add_versions("0.3.4", "88ba1ae2aa828383e51af95dbd029f90d16d5428d868739c8c91de3f31bed70b") - add_configs("ssl", {description = "Enable SSL", default = false, type = "boolean"}) + add_versions("0.3.4", "dd5edd3f43f23cd4b0614896e6587b61bb38c981dc21c85a54bcc54800d0dfe8") - add_deps("asio", "async_simple") + add_configs("ssl", {description = "Enable ssl support", default = false, type = "boolean"}) + add_configs("pmr", {description = "Enable pmr support", default = false, type = "boolean"}) + add_configs("io_uring", {description = "Enable io_uring", default = false, type = "boolean"}) + add_configs("file_io_uring", {description = "Enable file io_uring", default = false, type = "boolean"}) + add_configs("struct_pack_unportable_type", {description = "enable struct_pack unportable type(like wchar_t)", default = false, type = "boolean"}) + add_configs("struct_pack_unportable_optimize", {description = "enable struct_pack optimize(but cost more compile time)", default = false, type = "boolean"}) + + add_deps("cinatra", "iguana") on_load(function (package) - if package:config("ssl")then - package:add("deps", "openssl3") + if package:config("ssl") then + package:add("deps", "openssl") + package:add("defines", "YLT_ENABLE_SSL") + end + if package:config("pmr") then + package:add("defines", "YLT_ENABLE_PMR") + end + if package:config("io_uring") then + package:add("deps", "liburing") + package:add("defines", "ASIO_HAS_IO_URING", "ASIO_DISABLE_EPOLL", "ASIO_HAS_FILE", "YLT_ENABLE_FILE_IO_URING") + end + if package:config("file_io_uring") then + package:add("deps", "liburing") + package:add("defines", "ASIO_HAS_IO_URING", "ASIO_HAS_FILE", "YLT_ENABLE_FILE_IO_URING") + end + if package:config("struct_pack_unportable_type") then + package:add("defines", "STRUCT_PACK_ENABLE_UNPORTABLE_TYPE") + end + if package:config("struct_pack_unportable_optimize") then + package:add("defines", "YLT_ENABLE_STRUCT_PACK_OPTIMIZE") end end) - on_install("linux", "macos", "windows", function (package) - os.cp("include", package:installdir()) + on_install("windows", "linux", "macosx", function (package) + local configs = { + "-DINSTALL_THIRDPARTY=OFF", + "-DINSTALL_STANDALONE=OFF", + "-DINSTALL_INDEPENDENT_THIRDPARTY=OFF", + "-DINSTALL_INDEPENDENT_STANDALONE=OFF", + "-DCMAKE_PROJECT_NAME=xmake", + } + for name, enabled in table.orderpairs(package:configs()) do + if not package:extraconf("configs", name, "builtin") then + table.insert(configs, "-DYLT_ENABLE_" .. name:upper() .. "=" .. (enabled and "ON" or "OFF")) + end + end + import("package.tools.cmake").install(package, configs) end) on_test(function (package) From f71af647536510f0f79135caddc314550bf90b8f Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sat, 29 Jun 2024 16:48:22 +0800 Subject: [PATCH 267/671] Update cinatra to 0.9.1 (#4307) * Update cinatra to 0.9.1 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/c/cinatra/xmake.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/c/cinatra/xmake.lua b/packages/c/cinatra/xmake.lua index 4f4b9bf3c..4bf0923aa 100644 --- a/packages/c/cinatra/xmake.lua +++ b/packages/c/cinatra/xmake.lua @@ -4,13 +4,14 @@ package("cinatra") set_description("modern c++(c++20), cross-platform, header-only, easy to use http framework") set_license("MIT") - add_urls("https://github.com/qicosmos/cinatra/archive/refs/tags/v$(version).tar.gz", + add_urls("https://github.com/qicosmos/cinatra/archive/refs/tags/$(version).tar.gz", "https://github.com/qicosmos/cinatra.git") - add_versions("0.8.9", "007dc38aceedf42d03a9c05dc9aa6d2f303456ae7ce1100800df7a565b83b510") - add_versions("0.8.0", "4e14d5206408eccb43b3e810d3a1fe228fbc7496ded8a16b041ed12cbcce4479") + add_versions("0.9.1", "d1a8018e41caabbda2c380175b632e3c9c10b519727f6b998eda4e3f4ede84bd") + add_versions("v0.8.9", "007dc38aceedf42d03a9c05dc9aa6d2f303456ae7ce1100800df7a565b83b510") + add_versions("v0.8.0", "4e14d5206408eccb43b3e810d3a1fe228fbc7496ded8a16b041ed12cbcce4479") - add_patches("0.8.9", "patches/0.8.9/windows-move.patch", "c913ed0e9044ffc0ced40516245ec0d55262f8eabd30244d9911c3f0427a60f5") + add_patches(">=0.8.9", "patches/0.8.9/windows-move.patch", "c913ed0e9044ffc0ced40516245ec0d55262f8eabd30244d9911c3f0427a60f5") add_configs("ssl", {description = "Enable SSL", default = false, type = "boolean"}) add_configs("gzip", {description = "Enable GZIP", default = false, type = "boolean"}) From 2a04a8a0d2785afc0e0c4e6e29362bb2fa95634a Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 29 Jun 2024 22:08:09 +0800 Subject: [PATCH 268/671] pe-parse: add package (#4513) * pe-parse: add package * remove werror * fix windows arm --- packages/p/pe-parse/xmake.lua | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/p/pe-parse/xmake.lua diff --git a/packages/p/pe-parse/xmake.lua b/packages/p/pe-parse/xmake.lua new file mode 100644 index 000000000..7e1ec754d --- /dev/null +++ b/packages/p/pe-parse/xmake.lua @@ -0,0 +1,34 @@ +package("pe-parse") + set_homepage("https://github.com/trailofbits/pe-parse") + set_description("Principled, lightweight C/C++ PE parser") + set_license("MIT") + + add_urls("https://github.com/trailofbits/pe-parse/archive/f2f0ee91f3b6dee41f75b2f775e82015f2b72007.tar.gz", + "https://github.com/trailofbits/pe-parse.git") + + add_versions("2024.06.04", "f20594916452f868a55928ef99945dbbd416387e320101b1bf63f9dcff4af628") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + add_deps("cmake") + + on_install(function (package) + io.replace("cmake/compilation_flags.cmake", "-Werror", "", {plain = true}) + if package:is_plat("windows") and package:is_arch("arm.*") then + io.replace("CMakeLists.txt", "find_package(Filesystem COMPONENTS Experimental Final REQUIRED)", "", {plain = true}) + end + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_COMMAND_LINE_TOOLS=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + std::string str = peparse::GetPEErrString(); + } + ]]}, {configs = {languages = "c++17"}, includes = "pe-parse/parse.h"})) + end) From 8ccbc0dff27bd70c17ae1d811bb829bdfe24dff1 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:14:14 +0800 Subject: [PATCH 269/671] Update re2 to 2024.06.01 (#4512) * Update re2 to 2024.06.01 * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/r/re2/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/r/re2/xmake.lua b/packages/r/re2/xmake.lua index f1fd45eaa..127bc6fc4 100644 --- a/packages/r/re2/xmake.lua +++ b/packages/r/re2/xmake.lua @@ -13,6 +13,7 @@ package("re2") add_versions("2023.11.01", "4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a") add_versions("2024.03.01", "7b2b3aa8241eac25f674e5b5b2e23d4ac4f0a8891418a2661869f736f03f57f4") add_versions("2024.04.01", "3f6690c3393a613c3a0b566309cf04dc381d61470079b653afc47c67fb898198") + add_versions("2024.06.01", "7326c74cddaa90b12090fcfc915fe7b4655723893c960ee3c2c66e85c5504b6c") add_deps("cmake", "abseil") @@ -20,6 +21,13 @@ package("re2") add_syslinks("pthread") end + on_load(function (package) + local version = package:version() + if version:eq("2024.06.01") and package:is_plat("mingw") then + package:add("syslinks", "Dbghelp") + end + end) + on_install("macosx", "linux", "windows", "mingw", "cross", function (package) local configs = {"-DRE2_BUILD_TESTING=OFF"} table.insert(configs, "-DCMAKE_CXX_STANDARD=17") From f0b45d81e635885f00c8e9de04c97772869bffef Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 30 Jun 2024 10:09:11 +0800 Subject: [PATCH 270/671] Update csvparser to 2.3.0 (#4519) --- packages/c/csvparser/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/csvparser/xmake.lua b/packages/c/csvparser/xmake.lua index 00e3e9adb..f08c4c7d2 100644 --- a/packages/c/csvparser/xmake.lua +++ b/packages/c/csvparser/xmake.lua @@ -4,6 +4,7 @@ package("csvparser") set_description("A modern C++ library for reading, writing, and analyzing CSV (and similar) files (by vincentlaucsb)") add_urls("https://github.com/vincentlaucsb/csv-parser/archive/refs/tags/$(version).zip") + add_versions("2.3.0", "17eb8e1a4f2f8cdc6679329e4626de608bb33a830d5614184a21b5d8838bbbb0") add_versions("2.2.3", "83170169f2af38b171d7c3e127d9411fe381988a4b8910465f7d1c4c6169e815") add_versions("2.2.2", "e8fb8693680f2a0931ef28cb67a1ea007123201c74073fc588c18f5151e29cfd") add_versions("2.2.1", "96fd6a468f56fc157a11fcbc5cece6da952b06190837c46465d091eff674a813") From df1b9e04d773baa1a4bbc174334882d1d3d42f65 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 30 Jun 2024 10:09:14 +0800 Subject: [PATCH 271/671] Update aws-c-s3 to v0.6.0 (#4517) --- packages/a/aws-c-s3/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-s3/xmake.lua b/packages/a/aws-c-s3/xmake.lua index 6681b2c6d..3a324a7ee 100644 --- a/packages/a/aws-c-s3/xmake.lua +++ b/packages/a/aws-c-s3/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-s3") add_urls("https://github.com/awslabs/aws-c-s3/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-s3.git") + add_versions("v0.6.0", "0a29dbb13ea003de3fd0d08a61fa705b1c753db4b35de9c464641432000f13ec") add_versions("v0.5.9", "7a337195b295406658d163b6dac64ff81f7556291b8a8e79e58ebaa2d55178ee") add_versions("v0.5.7", "2f2eab9bf90a319030fd3525953dc7ac00c8dc8c0d33e3f0338f2a3b554d3b6a") add_versions("v0.3.17", "72fd93a2f9a7d9f205d66890da249944b86f9528216dc0321be153bf19b2ecd5") From 81ff4c101de1048b2588c97d2b92a00d1c61d478 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 30 Jun 2024 10:09:16 +0800 Subject: [PATCH 272/671] Update cgif to v0.4.1 (#4516) --- packages/c/cgif/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cgif/xmake.lua b/packages/c/cgif/xmake.lua index d1d450aa1..edfcac112 100644 --- a/packages/c/cgif/xmake.lua +++ b/packages/c/cgif/xmake.lua @@ -6,6 +6,7 @@ package("cgif") add_urls("https://github.com/dloebl/cgif/archive/refs/tags/$(version).tar.gz", "https://github.com/dloebl/cgif.git") + add_versions("v0.4.1", "8666f9c5f8123d1c22137a6dd714502a330377fb74e2007621926fe4258529d5") add_versions("v0.4.0", "130ff8a604f047449e81ddddf818bd0e03826b5f468e989b02726b16b7d4742e") if is_plat("linux") then From 3cabd6c5a0bd755c1c2e89fbbf7f8768beed501a Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 30 Jun 2024 10:34:51 +0800 Subject: [PATCH 273/671] Update rapidcsv to 8.83 (#4520) --- packages/r/rapidcsv/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rapidcsv/xmake.lua b/packages/r/rapidcsv/xmake.lua index e340f354d..3faf23016 100644 --- a/packages/r/rapidcsv/xmake.lua +++ b/packages/r/rapidcsv/xmake.lua @@ -4,6 +4,7 @@ package("rapidcsv") set_description("C++ header-only library for CSV parsing (by d99kris)") add_urls("https://github.com/d99kris/rapidcsv/archive/refs/tags/v$(version).zip") + add_versions("8.83", "ca7e99a7229d50a8d7e59d77f31b53970579429c71bf05bc53729d15135c9b6f") add_versions("8.82", "e07c9355846b62b960ddebf79fef306ac21ee297f19880f237b7da8eb007a056") add_versions("8.80", "5bdbecc3542a881c058624d63c27574fa171fafe32be857e925fccaa1ae75f46") add_versions("8.50", "c7822b590f48f7d8c9b560a6e2d7e29d7ec2f7b3642eb75ddff40a803949b502") From e70b0c00dfe2b67a5dee38416eb2ab43fe9a9a8f Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 30 Jun 2024 13:27:44 +0800 Subject: [PATCH 274/671] update harfbuzz to 9.0.0 (#4521) --- packages/h/harfbuzz/xmake.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/h/harfbuzz/xmake.lua b/packages/h/harfbuzz/xmake.lua index 45a3ad4b5..202245324 100644 --- a/packages/h/harfbuzz/xmake.lua +++ b/packages/h/harfbuzz/xmake.lua @@ -6,21 +6,23 @@ package("harfbuzz") add_urls("https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$(version).tar.gz", {excludes = "README"}) add_urls("https://github.com/harfbuzz/harfbuzz.git") + + add_versions("9.0.0", "b7e481b109d19aefdba31e9f5888aa0cdfbe7608fed9a43494c060ce1f8a34d2") add_versions("8.5.0", "7ad8e4e23ce776efb6a322f653978b3eb763128fd56a90252775edb9fd327956") add_versions("8.4.0", "9f1ca089813b05944ad1ce8c7e018213026d35dc9bab480a21eb876838396556") - add_versions("2.8.1", "b3f17394c5bccee456172b2b30ddec0bb87e9c5df38b4559a973d14ccd04509d") - add_versions("2.9.0", "bf5d5bad69ee44ff1dd08800c58cb433e9b3bf4dad5d7c6f1dec5d1cf0249d04") - add_versions("3.0.0", "55f7e36671b8c5569b6438f80efed2fd663298f785ad2819e115b35b5587ef69") - add_versions("3.1.1", "5283c7f5f1f06ddb5e2e88319f6946ea37d2eb3a574e0f73f6000de8f9aa34e6") - add_versions("4.4.1", "1a95b091a40546a211b6f38a65ccd0950fa5be38d95c77b5c4fa245130b418e1") - add_versions("5.3.1", "77c8c903f4539b050a6d3a5be79705c7ccf7b1cb66d68152a651486e261edbd2") - add_versions("6.0.0", "6d753948587db3c7c3ba8cc4f8e6bf83f5c448d2591a9f7ec306467f3a4fe4fa") - add_versions("7.3.0", "7cefc6cc161e9d5c88210dafc43bc733ca3e383fd3dd4f1e6178f81bd41cfaae") - add_versions("8.0.0", "a8e8ec6f0befce0bd5345dd741d2f88534685a798002e343a38b7f9b2e00c884") - add_versions("8.0.1", "d54ca67b6a0bf732b66a343566446d7f93df2bb850133f886c0082fb618a06b2") - add_versions("8.1.0", "8d544f1b74797b7b4d88f586e3b9202528b3e8c17968d28b7cdde02041bff5a0") - add_versions("8.1.1", "b16e6bc0fc7e6a218583f40c7d201771f2e3072f85ef6e9217b36c1dc6b2aa25") add_versions("8.3.0", "6a093165442348d99f3307480ea87ed83bdabaf642cdd9548cff6b329e93bfac") + add_versions("8.1.1", "b16e6bc0fc7e6a218583f40c7d201771f2e3072f85ef6e9217b36c1dc6b2aa25") + add_versions("8.1.0", "8d544f1b74797b7b4d88f586e3b9202528b3e8c17968d28b7cdde02041bff5a0") + add_versions("8.0.1", "d54ca67b6a0bf732b66a343566446d7f93df2bb850133f886c0082fb618a06b2") + add_versions("8.0.0", "a8e8ec6f0befce0bd5345dd741d2f88534685a798002e343a38b7f9b2e00c884") + add_versions("7.3.0", "7cefc6cc161e9d5c88210dafc43bc733ca3e383fd3dd4f1e6178f81bd41cfaae") + add_versions("6.0.0", "6d753948587db3c7c3ba8cc4f8e6bf83f5c448d2591a9f7ec306467f3a4fe4fa") + add_versions("5.3.1", "77c8c903f4539b050a6d3a5be79705c7ccf7b1cb66d68152a651486e261edbd2") + add_versions("4.4.1", "1a95b091a40546a211b6f38a65ccd0950fa5be38d95c77b5c4fa245130b418e1") + add_versions("3.1.1", "5283c7f5f1f06ddb5e2e88319f6946ea37d2eb3a574e0f73f6000de8f9aa34e6") + add_versions("3.0.0", "55f7e36671b8c5569b6438f80efed2fd663298f785ad2819e115b35b5587ef69") + add_versions("2.9.0", "bf5d5bad69ee44ff1dd08800c58cb433e9b3bf4dad5d7c6f1dec5d1cf0249d04") + add_versions("2.8.1", "b3f17394c5bccee456172b2b30ddec0bb87e9c5df38b4559a973d14ccd04509d") add_configs("icu", {description = "Enable ICU library unicode functions.", default = false, type = "boolean"}) add_configs("freetype", {description = "Enable freetype interop helpers.", default = true, type = "boolean"}) From 066ec927c77e185f9104f9e0d9d596bebcfd211c Mon Sep 17 00:00:00 2001 From: PumpkinXD <54535387+PumpkinXD@users.noreply.github.com> Date: Sun, 30 Jun 2024 21:04:14 +0800 Subject: [PATCH 275/671] Update cosmocc to version 3.5.1 (#4515) * update cosmocc to 3.5.0 * update cosmocc to 3.5.1 * test 3.5.0 * add 3.5.1 back --------- Co-authored-by: Hoildkv <42310255+xq114@users.noreply.github.com> --- packages/c/cosmocc/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/c/cosmocc/xmake.lua b/packages/c/cosmocc/xmake.lua index 21fcce66e..e6fbe6f21 100644 --- a/packages/c/cosmocc/xmake.lua +++ b/packages/c/cosmocc/xmake.lua @@ -16,6 +16,8 @@ package("cosmocc") add_versions("3.3.9", "0a8a781710f58373077a91ca16a2fafc30a0bc3982fb9b9c5583f045833eca36") add_versions("3.3.10", "00d61c1215667314f66e288c8285bae38cc6137fca083e5bba6c74e3a52439de") add_versions("3.4.0", "475e24b84a18973312433f5280e267acbe1b4dac1b2e2ebb3cfce46051a8c08c") + add_versions("3.5.0", "6c8443078ce43bf15bb835c8317d6d44e694e1572023263359c082afb7ec2224") + add_versions("3.5.1", "ea1f47cd4ead6ce3038551be164ad357bd45a4b5b7824871c561d2af23f871d6") on_load("@windows|x64", function (package) package:add("deps", "msys2") From 5eda937c456357958929e67bb97e385897fc999c Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 30 Jun 2024 23:55:15 +0800 Subject: [PATCH 276/671] faker-cxx: add package (#3711) * faker-cxx: add package * add dep fmt * switch v2 * add check * limit plat --- packages/f/faker-cxx/xmake.lua | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/f/faker-cxx/xmake.lua diff --git a/packages/f/faker-cxx/xmake.lua b/packages/f/faker-cxx/xmake.lua new file mode 100644 index 000000000..df5cc5f8c --- /dev/null +++ b/packages/f/faker-cxx/xmake.lua @@ -0,0 +1,49 @@ +package("faker-cxx") + set_homepage("https://cieslarmichal.github.io/faker-cxx/") + set_description("C++ Faker library for generating fake (but realistic) data.") + set_license("MIT") + + add_urls("https://github.com/cieslarmichal/faker-cxx/archive/refs/tags/$(version).tar.gz", + "https://github.com/cieslarmichal/faker-cxx.git") + + add_versions("v2.0.0", "8a7f5441f4453af868444675878a2d9a74918c1595caa65d537d3ea327e46a49") + + add_deps("cmake") + add_deps("fmt") + + if on_check then + on_check(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + #include + static_assert(std::integral); + void test() { + const auto v = {4, 1, 3, 2}; + auto it = std::ranges::find(v, 3); + } + ]]}, {configs = {languages = "c++20"}}), "package(faker-cxx) Require at least C++20.") + end) + end + + on_install("!wasm", function (package) + local configs = {"-DBUILD_TESTING=OFF", "-DUSE_SYSTEM_DEPENDENCIES=ON", "-DUSE_STD_FORMAT=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + + local cxflags + if package:has_tool("cxx", "cl") then + cxflags = "/utf-8" + if package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + end + import("package.tools.cmake").install(package, configs, {cxflags = cxflags}) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + const auto id = faker::string::uuid(); + } + ]]}, {configs = {languages = "c++20"}, includes = "faker-cxx/String.h"})) + end) From 70f492ead04b7786fa24ca987b820c6191e6e1ae Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Sun, 30 Jun 2024 23:55:27 +0800 Subject: [PATCH 277/671] add github url to json-c (#4465) * add git url to json-c * Update xmake.lua --------- Co-authored-by: star9029 --- packages/j/json-c/xmake.lua | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/j/json-c/xmake.lua b/packages/j/json-c/xmake.lua index 661826e87..c7ecbcf4b 100644 --- a/packages/j/json-c/xmake.lua +++ b/packages/j/json-c/xmake.lua @@ -3,14 +3,26 @@ package("json-c") set_description("JSON parser for C") set_license("MIT") - set_urls("https://github.com/json-c/json-c/archive/refs/tags/json-c-$(version).zip") + add_urls("https://github.com/json-c/json-c.git") + add_urls("https://github.com/json-c/json-c/archive/refs/tags/json-c-$(version).tar.gz", { + version = function (version) + local list = { + ["0.17"] = "20230812", + } + return version .. "-" .. list[tostring(version)] + end}) - add_versions("0.17-20230812", "471e9eb1dad4fd2e4fec571d8415993e66a89f23a5b052f1ba11b54db90252de") + add_versions("0.17", "024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb") add_deps("cmake") + on_install(function (package) + if package:config("shared") and package:is_plat("windows") then + package:add("defines", "JSON_EXPORT=__declspec(dllimport)") + end + local configs = {"-DBUILD_TESTING=OFF", "-DBUILD_APPS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DBUILD_STATIC_LIBS=" .. (package:config("shared") and "OFF" or "ON")) if package:config("pic") ~= false then From 606d83293fa177f34a85eaa4f8a5c0d12c05a174 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Sun, 30 Jun 2024 23:55:46 +0800 Subject: [PATCH 278/671] update dartsim (#4522) --- packages/d/dartsim/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/d/dartsim/xmake.lua b/packages/d/dartsim/xmake.lua index 87d62d2af..00c9fc5d2 100644 --- a/packages/d/dartsim/xmake.lua +++ b/packages/d/dartsim/xmake.lua @@ -7,6 +7,7 @@ package("dartsim") add_urls("https://github.com/dartsim/dart/archive/refs/tags/$(version).tar.gz", "https://github.com/dartsim/dart.git") add_versions("v6.13.0", "4da3ff8cee056252a558b05625a5ff29b21e71f2995e6d7f789abbf6261895f7") + add_versions("v6.14.2", "6bbaf452f8182b97bf22adeab6cc7f3dc1cd2733358543131fa130e07c0860fc") add_configs("dartpy", {description = "Build dartpy interface.", default = false, type = "boolean"}) local configdeps = {bullet3 = "Bullet", @@ -34,6 +35,9 @@ package("dartsim") package:add("deps", config) end end + if package:config("dartpy") then + package:add("deps", "python 3.x") + end end) on_install("windows|x64", "linux", "macosx", function (package) From 05691dab4045edd20579da79e440edddca6fdaad Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 1 Jul 2024 10:21:15 +0800 Subject: [PATCH 279/671] Update aws-c-common to v0.9.23 (#4528) --- packages/a/aws-c-common/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-common/xmake.lua b/packages/a/aws-c-common/xmake.lua index 878e921bd..652f9caa8 100644 --- a/packages/a/aws-c-common/xmake.lua +++ b/packages/a/aws-c-common/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-common") add_urls("https://github.com/awslabs/aws-c-common/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-common.git") + add_versions("v0.9.23", "adf838daf6a60aa31268522105b03262d745f529bc981d3ac665424133d6f91b") add_versions("v0.9.19", "196430fda1bca2c77df7d9199232956d371a92f49ee48fd6c29ff969410ca0ed") add_versions("v0.9.17", "82f1a88494c5563892f0e048f0f56acfe7e10e5aa3fe9267b956dbabcc043440") add_versions("v0.9.15", "8f36c7a6a5d2e17365759d15591f800d3e76dcaa34a226389b92647cbd92393a") From 77856d660dcbe074f8e1caf6429fe71e22ba1bc8 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 1 Jul 2024 10:21:19 +0800 Subject: [PATCH 280/671] Update libdwarf to 0.10.0 (#4526) --- packages/l/libdwarf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libdwarf/xmake.lua b/packages/l/libdwarf/xmake.lua index cfae2a2b2..21e11b495 100644 --- a/packages/l/libdwarf/xmake.lua +++ b/packages/l/libdwarf/xmake.lua @@ -4,6 +4,7 @@ package("libdwarf") set_license("LGPL-2.1") add_urls("https://github.com/davea42/libdwarf-code/releases/download/v$(version)/libdwarf-$(version).tar.xz") + add_versions("0.10.0", "17b7143c4b3e5949d1578c43e8f1e2abd9f1a47e725e6600fe7ac4833a93bb77") add_versions("0.9.2", "c1cd51467f9cb8459cd27d4071857abc56191cc5d4182d8bdd7744030f88f830") add_versions("0.9.1", "877e81b189edbb075e3e086f6593457d8353d4df09b02e69f3c0c8aa19b51bf4") add_versions("0.9.0", "d3cad80a337276a7581bb90ebcddbd743484a99a959157c066dd30f7535db59b") From 4a93b2c6fe823269e02bf29a92070a7fb0827515 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 1 Jul 2024 10:21:21 +0800 Subject: [PATCH 281/671] Update emmylua_debugger to 1.8.2 (#4525) --- packages/e/emmylua_debugger/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/emmylua_debugger/xmake.lua b/packages/e/emmylua_debugger/xmake.lua index ddbfefcfc..f786a8c15 100644 --- a/packages/e/emmylua_debugger/xmake.lua +++ b/packages/e/emmylua_debugger/xmake.lua @@ -6,6 +6,7 @@ package("emmylua_debugger") add_urls("https://github.com/EmmyLua/EmmyLuaDebugger/archive/refs/tags/$(version).tar.gz", "https://github.com/EmmyLua/EmmyLuaDebugger.git") + add_versions("1.8.2", "2ce5adbfad4055072d39302dccf794ec45800e84a5f3ba4784b373078a9dff8c") add_versions("1.8.1", "0dbbfefe798425323bd1f531463675460fce3418d73ef29b495e7369f8c76475") add_versions("1.8.0", "21e5ba1c82e4386cd8ad4f8c76511d70319b899b414d29ecdaba35649325d2ee") add_versions("1.7.1", "8757d372c146d9995b6e506d42f511422bcb1dc8bacbc3ea1a5868ebfb30015f") From 39cc87412847e5a3e1a56d9e5b516b6b1bbeced1 Mon Sep 17 00:00:00 2001 From: Frityet Date: Sun, 30 Jun 2024 19:38:14 -0700 Subject: [PATCH 282/671] Updated objfw (#4524) --- packages/o/objfw/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 1e1ce34de..8348c103a 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -19,6 +19,8 @@ package("objfw") add_versions("1.1.0", "79f6a6fdc90ad6474206c8f649d66415b09a3f07b9c6ddbaf64129291fd12d94") add_versions("1.1.1", "0492a08f964180b7453c05bd9f0080e70b61171a9b5194a6d1b891370c24cfc0") add_versions("1.1.2", "5d9f9a70d583298e780ae11fc75a7ae2beeef904b301e1bc4f4ffa8d7ee31d9f") + add_versions("1.1.3", "e66ff27ac93c5747019aaa5c8a72b2e4508938e59b3ce08909e54e566ebb2e41") + add_versions("1.1.4", "f6bfdbab22008aae3e4b48d77ced1a04c5153961c6f7e5492891f90ae5131a78") if is_host("linux", "macosx") then From f5d02ae0d7d4922ff401edb660d390e6c7ebaa1d Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 1 Jul 2024 11:52:37 +0800 Subject: [PATCH 283/671] update magic_enum to 0.9.6 (#4530) --- packages/m/magic_enum/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/magic_enum/xmake.lua b/packages/m/magic_enum/xmake.lua index 2c66fe711..72e76dd8e 100644 --- a/packages/m/magic_enum/xmake.lua +++ b/packages/m/magic_enum/xmake.lua @@ -13,6 +13,7 @@ package("magic_enum") add_versions("v0.8.2", "62bd7034bbbfc3d7806001767d5775ab42f3ff33bb38366e1ceb21102f0dff9a") add_versions("v0.9.0", "2fb2f602b4660f8af539ee00958132a397e138bda19aa1ceae546de3a143386b") add_versions("v0.9.5", "44ad80db5a72f5047e01d90e18315751d9ac90c0ab42cbea7a6f9ec66a4cd679") + add_versions("v0.9.6", "814791ff32218dc869845af7eb89f898ebbcfa18e8d81aa4d682d18961e13731") add_deps("cmake") From 0abb90facd8ecb9851d442b51f1ba9080ab304cc Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 1 Jul 2024 17:02:08 +0800 Subject: [PATCH 284/671] update srpc (#4531) * update pb, srpc, gprc * rollback grpc * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/s/srpc/xmake.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/s/srpc/xmake.lua b/packages/s/srpc/xmake.lua index a91693435..c6dc1989c 100644 --- a/packages/s/srpc/xmake.lua +++ b/packages/s/srpc/xmake.lua @@ -6,20 +6,21 @@ package("srpc") add_urls("https://github.com/sogou/srpc/archive/refs/tags/$(version).tar.gz", "https://github.com/sogou/srpc.git") + add_versions("v0.10.3", "8fc8d5d0d0b0975ed4a5d266e82841c4e94eb041cb459357b92dba4e3b64ebb8") add_versions("v0.10.2", "da570f3522e9dfec9c396632044fcb51b5ddc5c854ba7824d1770de138f469fb") - add_deps("cmake", "protobuf-cpp") + add_deps("cmake", "protobuf-cpp 3.19.4", "abseil", "utf8_range") add_deps("workflow", "snappy", "lz4", "zlib") on_install("linux", "macosx", function (package) - local configs = {} + local configs = {"-DCMAKE_CXX_STANDARD=17"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) os.rm("third_party") io.replace("CMakeLists.txt", 'check_include_file_cxx("workflow/Workflow.h" WORKFLOW_INSTALLED)', "set(WORKFLOW_INSTALLED TRUE)", {plain = true}) import("package.tools.cmake").install(package, configs, {packagedeps = { - "workflow", "snappy", "lz4", "zlib"}}) + "workflow", "snappy", "lz4", "zlib", "abseil", "utf8_range"}}) if package:config("shared") then os.rm(path.join(package:installdir("lib"), "*.a")) else From bdf9bcd66c115e144115dd2527fb26289a76347e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 1 Jul 2024 16:18:48 +0200 Subject: [PATCH 285/671] Discord: Fix arch --- packages/d/discord/xmake.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/d/discord/xmake.lua b/packages/d/discord/xmake.lua index c7a4cf7ad..02444256c 100644 --- a/packages/d/discord/xmake.lua +++ b/packages/d/discord/xmake.lua @@ -1,5 +1,4 @@ package("discord") - set_homepage("https://discord.com/developers/docs/game-sdk/") set_description("Whether you’re part of a school club, gaming group, worldwide art community, or just a handful of friends that want to spend time together, Discord makes it easy to talk every day and hang out more often.") @@ -16,7 +15,7 @@ package("discord") add_links("discordcpp") - on_install("windows|x86", "windows|x64", "linux|x64", "macosx|x86_64", "macosx|arm64", function (package) + on_install("windows|x86", "windows|x64", "linux|x64", "linux|x86_64", "macosx|x86_64", "macosx|arm64", function (package) -- linux|x64 for retrocompatibility if package:config("cppapi") then os.cp("cpp/*.h", package:installdir("include")) end From 3f9079ac8740d54e16d9dbecf4605fa5675ee862 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Jul 2024 10:41:33 +0800 Subject: [PATCH 286/671] Update toml11 to v4.0.2 (#4536) --- packages/t/toml11/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/toml11/xmake.lua b/packages/t/toml11/xmake.lua index 6d1e456a9..969a8ff51 100644 --- a/packages/t/toml11/xmake.lua +++ b/packages/t/toml11/xmake.lua @@ -7,6 +7,7 @@ package("toml11") add_urls("https://github.com/ToruNiina/toml11/archive/refs/tags/$(version).tar.gz", "https://github.com/ToruNiina/toml11.git") + add_versions("v4.0.2", "d1bec1970d562d328065f2667b23f9745a271bf3900ca78e92b71a324b126070") add_versions("v4.0.1", "96965cb00ca7757c611c169cd5a6fb15736eab1cd1c1a88aaa62ad9851d926aa") add_versions("v3.8.1", "6a3d20080ecca5ea42102c078d3415bef80920f6c4ea2258e87572876af77849") add_versions("v3.7.0", "a0b6bec77c0e418eea7d270a4437510884f2fe8f61e7ab121729624f04c4b58e") From 1878aa492cb5f06bdcb3d9516bf120f5159f5c05 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Jul 2024 10:41:37 +0800 Subject: [PATCH 287/671] Update fast-cdr to v2.2.2 (#4534) --- packages/f/fast-cdr/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fast-cdr/xmake.lua b/packages/f/fast-cdr/xmake.lua index 78626e69f..07b435a3c 100644 --- a/packages/f/fast-cdr/xmake.lua +++ b/packages/f/fast-cdr/xmake.lua @@ -6,6 +6,7 @@ package("fast-cdr") add_urls("https://github.com/eProsima/Fast-CDR/archive/refs/tags/$(version).tar.gz", "https://github.com/eProsima/Fast-CDR.git") + add_versions("v2.2.2", "ae8b78a23c2929f26813d791757d0ef63a5e47e00ccfd3482743af1e837d9556") add_versions("v2.2.1", "11079a534cda791a8fc28d93ecb518bbd3804c0d4e9ca340ab24dcc21ad69a04") add_versions("v2.1.3", "9a992cf20d8df727df1cd389cc36039c92bbe86762b2c17a479f4f59a499b1ea") add_versions("v1.1.0", "5c4b2ad5493abd30b9475b14856641a8944c98077a36bd0760c1d83c65216e67") From a0fa94fd44be5add54bdea03e1848cb530696f0f Mon Sep 17 00:00:00 2001 From: Latias94 Date: Tue, 2 Jul 2024 13:54:03 +0800 Subject: [PATCH 288/671] update imgui to v1.90.9 (#4539) --- packages/i/imgui/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 4b7838f7a..14c371a33 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -6,6 +6,7 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/ocornut/imgui.git", {alias = "git"}) + add_versions("v1.90.9", "04943919721e874ac75a2f45e6eb6c0224395034667bf508923388afda5a50bf") add_versions("v1.90.8", "f606b4fb406aa0f8dad36d4a9dd3d6f0fd39f5f0693e7468abc02d545fb505ae") add_versions("v1.90.7", "872574217643d4ad7e9e6df420bb8d9e0d468fb90641c2bf50fd61745e05de99") add_versions("v1.90.6", "70b4b05ac0938e82b4d5b8d59480d3e2ca63ca570dfb88c55023831f387237ad") @@ -39,6 +40,7 @@ package("imgui") add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc") add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866") + add_versions("git:v1.90.9-docking", "v1.90.9-docking") add_versions("git:v1.90.8-docking", "v1.90.8-docking") add_versions("git:v1.90.7-docking", "v1.90.7-docking") add_versions("git:v1.90.6-docking", "v1.90.6-docking") From 3e574e7598ab3584e3ef5484b781320578e951cc Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Jul 2024 16:11:28 +0800 Subject: [PATCH 289/671] Update nsync to 1.29.2 (#4535) --- packages/n/nsync/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/nsync/xmake.lua b/packages/n/nsync/xmake.lua index 2b0bef301..d93d59bfb 100644 --- a/packages/n/nsync/xmake.lua +++ b/packages/n/nsync/xmake.lua @@ -6,6 +6,7 @@ package("nsync") add_urls("https://github.com/google/nsync/archive/refs/tags/$(version).tar.gz", "https://github.com/google/nsync.git") + add_versions("1.29.2", "1d63e967973733d2c97e841e3c05fac4d3fa299f01d14c86f2695594c7a4a2ec") add_versions("1.29.1", "3045a8922171430426b695edf794053182d245f6a382ddcc59ef4a6190848e98") add_versions("1.28.1", "0011fc00820088793b6a9ba97536173a25cffd3df2dc62616fb3a2824b3c43f5") From 9cb40b26cd6c2d6be9cbfc3a3765279487880b40 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Jul 2024 21:22:18 +0800 Subject: [PATCH 290/671] Auto-update quill to v4.5.0 (#4529) * Update quill to v4.5.0 * add patch --------- Co-authored-by: star9029 --- .../q/quill/patches/4.5.0/windows-arm.patch | 28 +++++++++++++++++++ packages/q/quill/xmake.lua | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 packages/q/quill/patches/4.5.0/windows-arm.patch diff --git a/packages/q/quill/patches/4.5.0/windows-arm.patch b/packages/q/quill/patches/4.5.0/windows-arm.patch new file mode 100644 index 000000000..e97d99cf3 --- /dev/null +++ b/packages/q/quill/patches/4.5.0/windows-arm.patch @@ -0,0 +1,28 @@ +diff --git a/quill/include/quill/core/Rdtsc.h b/quill/include/quill/core/Rdtsc.h +index 2a5203b..17b92b7 100644 +--- a/quill/include/quill/core/Rdtsc.h ++++ b/quill/include/quill/core/Rdtsc.h +@@ -45,7 +45,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept + __asm__ volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value)); + return static_cast(virtual_timer_value); + } +-#elif defined(__ARM_ARCH) ++#elif (defined(__ARM_ARCH) && !defined(_MSC_VER)) + QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept + { + #if (__ARM_ARCH >= 6) +@@ -69,13 +69,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept + // soft failover + return static_cast(std::chrono::system_clock::now().time_since_epoch().count()); + } +-#elif (defined(_M_ARM) || defined(_M_ARM64)) +-QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept +-{ +- // soft failover +- return static_cast(std::chrono::system_clock::now().time_since_epoch().count()); +-} +-#elif (defined(__PPC64__)) ++#elif (defined(_M_ARM) || defined(_M_ARM64) || defined(__PPC64__)) + QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept + { + // soft failover diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index 4377ce8fa..6c5d4c56f 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -6,6 +6,7 @@ package("quill") set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") + add_versions("v4.5.0", "70e8f4a76fd8a83b60d378f31b70dd09a9381686ebafdcd0db08fe099f518309") add_versions("v4.3.0", "c97bf3bfac6dfb7ed77fa08d945a490e302ba07e405539fda61985b39750cb29") add_versions("v3.8.0", "d3e1b349c5d6904c9644e5b79ec65f21692e8094a3d75241a7fe071076eef4dd") add_versions("v3.6.0", "ba9dc3df262f2e65c57904580cc8407eba9a462001340c17bab7ae1dccddb4bd") @@ -14,6 +15,8 @@ package("quill") add_versions("v2.9.1", "921e053118136f63cebb2ca1d7e42456fd0bf9626facb755884709092753c054") add_versions("v2.8.0", "0461a6c314e3d882f3b9ada487ef1bf558925272509ee41a9fd25f7776db6075") + add_patches("4.5.0", "patches/4.5.0/windows-arm.patch", "e7db1f07e1eea048798283f9865842c4754ed3d1ff220954cadd392ad4450cc3") + if is_plat("macosx") then add_extsources("brew::quill") end From 5a1f9dacc9bd989547c43af9cb1de33c7d0bc6fe Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 2 Jul 2024 21:24:48 +0800 Subject: [PATCH 291/671] libpopcnt: add package (#4541) --- packages/l/libpopcnt/xmake.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/l/libpopcnt/xmake.lua diff --git a/packages/l/libpopcnt/xmake.lua b/packages/l/libpopcnt/xmake.lua new file mode 100644 index 000000000..0ce359d5c --- /dev/null +++ b/packages/l/libpopcnt/xmake.lua @@ -0,0 +1,18 @@ +package("libpopcnt") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/kimwalisch/libpopcnt") + set_description("🚀 Fast C/C++ bit population count library") + set_license("BSD-2-Clause") + + add_urls("https://github.com/kimwalisch/libpopcnt/archive/refs/tags/$(version).tar.gz", + "https://github.com/kimwalisch/libpopcnt.git") + + add_versions("v3.1", "b4ea061f4c2e5385dff0dd032ad5a16c60dc0dd050391283afb463c0d62c19bd") + + on_install(function (package) + os.cp("libpopcnt.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cfuncs("popcnt", {includes = "libpopcnt.h"})) + end) From 5d64ae3d437eb91516275512cdd85df26738f006 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 2 Jul 2024 22:07:25 +0800 Subject: [PATCH 292/671] Auto-update ginkgo to v1.8.0 (#4537) * Update ginkgo to v1.8.0 * support windows x86 --------- Co-authored-by: Hoildkv <42310255+xq114@users.noreply.github.com> --- packages/g/ginkgo/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/g/ginkgo/xmake.lua b/packages/g/ginkgo/xmake.lua index b8b9d145e..0d8491751 100644 --- a/packages/g/ginkgo/xmake.lua +++ b/packages/g/ginkgo/xmake.lua @@ -6,6 +6,7 @@ package("ginkgo") add_urls("https://github.com/ginkgo-project/ginkgo/archive/refs/tags/$(version).tar.gz", "https://github.com/ginkgo-project/ginkgo.git") + add_versions("v1.8.0", "421efaed1be2ef11d230b79fc68bcf7e264a2c57ae52aff6dec7bd90f8d4ae30") add_versions("v1.7.0", "f4b362bcb046bc53fbe2e578662b939222d0c44b96449101829e73ecce02bcb3") add_configs("openmp", {description = "Compile OpenMP kernels for CPU.", default = false, type = "boolean"}) @@ -24,7 +25,7 @@ package("ginkgo") -- TODO: add hip and sycl end) - on_install("windows|x64", "windows|arm64", "macosx", "linux", function (package) + on_install("windows", "macosx", "linux", function (package) local configs = {"-DGINKGO_BUILD_TESTS=OFF", "-DGINKGO_BUILD_EXAMPLES=OFF", "-DGINKGO_BUILD_BENCHMARKS=OFF", "-DGINKGO_BUILD_REFERENCE=ON", "-DGINKGO_BUILD_MPI=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From 12e6b31b563e6f94ca6a6421e7d3235ba54c68ca Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 2 Jul 2024 22:18:27 +0800 Subject: [PATCH 293/671] fmt: add 11.0.0 version (#4533) * fmt: add 11.0.0 verson * fix unicode * add unicode config * Update xmake.lua --- packages/f/fmt/xmake.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index c42a03339..2a15107a6 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -1,10 +1,11 @@ package("fmt") - set_homepage("https://fmt.dev") set_description("fmt is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams.") set_urls("https://github.com/fmtlib/fmt/releases/download/$(version)/fmt-$(version).zip", "https://github.com/fmtlib/fmt.git") + + add_versions("11.0.0", "583ce480ef07fad76ef86e1e2a639fc231c3daa86c4aa6bcba524ce908f30699") add_versions("10.2.1", "312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9") add_versions("10.2.0", "8a942861a94f8461a280f823041cde8f620a6d8b0e0aacc98c15bb5a9dd92399") add_versions("10.1.1", "b84e58a310c9b50196cda48d5678d5fa0849bca19e5fdba6b684f0ee93ed9d1b") @@ -25,6 +26,7 @@ package("fmt") "3280569bced9ec08933f0ea37b6a4fef4538944d9046fe197ad63e22d1357cd4") add_configs("header_only", {description = "Use header only version.", default = false, type = "boolean"}) + add_configs("unicode", {description = "Enable Unicode support.", default = true, type = "boolean"}) if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::fmt") @@ -48,6 +50,9 @@ package("fmt") package:add("defines", "FMT_EXPORT") end end + if package:is_plat("windows") and package:config("unicode") then + package:add("cxxflags", "/utf-8") + end end) on_install(function (package) @@ -58,7 +63,8 @@ package("fmt") io.gsub("CMakeLists.txt", "MASTER_PROJECT AND CMAKE_GENERATOR MATCHES \"Visual Studio\"", "0") local configs = {"-DFMT_TEST=OFF", "-DFMT_DOC=OFF", "-DFMT_FUZZ=OFF", "-DCMAKE_CXX_VISIBILITY_PRESET=default"} table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DFMT_UNICODE=" .. (package:config("unicode") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) @@ -73,4 +79,3 @@ package("fmt") } ]]}, {configs = {languages = "c++14"}, includes = "fmt/format.h"})) end) - From f4e873870f4b166987a171ac993e51779941d5d8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 2 Jul 2024 22:22:43 +0800 Subject: [PATCH 294/671] algo_plus: add package (#4540) --- packages/a/algo_plus/xmake.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/a/algo_plus/xmake.lua diff --git a/packages/a/algo_plus/xmake.lua b/packages/a/algo_plus/xmake.lua new file mode 100644 index 000000000..3c25d7958 --- /dev/null +++ b/packages/a/algo_plus/xmake.lua @@ -0,0 +1,27 @@ +package("algo_plus") + set_kind("library", {headeronly = true}) + set_homepage("https://csrt-ntua.github.io/AlgoPlus") + set_description("AlgoPlus is a C++17 library for complex data structures and algorithms") + set_license("Apache-2.0") + + add_urls("https://github.com/CSRT-NTUA/AlgoPlus.git") + add_versions("2024.07.02", "1287dfc5bf666bace15af9c14d03e807b71efa82") + + add_deps("nlohmann_json") + + on_install(function (package) + for _, file in ipairs(os.files("src/**.h")) do + io.replace(file, "../../../../third_party/json.hpp", "nlohmann/json.hpp", {plain = true}) + end + os.cp("src/*", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + std::vector > data; + int CLUSTERS; + kmeans a(data, CLUSTERS); + } + ]]}, {configs = {languages = "c++17"}, includes = {"machine_learning/clustering/kmeans/kmeans.h"}})) + end) From 325055d222b4efd60267b1684bca902e8af76aa4 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 3 Jul 2024 09:32:44 +0800 Subject: [PATCH 295/671] ctpg: add package (#4542) * ctpg: add package * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/c/ctpg/xmake.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/c/ctpg/xmake.lua diff --git a/packages/c/ctpg/xmake.lua b/packages/c/ctpg/xmake.lua new file mode 100644 index 000000000..c9c697c31 --- /dev/null +++ b/packages/c/ctpg/xmake.lua @@ -0,0 +1,30 @@ +package("ctpg") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/peter-winter/ctpg") + set_description("Compile Time Parser Generator.") + set_license("MIT") + + add_urls("https://github.com/peter-winter/ctpg/archive/refs/tags/$(version).tar.gz", + "https://github.com/peter-winter/ctpg.git") + + add_versions("v1.3.7", "6cc7c34de4983e21070599fd5693b65ef08cd5c8f42612e43b47eda723623429") + + add_deps("cmake") + + on_install(function (package) + import("package.tools.cmake").install(package, { + "-DBUILD_TESTING=OFF" + }) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + using namespace ctpg; + using namespace ctpg::buffers; + + constexpr nterm list("list"); + constexpr char number_pattern[] = "[1-9][0-9]*"; + constexpr regex_term number("number"); + void test() {} + ]]}, {configs = {languages = "c++17"}, includes = "ctpg/ctpg.hpp"})) + end) From 8888c4a23310b39b7f5952c280eb1319423fbec3 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 3 Jul 2024 10:45:41 +0800 Subject: [PATCH 296/671] Update protobuf-cpp to 27.2 (#4549) --- packages/p/protobuf-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/protobuf-cpp/xmake.lua b/packages/p/protobuf-cpp/xmake.lua index a22cf2c78..379cdfccd 100644 --- a/packages/p/protobuf-cpp/xmake.lua +++ b/packages/p/protobuf-cpp/xmake.lua @@ -11,6 +11,7 @@ package("protobuf-cpp") end end}) + add_versions("27.2", "7b4554f730a41f5c595cef3502038a69b8954c30d8ec9c62a167d5e1ebd8c210") add_versions("27.0", "3e1148db090ff21226c1888ef39fa7bc7790042be21ff4289fd21ce1735f3455") add_versions("26.1", "e15c272392df84ae95797759c685a9225fe5e88838bab3e0650c29239bdfccdd") add_versions("3.8.0", "91ea92a8c37825bd502d96af9054064694899c5c7ecea21b8d11b1b5e7e993b5") From 8874167bf724d1f580ec86fcb38ca1a706511962 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 3 Jul 2024 10:45:44 +0800 Subject: [PATCH 297/671] Update reflect-cpp to v0.12.0 (#4548) --- packages/r/reflect-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 823b7992e..44daf6510 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -7,6 +7,7 @@ package("reflect-cpp") add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/getml/reflect-cpp.git") + add_versions("v0.12.0", "13d448dd5eaee13ecb7ab5cb61cb263c7111ba75230503adc823a888f68e1eaa") add_versions("v0.11.1", "e45f112fb3f14507a4aa53b99ae2d4ab6a4e7b2d5f04dd06fec00bf7faa7bbdc") add_versions("v0.10.0", "d2c8876d993ddc8c57c5804e767786bdb46a2bdf1a6cd81f4b14f57b1552dfd7") From 2cb483b5e0502afceaf3dbb35614ec20a5518466 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 3 Jul 2024 20:02:48 +0800 Subject: [PATCH 298/671] Update daw_json_link to v3.24.1 (#4552) --- packages/d/daw_json_link/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/daw_json_link/xmake.lua b/packages/d/daw_json_link/xmake.lua index b443ead0f..5d878a26c 100644 --- a/packages/d/daw_json_link/xmake.lua +++ b/packages/d/daw_json_link/xmake.lua @@ -7,6 +7,7 @@ package("daw_json_link") add_urls("https://github.com/beached/daw_json_link/archive/refs/tags/$(version).tar.gz", "https://github.com/beached/daw_json_link.git") + add_versions("v3.24.1", "439b4678377950f165e3d49d472c0676f0ef2fae3c5e6e7febddd5633f6e4f39") add_versions("v3.24.0", "7cecb2acde88028043e343ed4da7cde84c565a38125d3edb90db90daf881240a") add_versions("v3.23.2", "fd1234a14c126c79076e0b6e6eceae42afd465c419dc7a7393c69c28aa7f53d4") add_versions("v3.20.1", "046638bc4437d138cc8bdc882027d318ca3e267f33d1b419c5bdecb45b595a47") From 49d10b55413831c89fbebeffaa74b964cb645237 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 3 Jul 2024 20:03:16 +0800 Subject: [PATCH 299/671] Update ittapi to v3.25.1 (#4551) --- packages/i/ittapi/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/ittapi/xmake.lua b/packages/i/ittapi/xmake.lua index e2551a177..57c0e21c8 100644 --- a/packages/i/ittapi/xmake.lua +++ b/packages/i/ittapi/xmake.lua @@ -6,6 +6,7 @@ package("ittapi") add_urls("https://github.com/intel/ittapi/archive/refs/tags/$(version).tar.gz", "https://github.com/intel/ittapi.git") + add_versions("v3.25.1", "866a5a75a287a7440760146f99bd1093750c3fb5bf572c3bff2d4795628ebc7c") add_versions("v3.24.8", "4e57ece3286f3b902d17b1247710f0f6f9a370cc07d5e67631d3656ffac28d81") add_versions("v3.24.7", "2ff56c5c3f144b92e34af9bee451115f6076c9070ec92d361c3c07de8ff42649") add_versions("v3.24.6", "4e6cb42b6bd9e699e3dfbaf678e572f4292127dfee3312744137ac567064a26f") From 12301519c42acd15ba290de1b6cc00cae61d1e00 Mon Sep 17 00:00:00 2001 From: jj683 <87266000+jj683@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:27:07 +0200 Subject: [PATCH 300/671] Folly do not support fmt 11 (#4547) * Folly do not support fmt 10.2 * Relax fmt version restriction --- packages/f/folly/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 2219ec7ab..4f3c2ea61 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -40,7 +40,7 @@ package("folly") add_deps("cmake") add_deps("boost", {configs = {date_time = true, iostreams = true, context = true, filesystem = true, program_options = true, regex = true, system = true, thread = true}}) add_deps("libevent", {configs = {openssl = true}}) - add_deps("double-conversion", "gflags", "glog <0.7.0", "zlib", "fmt") + add_deps("double-conversion", "gflags", "glog <0.7.0", "zlib", "fmt <11") add_deps("bzip2", "lz4", "zstd", {optional = true}) if is_plat("linux") then add_syslinks("pthread") From 5c685498712f116dfabfbf787b093c847a8c5405 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 3 Jul 2024 23:44:55 +0800 Subject: [PATCH 301/671] Auto-update rocksdb to v9.2.1 (#4148) * Update rocksdb to v9.2.1 * fix cross build * disable cross compilation with mingw --------- Co-authored-by: star9029 --- packages/r/rocksdb/xmake.lua | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/r/rocksdb/xmake.lua b/packages/r/rocksdb/xmake.lua index 2d09c0a02..532042574 100644 --- a/packages/r/rocksdb/xmake.lua +++ b/packages/r/rocksdb/xmake.lua @@ -1,15 +1,16 @@ package("rocksdb") set_homepage("http://rocksdb.org") set_description("A library that provides an embeddable, persistent key-value store for fast storage.") + set_license("Apache-2.0") add_urls("https://github.com/facebook/rocksdb/archive/refs/tags/$(version).tar.gz", "https://github.com/facebook/rocksdb.git") + + add_versions("v9.2.1", "bb20fd9a07624e0dc1849a8e65833e5421960184f9c469d508b58ed8f40a780f") add_versions("v9.1.1", "54ca90dd782a988cd3ebc3e0e9ba9b4efd563d7eb78c5e690c2403f1b7d4a87a") add_versions("v9.0.0", "013aac178aa12837cbfa3b1e20e9e91ff87962ab7fdd044fd820e859f8964f9b") add_versions("v7.10.2", "4619ae7308cd3d11cdd36f0bfad3fb03a1ad399ca333f192b77b6b95b08e2f78") - add_deps("cmake") - add_configs("jemalloc", {description = "Build with JeMalloc.", default = false, type = "boolean"}) add_configs("liburing", {description = "Build with liburing.", default = false, type = "boolean"}) add_configs("snappy", {description = "Build with snappy.", default = false, type = "boolean"}) @@ -25,6 +26,14 @@ package("rocksdb") add_syslinks("shlwapi", "rpcrt4") end + add_deps("cmake") + + if on_check then + on_check("mingw", function (package) + assert(not package:is_cross(), "package(rocksdb/mingw): cross compilation only support <= v9.1.1") + end) + end + on_load(function (package) for name, enabled in pairs(package:configs()) do if (name ~= "rtti") and (not package:extraconf("configs", name, "builtin")) then @@ -35,7 +44,7 @@ package("rocksdb") end end) - on_install("linux", "windows|arm", "windows|x64", "macosx", "mingw|x86_64", function (package) + on_install("linux", "windows|arm64", "windows|x64", "macosx", "mingw|x86_64", function (package) local configs = { "-DWITH_ALL_TESTS=OFF", "-DWITH_TESTS=OFF", @@ -43,8 +52,9 @@ package("rocksdb") "-DWITH_CORE_TOOLS=OFF", "-DWITH_TOOLS=OFF", "-DFAIL_ON_WARNINGS=OFF", - "-DROCKSDB_INSTALL_ON_WINDOWS=ON"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + "-DROCKSDB_INSTALL_ON_WINDOWS=ON", + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DROCKSDB_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) for name, enabled in pairs(package:configs()) do if name == "rtti" then From b895e557f24cafdb1961334f073922e4ecf8f7c4 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 4 Jul 2024 02:08:55 +0800 Subject: [PATCH 302/671] Update rocksdb to v9.3.1 (#4527) Co-authored-by: star9029 --- packages/r/rocksdb/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rocksdb/xmake.lua b/packages/r/rocksdb/xmake.lua index 532042574..7fb0cb881 100644 --- a/packages/r/rocksdb/xmake.lua +++ b/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("v9.3.1", "e63f1be162998c0f49a538a7fe3fcac0e40cad77ee47d5592a65bca50f7c4620") add_versions("v9.2.1", "bb20fd9a07624e0dc1849a8e65833e5421960184f9c469d508b58ed8f40a780f") add_versions("v9.1.1", "54ca90dd782a988cd3ebc3e0e9ba9b4efd563d7eb78c5e690c2403f1b7d4a87a") add_versions("v9.0.0", "013aac178aa12837cbfa3b1e20e9e91ff87962ab7fdd044fd820e859f8964f9b") From a627341c6af884825445413654b672cda3762ddc Mon Sep 17 00:00:00 2001 From: Tab Ye <135727531+TabNahida@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:38:34 +0800 Subject: [PATCH 303/671] Add poco msys and mingw version (#4390) * add msys * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/p/poco/xmake.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/p/poco/xmake.lua b/packages/p/poco/xmake.lua index 0ffa62759..9ee37b291 100644 --- a/packages/p/poco/xmake.lua +++ b/packages/p/poco/xmake.lua @@ -21,7 +21,9 @@ package("poco") end add_configs("mysql", {description = "Enable mysql support.", default = false, type = "boolean"}) add_configs("postgresql", {description = "Enable postgresql support.", default = false, type = "boolean"}) + add_configs("mongodb", {description = "Enable mongodb support.", default = false, type = "boolean"}) add_configs("odbc", {description = "Enable odbc support.", default = is_plat("windows"), type = "boolean"}) + add_configs("sql_parser", {description = "Enable poco data sql parser.", default = false, type = "boolean"}) add_deps("cmake") add_deps("openssl", "sqlite3", "expat", "zlib") @@ -30,7 +32,7 @@ package("poco") add_syslinks("iphlpapi") end - on_load("windows", "linux", "macosx", function (package) + on_load(function (package) if package:config("postgresql") then package:add("deps", "postgresql") end @@ -44,7 +46,7 @@ package("poco") end end) - on_install("windows", "linux", "macosx", function (package) + on_install("windows", "linux", "macosx", "mingw|x86_64@msys", function (package) io.replace("XML/CMakeLists.txt", "EXPAT REQUIRED", "EXPAT CONFIG REQUIRED") io.replace("XML/CMakeLists.txt", "EXPAT::EXPAT", "expat::expat") io.replace("XML/CMakeLists.txt", "PUBLIC POCO_UNBUNDLED", "PUBLIC POCO_UNBUNDLED XML_DTD XML_NS") @@ -54,14 +56,16 @@ package("poco") io.replace("cmake/FindPCRE2.cmake", "NAMES pcre2-8", "NAMES pcre2-8-static pcre2-8", {plain = true}) io.replace("cmake/FindPCRE2.cmake", "IMPORTED_LOCATION \"${PCRE2_LIBRARY}\"", "IMPORTED_LOCATION \"${PCRE2_LIBRARY}\"\nINTERFACE_COMPILE_DEFINITIONS PCRE2_STATIC", {plain = true}) end + local configs = {"-DPOCO_UNBUNDLED=ON", "-DENABLE_TESTS=OFF", "-DENABLE_PDF=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") and not package:config("shared") then - table.insert(configs, "-DPOCO_MT=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + table.insert(configs, "-DPOCO_MT=" .. (package:has_runtime("MT", "MTd") and "ON" or "OFF")) end + if package:is_plat("windows") then - local vs_sdkver = import("core.tool.toolchain").load("msvc"):config("vs_sdkver") + local vs_sdkver = package:toolchain("msvc"):config("vs_sdkver") if vs_sdkver then local build_ver = string.match(vs_sdkver, "%d+%.%d+%.(%d+)%.?%d*") assert(tonumber(build_ver) >= 18362, "poco requires Windows SDK to be at least 10.0.18362.0") @@ -69,10 +73,12 @@ package("poco") table.insert(configs, "-DCMAKE_SYSTEM_VERSION=" .. vs_sdkver) end end - for _, lib in ipairs({"mysql", "postgresql", "odbc"}) do + + for _, lib in ipairs({"mysql", "postgresql", "odbc", "mongodb"}) do table.insert(configs, "-DENABLE_DATA_" .. lib:upper() .. "=" .. (package:config(lib) and "ON" or "OFF")) end - + table.insert(configs, "-DPOCO_DATA_NO_SQL_PARSER=" .. (package:config("sql_parser") and "OFF" or "ON")) + if package:config("mysql") then io.replace("Data/MySQL/include/Poco/Data/MySQL/MySQL.h", '#pragma comment(lib, "libmysql")', '', {plain = true}) local libmysql = package:dep("mysql"):fetch() From c045fccb374618c2d2d95a77d831e15ce224dc48 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 4 Jul 2024 10:18:59 +0800 Subject: [PATCH 304/671] Update pocketpy to v1.4.6 (#4557) --- packages/p/pocketpy/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pocketpy/xmake.lua b/packages/p/pocketpy/xmake.lua index 4f601aa17..1ecd7b1cb 100644 --- a/packages/p/pocketpy/xmake.lua +++ b/packages/p/pocketpy/xmake.lua @@ -6,6 +6,7 @@ package("pocketpy") add_urls("https://github.com/pocketpy/pocketpy/releases/download/$(version)/pocketpy.h") + add_versions("v1.4.6", "fbbe335e55fabfd41146ba3287bd93c992135da057e2da09e47dd7dc77682a04") add_versions("v1.4.5", "144f63ed8a21fd2a65e252df53939f7af453d544eb35570603af319ce1af5a46") add_versions("v0.9.0", "0da63afb3ea4ebb8b686bfe33b4c7556c0a927cd98ccf3c7a3fb4aa216fbf30b") From 381b2a854d31d27284a7d9d8c4c5b03d4fdee78b Mon Sep 17 00:00:00 2001 From: IMXEren <96839938+IMXEren@users.noreply.github.com> Date: Thu, 4 Jul 2024 07:51:36 +0530 Subject: [PATCH 305/671] metalang99: add package (#4544) * metalang99: add package * metalang99: test against older version * metalang99: improve test * metalang99: use c11 flag * metalang99: test latest version --- packages/m/metalang99/xmake.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/m/metalang99/xmake.lua diff --git a/packages/m/metalang99/xmake.lua b/packages/m/metalang99/xmake.lua new file mode 100644 index 000000000..9a3d694c8 --- /dev/null +++ b/packages/m/metalang99/xmake.lua @@ -0,0 +1,28 @@ +package("metalang99") + set_kind("library", { headeronly = true }) + set_homepage("https://github.com/Hirrolot/metalang99") + set_description("Full-blown preprocessor metaprogramming") + set_license("MIT") + + add_urls("https://github.com/Hirrolot/metalang99/archive/refs/tags/v$(version).tar.gz", + "https://github.com/Hirrolot/metalang99.git") + + add_versions("1.13.2", "912c6d91b872d34d2b6580d25afc38faccacf6c57462ab1c862010ff4afbf790") + add_versions("1.13.3", "91fe8d4edcc2e7f91c5b567a2b90f2e30c2373f1ebbabcf209ea0d74f63bc1e9") + + on_install(function(package) + os.cp("include", package:installdir()) + end) + + on_test(function(package) + assert(package:check_csnippets({test = [[ + typedef struct { + double width, height; + } Rect; + #define Rect_new(...) ML99_OVERLOAD(Rect_new_, __VA_ARGS__) + #define Rect_new_1(x) { x, x } + #define Rect_new_2(x, y) { x, y } + static Rect ra = Rect_new(7, 8); + static Rect rb = Rect_new(10); + ]]}, { configs = { languages = "c11" }, includes = "metalang99.h" })) + end) From 89fab6e570ecadee068500ee862a5ec4d8d127ad Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 4 Jul 2024 14:10:46 +0800 Subject: [PATCH 306/671] [folly related] update to 07.01 (#4558) --- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 1 + packages/m/mvfst/xmake.lua | 1 + packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 6 files changed, 6 insertions(+) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index b16ef576d..8060f198a 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -13,6 +13,7 @@ package("fbthrift") add_versions("2024.06.10", "a71481f9621891a5094d93a7c49d630ae544a1f056a93811742df6469b95bf64") add_versions("2024.06.17", "bfacfe477c1152df43a1681c31801f337ef7f67bc85507e09340abdd146cca7f") add_versions("2024.06.24", "78bbc48d1dfa8948580b780b3e827b4562102d2b9ca87db11b5a03ba277ac0e5") + add_versions("2024.07.01", "fa2302fdabf54780213cc3c5b7047226d7d9b91b8e1b9528330f1041c16b25eb") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index 487182720..86d69bebe 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -14,6 +14,7 @@ package("fizz") add_versions("2024.06.10", "dabc77e2238383fb37c19327af8ab864ba030d32e98f49b23008075a7afb6e19") add_versions("2024.06.17", "46e9d1b782a51b2c063390dc1161f26f2c77ef7a94ff8ccc4bdc272697cad8bb") add_versions("2024.06.24", "b5fd5fb3fe1cf20519ea91d6a0127505596f8c74c82cde9d54ea6ae92df86a50") + add_versions("2024.07.01", "002bca2765cb0889ec535eeb1950acf93af57638a2da9b2deacc522113625fcc") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 4f3c2ea61..eabd8ae47 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -22,6 +22,7 @@ package("folly") add_versions("2024.06.10", "27d7f825a9a3469b59a4f0a5ba2edac733407ea8dcc036e7ca9279d803ece1e9") add_versions("2024.06.17", "a26cda1cf5f9914f2ff05b5f8e4062d73f5a1ff71ee1911e734dc758313f6d30") add_versions("2024.06.24", "05ce0aed45c3a8125334438564364fbf32cd0d80b2a58c010cc821f5f16def50") + add_versions("2024.07.01", "a619f2759e821d4657aa9f1cae0dedcec2085e656e16a3c458e053a759d2ce83") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 8ec874c72..78a913b96 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -13,6 +13,7 @@ package("mvfst") add_versions("2024.06.10", "cc75889429a66463cc8e607ba09d584fb4e6d2e69b1127a538043b367c54a1ae") add_versions("2024.06.17", "748c744dae967a0ac25c89a6c7ccf62da2a4974ab45644d395fb7bc8f2e96dc1") add_versions("2024.06.24", "0a8c9bf9c9e1e293e56c0bd05e60606b2b299245510442a2e9af01519c040041") + add_versions("2024.07.01", "833fc3421cb8a17ab1c2b5542e76074bcb9cfd534ec5e459393dd1e774921907") add_patches(">=2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 252810b4b..04d747258 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -13,6 +13,7 @@ package("proxygen") add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4") add_versions("2024.06.17", "ab45c56c705d4c47595f3118cbaa2641be2bcd26c4d3b43e49e0c743a7272089") add_versions("2024.06.24", "4087de735334ba50f1e9c8df7c2040718d3c1ba9f9da102db5bbb7328a56b94a") + add_versions("2024.07.01", "eb5141c6e972b3957a15ab90feb3d56b68061b2ca8d463fe84776cce5c9629bb") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index 011cbf1d2..e7aaab400 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -14,6 +14,7 @@ package("wangle") add_versions("2024.06.10", "0328a481258a399a70ee2d003be8d482529b2f26e79ea2c218a32361051ea5be") add_versions("2024.06.17", "9d3e2349be6f8462243beebc1245f8d82808734060d9e3d9c0cf45bbda3c1f70") add_versions("2024.06.24", "a4e83d477ef3c8c208f30a811772f0d551e0728f42f45bf647a82f3b82d60baf") + add_versions("2024.07.01", "596dff77b6d6adef64e7b86f0f3e019c2ac787c92da0ddc18fbdaa4eca02cb3d") add_deps("cmake", "folly", "fizz") From 13036769634024b0089db3598bfc6e9b5ad4c3bd Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 4 Jul 2024 14:25:45 +0800 Subject: [PATCH 307/671] fix depot_tools (#4559) --- packages/d/depot_tools/xmake.lua | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/d/depot_tools/xmake.lua b/packages/d/depot_tools/xmake.lua index 2a4d9f740..c0ecbd117 100644 --- a/packages/d/depot_tools/xmake.lua +++ b/packages/d/depot_tools/xmake.lua @@ -21,10 +21,7 @@ package("depot_tools") on_install("linux", "macosx", "windows", function (package) import("core.base.global") - local ninja = path.join(package:dep("ninja"):installdir("bin"), "ninja" .. (is_host("windows") and ".exe" or "")) - if ninja and os.isfile(ninja) then - os.trycp(ninja, os.curdir()) - end + local sourcedir = os.curdir() os.cp("*", package:installdir()) os.cd(package:installdir()) -- maybe we need set proxy, e.g. `xmake g --proxy=http://127.0.0.1:xxxx` @@ -36,18 +33,27 @@ package("depot_tools") envs.HTTPS_PROXY = proxy envs.ALL_PROXY = proxy end - envs.PATH = table.join(os.curdir(), path.splitenv(os.getenv("PATH"))) + envs.PATH = table.join(sourcedir, path.splitenv(os.getenv("PATH"))) -- skip to check and update obsolete URL io.replace("./update_depot_tools", 'CANONICAL_GIT_URL="https://chromium.googlesource.com/chromium/tools/depot_tools.git"', 'CANONICAL_GIT_URL="https://github.com/xmake-mirror/depot_tools.git"', {plain = true}) + io.replace("./update_depot_tools", 'remote_url=$(eval "$GIT" config --get remote.origin.url)', + 'remote_url="https://github.com/xmake-mirror/depot_tools.git"', {plain = true}) + os.vrunv("git", {"config", "user.email", "you@example.com"}) + os.vrunv("git", {"config", "user.name", "me"}) + os.vrunv("git", {"commit", "-a", "-m", "..."}) -- we need fetch some files when running gclient for the first time if is_host("windows") then os.vrunv("gclient.bat", {"--verbose"}, {envs = envs}) else os.vrunv("./gclient", {"--verbose"}, {shell = true, envs = envs}) end - end) + local ninja = path.join(package:dep("ninja"):installdir("bin"), "ninja" .. (is_host("windows") and ".exe" or "")) + if ninja and os.isfile(ninja) then + os.cp(ninja, package:installdir()) + end + end) on_test(function (package) import("core.base.global") From 5ef0923d372368e411e4852697ad97527dfe92fd Mon Sep 17 00:00:00 2001 From: IMXEren <96839938+IMXEren@users.noreply.github.com> Date: Thu, 4 Jul 2024 12:09:07 +0530 Subject: [PATCH 308/671] datatype99: add package (#4545) * datatype99: add package * datatype99: test against older version * datatype99: improve test * datatype99: use c11 flag * Update xmake.lua --------- Co-authored-by: ruki --- packages/d/datatype99/xmake.lua | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 packages/d/datatype99/xmake.lua diff --git a/packages/d/datatype99/xmake.lua b/packages/d/datatype99/xmake.lua new file mode 100644 index 000000000..c530078a3 --- /dev/null +++ b/packages/d/datatype99/xmake.lua @@ -0,0 +1,41 @@ +package("datatype99") + set_kind("library", { headeronly = true }) + set_homepage("https://github.com/Hirrolot/datatype99") + set_description("Algebraic data types for C99") + set_license("MIT") + + add_urls("https://github.com/Hirrolot/datatype99/archive/refs/tags/v$(version).tar.gz", + "https://github.com/Hirrolot/datatype99.git") + + add_versions("1.6.3", "0ddc138eac8db19fa22c482d9a2ec107ff622fd7ce61bb0b1eefb4d8f522e01e") + add_versions("1.6.4", "f8488decc7ab035e3af77ee62e64fc678d5cb57831457f7270efe003e63d6f09") + + add_deps("metalang99") + + on_install(function(package) + os.cp("*.h", package:installdir("include")) + end) + + on_test(function(package) + assert(package:check_csnippets({test = [[ + #include + datatype( + BinaryTree, + (Leaf, int), + (Node, BinaryTree *, int, BinaryTree *) + ); + int sum(const BinaryTree *tree) { + match(*tree) { + of(Leaf, x) return *x; + of(Node, lhs, x, rhs) return sum(*lhs) + *x + sum(*rhs); + } + return -1; + } + void test() { + BinaryTree leaf5 = Leaf(5); + BinaryTree leaf7 = Leaf(7); + BinaryTree node = Node(&leaf5, 123, &leaf7); + assert(sum(&node) == 135); + } + ]]}, { configs = { languages = "c11" }, includes = "datatype99.h" })) + end) From 1e956bf4f5fd26d1c8e5064124c6eb5e447381e0 Mon Sep 17 00:00:00 2001 From: jj683 <87266000+jj683@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:32:19 +0200 Subject: [PATCH 309/671] Update decimal_for_cpp to 1.20 (#4563) --- packages/d/decimal_for_cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/decimal_for_cpp/xmake.lua b/packages/d/decimal_for_cpp/xmake.lua index fb9e3bd30..0c12f59d3 100644 --- a/packages/d/decimal_for_cpp/xmake.lua +++ b/packages/d/decimal_for_cpp/xmake.lua @@ -7,6 +7,7 @@ package("decimal_for_cpp") add_urls("https://github.com/vpiotr/decimal_for_cpp.git") + add_versions("1.20", "ad4f8f6cfe5096d7576d6ca782795c584abc1053") add_versions("1.19", "2bcf48af509690579cf2b521af46e7fb0157c8da") on_install(function (package) From feadc4000f700219620fb079c5085d8d2e3170a5 Mon Sep 17 00:00:00 2001 From: IMXEren <96839938+IMXEren@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:01:52 +0530 Subject: [PATCH 310/671] interface99: add package (#4546) * interface99: add package * interface99: test against older version * interface99: improve test * interface99: use c11 flag * interface99: test latest version --- packages/i/interface99/xmake.lua | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 packages/i/interface99/xmake.lua diff --git a/packages/i/interface99/xmake.lua b/packages/i/interface99/xmake.lua new file mode 100644 index 000000000..e8f943f71 --- /dev/null +++ b/packages/i/interface99/xmake.lua @@ -0,0 +1,46 @@ +package("interface99") + set_kind("library", { headeronly = true }) + set_homepage("https://github.com/Hirrolot/interface99") + set_description("Full-featured interfaces for C99") + set_license("MIT") + + add_urls("https://github.com/Hirrolot/interface99/archive/refs/tags/v$(version).tar.gz", + "https://github.com/Hirrolot/interface99.git") + + add_versions("1.0.0", "578c7e60fde4ea1c7fd3515e444c6a2e62a9095dac979516c0046a8ed008e3b2") + add_versions("1.0.1", "ddc7cd979cf9c964a4313a5e6bdc87bd8df669142f29c8edb71d2f2f7822d9aa") + + add_deps("metalang99") + + on_install(function(package) + os.cp("*.h", package:installdir("include")) + end) + + on_test(function(package) + assert(package:check_csnippets({test = [[ + #include + #define Shape_IFACE \ + vfunc( int, perim, const VSelf) \ + vfunc(void, scale, VSelf, int factor) + interface(Shape); + typedef struct { + int a, b; + } Rectangle; + int Rectangle_perim(const VSelf) { + VSELF(const Rectangle); + return (self->a + self->b) * 2; + } + void Rectangle_scale(VSelf, int factor) { + VSELF(Rectangle); + self->a *= factor; + self->b *= factor; + } + impl(Shape, Rectangle); + void test() { + Shape shape = DYN_LIT(Rectangle, Shape, {5, 7}); + assert(VCALL(shape, perim) == 24); + VCALL(shape, scale, 5); + assert(VCALL(shape, perim) == 120); + } + ]]}, { configs = { languages = "c11" }, includes = "interface99.h" })) + end) From c1a9d947c5286cac7929f1183960918ba893c3b5 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 5 Jul 2024 10:06:43 +0800 Subject: [PATCH 311/671] Update libdwarf to 0.10.1 (#4578) --- packages/l/libdwarf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libdwarf/xmake.lua b/packages/l/libdwarf/xmake.lua index 21e11b495..1e6ac7e34 100644 --- a/packages/l/libdwarf/xmake.lua +++ b/packages/l/libdwarf/xmake.lua @@ -4,6 +4,7 @@ package("libdwarf") set_license("LGPL-2.1") add_urls("https://github.com/davea42/libdwarf-code/releases/download/v$(version)/libdwarf-$(version).tar.xz") + add_versions("0.10.1", "b511a2dc78b98786064889deaa2c1bc48a0c70115c187900dd838474ded1cc19") add_versions("0.10.0", "17b7143c4b3e5949d1578c43e8f1e2abd9f1a47e725e6600fe7ac4833a93bb77") add_versions("0.9.2", "c1cd51467f9cb8459cd27d4071857abc56191cc5d4182d8bdd7744030f88f830") add_versions("0.9.1", "877e81b189edbb075e3e086f6593457d8353d4df09b02e69f3c0c8aa19b51bf4") From 5256542ec0d9781c465411bcc998541acacab370 Mon Sep 17 00:00:00 2001 From: Yiheng Wu <36156959+jingkaimori@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:10:35 +0800 Subject: [PATCH 312/671] update qtifw to 4.7.0 (#4571) --- packages/q/qtifw/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/q/qtifw/xmake.lua b/packages/q/qtifw/xmake.lua index 70ee3f8b9..457967491 100644 --- a/packages/q/qtifw/xmake.lua +++ b/packages/q/qtifw/xmake.lua @@ -4,7 +4,7 @@ package("qtifw") set_description("The Qt Installer Framework provides a set of tools and utilities to create installers for the supported desktop Qt platforms: Linux, Microsoft Windows, and macOS.") set_license("GPL-3") - add_versions("4.6.0", "dummy") + add_versions("4.7.0", "dummy") add_deps("aqt") From 98577d7c0528f9d6a9be8e05e54ca3edac184f34 Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Fri, 5 Jul 2024 03:12:00 +0100 Subject: [PATCH 313/671] libtomcrypt: add package (#4576) * libtomcrypt: add package * libtommath: fix test * libtommath: fix test again * libtommath: fix moving files * libtomcrypt: add limits * Update xmake.lua --------- Co-authored-by: ruki --- packages/l/libtomcrypt/xmake.lua | 33 ++++++++++++++++++++++++++++++++ packages/l/libtommath/xmake.lua | 4 ++++ 2 files changed, 37 insertions(+) create mode 100644 packages/l/libtomcrypt/xmake.lua diff --git a/packages/l/libtomcrypt/xmake.lua b/packages/l/libtomcrypt/xmake.lua new file mode 100644 index 000000000..62306ff9c --- /dev/null +++ b/packages/l/libtomcrypt/xmake.lua @@ -0,0 +1,33 @@ +package("libtomcrypt") + set_homepage("https://www.libtom.net") + set_description("A fairly comprehensive, modular and portable cryptographic toolkit.") + set_license("Unlicense") + + add_urls("https://github.com/libtom/libtomcrypt.git") + + add_versions("2024.06.26", "2302a3a89752b317d59e9cdb67d2d4eb9b53be8e") + + add_deps("libtommath", "cmake") + + on_install("!wasm and (macosx|!x86_64 or !macosx)", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") and package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + unsigned char input[] = "hello"; + unsigned long input_len = 5; + char out[256]; + unsigned long out_len; + base64_encode(input, input_len, out, &out_len); + } + ]]}, {configs = {languages = "cxx11"}})) + end) diff --git a/packages/l/libtommath/xmake.lua b/packages/l/libtommath/xmake.lua index abc16e8c7..11d9ad0e4 100644 --- a/packages/l/libtommath/xmake.lua +++ b/packages/l/libtommath/xmake.lua @@ -19,6 +19,8 @@ package("libtommath") add_deps("cmake") + add_includedirs("include", "include/libtommath") + on_install(function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) @@ -28,8 +30,10 @@ package("libtommath") table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") end import("package.tools.cmake").install(package, configs) + os.trymv(package:installdir("include/*.h"), package:installdir("include/libtommath")) end) on_test(function (package) assert(package:has_cfuncs("mp_init", {includes = "tommath.h"})) + assert(package:has_cfuncs("mp_init", {includes = "libtommath/tommath.h"})) end) From 648456ba23c334868754f3480d215f27a6ebc6cd Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 5 Jul 2024 10:12:21 +0800 Subject: [PATCH 314/671] try enable folly for windows (#4572) * update glog * try enable folly for windows --- packages/f/folly/xmake.lua | 8 ++++---- packages/g/glog/xmake.lua | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index eabd8ae47..7eec5bcd8 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -26,8 +26,8 @@ package("folly") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") - add_patches("<=2024.04.01", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") - add_patches("<=2024.04.01", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") + add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") + add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) @@ -65,7 +65,7 @@ package("folly") end end) - on_install("linux", "macosx", function (package) + on_install("windows|x64", "macosx", "linux", function (package) local configs = {"-DBUILD_TESTS=OFF", "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON", @@ -80,7 +80,7 @@ package("folly") import("package.tools.cmake").install(package, configs) end) - on_test("macosx", function (package) + on_test("windows|x64", "macosx", function (package) assert(package:check_cxxsnippets({test = [[ #include void test() { diff --git a/packages/g/glog/xmake.lua b/packages/g/glog/xmake.lua index 7ba5a17ac..2253e37b2 100644 --- a/packages/g/glog/xmake.lua +++ b/packages/g/glog/xmake.lua @@ -6,10 +6,11 @@ package("glog") add_urls("https://github.com/google/glog/archive/refs/tags/$(version).tar.gz", "https://github.com/google/glog.git") + add_versions("v0.7.1", "00e4a87e87b7e7612f519a41e491f16623b12423620006f59f5688bfd8d13b08") add_versions("v0.7.0", "375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11") - add_versions("v0.4.0", "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c") - add_versions("v0.5.0", "eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5") add_versions("v0.6.0", "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6") + add_versions("v0.5.0", "eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5") + add_versions("v0.4.0", "f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c") local configdeps = {gtest = "gtest", gflags = "gflags", unwind = "libunwind"} for config, dep in pairs(configdeps) do From 10ad5e22cf005b076496fe3f38a6b56d2b633b9b Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 5 Jul 2024 10:25:45 +0800 Subject: [PATCH 315/671] Update glaze to v2.9.5 (#4581) --- packages/g/glaze/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/glaze/xmake.lua b/packages/g/glaze/xmake.lua index 3663a61df..b41dcca03 100644 --- a/packages/g/glaze/xmake.lua +++ b/packages/g/glaze/xmake.lua @@ -6,6 +6,7 @@ package("glaze") add_urls("https://github.com/stephenberry/glaze/archive/refs/tags/$(version).tar.gz", "https://github.com/stephenberry/glaze.git") + add_versions("v2.9.5", "67fda0fb0cc701451c261bb1e0c94d63bafaaba13390527521e02a034eff085e") add_versions("v2.7.0", "8e3ee2ba725137cd4f61bc9ceb74e2225dc22b970da1c5a43d2a6833115adbfc") add_versions("v2.6.4", "79aff3370c6fe79be8e1774c4fab3e450a10444b91c2aa15aeebf5f54efedc5d") add_versions("v2.5.3", "f4c5eb83c80f1caa0feaa831715e9982203908ea140242cb061aead161e2b09b") From 8ba73122640e672469307fd8f844ea61e4a5c613 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 5 Jul 2024 10:25:47 +0800 Subject: [PATCH 316/671] Update daw_header_libraries to v2.106.1 (#4580) --- packages/d/daw_header_libraries/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/daw_header_libraries/xmake.lua b/packages/d/daw_header_libraries/xmake.lua index c27a361ed..841f6ba37 100644 --- a/packages/d/daw_header_libraries/xmake.lua +++ b/packages/d/daw_header_libraries/xmake.lua @@ -6,6 +6,7 @@ package("daw_header_libraries") add_urls("https://github.com/beached/header_libraries/archive/refs/tags/$(version).tar.gz", "https://github.com/beached/header_libraries.git") + add_versions("v2.106.1", "393815fbf249ca1220a216899cae3d2672ca193f9db228a0b99925a9b0f90854") add_versions("v2.106.0", "7838ada09afa69e7a42d742991c4b24b32ba27681e7b4dadf7b1e45c168937b5") add_versions("v2.102.0", "bc80936b439da0ef8a432175732e94573b14069a778b83d5f26ce8847f11ebb8") add_versions("v2.96.1", "2a9a5c33baa9e3adc1d82fa13a56522638af13cc39372a0c1c8f5c5d984f1464") From 96c88f10678ff5d2b54175dbd327fb13e9e47a71 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 5 Jul 2024 10:29:51 +0800 Subject: [PATCH 317/671] update depot_tools (#4574) --- packages/d/depot_tools/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/depot_tools/xmake.lua b/packages/d/depot_tools/xmake.lua index c0ecbd117..a46c28002 100644 --- a/packages/d/depot_tools/xmake.lua +++ b/packages/d/depot_tools/xmake.lua @@ -7,6 +7,7 @@ package("depot_tools") "https://chromium.googlesource.com/chromium/tools/depot_tools.git") add_versions("2022.2.1", "8a6d00f116d6de9d5c4e92acb519fd0859c6449a") add_versions("2024.2.29", "50de666ba40a4808daf9791fece3d8a43228a1de") + add_versions("2024.7.4", "452fe3be37f78fbecefa1b4b0d359531bcd70d0d") -- we use external ninja instead of depot_tools/ninja which eating ram until VM exhaustion (16GB) add_deps("ninja", {private = true, system = false}) From 13ee9004e49a5bc21937be1345d10b828a39923e Mon Sep 17 00:00:00 2001 From: Latias94 Date: Fri, 5 Jul 2024 14:02:25 +0800 Subject: [PATCH 318/671] update assimp to v5.4.2 (#4582) --- packages/a/assimp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/assimp/xmake.lua b/packages/a/assimp/xmake.lua index aedd90ab5..e45a17f3c 100644 --- a/packages/a/assimp/xmake.lua +++ b/packages/a/assimp/xmake.lua @@ -5,6 +5,7 @@ package("assimp") set_urls("https://github.com/assimp/assimp/archive/refs/tags/$(version).zip", "https://github.com/assimp/assimp.git") + add_versions("v5.4.2", "7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a") add_versions("v5.4.1", "08837ee7c50b98ca72d2c9e66510ca6640681db8800aa2d3b1fcd61ccc615113") add_versions("v5.4.0", "0f3698e9ba0110df0b636dbdd95706e7e28d443ff3dbaf5828926c23bfff778d") add_versions("v5.3.1", "f4020735fe4601de9d85cb335115568cce0e027a65e546dd8895081696d624bd") From cbd315bec5c319f3cdba20533aec44b70f8d6f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 5 Jul 2024 13:47:10 +0200 Subject: [PATCH 319/671] assimp: Fix 5.4.2 hash (#4583) --- packages/a/assimp/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/a/assimp/xmake.lua b/packages/a/assimp/xmake.lua index e45a17f3c..d87b036fb 100644 --- a/packages/a/assimp/xmake.lua +++ b/packages/a/assimp/xmake.lua @@ -5,7 +5,7 @@ package("assimp") set_urls("https://github.com/assimp/assimp/archive/refs/tags/$(version).zip", "https://github.com/assimp/assimp.git") - add_versions("v5.4.2", "7414861a7b038e407b510e8b8c9e58d5bf8ca76c9dfe07a01d20af388ec5086a") + add_versions("v5.4.2", "03e38d123f6bf19a48658d197fd09c9a69db88c076b56a476ab2da9f5eb87dcc") add_versions("v5.4.1", "08837ee7c50b98ca72d2c9e66510ca6640681db8800aa2d3b1fcd61ccc615113") add_versions("v5.4.0", "0f3698e9ba0110df0b636dbdd95706e7e28d443ff3dbaf5828926c23bfff778d") add_versions("v5.3.1", "f4020735fe4601de9d85cb335115568cce0e027a65e546dd8895081696d624bd") From 4eff67fba4c91125d096d3dac60efa75baba6e0b Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Fri, 5 Jul 2024 19:48:19 +0800 Subject: [PATCH 320/671] add commata packages (#4569) * add commata packages * impoove the script of commata * add license and change the way of os.cp writing * add commit url * Update xmake.lua --------- Co-authored-by: benny WU Co-authored-by: ruki --- packages/c/commata/xmake.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/c/commata/xmake.lua diff --git a/packages/c/commata/xmake.lua b/packages/c/commata/xmake.lua new file mode 100644 index 000000000..f3fff7769 --- /dev/null +++ b/packages/c/commata/xmake.lua @@ -0,0 +1,22 @@ +package("commata") + set_kind("library", {headeronly = true}) + set_homepage("https://furfurylic.github.io/commata/CommataSpecification.xml") + set_description("Just another header-only C++17 CSV parser") + set_license("Unlicense") + + add_urls("https://github.com/furfurylic/commata/archive/refs/tags/$(version)-rc.2.zip", + "https://github.com/furfurylic/commata.git") + add_versions("v1.0.0", "5f9ef542d10d5d04d296e609ae8931e09a157761c86630d71b2f397c6a205a75") + + on_install(function (package) + os.cp("include", package:installdir()) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + using commata::stored_table; + void test() { + stored_table table; + } + ]]}, {configs = {languages = "c++17"}, includes = "commata/stored_table.hpp"})) + end) From 1c5fc88262b3e8a0a81c86043db813a3dc28aedb Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 5 Jul 2024 20:21:16 +0800 Subject: [PATCH 321/671] actor-framework: add v1.0.0 (#4584) --- packages/a/actor-framework/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/a/actor-framework/xmake.lua b/packages/a/actor-framework/xmake.lua index 44edaaaa5..008a4fc81 100644 --- a/packages/a/actor-framework/xmake.lua +++ b/packages/a/actor-framework/xmake.lua @@ -6,6 +6,7 @@ package("actor-framework") add_urls("https://github.com/actor-framework/actor-framework/archive/refs/tags/$(version).tar.gz", "https://github.com/actor-framework/actor-framework.git") + add_versions("1.0.0", "602018239d23a1805d35ebda704fd5c969a0693fc513fcf7459063b628459e5b") add_versions("0.19.6", "48dc4c4abf5ab5a7c6f84b9259cc8be1b02c601d31893647ab44e143cdc4b6d5") add_versions("0.19.2", "aa3fcc494424e0e20b177125458a6a6ed39c751a3d3d5193054e88bdf8a146d2") @@ -37,6 +38,7 @@ package("actor-framework") { "-DCAF_ENABLE_EXAMPLES=OFF", "-DCAF_ENABLE_TESTING=OFF", + "-DCAF_ENABLE_TESTING=OFF", "-DCAF_ENABLE_TOOLS=OFF", } table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) From 117ab12b31277617f7a32ce705fdc9cce17b5005 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:36:37 +0800 Subject: [PATCH 322/671] add libatomic_ops (#4479) * add libatomic_ops * Update xmake.lua * Update xmake.lua --------- Co-authored-by: heheda123123 Co-authored-by: star9029 --- packages/l/libatomic_ops/xmake.lua | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/l/libatomic_ops/xmake.lua diff --git a/packages/l/libatomic_ops/xmake.lua b/packages/l/libatomic_ops/xmake.lua new file mode 100644 index 000000000..21da831a0 --- /dev/null +++ b/packages/l/libatomic_ops/xmake.lua @@ -0,0 +1,38 @@ +package("libatomic_ops") + set_homepage("https://github.com/ivmai/libatomic_ops") + set_description("The atomic_ops project (Atomic memory update operations portable implementation)") + set_license("GPL-2.0") + + add_urls("https://github.com/ivmai/libatomic_ops/releases/download/v$(version)/libatomic_ops-$(version).tar.gz", + "https://github.com/ivmai/libatomic_ops.git") + + add_versions("7.8.2", "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51") + + add_configs("gpl", {description = "Build atomic_ops_gpl library", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("pthread") + end + + add_deps("cmake") + + on_install(function (package) + local configs = {"-Denable_docs=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + + table.insert(configs, "-Denable_gpl=" .. (package:config("gpl") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + + if package:config("shared") and package:is_plat("windows", "mingw", "cygwin") then + package:add("defines", "AO_DLL") + end + end) + + on_test(function (package) + assert(package:check_csnippets({test = [[ + void test() { + AO_t atomic_var; + } + ]]}, {includes = "atomic_ops.h"})) + end) From 2d6a3692518c77317fb60e7c30dc8701badc43e3 Mon Sep 17 00:00:00 2001 From: Yiheng Wu <36156959+jingkaimori@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:55:16 +0800 Subject: [PATCH 323/671] upgrade fluidsynth and fix missing symbol in recent xmake (#4575) * upgrade fluidsynth and fix missing symbol in recent xmake * update patch for newer version * apply patch on linux * add systemd option for linux * fix line ending of patch on linux * fix deps * lower checksum * fix checksum * fix deps again * improve cmake finder of transitive dependencies * apply changes to version 2.3.3 --- .../patches/{ => 2.3.3}/find-intl.patch | 83 ++-- .../fluidsynth/patches/2.3.5/find-intl.patch | 385 ++++++++++++++++++ packages/f/fluidsynth/xmake.lua | 16 +- 3 files changed, 423 insertions(+), 61 deletions(-) rename packages/f/fluidsynth/patches/{ => 2.3.3}/find-intl.patch (84%) create mode 100644 packages/f/fluidsynth/patches/2.3.5/find-intl.patch diff --git a/packages/f/fluidsynth/patches/find-intl.patch b/packages/f/fluidsynth/patches/2.3.3/find-intl.patch similarity index 84% rename from packages/f/fluidsynth/patches/find-intl.patch rename to packages/f/fluidsynth/patches/2.3.3/find-intl.patch index 3bc98152a..79b3a6cac 100644 --- a/packages/f/fluidsynth/patches/find-intl.patch +++ b/packages/f/fluidsynth/patches/2.3.3/find-intl.patch @@ -124,41 +124,35 @@ index 2de2f41..0000000 -mark_as_advanced(FLAC_LIBRARY FLAC_INCLUDE_DIR FLAC++_LIBRARY - FLAC++_INCLUDE_DIR) diff --git a/cmake_admin/FindGLib2.cmake b/cmake_admin/FindGLib2.cmake -index f6fa6f1..b7821bf 100644 +index f6fa6f1..e29d4b1 100644 --- a/cmake_admin/FindGLib2.cmake +++ b/cmake_admin/FindGLib2.cmake -@@ -64,6 +64,14 @@ find_library( - NAMES "gobject-2.0" - HINTS "${PC_GOBJECT2_LIBDIR}") - -+find_library( -+ Intl_LIBRARY -+ NAMES "intl") -+ -+find_library( -+ Pcre_LIBRARY -+ NAMES "pcre") -+ - # GLib stores its config in lib/glib-2.0/include - get_filename_component(_glib2_libdir "${GLib2_glib-2_LIBRARY}" PATH) - find_path( -@@ -102,12 +110,15 @@ find_package_handle_standard_args( - "GLib2_INCLUDE_DIRS" - VERSION_VAR "GLib2_VERSION") - -+get_filename_component(_intl_path "${Intl_LIBRARY}" DIRECTORY) -+ - # Create the targets - if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) - # Handle transitive dependencies +@@ -108,6 +108,24 @@ if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) if(PC_GLIB2_FOUND) get_target_properties_from_pkg_config("${GLib2_glib-2_LIBRARY}" "PC_GLIB2" "_glib2") -+ list(APPEND _glib2_link_directories "${_intl_path}") ++ ++ find_library( ++ Intl_LIBRARY ++ NAMES "intl") ++ if(NOT "${Intl_LIBRARY}" STREQUAL "Intl_LIBRARY-NOTFOUND") ++ get_filename_component(_intl_path "${Intl_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_intl_path}") ++ list(APPEND _glib2_link_libraries "intl") ++ endif() ++ ++ find_library( ++ Iconv_LIBRARY ++ NAMES "iconv") ++ if(NOT "${Iconv_LIBRARY}" STREQUAL "Iconv_LIBRARY-NOTFOUND") ++ get_filename_component(_iconv_path "${Iconv_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_iconv_path}") ++ list(APPEND _glib2_link_libraries "iconv") ++ endif() else() find_package(Intl QUIET) find_package(Iconv QUIET) -@@ -118,36 +129,9 @@ if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) +@@ -118,35 +136,14 @@ if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) list(APPEND _glib2_link_libraries "Threads::Threads") endif() list(APPEND _glib2_link_libraries ${MATH_LIBRARY}) @@ -191,36 +185,17 @@ index f6fa6f1..b7821bf 100644 - else() - list(APPEND _glib2_link_libraries "pcre") - endif() ++ endif() ++ find_library( ++ Pcre_LIBRARY ++ NAMES "pcre2-8") ++ if(NOT "${Pcre_LIBRARY}" STREQUAL "Pcre_LIBRARY-NOTFOUND") ++ get_filename_component(_pcre_path "${Pcre_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_pcre_path}") ++ list(APPEND _glib2_link_libraries "pcre2-8") endif() -+ get_filename_component(_pcre_path "${Pcre_LIBRARY}" DIRECTORY) -+ list(APPEND _glib2_link_directories "${_pcre_path}") # pkg_check_modules consider these as LDFLAGS_OTHER rather instead of - # libraries -@@ -172,6 +156,7 @@ if(GLib2_gthread-2_LIBRARY AND NOT TARGET GLib2::gthread-2) - if(PC_GTHREAD2_FOUND) - get_target_properties_from_pkg_config("${GLib2_gthread-2_LIBRARY}" - "PC_GTHREAD2" "_gthread2") -+ list(APPEND _glib2_link_directories "${_intl_path}") - else() - set(_gthread2_link_libraries "Threads::Threads" "GLib2::glib-2") - endif() -@@ -191,6 +176,7 @@ if(GLib2_gmodule-2_LIBRARY AND NOT TARGET GLib2::gmodule-2) - if(PC_GMODULE2_FOUND) - get_target_properties_from_pkg_config("${GLib2_gmodule-2_LIBRARY}" - "PC_GMODULE2" "_gmodule2") -+ list(APPEND _glib2_link_directories "${_intl_path}") - else() - set(_gmodule2_link_libraries "GLib2::glib-2") - endif() -@@ -210,6 +196,7 @@ if(GLib2_gobject-2_LIBRARY AND NOT TARGET GLib2::gobject-2) - if(PC_GOBJECT2_FOUND) - get_target_properties_from_pkg_config("${GLib2_gobject-2_LIBRARY}" - "PC_OBJECT2" "_gobject2") -+ list(APPEND _glib2_link_directories "${_intl_path}") - else() - find_package(libffi QUIET) - set(_gobject2_link_libraries "libffi" "GLib2::glib-2") diff --git a/cmake_admin/FindSndFile.cmake b/cmake_admin/FindSndFile.cmake deleted file mode 100644 index d77333b..0000000 diff --git a/packages/f/fluidsynth/patches/2.3.5/find-intl.patch b/packages/f/fluidsynth/patches/2.3.5/find-intl.patch new file mode 100644 index 000000000..d85e78f1e --- /dev/null +++ b/packages/f/fluidsynth/patches/2.3.5/find-intl.patch @@ -0,0 +1,385 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 606bf8e..0f78e48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -356,6 +356,8 @@ endif ( WIN32 ) + # Check for threads and math + find_package ( Threads REQUIRED ) + ++unset ( HAS_LIBM CACHE ) ++unset ( MATH_LIBRARY CACHE ) + find_library ( HAS_LIBM NAMES "m" ) + if ( HAS_LIBM ) + set ( MATH_LIBRARY "m" ) +diff --git a/cmake_admin/FindFLAC.cmake b/cmake_admin/FindFLAC.cmake +deleted file mode 100644 +index 2de2f41..0000000 +--- a/cmake_admin/FindFLAC.cmake ++++ /dev/null +@@ -1,106 +0,0 @@ +-#[=======================================================================[.rst: +-FindFLAC +-------- +- +-Finds the FLAC library. +- +-Imported Targets +-^^^^^^^^^^^^^^^^ +- +-This module provides the following imported targets, if found: +- +-``FLAC::FLAC`` +- The FLAC C library. +-``FLAC::FLAC++`` +- The FLAC C++ library. +- +-Result Variables +-^^^^^^^^^^^^^^^^ +- +-This will define the following variables: +- +-``FLAC_FOUND`` +- True if both libraries were found. +-``FLAC_FLAC_FOUND`` +- True if the C library was found. +-``FLAC_FLAC++_FOUND`` +- True if the C++ library was found.. +- +-#]=======================================================================] +- +-# Use pkg-config if available +-find_package(PkgConfig QUIET) +-pkg_check_modules(PC_FLAC QUIET flac) +-pkg_check_modules(PC_FLAC++ QUIET flac++) +- +-# Find the headers and libraries +-find_path( +- FLAC_INCLUDE_DIR +- NAMES "FLAC/all.h" +- HINTS "PC_FLAC_INCLUDEDIR") +- +-find_path( +- FLAC++_INCLUDE_DIR +- NAMES "FLAC++/all.h" +- HINTS "PC_FLAC++_INCLUDEDIR") +- +-find_library( +- FLAC_LIBRARY +- NAMES "FLAC" +- HINTS "${PC_FLAC_LIBDIR}") +- +-find_library( +- FLAC++_LIBRARY +- NAMES "FLAC++" +- HINTS "${PC_FLAC++_LIBDIR}") +- +-# Handle transitive dependencies +-if(PC_FLAC_FOUND) +- get_target_properties_from_pkg_config("${FLAC_LIBRARY}" "PC_FLAC" "_flac") +-else() +- if(NOT TARGET "Ogg::ogg") +- find_package(Ogg QUIET) +- endif() +- set(_flac_link_libraries "Ogg::ogg" ${MATH_LIBRARY}) +-endif() +- +-if(PC_FLAC++_FOUND) +- get_target_properties_from_pkg_config("${FLAC++_LIBRARY}" "PC_FLAC++" +- "_flac++") +-else() +- set(_flac++_link_libraries "FLAC::FLAC") +-endif() +- +-# Forward the result to CMake +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args( +- FLAC REQUIRED_VARS "FLAC_LIBRARY" "FLAC_INCLUDE_DIR" "FLAC++_LIBRARY" +- "FLAC++_INCLUDE_DIR") +- +-# Create the target +-if(FLAC_FOUND AND NOT TARGET FLAC::FLAC) +- add_library(FLAC::FLAC UNKNOWN IMPORTED) +- set_target_properties( +- FLAC::FLAC +- PROPERTIES IMPORTED_LOCATION "${FLAC_LIBRARY}" +- INTERFACE_COMPILE_OPTIONS "${_flac_compile_options}" +- INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}" +- INTERFACE_LINK_LIBRARIES "${_flac_link_libraries}" +- INTERFACE_LINK_DIRECTORIES "${_flac_link_directories}") +- set(FLAC_FLAC_FOUND TRUE) +-endif() +- +-if(FLAC_FOUND AND NOT TARGET FLAC::FLAC++) +- add_library(FLAC::FLAC++ UNKNOWN IMPORTED) +- set_target_properties( +- FLAC::FLAC++ +- PROPERTIES IMPORTED_LOCATION "${FLAC++_LIBRARY}" +- INTERFACE_COMPILE_OPTIONS "${_flac++_compile_options}" +- INTERFACE_INCLUDE_DIRECTORIES "${FLAC++_INCLUDE_DIR}" +- INTERFACE_LINK_LIBRARIES "${_flac++_link_libraries}" +- INTERFACE_LINK_DIRECTORIES "${_flac++_link_directories}") +- set(FLAC_FLAC++_FOUND TRUE) +-endif() +- +-mark_as_advanced(FLAC_LIBRARY FLAC_INCLUDE_DIR FLAC++_LIBRARY +- FLAC++_INCLUDE_DIR) +diff --git a/cmake_admin/FindGLib2.cmake b/cmake_admin/FindGLib2.cmake +index f6fa6f1..e29d4b1 100644 +--- a/cmake_admin/FindGLib2.cmake ++++ b/cmake_admin/FindGLib2.cmake +@@ -108,6 +108,24 @@ if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) + if(PC_GLIB2_FOUND) + get_target_properties_from_pkg_config("${GLib2_glib-2_LIBRARY}" "PC_GLIB2" + "_glib2") ++ ++ find_library( ++ Intl_LIBRARY ++ NAMES "intl") ++ if(NOT "${Intl_LIBRARY}" STREQUAL "Intl_LIBRARY-NOTFOUND") ++ get_filename_component(_intl_path "${Intl_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_intl_path}") ++ list(APPEND _glib2_link_libraries "intl") ++ endif() ++ ++ find_library( ++ Iconv_LIBRARY ++ NAMES "iconv") ++ if(NOT "${Iconv_LIBRARY}" STREQUAL "Iconv_LIBRARY-NOTFOUND") ++ get_filename_component(_iconv_path "${Iconv_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_iconv_path}") ++ list(APPEND _glib2_link_libraries "iconv") ++ endif() + else() + find_package(Intl QUIET) + find_package(Iconv QUIET) +@@ -118,35 +136,14 @@ if(GLib2_glib-2_LIBRARY AND NOT TARGET GLib2::glib-2) + list(APPEND _glib2_link_libraries "Threads::Threads") + endif() + list(APPEND _glib2_link_libraries ${MATH_LIBRARY}) +- +- # Glib can link to either PCRE 1 or 2 +- find_library( +- _pcre2_8bit_library +- NAMES "pcre2-8" +- HINTS "${PC_GLIB2_LIBDIR}") +- if(_pcre2_8bit_library) +- include(CheckCSourceCompiles) +- set(_backup_includes ${CMAKE_REQUIRED_INCLUDES}) +- set(_backup_libraries ${CMAKE_REQUIRED_LIBRARIES}) +- set(_backup_libdir ${CMAKE_REQUIRED_LIBRARIES}) +- set(CMAKE_REQUIRED_INCLUDES "${GLib2_INCLUDE_DIRS}") +- set(CMAKE_REQUIRED_LIBRARIES +- "${GLib2_glib-2_LIBRARY}" "${_glib2_link_libraries}" +- "${_pcre2_8bit_library}") +- check_c_source_compiles( +- "#include +- int main(){ +- g_regex_error_quark(); +- }" +- GLIB2_USES_PCRE2) +- set(CMAKE_REQUIRED_INCLUDES ${_backup_includes}) +- set(CMAKE_REQUIRED_LIBRARIES ${_backup_libraries}) +- endif() +- if(GLIB2_USES_PCRE2) +- list(APPEND _glib2_link_libraries "${_pcre2_8bit_library}") +- else() +- list(APPEND _glib2_link_libraries "pcre") +- endif() ++ endif() ++ find_library( ++ Pcre_LIBRARY ++ NAMES "pcre2-8") ++ if(NOT "${Pcre_LIBRARY}" STREQUAL "Pcre_LIBRARY-NOTFOUND") ++ get_filename_component(_pcre_path "${Pcre_LIBRARY}" DIRECTORY) ++ list(APPEND _glib2_link_directories "${_pcre_path}") ++ list(APPEND _glib2_link_libraries "pcre2-8") + endif() + + # pkg_check_modules consider these as LDFLAGS_OTHER rather instead of +diff --git a/cmake_admin/FindSndFile.cmake b/cmake_admin/FindSndFile.cmake +deleted file mode 100644 +index 271bb06..0000000 +--- a/cmake_admin/FindSndFile.cmake ++++ /dev/null +@@ -1,181 +0,0 @@ +-#[=======================================================================[.rst: +-FindSndFile +-------- +- +-Finds the SndFile library. +- +-Imported Targets +-^^^^^^^^^^^^^^^^ +- +-This module provides the following imported targets, if found: +- +-``SndFile::sndfile`` +- The SndFile library +- +-Result Variables +-^^^^^^^^^^^^^^^^ +- +-This will define the following variables: +- +-``SndFile_FOUND`` +- True if the system has the SndFile library. +-``SndFile_VERSION`` +- The version of the SndFile library which was found. +-``SndFile_WITH_EXTERNAL_LIBS`` +- True if the library was built with Xiph codecs. +- +-For compatibility with upstream, the following variables are also set: +- +-``SndFile_WITH_MPEG`` +-``SndFile_VERSION_MAJOR`` +-``SndFile_VERSION_MINOR`` +-``SndFile_VERSION_PATCH`` +-``SndFile_LIBRARY`` +-``SndFile_LIBRARIES`` +-``SNDFILE_LIBRARY`` +-``SNDFILE_LIBRARIES`` +-``SNDFILE_INCLUDE_DIR`` +- +-#]=======================================================================] +- +-# Use pkg-config if available +-find_package(PkgConfig QUIET) +-pkg_check_modules(PC_SNDFILE QUIET sndfile) +- +-# Find the headers and libraries +-find_path( +- SndFile_INCLUDE_DIR +- NAMES "sndfile.h" +- HINTS "${PC_SNDFILE_INCLUDEDIR}") +- +-find_library( +- _sndfile_library +- NAMES "sndfile" "sndfile-1" +- HINTS "${PC_SNDFILE_LIBDIR}") +- +-# Get version from pkg-config or read the config header +-if(PC_SNDFILE_VERSION) +- set(SndFile_VERSION "${PC_SNDFILE_VERSION}") +- string(REPLACE "." ";" _sndfile_version_list "${SndFile_VERSION}") +- list(GET _sndfile_version_list 0 SndFile_VERSION_MAJOR) +- list(GET _sndfile_version_list 1 SndFile_VERSION_MINOR) +- list(GET _sndfile_version_list 2 SndFile_VERSION_PATCH) +-elseif(SndFile_INCLUDE_DIR) +- file(READ "${SndFile_INCLUDE_DIR}/sndfile.h" _sndfile_h) +- if("#define SNDFILE_1" MATCHES _snfile_h) +- set(SndFile_VERSION "1") +- set(SndFile_VERSION_MAJOR "1") +- endif() +-endif() +- +-# Check the features SndFile was built with +-# 2024-01-02: Recent versions of libsndfile don't seem to provide a pkgconfig file and older version who did are lacking private libraries like OGG. +-if(FALSE) #PC_SNDFILE_FOUND +- if("vorbis" IN_LIST PC_SNDFILE_STATIC_LIBRARIES) +- set(SndFile_WITH_EXTERNAL_LIBS TRUE) +- endif() +- if("mpg123" IN_LIST PC_SNDFILE_STATIC_LIBRARIES) +- set(SndFile_WITH_MPEG TRUE) +- endif() +-elseif(_sndfile_library) +- # sndfile may need any of these libraries +- find_package(Ogg 1.3 QUIET) +- find_package(Vorbis QUIET) +- find_package(FLAC QUIET) +- find_package(Opus QUIET) +- find_package(mp3lame QUIET) +- find_package(mpg123 QUIET) +- +- if(NOT CMAKE_CROSSCOMPILING) +- include(CheckSourceRuns) +- set(_backup_includes ${CMAKE_REQUIRED_INCLUDES}) +- set(_backup_libraries ${CMAKE_REQUIRED_LIBRARIES}) +- set(CMAKE_REQUIRED_INCLUDES "${SndFile_INCLUDE_DIR}") +- set(CMAKE_REQUIRED_LIBRARIES "${_sndfile_library}") +- +- set(_optional_libs "MPG123::libmpg123" "mp3lame::mp3lame" "FLAC::FLAC" +- "Opus::opus" "Vorbis::vorbisenc" "Ogg::ogg") +- foreach(_target ${_optional_libs}) +- if(TARGET "${_target}") +- list(APPEND CMAKE_REQUIRED_LIBRARIES "${_target}") +- endif() +- endforeach() +- +- check_source_runs( +- C +- "#include +-#include +-int main() { +- SF_FORMAT_INFO info = {SF_FORMAT_VORBIS}; +- sf_command(NULL, SFC_GET_FORMAT_INFO, &info, sizeof info); +- return info.name != NULL ? EXIT_SUCCESS : EXIT_FAILURE; +-}" +- SNDFILE_SUPPORTS_VORBIS) +- +- check_source_runs( +- C +- "#include +-#include +-int main() { +- SF_FORMAT_INFO info = {SF_FORMAT_MPEG_LAYER_III}; +- sf_command(NULL, SFC_GET_FORMAT_INFO, &info, sizeof info); +- return info.name != NULL ? EXIT_SUCCESS : EXIT_FAILURE; +-}" +- SNDFILE_SUPPORTS_MPEG) +- +- set(SndFile_WITH_EXTERNAL_LIBS ${SNDFILE_SUPPORTS_VORBIS}) +- set(SndFile_WITH_MPEG ${SNDFILE_SUPPORTS_MPEG}) +- set(CMAKE_REQUIRED_INCLUDES ${_backup_includes}) +- set(CMAKE_REQUIRED_LIBRARIES ${_backup_libraries}) +- else() +- message( +- STATUS +- "Cross-compiling without pkg-config - cannot check for external libraries." +- "If you have the upstream CMake config set CMAKE_FIND_PACKAGE_PREFER_CONFIG to true for accurate results." +- ) +- set(SndFile_WITH_EXTERNAL_LIBS FALSE) +- set(SndFile_WITH_MPEG FALSE) +- endif() +-endif() +- +-# Handle transitive dependencies +-if(PC_SNDFILE_FOUND) +- get_target_properties_from_pkg_config("${_sndfile_library}" "PC_SNDFILE" +- "_sndfile") +-else() +- if(SndFile_WITH_EXTERNAL_LIBS) +- list(APPEND _sndfile_link_libraries "FLAC::FLAC" "Opus::opus" +- "Vorbis::vorbisenc" "Ogg::ogg") +- endif() +- if(SndFile_WITH_MPEG) +- list(APPEND _sndfile_link_libraries "MPG123::libmpg123" "mp3lame::mp3lame") +- endif() +-endif() +- +-# Forward the result to CMake +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args( +- SndFile +- REQUIRED_VARS "_sndfile_library" "SndFile_INCLUDE_DIR" +- VERSION_VAR "SndFile_VERSION") +- +-if(SndFile_FOUND AND NOT TARGET SndFile::sndfile) +- add_library(SndFile::sndfile UNKNOWN IMPORTED) +- set_target_properties( +- SndFile::sndfile +- PROPERTIES IMPORTED_LOCATION "${_sndfile_library}" +- INTERFACE_COMPILE_OPTIONS "${_sndfile_compile_options}" +- INTERFACE_INCLUDE_DIRECTORIES "${SndFile_INCLUDE_DIR}" +- INTERFACE_LINK_LIBRARIES "${_sndfile_link_libraries}" +- INTERFACE_LINK_DIRECTORIES "${_sndfile_link_directories}") +- +- # Set additional variables for compatibility with upstream config +- set(SNDFILE_FOUND TRUE) +- set(SndFile_LIBRARY SndFile::sndfile) +- set(SndFile_LIBRARIES SndFile::sndfile) +- set(SNDFILE_LIBRARY SndFile::sndfile) +- set(SNDFILE_LIBRARIES SndFile::sndfile) +- set(SNDFILE_INCLUDE_DIR "${SndFile_INCLUDE_DIR}") +-endif() +- +-mark_as_advanced(_sndfile_library) diff --git a/packages/f/fluidsynth/xmake.lua b/packages/f/fluidsynth/xmake.lua index cee955255..a14ab0852 100644 --- a/packages/f/fluidsynth/xmake.lua +++ b/packages/f/fluidsynth/xmake.lua @@ -7,10 +7,10 @@ package("fluidsynth") add_urls("https://github.com/FluidSynth/fluidsynth/archive/refs/tags/$(version).zip", "https://github.com/FluidSynth/fluidsynth.git") add_versions("v2.3.3", "0ab6f1aae1c7652b9249de2d98070313f3083046fddd673277556f1cca65568e") + add_versions("v2.3.5", "3cdaa24777f11fbc6da506d7f7b41fef31822006f83886dcf6e758a9941cae40") - if is_plat("windows", "macosx") then - add_patches("v2.3.3", path.join(os.scriptdir(), "patches", "find-intl.patch"), "dafdb8f11957ed2f396832fe3b63933e8a32b96d8c836166b2fefacf3f918a9d") - end + add_patches("v2.3.3", path.join(os.scriptdir(), "patches", "2.3.3", "find-intl.patch"), "0c80989cce85b8e69409498e3a5d1df41c1ce29bf11261bcb441fdbf08c42f85") + add_patches("v2.3.5", path.join(os.scriptdir(), "patches", "2.3.5", "find-intl.patch"), "b71c50191e3799e93606b2cf79e61098bdf52d681bd3e758103d2c43c192bfc5") add_configs("aufile", {description = "Compile support for sound file output", default = true, type = "boolean"}) add_configs("dbus", {description = "Compile DBUS support", default = not is_plat("windows"), type = "boolean"}) @@ -21,6 +21,7 @@ package("fluidsynth") add_configs("sdl2", {description = "Compile SDL2 audio support ", default = false, type = "boolean"}) if is_plat("linux") then add_configs("pulseaudio", {description = "Compile PulseAudio support", default = false, type = "boolean"}) + add_configs("systemd", {description = "Compile systemd support", default = true, type = "boolean"}) end add_configs("readline", {description = "Compile support for sound file output", default = false, type = "boolean"}) add_configs("threads", {description = "Enable multi-threading support (such as parallel voice synthesis)", default = true, type = "boolean"}) @@ -31,14 +32,15 @@ package("fluidsynth") add_deps("cmake") add_deps("glib") - add_deps("libiconv") if is_plat("windows") then - add_deps("libintl") + add_deps("libiconv") add_deps("pkgconf") add_syslinks("ws2_32") elseif is_plat("linux") then + add_deps("libiconv") add_deps("pkg-config") - else + elseif is_plat("macosx") then + add_deps("libiconv", {system = true}) add_deps("libintl") add_deps("pkg-config") end @@ -64,7 +66,7 @@ package("fluidsynth") on_install("windows", "linux", "macosx", function (package) local configs = {} local configopts = { - "aufile", "dbus", "jack", "libsndfile", "opensles", "network", "sdl2", "readline", "pulseaudio", "threads", "openmp" + "aufile", "dbus", "jack", "libsndfile", "opensles", "network", "sdl2", "readline", "pulseaudio", "systemd", "threads", "openmp" } for _, config in ipairs(configopts) do table.insert(configs, "-Denable-" .. config .. "=" .. (package:config(config) and "ON" or "OFF")) From 8fd86986a0d658c9c3f9d9deda84870c4b981f35 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 5 Jul 2024 22:26:24 +0800 Subject: [PATCH 324/671] actor-framework: improve xmake.lua --- packages/a/actor-framework/xmake.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/a/actor-framework/xmake.lua b/packages/a/actor-framework/xmake.lua index 008a4fc81..9579d30c2 100644 --- a/packages/a/actor-framework/xmake.lua +++ b/packages/a/actor-framework/xmake.lua @@ -38,7 +38,6 @@ package("actor-framework") { "-DCAF_ENABLE_EXAMPLES=OFF", "-DCAF_ENABLE_TESTING=OFF", - "-DCAF_ENABLE_TESTING=OFF", "-DCAF_ENABLE_TOOLS=OFF", } table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) From d9aa2ee85cbb4b406eb3e95f3ca9ffd36aff70ef Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 6 Jul 2024 10:00:48 +0800 Subject: [PATCH 325/671] Update tgbot-cpp to v1.8 (#4588) --- packages/t/tgbot-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tgbot-cpp/xmake.lua b/packages/t/tgbot-cpp/xmake.lua index a956c9f59..f517ddee4 100644 --- a/packages/t/tgbot-cpp/xmake.lua +++ b/packages/t/tgbot-cpp/xmake.lua @@ -6,6 +6,7 @@ package("tgbot-cpp") set_urls("https://github.com/reo7sp/tgbot-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/reo7sp/tgbot-cpp.git") + add_versions("v1.8", "43ff1a359b8db026e58e517703e616accaae33e01ebc7e87613632b7e4653467") add_versions("v1.7.3", "f1d2863a7ac77f2a58b3c6f8a163b4d6e9d191ab5bff0dcf6e271adabf9111a9") add_versions("v1.7.2", "3a41c25c5e4b60bda3f278550a380f1c7c382fd50ea1ab1801edc837d1535462") From 16b692c0f7e56af95c0d683eb67b2e545fc3fa56 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 6 Jul 2024 10:00:51 +0800 Subject: [PATCH 326/671] Update raylib-cpp to v5.0.2 (#4587) --- packages/r/raylib-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/raylib-cpp/xmake.lua b/packages/r/raylib-cpp/xmake.lua index dcd82771b..f3522d4f4 100644 --- a/packages/r/raylib-cpp/xmake.lua +++ b/packages/r/raylib-cpp/xmake.lua @@ -7,6 +7,7 @@ package("raylib-cpp") add_urls("https://github.com/RobLoach/raylib-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/RobLoach/raylib-cpp.git") + add_versions("v5.0.2", "d3a718170882bc873c973a19a824d7fa4bfd9d0087b4778057231409a240920d") add_versions("v5.0.1", "6d10469019700fd5993db9a18bdd0ed025105b1bf7dd8916e353eef8bfac6355") add_deps("raylib 5.x") From 7a290c87a10b49807a1ba82511ae3913a91f6dd2 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 6 Jul 2024 11:08:44 +0800 Subject: [PATCH 327/671] Update highs to v1.7.2 (#4589) --- packages/h/highs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/highs/xmake.lua b/packages/h/highs/xmake.lua index 54f5c42f0..afbf47985 100644 --- a/packages/h/highs/xmake.lua +++ b/packages/h/highs/xmake.lua @@ -6,6 +6,7 @@ package("highs") add_urls("https://github.com/ERGO-Code/HiGHS/archive/refs/tags/$(version).tar.gz", "https://github.com/ERGO-Code/HiGHS.git") + add_versions("v1.7.2", "5ff96c14ae19592d3568e9ae107624cbaf3409d328fb1a586359f0adf9b34bf7") add_versions("v1.7.1", "65c6f9fc2365ced42ee8eb2d209a0d3a7942cd59ff4bd20464e195c433f3a885") add_versions("v1.7.0", "d10175ad66e7f113ac5dc00c9d6650a620663a6884fbf2942d6eb7a3d854604f") add_versions("v1.5.3", "ce1a7d2f008e60cc69ab06f8b16831bd0fcd5f6002d3bbebae9d7a3513a1d01d") From da0004e7b6b828af63e88195d0cf893b6aa48c4b Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:30:48 +0800 Subject: [PATCH 328/671] add openvdb python interface (#4573) --- packages/o/openvdb/xmake.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/packages/o/openvdb/xmake.lua b/packages/o/openvdb/xmake.lua index 793d3e1d7..a7089f2ed 100644 --- a/packages/o/openvdb/xmake.lua +++ b/packages/o/openvdb/xmake.lua @@ -24,6 +24,7 @@ package("openvdb") add_configs("with_houdini", {description = "Location of Houdini installation. Set to enable built with Houdini.", default = "", type = "string"}) add_configs("with_maya", {description = "Location of Maya installation. Set to enable built with Maya.", default = "", type = "string"}) add_configs("simd", {description = "SIMD acceleration architecture.", type = "string", values = {"None", "SSE42", "AVX"}}) + add_configs("python", {description = "Build the pyopenvdb Python module.", default = false, type = "boolean"}) add_configs("print", {description = "Command line binary for displaying information about OpenVDB files.", default = true, type = "boolean"}) add_configs("lod", {description = "Command line binary for generating volume mipmaps from an OpenVDB grid.", default = false, type = "boolean"}) add_configs("render", {description = "Command line binary for ray-tracing OpenVDB grids.", default = false, type = "boolean"}) @@ -45,6 +46,10 @@ package("openvdb") package:add("deps", package:version():ge("9.0.0") and "tbb" or "tbb <2021.0") end end + if package:config("python") then + package:add("deps", "python 3.x") + package:add("deps", "pybind11") + end if package:config("view") then package:add("deps", "glew", {configs = {shared = true}}) package:add("deps", "glfw") @@ -92,6 +97,7 @@ package("openvdb") end table.insert(configs, "-DBoost_USE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) end + table.insert(configs, "-DOPENVDB_BUILD_PYTHON_MODULE=" .. (package:config("python") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_VDB_LOD=" .. (package:config("lod") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_VDB_PRINT=" .. (package:config("print") and "ON" or "OFF")) table.insert(configs, "-DOPENVDB_BUILD_BINARIES=" .. (package:config("print") and "ON" or "OFF")) @@ -128,6 +134,22 @@ package("openvdb") end import("package.tools.cmake").install(package, configs) package:addenv("PATH", "bin") + if package:config("python") then + local pyver = package:dep("python"):version() + local pydpath = path.join(package:installdir("lib"), format("python%d.%d", pyver:major(), pyver:minor()), "site-packages") + package:addenv("PYTHONPATH", pydpath) + -- after python 3.8, python will not search in PATH for dlls + if package:is_plat("windows") then + local tbb = package:dep("tbb"):fetch() + if tbb and tbb.linkdirs then + local tbb_dir = path.directory(tbb.linkdirs[1]) + os.cp(path.join(tbb_dir, "bin", "tbb*.dll"), pydpath) + end + if package:config("shared") then + os.cp(path.join(package:installdir("bin"), "openvdb.dll"), pydpath) + end + end + end end) on_test(function (package) @@ -151,4 +173,7 @@ package("openvdb") ]]}, {configs = {languages = "c++17"}, includes = {"nanovdb/util/GridBuilder.h"}})) end + if package:config("python") then + os.vrun("python -c 'import pyopenvdb'") + end end) From 7626414c3dfe815d352a67733cf81ffda1f4fbe9 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 7 Jul 2024 04:53:13 +0800 Subject: [PATCH 329/671] update fmt to 11.0.1 (#4590) --- packages/f/fmt/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index 2a15107a6..7b5cd1fb8 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -5,6 +5,7 @@ package("fmt") set_urls("https://github.com/fmtlib/fmt/releases/download/$(version)/fmt-$(version).zip", "https://github.com/fmtlib/fmt.git") + add_versions("11.0.1", "62ca45531814109b5d6cef0cf2fd17db92c32a30dd23012976e768c685534814") add_versions("11.0.0", "583ce480ef07fad76ef86e1e2a639fc231c3daa86c4aa6bcba524ce908f30699") add_versions("10.2.1", "312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9") add_versions("10.2.0", "8a942861a94f8461a280f823041cde8f620a6d8b0e0aacc98c15bb5a9dd92399") From 8715fcd9ddd63a2e468ac9f22c3e25588c287ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 7 Jul 2024 04:23:43 +0200 Subject: [PATCH 330/671] libsodium: Fix static and shared build (#4591) Both libs were built --- packages/l/libsodium/xmake.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/l/libsodium/xmake.lua b/packages/l/libsodium/xmake.lua index caa768be6..436bf845d 100644 --- a/packages/l/libsodium/xmake.lua +++ b/packages/l/libsodium/xmake.lua @@ -21,7 +21,18 @@ package("libsodium") end if package:is_plat("linux", "macosx") then - import("package.tools.autoconf").install(package) + local configs = {} + if package:debug() then + table.insert(configs, "--enable-debug") + end + if package:config("shared") then + table.insert(configs, "--enable-static=no") + table.insert(configs, "--enable-shared=yes") + else + table.insert(configs, "--enable-static=yes") + table.insert(configs, "--enable-shared=no") + end + import("package.tools.autoconf").install(package, configs) else os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") import("package.tools.xmake").install(package) From ad4131eca1c932bcccddff994f5d1e744fe7064c Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 7 Jul 2024 10:24:06 +0800 Subject: [PATCH 331/671] Update thorvg to v0.14.1 (#4593) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index d0ca71917..4e9e98dc8 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.14.1", "9c0346fda8b62a3b13a764dda5784e0465c8cab54fb5342d0240c7fb40e415bd") add_versions("v0.13.8", "ce49929a94d1686d4f1436da6ef5fa7a8439901c22b5fa0879d7d5879b8ba2bd") add_versions("v0.13.6", "f24fd3647e1a309dec00f6455b32258c0dd0e0dbd1133233169467571f188bad") add_versions("v0.13.5", "977ed74c3846c9a6acd5765aff776745d40e3c91507b22e51177d59c69afd198") From a6c91e06140af20154f3662358b5942512644091 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 7 Jul 2024 11:09:48 +0800 Subject: [PATCH 332/671] Update ada to v2.9.0 (#4595) --- packages/a/ada/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/ada/xmake.lua b/packages/a/ada/xmake.lua index dbe7dcc57..9b9c5d90e 100644 --- a/packages/a/ada/xmake.lua +++ b/packages/a/ada/xmake.lua @@ -6,6 +6,7 @@ package("ada") set_urls("https://github.com/ada-url/ada/archive/refs/tags/$(version).tar.gz", "https://github.com/ada-url/ada.git") + add_versions("v2.9.0", "8b992f0ce9134cb4eafb74b164d2ce2cb3af1900902162713b0e0c5ab0b6acd8") add_versions("v2.8.0", "83b77fb53d1a9eea22b1484472cea0215c50478c9ea2b4b44b0ba3b52e07c139") add_versions("v2.7.8", "8de067b7cb3da1808bf5439279aee6048d761ba246bf8a854c2af73b16b41c75") add_versions("v2.7.7", "7116d86a80b79886efbc9d946d3919801815060ae62daf78de68c508552af554") From 3b2d79a6bc244f43e4f25fae78f2a52f497bdf23 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 7 Jul 2024 11:09:51 +0800 Subject: [PATCH 333/671] Update dartsim to v6.14.4 (#4594) --- packages/d/dartsim/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/dartsim/xmake.lua b/packages/d/dartsim/xmake.lua index 00c9fc5d2..40fbf9e3f 100644 --- a/packages/d/dartsim/xmake.lua +++ b/packages/d/dartsim/xmake.lua @@ -6,6 +6,7 @@ package("dartsim") add_urls("https://github.com/dartsim/dart/archive/refs/tags/$(version).tar.gz", "https://github.com/dartsim/dart.git") + add_versions("v6.14.4", "f5fc7f5cb1269cc127a1ff69be26247b9f3617ce04ff1c80c0f3f6abc7d9ab70") add_versions("v6.13.0", "4da3ff8cee056252a558b05625a5ff29b21e71f2995e6d7f789abbf6261895f7") add_versions("v6.14.2", "6bbaf452f8182b97bf22adeab6cc7f3dc1cd2733358543131fa130e07c0860fc") From 30323aba68023412229c9516f954208e69587fc0 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 7 Jul 2024 13:12:23 +0800 Subject: [PATCH 334/671] Update zlib-ng to 2.2.1 (#4592) --- packages/z/zlib-ng/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/z/zlib-ng/xmake.lua b/packages/z/zlib-ng/xmake.lua index 948767a9f..2da133b0f 100644 --- a/packages/z/zlib-ng/xmake.lua +++ b/packages/z/zlib-ng/xmake.lua @@ -6,6 +6,7 @@ package("zlib-ng") add_urls("https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$(version).tar.gz", "https://github.com/zlib-ng/zlib-ng.git") + add_versions("2.2.1", "ec6a76169d4214e2e8b737e0850ba4acb806c69eeace6240ed4481b9f5c57cdf") add_versions("2.1.6", "a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2") add_versions("2.1.5", "3f6576971397b379d4205ae5451ff5a68edf6c103b2f03c4188ed7075fbb5f04") add_versions("2.0.6", "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6") From 4c4cf891b3c306640de16fef6c13fd43fc4c981d Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:07:17 +0800 Subject: [PATCH 335/671] update bvh (#4597) * update bvh * test c_api * add pthread on bsd --- packages/b/bvh/xmake.lua | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/packages/b/bvh/xmake.lua b/packages/b/bvh/xmake.lua index 2439fe9cd..74620aa0b 100644 --- a/packages/b/bvh/xmake.lua +++ b/packages/b/bvh/xmake.lua @@ -1,18 +1,39 @@ package("bvh") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/madmann91/bvh") set_description("A modern C++ BVH construction and traversal library") set_license("MIT") add_urls("https://github.com/madmann91/bvh.git") add_versions("2023.6.30", "578b1e8035743d0a97fcac802de81622c54f28e3") + add_versions("2024.7.8", "77a08cac234bae46abbb5e78c73e8f3c158051d0") - on_install(function (package) - if not package:is_plat("cross") then - package:add("cxxflags", "-march=native") + add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"}) + add_configs("c_api", {description = "Builds the C API library wrapper", default = true, type = "boolean"}) + + if is_plat("bsd") then + add_syslinks("pthread") + end + on_load(function (package) + if not package:config("c_api") then + package:set("kind", "library", {headeronly = true}) end + end) + + on_install(function (package) os.cp("src/bvh", package:installdir("include")) + if package:config("c_api") then + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + set_languages("c++20") + target("bvh_c") + set_kind("shared") + add_defines("BVH_BUILD_API") + add_files("src/bvh/v2/c_api/bvh.cpp") + add_includedirs("src") + ]]) + import("package.tools.xmake").install(package) + end end) on_test(function (package) From 3f1755db4d7b47b12ff9a74fdcb60d6759b104f9 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 8 Jul 2024 11:56:19 +0800 Subject: [PATCH 336/671] Update vk-bootstrap to v1.3.289 (#4601) --- packages/v/vk-bootstrap/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index 622239b50..b44939aff 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -6,6 +6,7 @@ package("vk-bootstrap") add_urls("https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/$(version).tar.gz", "https://github.com/charles-lunarg/vk-bootstrap.git") + add_versions("v1.3.289", "101c4b10aaf48f07c5aae955fab12d8a453970c13fa93e8fe5e5b0b58ea1ceac") add_versions("v1.3.285", "c86b12ac2a0a809f7bf2af009a612be188aa4bb3a669d5955b22007989b3e07c") add_versions("v1.3.284", "753a7cc337ae7dcfcbfad1547c010287fd4bec1237bf17f35349470c7430830c") add_versions("v1.3.283", "1e6e43b76c14fa544d057b3e4825817e1aed50c3a2efbaf94862340c6304dc24") From de2da087d7125c4c0b75f89844650e0583cfc4fb Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 8 Jul 2024 11:56:21 +0800 Subject: [PATCH 337/671] Update scons to 4.8.0 (#4600) --- packages/s/scons/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/scons/xmake.lua b/packages/s/scons/xmake.lua index 16bfeceeb..cd1c5970e 100644 --- a/packages/s/scons/xmake.lua +++ b/packages/s/scons/xmake.lua @@ -6,6 +6,7 @@ package("scons") add_urls("https://github.com/SCons/scons/archive/refs/tags/$(version).zip", "https://github.com/SCons/scons.git") + add_versions("4.8.0", "2309f77eede26a494d697a18b6bb803ddb4ba20875091fb82da504a3665241cd") add_versions("4.7.0", "c783ac12040d1682b81ffd153b48ac1dd9a0eff5a9fbfbb55d86c5d186e88e4a") add_versions("4.6.0", "ae729515e951cde252205c1c5a7f237025ce204db8e8b9a145616614d87c6f86") add_versions("4.1.0", "106259e92ba001feae5b50175bcec92306d0420bb08229fb037440cf303fcfc3") From cc091a10096102d7e415aba6cf0ab02d65180cf2 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 8 Jul 2024 13:09:27 +0800 Subject: [PATCH 338/671] Update cargs to v1.2.0 (#4602) --- packages/c/cargs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cargs/xmake.lua b/packages/c/cargs/xmake.lua index 8166cf30c..fcab63586 100644 --- a/packages/c/cargs/xmake.lua +++ b/packages/c/cargs/xmake.lua @@ -5,6 +5,7 @@ package("cargs") add_urls("https://github.com/likle/cargs/archive/refs/tags/$(version).tar.gz", "https://github.com/likle/cargs.git") + add_versions("v1.2.0", "0b33379e3d3c8cb3e22f33d3e1a260adcd366970868bc9b7c47237f24188ff25") add_versions("v1.1.0", "87e7da5b539f574d48529870cb0620ef5a244a5ee2eac73cc7559dedc04128ca") add_versions("v1.0.3", "ddba25bd35e9c6c75bc706c126001b8ce8e084d40ef37050e6aa6963e836eb8b") From b9a31280a11976452a38c45a2a4fef4b94fb9eb4 Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:49:16 +0800 Subject: [PATCH 339/671] add macdylibbundler package (#4596) * add macdylibbundler package * delete the part of windows, because this repo just support linux and macos * delete the part of mingw * Update xmake.lua * Delete packages/m/macdylibbundler/port/xmake.lua * Update xmake.lua --------- Co-authored-by: benny WU Co-authored-by: ruki --- packages/m/macdylibbundler/xmake.lua | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/m/macdylibbundler/xmake.lua diff --git a/packages/m/macdylibbundler/xmake.lua b/packages/m/macdylibbundler/xmake.lua new file mode 100644 index 000000000..5c5b13dab --- /dev/null +++ b/packages/m/macdylibbundler/xmake.lua @@ -0,0 +1,29 @@ +package("macdylibbundler") + set_homepage("https://github.com/auriamg/macdylibbundler") + set_description("dylibbundler is a small command-line programs that aims to make bundling") + set_license("MIT") + + add_urls("https://github.com/auriamg/macdylibbundler/archive/refs/tags/$(version).zip", + "https://github.com/auriamg/macdylibbundler.git") + + add_versions("1.0.5", "d48138fd6766c70097b702d179a657127f9aed3d083051c2d4fce145881a316e") + + on_install("linux", "macosx", "android", function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("macdylibbundler") + set_kind("$(kind)") + set_languages("c++11") + add_files("src/*.cpp") + add_includedirs("src") + add_headerfiles("src/*.h")]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + collectSubDependencies(); + } + ]]}, {configs = {languages = "c++11"}, includes = "DylibBundler.h"})) + end) From b0649de0ecab155492f523618f3a8a50b5604dd1 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Jul 2024 10:03:27 +0800 Subject: [PATCH 340/671] Update uwebsockets to v20.64.0 (#4605) --- packages/u/uwebsockets/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/u/uwebsockets/xmake.lua b/packages/u/uwebsockets/xmake.lua index d62ccaf79..1087eb8f0 100644 --- a/packages/u/uwebsockets/xmake.lua +++ b/packages/u/uwebsockets/xmake.lua @@ -7,6 +7,7 @@ package("uwebsockets") add_urls("https://github.com/uNetworking/uWebSockets/archive/refs/tags/$(version).tar.gz", "https://github.com/uNetworking/uWebSockets.git") + add_versions("v20.64.0", "bb81fa773dcbd6bc738904ad496554fd131a33269570e0e86fa09213d82ba9ef") add_versions("v20.62.0", "03dfc8037cf43856a41e64bbc7fc5a7cf5e6369c9158682753074ecbbe09eed1") add_versions("v20.61.0", "94778209571f832740fe1a4f19dbc059990b6acc34b8789f39cda6a158178d1f") add_versions("v20.60.0", "eb72223768f93d40038181653ee5b59a53736448a6ff4e8924fd56b2fcdc00db") From 11ffa2076bfb9f7ac26f01193d789af305bd1e1f Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Jul 2024 10:03:30 +0800 Subject: [PATCH 341/671] Update mapbox_polylabel to v2.0.1 (#4604) --- packages/m/mapbox_polylabel/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/mapbox_polylabel/xmake.lua b/packages/m/mapbox_polylabel/xmake.lua index 9dbbfe6be..c93d32b33 100644 --- a/packages/m/mapbox_polylabel/xmake.lua +++ b/packages/m/mapbox_polylabel/xmake.lua @@ -7,6 +7,7 @@ package("mapbox_polylabel") add_urls("https://github.com/mapbox/polylabel/archive/refs/tags/$(version).tar.gz", "https://github.com/mapbox/polylabel.git") + add_versions("v2.0.1", "d51ec39f9f1bc46c551dfdf642f72057a8c2cde2c5e89bc70e0bd712fad63a75") add_versions("v2.0.0", "9aba4320c6cb5a8e9a8d44feb0d68b79b3127bdcb759a26aca92ac637668d7b9") add_deps("mapbox_geometry") From dcf495855223a0b6ef440319a2f49f58328f6fc4 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Jul 2024 10:03:32 +0800 Subject: [PATCH 342/671] Update pdfhummus to v4.6.6 (#4603) --- packages/p/pdfhummus/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pdfhummus/xmake.lua b/packages/p/pdfhummus/xmake.lua index 6187da7b2..19bda13b8 100644 --- a/packages/p/pdfhummus/xmake.lua +++ b/packages/p/pdfhummus/xmake.lua @@ -6,6 +6,7 @@ package("pdfhummus") add_urls("https://github.com/galkahana/PDF-Writer/archive/refs/tags/$(version).tar.gz", "https://github.com/galkahana/PDF-Writer/archive/refs/tags/v$(version).tar.gz", "https://github.com/galkahana/PDF-Writer.git") + add_versions("v4.6.6", "8343820313e553052df68c75fe2bf35353da2719106e81eb2a8b026ff96c7d7c") add_versions("v4.6.4", "93b5f1dc88fd67fdebde409e927e828dfbae02efa44936e89728622411c6a047") add_versions("v4.6.3", "3b5d9ba4b49d0380678e8172f27cdb8eda196ea448e7f1cdd79620066d082ab9") add_versions("v4.6.2", "0a36815ccc9d207028567f90039785c824b211169ba5da68de84d0c15455ab62") From c947535d269bd56df33eb7af548e195daffdd304 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Jul 2024 10:29:06 +0800 Subject: [PATCH 343/671] Update lunasvg to v2.4.0 (#4607) --- packages/l/lunasvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/lunasvg/xmake.lua b/packages/l/lunasvg/xmake.lua index ba4ca3ab2..17eb6d3e6 100644 --- a/packages/l/lunasvg/xmake.lua +++ b/packages/l/lunasvg/xmake.lua @@ -5,6 +5,7 @@ package("lunasvg") add_urls("https://github.com/sammycage/lunasvg/archive/refs/tags/$(version).tar.gz", "https://github.com/sammycage/lunasvg.git") + add_versions("v2.4.0", "0682c60501c91d75f4261d9c1a5cd44c2c9da8dba76f8402eab628448c9a4591") add_versions("v2.3.9", "088bc9fd1191a004552c65bdcc260989b83da441b0bdaa965e79d984feba88fa") add_versions("v2.3.5", "350ff56aa1acdedefe2ad8a4241a9fb8f9b232868adc7bd36dfb3dbdd57e2e93") From f4e9a1f1d8fa57c0c15c3a2765d60f5cdd8e0bc8 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 9 Jul 2024 12:08:54 +0800 Subject: [PATCH 344/671] Update clove-unit to v2.4.5 (#4606) --- packages/c/clove-unit/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/clove-unit/xmake.lua b/packages/c/clove-unit/xmake.lua index 047896016..fe36ce7ce 100644 --- a/packages/c/clove-unit/xmake.lua +++ b/packages/c/clove-unit/xmake.lua @@ -7,6 +7,7 @@ package("clove-unit") add_urls("https://github.com/fdefelici/clove-unit/archive/refs/tags/$(version).tar.gz", "https://github.com/fdefelici/clove-unit.git") + add_versions("v2.4.5", "e4db72612adf00d7c7c9512cb9990768f5f3e62a72039929b78ba17d5a6f4308") add_versions("v2.4.4", "25e611e1d4286c73d9cce7bbc99f83e00629551602351fec1edcbb669243e047") on_install(function (package) From 9c67593434add149fe0d465624727ee74afdfa65 Mon Sep 17 00:00:00 2001 From: xpxz <97490782+heheda123123@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:46:35 +0800 Subject: [PATCH 345/671] add windows support to bdwgc (#4586) * Update xmake.lua * Update xmake.lua * fix widnows defines * add check for android --------- Co-authored-by: star9029 --- packages/b/bdwgc/xmake.lua | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/packages/b/bdwgc/xmake.lua b/packages/b/bdwgc/xmake.lua index 0d150d93c..5589386af 100644 --- a/packages/b/bdwgc/xmake.lua +++ b/packages/b/bdwgc/xmake.lua @@ -2,29 +2,36 @@ package("bdwgc") set_homepage("https://www.hboehm.info/gc/") set_description("The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (bdwgc, also known as bdw-gc, boehm-gc, libgc)") - add_urls("https://github.com/ivmai/bdwgc/-/archive/$(version).tar.gz", + add_urls("https://github.com/ivmai/bdwgc/archive/refs/tags/$(version).tar.gz", "https://github.com/ivmai/bdwgc.git") add_versions("v8.2.6", "3bfc2b1dd385bfb46d2dab029211a66249a309795b6893f4e00554904999e40a") add_versions("v8.2.4", "18e63ab1428bd52e691da107a6a56651c161210b11fbe22e2aa3c31f7fa00ca5") add_deps("cmake") + add_deps("libatomic_ops") - on_install("macosx", "linux", "android", "iphoneos", function (package) - local configs = {} + if on_check then + on_check("android", function (package) + if package:is_arch("armeabi-v7a") then + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) > 21, "package(bdwgc/armeabi-v7a): need ndk api level > 21") + end + end) + end + + on_install("!wasm", function (package) + local configs = {"-Denable_docs=OFF", "-Dwith_libatomic_ops=ON"} table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - import("package.tools.cmake").install(package, configs) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + import("package.tools.cmake").install(package, configs, {packagedeps = "libatomic_ops"}) + + if package:is_plat("windows", "mingw", "cygwin") then + package:add("defines", (package:config("shared") and "GC_DLL" or "GC_NOT_DLL")) + end end) on_test(function (package) - assert(package:has_cfuncs({test=[[ - void test() { - GC_INIT(); - int *ptr = GC_MALLOC(sizeof(int)); - *ptr = 42; - printf("Value: %d\n", *ptr); - return 0; - } - ]]}),{configs = {includes = "gc.h"}}) + assert(package:has_cfuncs("GC_init", {includes = "gc/gc.h"})) end) From c4ed5c82013fbe8f5b9d0bc85ed646f7a4e47141 Mon Sep 17 00:00:00 2001 From: c8ef Date: Wed, 10 Jul 2024 13:47:01 +0800 Subject: [PATCH 346/671] update folly related to 07.08 (#4610) * [folly related] update to 07.08 * Update xmake.lua --- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 5 +++-- packages/m/mvfst/xmake.lua | 1 + packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index 8060f198a..2107b10a5 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -14,6 +14,7 @@ package("fbthrift") add_versions("2024.06.17", "bfacfe477c1152df43a1681c31801f337ef7f67bc85507e09340abdd146cca7f") add_versions("2024.06.24", "78bbc48d1dfa8948580b780b3e827b4562102d2b9ca87db11b5a03ba277ac0e5") add_versions("2024.07.01", "fa2302fdabf54780213cc3c5b7047226d7d9b91b8e1b9528330f1041c16b25eb") + add_versions("2024.07.08", "5efada565a85057824c58784dedd2600a03e531d526021bfe8bb8b655f56f09e") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index 86d69bebe..d831ba8c8 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -15,6 +15,7 @@ package("fizz") add_versions("2024.06.17", "46e9d1b782a51b2c063390dc1161f26f2c77ef7a94ff8ccc4bdc272697cad8bb") add_versions("2024.06.24", "b5fd5fb3fe1cf20519ea91d6a0127505596f8c74c82cde9d54ea6ae92df86a50") add_versions("2024.07.01", "002bca2765cb0889ec535eeb1950acf93af57638a2da9b2deacc522113625fcc") + add_versions("2024.07.08", "dd80231fb79760ef0b15394364ddbe35d4da82a7e07238dbaaf2f98f267d3938") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 7eec5bcd8..69ff9cbf0 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -23,11 +23,12 @@ package("folly") add_versions("2024.06.17", "a26cda1cf5f9914f2ff05b5f8e4062d73f5a1ff71ee1911e734dc758313f6d30") add_versions("2024.06.24", "05ce0aed45c3a8125334438564364fbf32cd0d80b2a58c010cc821f5f16def50") add_versions("2024.07.01", "a619f2759e821d4657aa9f1cae0dedcec2085e656e16a3c458e053a759d2ce83") + add_versions("2024.07.08", "93c9c7c7e3cb30c1b4437ac3043c05a245383fbb6e558abda704d61f14dc67bd") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") - add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") - add_patches("<=2024.07.01", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") + add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") + add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 78a913b96..8ccfe7247 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -14,6 +14,7 @@ package("mvfst") add_versions("2024.06.17", "748c744dae967a0ac25c89a6c7ccf62da2a4974ab45644d395fb7bc8f2e96dc1") add_versions("2024.06.24", "0a8c9bf9c9e1e293e56c0bd05e60606b2b299245510442a2e9af01519c040041") add_versions("2024.07.01", "833fc3421cb8a17ab1c2b5542e76074bcb9cfd534ec5e459393dd1e774921907") + add_versions("2024.07.08", "345080326a3a8a24439253f7029b8f3c0785d804a179757b94ea2a5a52f4013f") add_patches(">=2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 04d747258..777af3433 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -14,6 +14,7 @@ package("proxygen") add_versions("2024.06.17", "ab45c56c705d4c47595f3118cbaa2641be2bcd26c4d3b43e49e0c743a7272089") add_versions("2024.06.24", "4087de735334ba50f1e9c8df7c2040718d3c1ba9f9da102db5bbb7328a56b94a") add_versions("2024.07.01", "eb5141c6e972b3957a15ab90feb3d56b68061b2ca8d463fe84776cce5c9629bb") + add_versions("2024.07.08", "3980eceba8a353222f831a411feeeec8f4e8b846278abb915f20865765a2edbf") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index e7aaab400..ec0484445 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -15,6 +15,7 @@ package("wangle") add_versions("2024.06.17", "9d3e2349be6f8462243beebc1245f8d82808734060d9e3d9c0cf45bbda3c1f70") add_versions("2024.06.24", "a4e83d477ef3c8c208f30a811772f0d551e0728f42f45bf647a82f3b82d60baf") add_versions("2024.07.01", "596dff77b6d6adef64e7b86f0f3e019c2ac787c92da0ddc18fbdaa4eca02cb3d") + add_versions("2024.07.08", "b620ba5dee2f6c47c1d3002cb795524b1efe30f2689088000f010ecc0f9b03b2") add_deps("cmake", "folly", "fizz") From a6026e7f2714819298c277f27c24cf4c334ad2f8 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:11:19 +0800 Subject: [PATCH 347/671] update libxml2 (#4609) --- packages/l/libxml2/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/l/libxml2/xmake.lua b/packages/l/libxml2/xmake.lua index 87021ff88..169e42bce 100644 --- a/packages/l/libxml2/xmake.lua +++ b/packages/l/libxml2/xmake.lua @@ -6,13 +6,14 @@ package("libxml2") add_urls("https://download.gnome.org/sources/libxml2/$(version).tar.xz", {version = function (version) return format("%d.%d/libxml2-%s", version:major(), version:minor(), version) end}) add_urls("https://gitlab.gnome.org/GNOME/libxml2.git") add_versions("2.10.3", "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c") + add_versions("2.13.2", "e7c8f5e0b5542159e0ddc409c22c9164304b581eaa9930653a76fb845b169263") add_configs("iconv", {description = "Enable libiconv support.", default = false, type = "boolean"}) add_configs("python", {description = "Enable the python interface.", default = false, type = "boolean"}) add_includedirs("include/libxml2") if is_plat("windows") then - add_syslinks("wsock32", "ws2_32") + add_syslinks("wsock32", "ws2_32", "bcrypt") else add_links("xml2") end @@ -89,6 +90,9 @@ package("libxml2") end) on_install("macosx", "linux", "iphoneos", "android@!windows", "bsd", function (package) + if package:is_plat("iphoneos") then + io.replace("dict.c", "defined(HAVE_GETENTROPY)", "0", {plain = true}) -- getentropy is private on iOS + end import("package.tools.autoconf") local configs = {"--disable-dependency-tracking", "--without-lzma", From acd872a4d68ae6ee598d38804933167289c15e00 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 10 Jul 2024 23:45:02 +0800 Subject: [PATCH 348/671] aws-c-cal: add 0.7.1 version (#4614) --- packages/a/aws-c-cal/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-cal/xmake.lua b/packages/a/aws-c-cal/xmake.lua index 24c1d6d5e..7bcaf4fc2 100644 --- a/packages/a/aws-c-cal/xmake.lua +++ b/packages/a/aws-c-cal/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-cal") add_urls("https://github.com/awslabs/aws-c-cal/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-cal.git") + add_versions("v0.7.1", "2fbdc04d72d1f3af28b80fe3917f03f20c0a62bc22b6c7b3450486ee9cbe77f6") add_versions("v0.6.15", "67dda8049a59bbb70cdb166f46f741bc3a8443c86009a1ae4cb7842964a76e0d") add_versions("v0.6.14", "2326304b15bec45b212f6b738020c21afa41f9da295936687e103f9f2efb7b5e") add_versions("v0.6.12", "1ec1bc9a50df8d620f226480b420ec69d4fefd3792fb4e877aa7e350c2b174dc") From 7b2b3471890343a4d75813e27967a8883dc44b2f Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 10 Jul 2024 23:59:39 +0800 Subject: [PATCH 349/671] aws-lc: add package (#4616) --- packages/a/aws-lc/xmake.lua | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/a/aws-lc/xmake.lua diff --git a/packages/a/aws-lc/xmake.lua b/packages/a/aws-lc/xmake.lua new file mode 100644 index 000000000..d759806a2 --- /dev/null +++ b/packages/a/aws-lc/xmake.lua @@ -0,0 +1,49 @@ +package("aws-lc") + set_homepage("https://github.com/aws/aws-lc") + set_description("AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. It іs based on code from the Google BoringSSL project and the OpenSSL project.") + + add_urls("https://github.com/aws/aws-lc/archive/refs/tags/$(version).tar.gz", + "https://github.com/aws/aws-lc.git") + + add_versions("v1.31.0", "f2dfe0ef8fe21482b6795da01a1b226f826e9a084833ff8d5371a02f9623c150") + + add_configs("jitter", {description = "Enable FIPS entropy source: CPU Jitter", default = false, type = "boolean"}) + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + add_deps("cmake") + if is_plat("windows") then + add_deps("nasm") + end + + add_links("ssl", "crypto") + + if is_plat("windows", "mingw") then + add_syslinks("ws2_32") + elseif is_plat("linux", "bsd") then + add_syslinks("pthread", "dl", "m") + end + + on_install(function (package) + if package:config("shared") and package:is_plat("windows") then + package:add("defines", "BORINGSSL_SHARED_LIBRARY") + end + + local configs = { + "-DBUILD_TESTING=OFF", + "-DCMAKE_INSTALL_INCLUDEDIR=include", + "-DBUILD_LIBSSL=ON", + "-DDISABLE_GO=ON", "-DDISABLE_PERL=ON" + } + + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + + table.insert(configs, "-DBUILD_LIBSSL=ON") + table.insert(configs, "-DENABLE_FIPS_ENTROPY_CPU_JITTER=" .. (package:config("jitter") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_TOOL=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("SSL_new", {includes = "openssl/ssl.h"})) + end) From 77b81666e231dc4bbf5073188ccf97c0166b771e Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Jul 2024 01:48:42 +0800 Subject: [PATCH 350/671] Update aws-crt-cpp to v0.27.2 (#4579) Co-authored-by: star9029 --- packages/a/aws-crt-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua index 06e7b6173..879a55bf1 100644 --- a/packages/a/aws-crt-cpp/xmake.lua +++ b/packages/a/aws-crt-cpp/xmake.lua @@ -6,6 +6,7 @@ package("aws-crt-cpp") add_urls("https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-crt-cpp.git") + add_versions("v0.27.2", "e17c82d7cc3b5e6e4300bc7e4794306e292b5281d212ead536000a8b5f5f1be4") add_versions("v0.26.11", "23acb2b14019182dd73fe6779ec266ee4d8937f19a99803da6407937fa22db7d") add_versions("v0.26.9", "5b5760d34fbbfcc971f561296e828de4c788750472fd9bd3ac20068a083620f2") add_versions("v0.26.8", "36ced4fb54c8eb7325b4576134e01f93bfaca2709565b5ad036d198d703e4c8f") From 3e3b58874d2c768a22d009a2902223ae976a8fbb Mon Sep 17 00:00:00 2001 From: Maxime <672982+maximegmd@users.noreply.github.com> Date: Thu, 11 Jul 2024 01:30:08 +0200 Subject: [PATCH 351/671] mimalloc 2.1.7 & 1.8.7 (#4612) * mimalloc 2.1.7 & 1.8.7 * Update test.lua * Update xmake.lua * mac shared fix --------- Co-authored-by: ruki --- packages/m/mimalloc/xmake.lua | 8 +++++++- scripts/test.lua | 35 +++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/packages/m/mimalloc/xmake.lua b/packages/m/mimalloc/xmake.lua index 33a7d479b..df188ffd4 100644 --- a/packages/m/mimalloc/xmake.lua +++ b/packages/m/mimalloc/xmake.lua @@ -5,6 +5,7 @@ package("mimalloc") set_license("MIT") set_urls("https://github.com/microsoft/mimalloc/archive/v$(version).zip") + add_versions("2.1.7", "fa61cf01e3dd869b35275bfd8be95bfde77f0b65dfa7e34012c09a66e1ea463f") add_versions("2.1.2", "86281c918921c1007945a8a31e5ad6ae9af77e510abfec20d000dd05d15123c7") add_versions("2.0.7", "ddb32937aabddedd0d3a57bf68158d4e53ecf9e051618df3331a67182b8b0508") add_versions("2.0.6", "23e7443d0b4d7aa945779ea8a806e4e109c0ed62d740953d3656cddea7e04cf8") @@ -13,6 +14,7 @@ package("mimalloc") add_versions("2.0.2", "6ccba822e251b8d10f8a63d5d7767bc0cbfae689756a4047cdf3d1e4a9fd33d0") add_versions("2.0.1", "59c1fe79933e0ac9837a9ca4d954e4887dccd80a84281a6f849681b89a8b8876") + add_versions("1.8.7", "c37c099244f1096c40fca6ca9d2d456bb22efb99d64d34a26e39e3291a774ed9") add_versions("1.7.7", "d51a5b8f3bc6800a0b2fc46830ce67b4d31b12f4e4550ff80cf394d5a88fead8") add_versions("1.7.6", "bae56f8ebdcd43da83b52610d7f1c1602ea8d3798d906825defa5c40ad2eb560") add_versions("1.7.3", "8319eca4a114dce5f897a4cb7d945bce22d915b4b262adb861cd7ac68fa3e848") @@ -26,7 +28,7 @@ package("mimalloc") if is_plat("windows") then add_configs("etw", {description = "Enable Event tracing for Windows", default = false, type = "boolean"}) end - + add_deps("cmake") if is_plat("windows") then @@ -79,6 +81,10 @@ package("mimalloc") elseif package:is_plat("mingw") then os.trycp("build/**.dll", package:installdir("bin")) os.trycp("build/**.a", package:installdir("lib")) + elseif package:is_plat("macosx") then + os.trycp("build/*.dylib", package:installdir("bin")) + os.trycp("build/*.dylib", package:installdir("lib")) + os.trycp("build/*.a", package:installdir("lib")) else os.trycp("build/*.so", package:installdir("bin")) os.trycp("build/*.so", package:installdir("lib")) diff --git a/scripts/test.lua b/scripts/test.lua index 71c2019bc..76d2d90aa 100644 --- a/scripts/test.lua +++ b/scripts/test.lua @@ -216,6 +216,32 @@ function _package_is_supported(argv, packagename) end end +function get_modified_packages() + local packages = {} + local diff = os.iorun("git --no-pager diff HEAD^") + for _, line in ipairs(diff:split("\n")) do + if line:startswith("+++ b/") then + local file = line:sub(7) + if file:startswith("packages") then + assert(file == file:lower(), "%s must be lower case!", file) + local package = file:match("packages/%w/(%S-)/") + table.insert(packages, package) + end + elseif line:startswith("+") and line:find("add_versions") then + local version = line:match("add_versions%(\"(.-)\"") + if #packages > 0 and version then + local lastpackage = packages[#packages] + local splitinfo = lastpackage:split("%s+") + if #splitinfo == 1 then + table.remove(packages) + end + table.insert(packages, splitinfo[1] .. " " .. version) + end + end + end + return packages +end + -- the main entry function main(...) @@ -225,14 +251,7 @@ function main(...) -- get packages local packages = argv.packages or {} if #packages == 0 then - local files = os.iorun("git diff --name-only HEAD^") - for _, file in ipairs(files:split('\n'), string.trim) do - if file:startswith("packages") then - assert(file == file:lower(), "%s must be lower case!", file) - local package = file:match("packages/%w/(%S-)/") - table.insert(packages, package) - end - end + packages = get_modified_packages() end if #packages == 0 then table.insert(packages, "tbox dev") From 1d410a0bdae752b4b4320b3fffa5a2935ce976a8 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Jul 2024 09:44:52 +0800 Subject: [PATCH 352/671] Update zziplib to v0.13.77 (#4619) --- packages/z/zziplib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/z/zziplib/xmake.lua b/packages/z/zziplib/xmake.lua index b3b092676..46aa8770e 100644 --- a/packages/z/zziplib/xmake.lua +++ b/packages/z/zziplib/xmake.lua @@ -6,6 +6,7 @@ package("zziplib") add_urls("https://github.com/gdraheim/zziplib/archive/refs/tags/$(version).tar.gz", "https://github.com/gdraheim/zziplib.git") + add_versions("v0.13.77", "50e166e6a879c2bd723e60e482a91ec793a7362fa2d9c5fe556fb0e025810477") add_versions("v0.13.76", "08b0e300126329c928a41b6d68e397379fad02469e34a0855d361929968ea4c0") add_versions("v0.13.74", "319093aa98d39453f3ea2486a86d8a2fab2d5632f6633a2665318723a908eecf") add_versions("v0.13.72", "93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc") From 5ba4a4be37d2aa99d27ae5761d23b655c9be5e8b Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Thu, 11 Jul 2024 02:45:49 +0100 Subject: [PATCH 353/671] date: fix links, change versioning (#4618) * date: fix package Links were missing to run this package * date: change versioning https://github.com/HowardHinnant/date/issues/828#issuecomment-2184283807 * date: use c++11 for test * date: add_syslinks("z") for macosx * date: add_deps("zlib") for macosx * date: add_frameworks("Foundation") for macosx & iphoneos --- packages/d/date/xmake.lua | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/d/date/xmake.lua b/packages/d/date/xmake.lua index 287e060c5..fdb876f81 100644 --- a/packages/d/date/xmake.lua +++ b/packages/d/date/xmake.lua @@ -4,12 +4,21 @@ package("date") set_description("A date and time library for use with C++11 and C++14.") set_license("MIT") - add_urls("https://github.com/HowardHinnant/date/archive/refs/tags/$(version).zip", - "https://github.com/HowardHinnant/date.git") + add_urls("https://github.com/HowardHinnant/date.git") - add_versions("v3.0.1", "f4300b96f7a304d4ef9bf6e0fa3ded72159f7f2d0f605bdde3e030a0dba7cf9f") + add_versions("2024.05.14", "1ead6715dec030d340a316c927c877a3c4e5a00c") + add_versions("2021.04.17", "6e921e1b1d21e84a5c82416ba7ecd98e33a436d0") + + if is_plat("windows", "mingw") then + add_syslinks("ole32", "shell32") + elseif is_plat("macosx", "iphoneos") then + add_frameworks("Foundation") + end add_deps("cmake") + if is_plat("macosx", "iphoneos") then + add_deps("zlib") + end on_install(function (package) local configs = {"-DBUILD_TZ_LIB=ON", @@ -20,6 +29,19 @@ package("date") end) on_test(function (package) - assert(package:has_cxxtypes("date::sys_days", {configs = {languages = "c++11"}, includes = "date/date.h"})) - assert(package:has_cxxtypes("date::time_zone", {configs = {languages = "c++11"}, includes = "date/tz.h"})) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + using namespace date; + year_month_weekday_last{year{2015}, month{3u}, weekday_last{weekday{0u}}}; + } + ]]}, {configs = {languages = "c++11"}})) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + using namespace date; + using namespace std::chrono; + make_zoned(current_zone(), system_clock::now()); + } + ]]}, {configs = {languages = "c++11"}})) end) From 3a37152923e77e915fbef66426d8bffdeccfff4e Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 11 Jul 2024 21:00:36 +0800 Subject: [PATCH 354/671] sse2rvv: add package --- packages/s/sse2rvv/xmake.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/s/sse2rvv/xmake.lua diff --git a/packages/s/sse2rvv/xmake.lua b/packages/s/sse2rvv/xmake.lua new file mode 100644 index 000000000..ddf62c659 --- /dev/null +++ b/packages/s/sse2rvv/xmake.lua @@ -0,0 +1,19 @@ +package("sse2rvv") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/pattonkan/sse2rvv") + set_description("A translator from Intel SSE intrinsics to RISCV-V Extension implementation") + set_license("MIT") + + add_urls("https://github.com/pattonkan/sse2rvv/archive/58b524e3f3cb8732118194f2920a343a5c5ce530.tar.gz", + "https://github.com/pattonkan/sse2rvv.git") + + add_versions("2024.02.18", "e41e24195fda914c0ef85671c202e43d0e3bf86a63ece6564c539ad60f571bd1") + + on_install(function (package) + assert(package:is_arch("riscv.*"), "package(sse2rvv): only support riscv") + os.vcp("sse2rvv.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cxxincludes("sse2rvv.h")) + end) From 98183ddec55e3e24b53476f616d6de693250fbbf Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Jul 2024 21:13:28 +0800 Subject: [PATCH 355/671] Update aws-crt-cpp to v0.27.0 (#4456) Co-authored-by: star9029 --- packages/a/aws-crt-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua index 879a55bf1..d256ea2e0 100644 --- a/packages/a/aws-crt-cpp/xmake.lua +++ b/packages/a/aws-crt-cpp/xmake.lua @@ -7,6 +7,7 @@ package("aws-crt-cpp") "https://github.com/awslabs/aws-crt-cpp.git") add_versions("v0.27.2", "e17c82d7cc3b5e6e4300bc7e4794306e292b5281d212ead536000a8b5f5f1be4") + add_versions("v0.27.0", "e7601c8c5e6391013b6ad164d2dd7b970bf5dbb3693b9cc80c424bd6f42b79c8") add_versions("v0.26.11", "23acb2b14019182dd73fe6779ec266ee4d8937f19a99803da6407937fa22db7d") add_versions("v0.26.9", "5b5760d34fbbfcc971f561296e828de4c788750472fd9bd3ac20068a083620f2") add_versions("v0.26.8", "36ced4fb54c8eb7325b4576134e01f93bfaca2709565b5ad036d198d703e4c8f") From 9975679ad9667446f64ee5b347dcab5ec98f3c5c Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Jul 2024 21:14:25 +0800 Subject: [PATCH 356/671] Auto-update tinygltf to v2.9.2 (#4622) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update tinygltf to v2.9.2 * trigger ci * Update xmake.lua --------- Co-authored-by: star9029 Co-authored-by: Jérôme Leclercq --- packages/n/nlohmann_json/xmake.lua | 2 +- packages/t/tinygltf/xmake.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/n/nlohmann_json/xmake.lua b/packages/n/nlohmann_json/xmake.lua index 6a8d91e97..adec837b2 100644 --- a/packages/n/nlohmann_json/xmake.lua +++ b/packages/n/nlohmann_json/xmake.lua @@ -1,5 +1,5 @@ package("nlohmann_json") - + set_kind("library", { headeronly = true }) set_homepage("https://nlohmann.github.io/json/") set_description("JSON for Modern C++") set_license("MIT") diff --git a/packages/t/tinygltf/xmake.lua b/packages/t/tinygltf/xmake.lua index 7637458d1..5b1b1a296 100644 --- a/packages/t/tinygltf/xmake.lua +++ b/packages/t/tinygltf/xmake.lua @@ -6,6 +6,8 @@ package("tinygltf") add_urls("https://github.com/syoyo/tinygltf/archive/refs/tags/$(version).tar.gz", "https://github.com/syoyo/tinygltf.git") + + add_versions("v2.9.2", "b34d1456bb1d63bbb4e05ea1e4d8691d0253a03ef72385a8bffd2fae4b743feb") add_versions("v2.8.22", "97c3eb1080c1657cd749d0b49af189c6a867d5af30689c48d5e19521e7b5a070") add_versions("v2.8.21", "e567257d7addde58b0a483832cbaa5dd8f15e5bcaee6f023831e215d1a2c0502") add_versions("v2.5.0", "5d85bd556b60b1b69527189293cfa4902957d67fabb8582b6532f23a5ef27ec1") @@ -20,7 +22,7 @@ package("tinygltf") "-DTINYGLTF_BUILD_LOADER_EXAMPLE=OFF", "-DTINYGLTF_HEADER_ONLY=ON" } - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) From b5797f433118b1e5d21ccab4ab44ad742a834b42 Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 12 Jul 2024 06:50:49 +0800 Subject: [PATCH 357/671] update yyjson to 0.10.0 (#4627) --- packages/y/yyjson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/y/yyjson/xmake.lua b/packages/y/yyjson/xmake.lua index a8252e2b4..29f77a032 100644 --- a/packages/y/yyjson/xmake.lua +++ b/packages/y/yyjson/xmake.lua @@ -6,6 +6,7 @@ package("yyjson") add_urls("https://github.com/ibireme/yyjson/archive/$(version).tar.gz", "https://github.com/ibireme/yyjson.git") + add_versions("0.10.0", "0d901cb2c45c5586e3f3a4245e58c2252d6b24bf4b402723f6179523d389b165") add_versions("0.9.0", "59902bea55585d870fd7681eabe6091fbfd1a8776d1950f859d2dbbd510c74bd") add_versions("0.8.0", "b2e39ac4c65f9050820c6779e6f7dd3c0d3fed9c6667f91caec0badbedce00f3") add_versions("0.5.1", "b484d40b4e20cc3174a6fdc160d0f20f961417f9cb3f6dc1cf6555fffa8359f3") From b324b507640f08a444f0f815cacf7d5afa9f8f4b Mon Sep 17 00:00:00 2001 From: KaoruXun <2480707737@qq.com> Date: Fri, 12 Jul 2024 06:51:44 +0800 Subject: [PATCH 358/671] pl_mpeg: add package (#4626) --- packages/p/pl_mpeg/xmake.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/p/pl_mpeg/xmake.lua diff --git a/packages/p/pl_mpeg/xmake.lua b/packages/p/pl_mpeg/xmake.lua new file mode 100644 index 000000000..7c34408e8 --- /dev/null +++ b/packages/p/pl_mpeg/xmake.lua @@ -0,0 +1,16 @@ +package("pl_mpeg") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/phoboslab/pl_mpeg") + set_description("Single file C library for decoding MPEG1 Video and MP2 Audio") + set_license("MIT") + + set_urls("https://github.com/phoboslab/pl_mpeg.git") + add_versions("2024.04.12", "9e40dd6536269d788728e32c39bfacf2ab7a0866") + + on_install(function (package) + os.cp("pl_mpeg.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cfuncs("plm_create_with_filename", {includes = "pl_mpeg.h"})) + end) \ No newline at end of file From 4769772751efb1b5cc120ae73de237ac4332000a Mon Sep 17 00:00:00 2001 From: Ahmed AbouEleyoun Date: Fri, 12 Jul 2024 01:52:51 +0300 Subject: [PATCH 359/671] glad: add extra configs to customize the generation (#4617) --- packages/g/glad/xmake.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/g/glad/xmake.lua b/packages/g/glad/xmake.lua index 93def31ed..b66dc15b6 100644 --- a/packages/g/glad/xmake.lua +++ b/packages/g/glad/xmake.lua @@ -21,10 +21,23 @@ package("glad") end end) + add_configs("reproducible", {description = "Disable fetching the latest specification from Khronos", default = true, type = "boolean"}) + add_configs("profile", {description = "OpenGL profile", default = "compatibility", type = "string", values = {"core", "compatibility"}}) + add_configs("api", {description = "OpenGL API", default = "", type = "string"}) + add_configs("extensions", {description = "OpenGL extensions", default = "", type = "string"}) + add_configs("generator", {description = "Generator", default = "c", type = "string", values = {"c", "c-debug", "d", "nim", "pascal", "volt"}}) + add_configs("spec", {description = "OpenGL spec", default = "gl", type = "string"}) + on_install("windows", "linux", "macosx", "mingw", function (package) - local configs = {"-DGLAD_INSTALL=ON", "-DGLAD_REPRODUCIBLE=ON"} + local configs = {"-DGLAD_INSTALL=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DGLAD_REPRODUCIBLE=" .. (package:config("reproducible") and "ON" or "OFF")) + table.insert(configs, "-DGLAD_PROFILE=" .. package:config("profile")) + table.insert(configs, "-DGLAD_API=" .. package:config("api")) + table.insert(configs, "-DGLAD_EXTENSIONS=" .. package:config("extensions")) + table.insert(configs, "-DGLAD_GENERATOR=" .. package:config("generator")) + table.insert(configs, "-DGLAD_SPEC=" .. package:config("spec")) if package:is_plat("windows") then table.insert(configs, "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=" .. (package:config("vs_runtime"):startswith("MT") and "OFF" or "ON")) end From 199b79ad4c808211bf228554e76b066b261b3932 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 12 Jul 2024 06:55:32 +0800 Subject: [PATCH 360/671] libinterpolate: add package (#4623) --- packages/l/libinterpolate/xmake.lua | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/l/libinterpolate/xmake.lua diff --git a/packages/l/libinterpolate/xmake.lua b/packages/l/libinterpolate/xmake.lua new file mode 100644 index 000000000..f35066e73 --- /dev/null +++ b/packages/l/libinterpolate/xmake.lua @@ -0,0 +1,30 @@ +package("libinterpolate") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/CD3/libInterpolate") + set_description("A C++ library for interpolation.") + set_license("MIT") + + add_urls("https://github.com/CD3/libInterpolate/archive/2887aaf000e62cec1cceb9b238d402852c24fa26.tar.gz", + "https://github.com/CD3/libInterpolate.git") + + add_versions("2024.04.29", "1f39904d09da933dd11a58c6ea061c5f2459bbd44dd6ffa2429734629b15b489") + + add_deps("cmake") + add_deps("boost", "eigen") + + on_install("windows", "linux", "macosx", "mingw", "cross", function (package) + local configs = {"-DBUILD_TESTS=OFF"} + local version = package:version() + if version then + table.insert(configs, "-DlibInterpolate_VERSION=" .. version) + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + _1D::CubicSplineInterpolator interp; + } + ]]}, {configs = {languages = "c++17"}, includes = "libInterpolate/Interpolate.hpp"})) + end) From ffd373a225d8ece9f592950c49f703c33f3c30cc Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 12 Jul 2024 07:29:35 +0800 Subject: [PATCH 361/671] pdfio: add package (#4624) * pdfio: add package * remove main cpp * fix missing files * patch mingw --- packages/p/pdfio/port/xmake.lua | 19 ++++++++++++++++ packages/p/pdfio/xmake.lua | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 packages/p/pdfio/port/xmake.lua create mode 100644 packages/p/pdfio/xmake.lua diff --git a/packages/p/pdfio/port/xmake.lua b/packages/p/pdfio/port/xmake.lua new file mode 100644 index 000000000..7a26311d4 --- /dev/null +++ b/packages/p/pdfio/port/xmake.lua @@ -0,0 +1,19 @@ +add_rules("mode.debug", "mode.release") + +add_requires("zlib") +add_packages("zlib") + +target("pdfio") + set_kind("$(kind)") + add_files("pdfio-*.c", "ttf.c") + add_headerfiles("pdfio.h") + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + + if is_plat("windows", "mingw") then + add_syslinks("advapi32") + elseif is_plat("linux", "bsd") then + add_syslinks("m") + end diff --git a/packages/p/pdfio/xmake.lua b/packages/p/pdfio/xmake.lua new file mode 100644 index 000000000..caf28c479 --- /dev/null +++ b/packages/p/pdfio/xmake.lua @@ -0,0 +1,39 @@ +package("pdfio") + set_homepage("https://www.msweet.org/pdfio") + set_description("PDFio is a simple C library for reading and writing PDF files.") + set_license("Apache-2.0") + + add_urls("https://github.com/michaelrsweet/pdfio/archive/refs/tags/$(version).tar.gz", + "https://github.com/michaelrsweet/pdfio.git") + + add_versions("v1.3.0", "aae5b4850560869021f6af1700a0681f0d19299554f24abf890a1a78188ddf02") + + if is_plat("windows", "mingw") then + add_syslinks("advapi32") + elseif is_plat("linux", "bsd") then + add_syslinks("m") + end + + add_deps("zlib") + + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) > 21, "package(pdfio): need ndk api level > 21") + end) + end + + on_install(function (package) + if package:is_plat("mingw") and package:is_arch("i386") then + io.replace("ttf.c", "typedef __int64 ssize_t;", "", {plain = true}) + io.replace("pdfio.h", "typedef __int64 ssize_t;", "", {plain = true}) + end + + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("pdfioArrayCreate", {includes = "pdfio.h"})) + end) From 7b9952bc7e431af70c32483856b34e43df4e5372 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Jul 2024 09:55:25 +0800 Subject: [PATCH 362/671] Update simdutf to v5.3.0 (#4628) --- packages/s/simdutf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdutf/xmake.lua b/packages/s/simdutf/xmake.lua index 6d2451162..c966cc00b 100644 --- a/packages/s/simdutf/xmake.lua +++ b/packages/s/simdutf/xmake.lua @@ -6,6 +6,7 @@ package("simdutf") add_urls("https://github.com/simdutf/simdutf/archive/refs/tags/$(version).tar.gz", "https://github.com/simdutf/simdutf.git") + add_versions("v5.3.0", "9b568d6e66b14810bdbcf645f19b103475ab8175201b5c85828222c0ff0a735c") add_versions("v5.2.8", "2706f1bef85a6d8598f82defd3848f1c5100e2e065c5d416d993118b53ea8d77") add_versions("v5.2.6", "ab9e56facf7cf05f4e9d062a0adef310fc6a0f82a8132e8ec1e1bb7ab5e234df") add_versions("v5.2.4", "36281d6489a4a8c2b5bfac2d41c03dce8fc89ec1cda15cc05c53d44f5ad30b4d") From 4b9259c261e3ef67f4f76b579fa6a9297464dfd8 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Jul 2024 10:29:38 +0800 Subject: [PATCH 363/671] Update meson to 1.4.2 (#4630) --- packages/m/meson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/meson/xmake.lua b/packages/m/meson/xmake.lua index f3d00c4f4..6ca3aef24 100644 --- a/packages/m/meson/xmake.lua +++ b/packages/m/meson/xmake.lua @@ -6,6 +6,7 @@ package("meson") add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz", "https://github.com/mesonbuild/meson.git") + add_versions("1.4.2", "ea2546a26f4a171a741c1fd036f22c9c804d6198e3259f1df588e01f842dd69f") add_versions("1.4.1", "1b8aad738a5f6ae64294cc8eaba9a82988c1c420204484ac02ef782e5bba5f49") add_versions("1.4.0", "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d") add_versions("1.3.2", "492eb450c8b073024276f916f5adbb3c4bb7e90e9e6ec124efda064f3d9b5baa") From f581fd74d16221bcae6e6ad2d04c25980414e0a1 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Jul 2024 15:39:56 +0800 Subject: [PATCH 364/671] Update pahomqttcpp to v1.4.1 (#4629) --- packages/p/pahomqttcpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pahomqttcpp/xmake.lua b/packages/p/pahomqttcpp/xmake.lua index cc3c2e3ea..ad634c954 100644 --- a/packages/p/pahomqttcpp/xmake.lua +++ b/packages/p/pahomqttcpp/xmake.lua @@ -6,6 +6,7 @@ package("pahomqttcpp") add_urls("https://github.com/eclipse/paho.mqtt.cpp/archive/refs/tags/$(version).zip", "https://github.com/eclipse/paho.mqtt.cpp.git") + add_versions("v1.4.1", "a3b2782ef6d19ff2ac4c6cfe29de79d8888f75122deb361ae91ca3d3a14456ee") add_versions("v1.4.0", "c165960f64322de21697eb06efdca3d74cce90f45ff5ff0efdd968708e13ba0c") add_versions("v1.3.2", "e01f43cf0ba35efa666503c7adb2786d4a6f7fe6eb44ce5311ac4785a0ce8a98") add_versions("v1.2.0", "90c4d8ae4f56bb706120fddcc5937cd0a0360b6f39d5cd5574a5846c0f923473") From e67680812179fa3d91aa605376a5e009c9399807 Mon Sep 17 00:00:00 2001 From: JXMaster Date: Fri, 12 Jul 2024 15:43:31 +0800 Subject: [PATCH 365/671] Add `on_load` function to volk package script to fix installing error on latest xmake version. (#4632) --- packages/v/volk/xmake.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/v/volk/xmake.lua b/packages/v/volk/xmake.lua index e8064a534..f678b8533 100644 --- a/packages/v/volk/xmake.lua +++ b/packages/v/volk/xmake.lua @@ -65,6 +65,12 @@ package("volk") import("package.tools.xmake").install(package) end) + on_load(function (package) + if package:config("header_only") then + package:set("kind", "library", {headeronly = true}) + end + end) + on_test(function (package) local defines if package:config("header_only") then From 41fe34936a4d2a81355528dcfba3d809de3b1905 Mon Sep 17 00:00:00 2001 From: Enzo Einhorn <52015993+enzalito@users.noreply.github.com> Date: Fri, 12 Jul 2024 16:03:08 +0200 Subject: [PATCH 366/671] add node_api_headers package (#4634) * add node_api_headers package * improve node-api-headers test * fix attempt node-api-headers test * Update xmake.lua --------- Co-authored-by: ruki --- packages/n/node-api-headers/xmake.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/n/node-api-headers/xmake.lua diff --git a/packages/n/node-api-headers/xmake.lua b/packages/n/node-api-headers/xmake.lua new file mode 100644 index 000000000..9e2725d3b --- /dev/null +++ b/packages/n/node-api-headers/xmake.lua @@ -0,0 +1,17 @@ +package("node-api-headers") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/nodejs/node-api-headers") + set_description("C-based Node-API headers") + set_license("MIT") + + set_urls("https://github.com/nodejs/node-api-headers/archive/refs/tags/$(version).tar.gz", + "https://github.com/nodejs/node-api-headers.git") + add_versions("v1.1.0", "70608bc1e6dddce280285f3462f18a106f687c0720a4b90893e1ecd86e5a8bbf") + + on_install(function(package) + os.cp("include/*.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cfuncs("napi_async_init", {includes = "node_api.h"})) + end) From ac0e2990627270ff85ceb5a8bf393eeae37e2faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 13 Jul 2024 03:10:33 +0200 Subject: [PATCH 367/671] Update flecs to v3.2.12 (#4638) --- packages/f/flecs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/flecs/xmake.lua b/packages/f/flecs/xmake.lua index fe94240ff..7ef0bd591 100644 --- a/packages/f/flecs/xmake.lua +++ b/packages/f/flecs/xmake.lua @@ -5,6 +5,7 @@ package("flecs") add_urls("https://github.com/SanderMertens/flecs/archive/refs/tags/$(version).tar.gz", "https://github.com/SanderMertens/flecs.git") + add_versions("v3.2.12", "976551dabeecf3ae109648034b8dbc47f39f50226b6d71d76bace1d0b6e2d8ae") add_versions("v3.2.11", "8ebc5f6f3ec7bbba30b0afe9d22f157437925772857ea1c6e4201eb5d31b4fe5") add_versions("v3.2.10", "b799e85d47b3e5c2e631ebbd3b81cc6af4be574fccbe07099c58252182827a88") add_versions("v3.2.9", "65d50d6058cd38308a0ad2a971afa9f64aef899ebf78d6a074d905922ec5fdf8") From b9256cbb4623e045e2c95992b5bfc698c82e5c27 Mon Sep 17 00:00:00 2001 From: Zetelias <145657074+Zetelias@users.noreply.github.com> Date: Sat, 13 Jul 2024 04:20:04 +0200 Subject: [PATCH 368/671] Make glaze multiplatform (#4637) * Make glaze multiplatform * Update xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 --- packages/g/glaze/xmake.lua | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/g/glaze/xmake.lua b/packages/g/glaze/xmake.lua index b41dcca03..b9d282ce7 100644 --- a/packages/g/glaze/xmake.lua +++ b/packages/g/glaze/xmake.lua @@ -2,6 +2,7 @@ package("glaze") set_kind("library", {headeronly = true}) set_homepage("https://github.com/stephenberry/glaze") set_description("Extremely fast, in memory, JSON and interface library for modern C++") + set_license("MIT") add_urls("https://github.com/stephenberry/glaze/archive/refs/tags/$(version).tar.gz", "https://github.com/stephenberry/glaze.git") @@ -16,8 +17,31 @@ package("glaze") add_versions("v2.2.0", "1d6e36029a58bf8c4bdd035819e1ab02b87d8454dd80fa2f5d46c96a1e6d600c") add_versions("v1.3.5", "de5d59cb7f31193d45f67f25d8ced1499df50c0d926a1461432b87f2b2368817") - on_install("linux", function (package) - os.cp("include", package:installdir()) + add_deps("cmake") + + if on_check then + on_check("windows", function (package) + if package:is_plat("windows") then + local vs = package:toolchain("msvc"):config("vs") + assert(vs and tonumber(vs) >= 2022, "package(glaze): need vs >= 2022") + end + end) + end + + on_install("windows", "linux", "bsd", "mingw", "wasm", function (package) + local version = package:version() + if version and version:ge("2.9.5") then + if package:has_tool("cxx", "cl", "clang_cl") then + package:add("cxxflags", "/Zc:preprocessor", "/permissive-", "/Zc:lambda") + end + + import("package.tools.cmake").install(package, { + "-Dglaze_DEVELOPER_MODE=OFF", + "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release") + }) + else + os.cp("include", package:installdir()) + end end) on_test(function (package) From 4516486c9452edffd630bba4d1c8bef77425a869 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 13 Jul 2024 10:23:35 +0800 Subject: [PATCH 369/671] Update node-api-headers to v1.2.0 (#4641) --- packages/n/node-api-headers/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/node-api-headers/xmake.lua b/packages/n/node-api-headers/xmake.lua index 9e2725d3b..167251a5d 100644 --- a/packages/n/node-api-headers/xmake.lua +++ b/packages/n/node-api-headers/xmake.lua @@ -6,6 +6,7 @@ package("node-api-headers") set_urls("https://github.com/nodejs/node-api-headers/archive/refs/tags/$(version).tar.gz", "https://github.com/nodejs/node-api-headers.git") + add_versions("v1.2.0", "deda1c8536ebae8b0a35c26d8547e23061c7d3cffd05ea70046be1c7c0efc2d0") add_versions("v1.1.0", "70608bc1e6dddce280285f3462f18a106f687c0720a4b90893e1ecd86e5a8bbf") on_install(function(package) From b57e34c7afa12fe959b4235d0d21d5c4225dc044 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 13 Jul 2024 10:23:38 +0800 Subject: [PATCH 370/671] Update s2n-tls to v1.4.17 (#4640) --- packages/s/s2n-tls/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/s2n-tls/xmake.lua b/packages/s/s2n-tls/xmake.lua index fc9d6b702..632651562 100644 --- a/packages/s/s2n-tls/xmake.lua +++ b/packages/s/s2n-tls/xmake.lua @@ -6,6 +6,7 @@ package("s2n-tls") add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/s2n-tls.git") + add_versions("v1.4.17", "5235cd2c926b89ae795b1e6b5158dce598c9e79120208b4bcd8d19ce04d86986") add_versions("v1.4.16", "84fdbaa894c722bf13cac87b8579f494c1c2d66de642e5e6104638fddea76ad9") add_versions("v1.4.14", "90cd0b7b1e5ebc7e40ba5f810cc24a4d604aa534fac7260dee19a35678e38659") add_versions("v1.4.12", "d0769f27eb9e6b8fc98d3e8e3eb87ed71e10b08fade87893b293878d84faaceb") From 4a028b552f4f89c5d2bc097c1b9ba88dd55632a9 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 13 Jul 2024 10:32:09 +0800 Subject: [PATCH 371/671] Update vvenc to v1.12.0 (#4643) --- packages/v/vvenc/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vvenc/xmake.lua b/packages/v/vvenc/xmake.lua index 132d2a63b..380c539f0 100644 --- a/packages/v/vvenc/xmake.lua +++ b/packages/v/vvenc/xmake.lua @@ -6,6 +6,7 @@ package("vvenc") add_urls("https://github.com/fraunhoferhhi/vvenc/archive/refs/tags/$(version).tar.gz", "https://github.com/fraunhoferhhi/vvenc.git") + add_versions("v1.12.0", "e7311ffcc87d8fcc4b839807061cca1b89be017ae7c449a69436dc2dd07615c2") add_versions("v1.11.1", "4f0c8ac3f03eb970bee7a0cacc57a886ac511d58f081bb08ba4bce6f547d92fa") add_versions("v1.9.0", "4ddb365dfc21bbbb7ed54655c7630ae3e8e977af31f22b28195e720215b1072d") From 04657d892f973966e8aeb5daac5f872986b8613e Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 13 Jul 2024 11:07:49 +0800 Subject: [PATCH 372/671] Update rapidfuzz to v3.0.5 (#4644) --- packages/r/rapidfuzz/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rapidfuzz/xmake.lua b/packages/r/rapidfuzz/xmake.lua index a13623bc2..612851507 100644 --- a/packages/r/rapidfuzz/xmake.lua +++ b/packages/r/rapidfuzz/xmake.lua @@ -7,6 +7,7 @@ package("rapidfuzz") add_urls("https://github.com/rapidfuzz/rapidfuzz-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/rapidfuzz/rapidfuzz-cpp.git") + add_versions("v3.0.5", "e32936cc66333a12f659553b5fdd6d0c22257d32ac3b7a806ac9031db8dea5a1") add_versions("v3.0.4", "18d1c41575ceddd6308587da8befc98c85d3b5bc2179d418daffed6d46b8cb0a") add_versions("v3.0.2", "4fddce5c0368e78bd604c6b820e6be248d669754715e39b4a8a281bda4c06de1") From 988dcba9fbea5fdfb670fd90f63a4a9eb9e69571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sat, 13 Jul 2024 13:45:47 +0200 Subject: [PATCH 373/671] Auto-update libsdl to 2.30.5 (#4639) * Update libsdl to 2.30.5 * Update test.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/l/libsdl/xmake.lua | 2 ++ packages/x/xtrans/xmake.lua | 2 +- scripts/test.lua | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/l/libsdl/xmake.lua b/packages/l/libsdl/xmake.lua index 8d3410b68..0428512f0 100644 --- a/packages/l/libsdl/xmake.lua +++ b/packages/l/libsdl/xmake.lua @@ -41,6 +41,7 @@ package("libsdl") add_versions("archive:2.30.2", "09a822abf6e97f80d09cf9c46115faebb3476b0d56c1c035aec8ec3f88382ae7") add_versions("archive:2.30.3", "c5d78a9e0346c6695f03df8ba25e5e111a1e23c8aefa8372a1c5a0dd79acaf10") add_versions("archive:2.30.4", "292d5e2f897aa3acb6b365b605c3249c92916fbe7eba4a2e57573ada3855d7cb") + add_versions("archive:2.30.5", "688d3da2bf7e887d0ba8e0f81c926119f85029544f4f6da8dea96db70f9d28e3") add_versions("github:2.0.8", "release-2.0.8") add_versions("github:2.0.12", "release-2.0.12") add_versions("github:2.0.14", "release-2.0.14") @@ -67,6 +68,7 @@ package("libsdl") add_versions("github:2.30.2", "release-2.30.2") add_versions("github:2.30.3", "release-2.30.3") add_versions("github:2.30.4", "release-2.30.4") + add_versions("github:2.30.5", "release-2.30.5") add_patches("2.30.0", path.join(os.scriptdir(), "patches", "2.30.0", "fix_mingw.patch"), "ab54eebc2e58d88653b257bc5b48a232c5fb0e6fad5d63661b6388215a7b0cd0") diff --git a/packages/x/xtrans/xmake.lua b/packages/x/xtrans/xmake.lua index e570af41a..65871bce9 100644 --- a/packages/x/xtrans/xmake.lua +++ b/packages/x/xtrans/xmake.lua @@ -1,10 +1,10 @@ package("xtrans") + set_kind("library", {headeronly = true}) set_homepage("https://www.x.org/") set_description("X.Org: X Network Transport layer shared code") set_urls("https://www.x.org/archive/individual/lib/xtrans-$(version).tar.gz") add_versions("1.4.0", "48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9") - -- add_versions("1.5.0", "a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86") if is_plat("linux") then add_extsources("apt::xtrans-dev", "pacman::xtrans") diff --git a/scripts/test.lua b/scripts/test.lua index 76d2d90aa..15196826d 100644 --- a/scripts/test.lua +++ b/scripts/test.lua @@ -229,6 +229,9 @@ function get_modified_packages() end elseif line:startswith("+") and line:find("add_versions") then local version = line:match("add_versions%(\"(.-)\"") + if version:find(":", 1, true) then + version = version:split(":")[2] + end if #packages > 0 and version then local lastpackage = packages[#packages] local splitinfo = lastpackage:split("%s+") @@ -239,7 +242,7 @@ function get_modified_packages() end end end - return packages + return table.unique(packages) end -- the main entry From dda9e3452e51e7acb4c4d76b22bb1e069f2958c0 Mon Sep 17 00:00:00 2001 From: KaoruXun Date: Sat, 13 Jul 2024 22:14:45 +0800 Subject: [PATCH 374/671] update sokol and stb (#4647) --- packages/s/sokol/xmake.lua | 1 + packages/s/stb/xmake.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/s/sokol/xmake.lua b/packages/s/sokol/xmake.lua index 2103bd791..bf0e67e1c 100644 --- a/packages/s/sokol/xmake.lua +++ b/packages/s/sokol/xmake.lua @@ -8,6 +8,7 @@ package("sokol") add_urls("https://github.com/floooh/sokol.git") add_versions("2022.02.10", "e8931e4399a0eb4bf026120d7bdb89825815af9e") add_versions("2023.01.27", "dc6814bdecd277366a650b6b0b744b52bb9131e5") + add_versions("2024.07.10", "7b20c1936229370277d1c61bde950bce194de584") on_install(function (package) os.cp("*.h", package:installdir("include")) diff --git a/packages/s/stb/xmake.lua b/packages/s/stb/xmake.lua index 4de3193a0..494a61c2d 100644 --- a/packages/s/stb/xmake.lua +++ b/packages/s/stb/xmake.lua @@ -9,6 +9,7 @@ package("stb") add_versions("2021.09.10", "af1a5bc352164740c1cc1354942b1c6b72eacb8a") add_versions("2023.01.30", "5736b15f7ea0ffb08dd38af21067c314d6a3aae9") add_versions("2023.12.15", "f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe") + add_versions("2024.06.01", "013ac3beddff3dbffafd5177e7972067cd2b5083") if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::stb") From 483deb239d01a57e249d4004302e0d179e88be82 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 14 Jul 2024 10:04:32 +0800 Subject: [PATCH 375/671] Update simdjson to v3.9.5 (#4651) --- packages/s/simdjson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdjson/xmake.lua b/packages/s/simdjson/xmake.lua index 151d40fee..b917280ce 100644 --- a/packages/s/simdjson/xmake.lua +++ b/packages/s/simdjson/xmake.lua @@ -6,6 +6,7 @@ package("simdjson") add_urls("https://github.com/simdjson/simdjson/archive/refs/tags/$(version).tar.gz", "https://github.com/simdjson/simdjson.git") + add_versions("v3.9.5", "3d9e894a0ded85c000ec5b6ed1450ab4b037f44ba95eb3b0fefb4cda72cd9dab") add_versions("v3.9.4", "9bf13be00fa1e1c5891a90dbc39b983e09972f0972a8956c20a9974cedfcca2f") add_versions("v3.9.3", "2e3d10abcde543d3dd8eba9297522cafdcebdd1db4f51b28f3bc95bf1d6ad23c") add_versions("v3.9.2", "79fbe700f4ac3dd69c4f08275af58399daabd612bca0c0465aea959c60256651") From 4e6524d8075224991d1b191b099e858f346b1129 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 14 Jul 2024 10:04:35 +0800 Subject: [PATCH 376/671] Update cgraph to v2.6.0 (#4649) --- packages/c/cgraph/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cgraph/xmake.lua b/packages/c/cgraph/xmake.lua index bd0ab4e44..e8700ff44 100644 --- a/packages/c/cgraph/xmake.lua +++ b/packages/c/cgraph/xmake.lua @@ -7,6 +7,7 @@ package("cgraph") add_urls("https://github.com/ChunelFeng/CGraph/archive/refs/tags/$(version).tar.gz", "https://github.com/ChunelFeng/CGraph.git") + add_versions("v2.6.0", "1b055ee86f0340f2c35b4ed40c4a3b4cc05081b115b0fb634d778671018648f2") add_versions("v2.5.4", "fd5a53dc0d7e3fc11050ccc13fac987196ad42184a4e244b9d5e5d698b1cb101") if is_plat("windows") then From d84504be2ce2615294a8d039377462358c1f974c Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 14 Jul 2024 11:10:14 +0800 Subject: [PATCH 377/671] Update scnlib to v3.0.1 (#4653) --- packages/s/scnlib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/scnlib/xmake.lua b/packages/s/scnlib/xmake.lua index 700fce226..21ab21945 100644 --- a/packages/s/scnlib/xmake.lua +++ b/packages/s/scnlib/xmake.lua @@ -6,6 +6,7 @@ package("scnlib") add_urls("https://github.com/eliaskosunen/scnlib/archive/refs/tags/$(version).tar.gz", "https://github.com/eliaskosunen/scnlib.git") + add_versions("v3.0.1", "bc8a668873601d00cce6841c2d0f2c93f836f63f0fbc77997834dea12e951eb1") add_versions("v2.0.3", "507ed0e988f1d9460a9c921fc21f5a5244185a4015942f235522fbe5c21e6a51") add_versions("v2.0.2", "a485076b8710576cf05fbc086d39499d16804575c0660b0dfaeeaf7823660a17") add_versions("v1.1.2", "5ed3ec742302c7304bf188bde9c4012a65dc8124ff4e1a69b598480d664250e6") From 7169f79cf3d705c228fc40ac70a8c441cba25579 Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Sun, 14 Jul 2024 14:27:31 +0100 Subject: [PATCH 378/671] msgpack-cxx: make headeronly and boost optional (#4648) * msgpack-cxx: make option to not use boost * msgpack-cxx: test remove limits * msgpack-cxx: test with boost * msgpack-cxx: move MSGPACK_NO_BOOST into on_load * msgpack-cxx: make headeronly * msgpack-cxx: remove cmake * msgpack-cxx: add config header_only * Revert "msgpack-cxx: add config header_only" This reverts commit 6361a9fd83e197031cd702cf55304c9dff3bb138. * Reapply "msgpack-cxx: add config header_only" This reverts commit 32fb42d4116a54513aacaa0d21f58a1bd475f7e2. * msgpack-cxx: add `set_kind("library", {headeronly = true})` * msgpack-cxx: remove `package:set("kind", "library", {headeronly = true})` * msgpack-cxx: disable boost for unsupported plats * msgpack-cxx: on line boost config * msgpack-cxx: add `package:set("kind", "library", {headeronly = true})` * msgpack-cxx: add requested * msgpack-cxx: remove header_only config --- packages/m/msgpack-cxx/xmake.lua | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/m/msgpack-cxx/xmake.lua b/packages/m/msgpack-cxx/xmake.lua index bbd7cd727..76683c9b4 100644 --- a/packages/m/msgpack-cxx/xmake.lua +++ b/packages/m/msgpack-cxx/xmake.lua @@ -1,5 +1,5 @@ package("msgpack-cxx") - + set_kind("library", {headeronly = true}) set_homepage("https://msgpack.org/") set_description("MessagePack implementation for C++") set_license("BSL-1.0") @@ -10,17 +10,30 @@ package("msgpack-cxx") add_versions("4.1.1", "8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b") add_configs("std", {description = "Choose C++ standard version.", default = "cxx17", type = "string", values = {"cxx98", "cxx11", "cxx14", "cxx17", "cxx20"}}) + add_configs("boost", {description = "Use Boost", default = is_plat("macosx", "linux", "windows", "bsd", "mingw", "cross"), type = "boolean"}) + + add_deps("cmake") + + on_load(function (package) + if package:config("boost") then + package:add("deps", "boost") + else + package:add("defines", "MSGPACK_NO_BOOST") + end + end) - add_deps("cmake", "boost") - on_install("windows", "macosx", "linux", "mingw", function (package) - local configs = {"-DMSGPACK_BUILD_EXAMPLES=OFF", "-DMSGPACK_BUILD_TESTS=OFF", "-DMSGPACK_BUILD_DOCS=OFF", "-DMSGPACK_USE_STATIC_BOOST=ON"} + on_install(function (package) + local configs = {"-DMSGPACK_BUILD_EXAMPLES=OFF", "-DMSGPACK_BUILD_TESTS=OFF", "-DMSGPACK_BUILD_DOCS=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:config("std") ~= "cxx98" then table.insert(configs, "-DMSGPACK_" .. package:config("std"):upper() .. "=ON") end - if package:is_plat("windows") then - table.insert(configs, "-DBoost_USE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + if package:config("boost") then + table.insert(configs, "-DMSGPACK_USE_STATIC_BOOST=ON") + table.insert(configs, "-DMSGPACK_USE_BOOST=ON") + else + table.insert(configs, "-DMSGPACK_USE_BOOST=OFF") end import("package.tools.cmake").install(package, configs) end) From f428da7ca3b040ce188c0ce11cc18d499a2ab456 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Sun, 14 Jul 2024 22:32:18 +0800 Subject: [PATCH 379/671] update flecs to v4.0.0 (#4655) --- packages/f/flecs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/flecs/xmake.lua b/packages/f/flecs/xmake.lua index 7ef0bd591..91f01580c 100644 --- a/packages/f/flecs/xmake.lua +++ b/packages/f/flecs/xmake.lua @@ -5,6 +5,7 @@ package("flecs") add_urls("https://github.com/SanderMertens/flecs/archive/refs/tags/$(version).tar.gz", "https://github.com/SanderMertens/flecs.git") + add_versions("v4.0.0", "6c9826c8602f797acd775269d143763adfb3d3a93031cc81bced2b6d267469d2") add_versions("v3.2.12", "976551dabeecf3ae109648034b8dbc47f39f50226b6d71d76bace1d0b6e2d8ae") add_versions("v3.2.11", "8ebc5f6f3ec7bbba30b0afe9d22f157437925772857ea1c6e4201eb5d31b4fe5") add_versions("v3.2.10", "b799e85d47b3e5c2e631ebbd3b81cc6af4be574fccbe07099c58252182827a88") From d809a0be65134954f18e800661f1df2348ebff12 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 14 Jul 2024 23:39:32 +0800 Subject: [PATCH 380/671] spdlog: fix header only kind --- packages/s/spdlog/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/s/spdlog/xmake.lua b/packages/s/spdlog/xmake.lua index 4077ddac7..1b2f82d79 100644 --- a/packages/s/spdlog/xmake.lua +++ b/packages/s/spdlog/xmake.lua @@ -39,7 +39,9 @@ package("spdlog") end on_load(function (package) - if not package:config("header_only") then + if package:config("header_only") then + package:set("kind", "library", {headeronly = true}) + else package:add("defines", "SPDLOG_COMPILED_LIB") package:add("deps", "cmake") end From 33830b821259b304bd223c22393ce5b4064af757 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 15 Jul 2024 10:09:48 +0800 Subject: [PATCH 381/671] add hyperscan package (#4646) * add hyperscan * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/h/hyperscan/xmake.lua | 21 ++++++++++++++++++++ packages/r/ragel/xmake.lua | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 packages/h/hyperscan/xmake.lua create mode 100644 packages/r/ragel/xmake.lua diff --git a/packages/h/hyperscan/xmake.lua b/packages/h/hyperscan/xmake.lua new file mode 100644 index 000000000..47c0d0f49 --- /dev/null +++ b/packages/h/hyperscan/xmake.lua @@ -0,0 +1,21 @@ +package("hyperscan") + set_homepage("https://www.hyperscan.io") + set_description("High-performance regular expression matching library") + set_license("BSD-3") + + add_urls("https://github.com/intel/hyperscan/archive/refs/tags/$(version).tar.gz", + "https://github.com/intel/hyperscan.git") + add_versions("v5.4.2", "32b0f24b3113bbc46b6bfaa05cf7cf45840b6b59333d078cc1f624e4c40b2b99") + + add_deps("cmake", "boost", "ragel", "python") + + on_install("linux", "windows|!arm*", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cxxfuncs("hs_compile", {includes = "hs/hs.h"})) + end) diff --git a/packages/r/ragel/xmake.lua b/packages/r/ragel/xmake.lua new file mode 100644 index 000000000..49d0e0392 --- /dev/null +++ b/packages/r/ragel/xmake.lua @@ -0,0 +1,36 @@ +package("ragel") + set_homepage("https://www.colm.net/open-source/ragel/") + set_description("Ragel State Machine Compiler") + set_license("MIT") + set_kind("binary") + + add_urls("http://www.colm.net/files/ragel/ragel-$(version).tar.gz", + "https://github.com/adrian-thurston/ragel.git") + add_versions("6.10", "5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f") + + on_install("linux", "windows|!arm*", function (package) + io.replace("ragel/main.cpp", "#include ", "", {plain = true}) + io.writefile("xmake.lua", [[ + add_rules("mode.release", "mode.debug") + target("ragel") + set_kind("binary") + add_files("ragel/*.cpp") + add_headerfiles("ragel/*.h") + add_includedirs("aapl") + ]]) + io.writefile("ragel/config.h", [[ + #define PACKAGE "ragel" + #define PACKAGE_BUGREPORT "" + #define PACKAGE_NAME "ragel" + #define PACKAGE_STRING "ragel 6.10" + #define PACKAGE_TARNAME "ragel" + #define PACKAGE_URL "" + #define PACKAGE_VERSION "6.10" + #define VERSION "6.10" + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + os.vrun("ragel -v") + end) From 8046a884107d0dc6f312072ce095d83cca18ca9e Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 15 Jul 2024 10:41:01 +0800 Subject: [PATCH 382/671] fix fmt (#4660) --- packages/f/fmt/xmake.lua | 7 +++---- packages/s/spdlog/xmake.lua | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index 7b5cd1fb8..f3813724c 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -13,7 +13,7 @@ package("fmt") add_versions("10.1.0", "d725fa83a8b57a3cedf238828fa6b167f963041e8f9f7327649bddc68ae316f4") add_versions("10.0.0", "4943cb165f3f587f26da834d3056ee8733c397e024145ca7d2a8a96bb71ac281") add_versions("9.1.0", "cceb4cb9366e18a5742128cb3524ce5f50e88b476f1e54737a47ffdf4df4c996") - add_versions("9.0.0", "fc96dd2d2fdf2bded630787adba892c23cb9e35c6fd3273c136b0c57d4651ad6") + add_versions("9.0.0", "fc96dd2d2fdf2bded630787adba892c23cb9e35c6fd3273c136b0c57d4651ad6") add_versions("8.1.1", "23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d") add_versions("8.0.1", "a627a56eab9554fc1e5dd9a623d0768583b3a383ff70a4312ba68f94c9d415bf") add_versions("8.0.0", "36016a75dd6e0a9c1c7df5edb98c93a3e77dabcf122de364116efb9f23c6954a") @@ -22,9 +22,7 @@ package("fmt") add_versions("6.0.0", "b4a16b38fa171f15dbfb958b02da9bbef2c482debadf64ac81ec61b5ac422440") add_versions("5.3.0", "4c0741e10183f75d7d6f730b8708a99b329b2f942dad5a9da3385ab92bb4a15c") - add_patches("10.1.0", - path.join(os.scriptdir(), "patches", "10.1.0", "utf8.patch" ), - "3280569bced9ec08933f0ea37b6a4fef4538944d9046fe197ad63e22d1357cd4") + add_patches("10.1.0", "patches/10.1.0/utf8.patch", "3280569bced9ec08933f0ea37b6a4fef4538944d9046fe197ad63e22d1357cd4") add_configs("header_only", {description = "Use header only version.", default = false, type = "boolean"}) add_configs("unicode", {description = "Enable Unicode support.", default = true, type = "boolean"}) @@ -40,6 +38,7 @@ package("fmt") on_load(function (package) if package:config("header_only") then package:add("defines", "FMT_HEADER_ONLY=1") + package:set("kind", "library", {headeronly = true}) else package:add("deps", "cmake") end diff --git a/packages/s/spdlog/xmake.lua b/packages/s/spdlog/xmake.lua index 1b2f82d79..9904e746a 100644 --- a/packages/s/spdlog/xmake.lua +++ b/packages/s/spdlog/xmake.lua @@ -1,5 +1,4 @@ package("spdlog") - set_homepage("https://github.com/gabime/spdlog") set_description("Fast C++ logging library.") set_license("MIT") From 56dea76179b8dfab13d1aa99265fcb1307435cef Mon Sep 17 00:00:00 2001 From: Will Date: Sun, 14 Jul 2024 23:02:03 -0400 Subject: [PATCH 383/671] Update watcher to version 0.11.0 (#4631) * watcher/0.11.0 * sha256sum of watcher-release-0.11.0.tar.gz --------- Co-authored-by: Will --- packages/w/watcher/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/w/watcher/xmake.lua b/packages/w/watcher/xmake.lua index 9f6a5f62d..49ad9bd0d 100644 --- a/packages/w/watcher/xmake.lua +++ b/packages/w/watcher/xmake.lua @@ -7,6 +7,7 @@ package("watcher") set_urls("https://github.com/e-dant/watcher/archive/refs/tags/release/$(version).tar.gz", "https://github.com/e-dant/watcher.git") + add_versions("0.11.0", "dd92496d77b6bc27e27ed28253faae4d81bc58b19407d154bb49504b2af73664") add_versions("0.9.5", "41b74d138eec106c35a99e7544def599453a8bf4cf4887ad627e1c9e3355287c") if is_plat("linux", "bsd") then From 588080a621fcfec17fcdff615e6bfbba1df268e3 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Mon, 15 Jul 2024 14:00:00 +0800 Subject: [PATCH 384/671] update meshoptimizer to v0.21 (#4661) --- packages/m/meshoptimizer/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/meshoptimizer/xmake.lua b/packages/m/meshoptimizer/xmake.lua index f08d486f8..c9bb885be 100644 --- a/packages/m/meshoptimizer/xmake.lua +++ b/packages/m/meshoptimizer/xmake.lua @@ -8,6 +8,7 @@ package("meshoptimizer") "https://github.com/zeux/meshoptimizer.git") add_versions("v0.18", "f5bc07d7322e6292fe0afce03462b5c394d111386236f926fdc44d2aff3b854b") add_versions("v0.20", "cf1077a83958bed3d8da28a841ca53a6a42d871e49023edce64e37002a0f5a48") + add_versions("v0.21", "050a5438e4644833ff69f35110fcf4e37038a89c5fdc8aed45d8cd848ecb3a20") add_deps("cmake") on_load("windows", function (package) From de97c7eb654b65b433da7b100f3b197c242a04cc Mon Sep 17 00:00:00 2001 From: AIR <129256286+KochabStar@users.noreply.github.com> Date: Mon, 15 Jul 2024 21:12:01 +0800 Subject: [PATCH 385/671] add cserialport lib (#4662) * add cserialport lib * Update xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 --- packages/c/cserialport/xmake.lua | 64 ++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 packages/c/cserialport/xmake.lua diff --git a/packages/c/cserialport/xmake.lua b/packages/c/cserialport/xmake.lua new file mode 100644 index 000000000..6c5473e71 --- /dev/null +++ b/packages/c/cserialport/xmake.lua @@ -0,0 +1,64 @@ +package("cserialport") + set_homepage("https://github.com/itas109/CSerialPort") + set_description("CSerialPort is a lightweight cross-platform serial port library based on C++, which can easy to read and write serial port on multiple operating system.") + set_license("LGPL-3.0") + + add_urls("https://github.com/itas109/CSerialPort/archive/refs/tags/$(version).tar.gz", + "https://github.com/itas109/CSerialPort.git") + + add_versions("v4.3.1", "376f41866be65ddfed91f3d0fea91aaaf5ca7e645f9b9cfcdaa0a9182a0bb3ac") + + add_configs("c_api", {description = "Build C API", default = false, type = "boolean"}) + + if is_plat("windows", "mingw") then + add_syslinks("advapi32") + elseif is_plat("linux", "bsd") then + add_syslinks("pthread") + elseif is_plat("macosx") then + add_frameworks("Foundation", "IOKit") + end + + add_deps("cmake") + + if on_check then + on_check("windows", function (package) + import("core.base.semver") + + if package:is_arch("arm.*") then + local vs_toolset = package:toolchain("msvc"):config("vs_toolset") + assert(vs_toolset and semver.new(vs_toolset):minor() >= 30, "package(cserialport/arm): need vs_toolset >= v143") + end + end) + end + + on_install("!cross and !iphoneos and !android", function (package) + local configs = {"-DCSERIALPORT_BUILD_EXAMPLES=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + + if package:config("c_api") then + io.replace("bindings/c/cserialport.h", "#define C_DLL_EXPORT __declspec(dllexport)", "#define C_DLL_EXPORT", {plain = true}) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("cserialport-c") + set_kind("static") + add_files("bindings/c/cserialport.cpp") + add_headerfiles("bindings/c/cserialport.h") + add_includedirs("include") + ]]) + import("package.tools.xmake").install(package) + end + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + itas109::CSerialPort serialPort; + } + ]]}, {configs = {languages = "c++11"}, includes = "CSerialPort/SerialPort.h"})) + + if package:config("c_api") then + assert(package:has_cfuncs("CSerialPortInit", {includes = "cserialport.h"})) + end + end) From 2a2247530ba2cb2e4e07a465be67911829f7ee45 Mon Sep 17 00:00:00 2001 From: Enzo Einhorn <52015993+enzalito@users.noreply.github.com> Date: Mon, 15 Jul 2024 15:51:06 +0200 Subject: [PATCH 386/671] add on_fetch to binutils package (#4636) * add on_fetch to binutils package * Update xmake.lua * Update xmake.lua * check more tools in binutil's on_fetch * fix boolean operator --------- Co-authored-by: ruki --- packages/b/binutils/xmake.lua | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/b/binutils/xmake.lua b/packages/b/binutils/xmake.lua index cd41c5172..38d960634 100644 --- a/packages/b/binutils/xmake.lua +++ b/packages/b/binutils/xmake.lua @@ -10,7 +10,7 @@ package("binutils") add_versions("2.41", "ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450") add_versions("2.38", "e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024") add_versions("2.34", "f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952") - + if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::binutils") elseif is_plat("linux") then @@ -19,6 +19,31 @@ package("binutils") add_extsources("brew::binutils") end + on_fetch("@linux", "@macosx", "@msys", function (package, opt) + if opt.system then + if package:is_binary() then + local tools = {"lb", "ranlib", "objcopy"} + for _, tool in ipairs(tools) do + if not package:find_tool(tool) then + return + end + end + return {} + elseif package:is_library() then + local libs = {"bfd", "ctf", "opcodes"} + local result + for _, lib in ipairs(libs) do + local libinfo = package:find_package("system::" .. lib) + if libinfo then + result = result or {links = {}} + table.insert(result.links, libinfo.links) + end + end + return result + end + end + end) + add_deps("bison") on_install("@linux", "@macosx", "@msys", function (package) From 915ab720ba9aba3451cb5dd7b905db9abd162c80 Mon Sep 17 00:00:00 2001 From: Enzo Einhorn <52015993+enzalito@users.noreply.github.com> Date: Tue, 16 Jul 2024 01:23:19 +0200 Subject: [PATCH 387/671] add node-addon-api package for linux (#4505) * add node-addon-api package for linux * add test and shorten configs * remove superfluous whitespace * remove options on node dependency * rename dependency node to nodejs * switch nodejs dep. to node-api-headers and add napi_version option * improve node-addonc-api test * use has_cxxfunc instead of has_cfunc * Update xmake.lua --------- Co-authored-by: ruki --- packages/n/node-addon-api/xmake.lua | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 packages/n/node-addon-api/xmake.lua diff --git a/packages/n/node-addon-api/xmake.lua b/packages/n/node-addon-api/xmake.lua new file mode 100644 index 000000000..cd2a99bb4 --- /dev/null +++ b/packages/n/node-addon-api/xmake.lua @@ -0,0 +1,42 @@ +package("node-addon-api") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/nodejs/node-addon-api") + set_description("Module for using Node-API from C++") + set_license("MIT") + + add_configs("errors", {description = "Choose error handling method.", default = "except", type = "string", values = {"except", "noexcept", "maybe"}}) + add_configs("deprecated", {description = "Disable deprecated APIs.", default = false, type = "boolean"}) + add_configs("napi_version", {description = "Target a specific Node-API version.", default = nil, type = "number"}) + + set_urls("https://github.com/nodejs/node-addon-api/archive/refs/tags/$(version).tar.gz", + "https://github.com/nodejs/node-addon-api.git") + add_versions("v8.0.0", "42424c5206b9d67b41af4fcff5d6e3cb22074168035a03b8467852938a281d47") + + add_deps("node-api-headers") + + on_load(function(package) + package:add("defines", "NAPI_VERSION=" .. package:config("napi_version") or package:version():major()) + if not package:config("deprecated") then + package:add("defines", "NODE_ADDON_API_DISABLE_DEPRECATED") + end + + local errors = package:config("errors") + if errors == "noexcept" or errors == "maybe" then + package:add("cxxflags", "-fno-exceptions") + package:add("defines", "NAPI_DISABLE_CPP_EXCEPTIONS") + end + if errors == "maybe" then + package:add("defines", "NODE_ADDON_API_ENABLE_MAYBE") + end + if errors == "except" then + package:add("defines", "NAPI_CPP_EXCEPTIONS") + end + end) + + on_install("linux" ,function(package) + os.cp("*.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cxxfuncs("Napi::Just(0)", {includes = "napi.h"})) + end) From f72e0c4d9149b891dc7a9cbeee6f4f99c9f2a5f1 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 09:35:01 +0800 Subject: [PATCH 388/671] improve openmp (#4663) * improve openmp * enable headeronly for openmp --- packages/o/openmp/xmake.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/o/openmp/xmake.lua b/packages/o/openmp/xmake.lua index 65b54f4a6..9242d220f 100644 --- a/packages/o/openmp/xmake.lua +++ b/packages/o/openmp/xmake.lua @@ -1,5 +1,5 @@ package("openmp") - + set_kind("library", {headeronly = true}) set_homepage("https://openmp.org/") set_description("The OpenMP API specification for parallel programming") @@ -56,13 +56,15 @@ package("openmp") elseif package:has_tool(toolkind, "icl") then result[flagname] = "-Qopenmp" end + end + for _, toolkind in ipairs({"ld", "fcld"}) do if package:config("runtime") == "default" then if package:has_tool(toolkind, "clang", "clangxx") then if not package:is_plat("macosx") then result.ldflags = "-fopenmp" result.shflags = "-fopenmp" end - elseif package:has_tool(toolkind, "gcc", "gxx", "gfortran") then + elseif package:has_tool(toolkind, "gcc", "gxx") then result.ldflags = "-fopenmp" result.shflags = "-fopenmp" elseif package:has_tool(toolkind, "icc", "icpc") then @@ -71,10 +73,13 @@ package("openmp") elseif package:has_tool(toolkind, "icl") then result.ldflags = "-Qopenmp" result.shflags = "-Qopenmp" + elseif package:has_tool(toolkind, "gfortran") then + result.fcldflags = "-fopenmp" + result.fcshflags = "-fopenmp" end end if package:config("runtime") == "custom" then - if package:has_tool(toolkind, "cl") then + if package:has_tool(toolkind, "link") then result.ldflags = "/nodefaultlib:vcomp" result.shflags = "/nodefaultlib:vcomp" end From 0515b232a186f7c26e7f7f38721d9da7ee9d78e6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 09:58:27 +0800 Subject: [PATCH 389/671] Update trompeloeil to v48 (#4667) --- packages/t/trompeloeil/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/trompeloeil/xmake.lua b/packages/t/trompeloeil/xmake.lua index e1e2e6e91..71c81475f 100644 --- a/packages/t/trompeloeil/xmake.lua +++ b/packages/t/trompeloeil/xmake.lua @@ -6,6 +6,7 @@ package("trompeloeil") set_license("BSL-1.0") add_urls("https://github.com/rollbear/trompeloeil/archive/refs/tags/$(version).tar.gz") + add_versions("v48", "eebd18456975251ea3450b815e241cccfefba5b883e4a36bd309f9cf629bdec6") add_versions("v47", "4a1d79260c1e49e065efe0817c8b9646098ba27eed1802b0c3ba7d959e4e5e84") add_versions("v43", "86a0afa2e97347202a0a883ab43da78c1d4bfff0d6cb93205cfc433d0d9eb9eb") From ef452f4d45f2244489c41a731ccf8810d3fdc1bc Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 09:58:30 +0800 Subject: [PATCH 390/671] Update libsvm to v333 (#4666) --- packages/l/libsvm/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsvm/xmake.lua b/packages/l/libsvm/xmake.lua index c6a046d51..7606638b5 100644 --- a/packages/l/libsvm/xmake.lua +++ b/packages/l/libsvm/xmake.lua @@ -5,6 +5,7 @@ package("libsvm") add_urls("https://github.com/cjlin1/libsvm/archive/refs/tags/$(version).tar.gz", "https://github.com/cjlin1/libsvm.git") + add_versions("v333", "ee898ca11cef85b09e059b278b3ab4ff58cd38f70169829e75b4a3cb9ddc5013") add_versions("v332", "e1d7d316112d199ebd69c9695f79226d236b86e2c8d88e70cfe35fd383954ed8") add_versions("v325", "1f587ec0df6fd422dfe50f942f8836ac179b0723b768fe9d2fabdfd1601a0963") From d4690ab1f0e0e0e9eac65785631f35dded3b98ea Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 09:58:32 +0800 Subject: [PATCH 391/671] Update aws-c-io to v0.14.13 (#4665) --- packages/a/aws-c-io/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-io/xmake.lua b/packages/a/aws-c-io/xmake.lua index acb4daad6..14dcacddd 100644 --- a/packages/a/aws-c-io/xmake.lua +++ b/packages/a/aws-c-io/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-io") add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-io.git") + add_versions("v0.14.13", "1c228b1ed327e3a8518b89702ac0d93265cf50788038091e187c697cace7fa5a") add_versions("v0.14.9", "3a3b7236f70209ac12b5bafa7dd81b75cc68b691a0aa0686d6d3b7e4bbe5fbc9") add_versions("v0.14.8", "d50e21fdbd5170a4071fe067ef4ce297b02cb058ad47e118305e25f6e07d9cf0") add_versions("v0.14.7", "ecf1f660d7d43913aa8a416be6a2027101ce87c3b241344342d608335b4df7d4") From f33fb227cc9c5f1fd7449252b2a5fb5cf179e0b7 Mon Sep 17 00:00:00 2001 From: Enzo Einhorn <52015993+enzalito@users.noreply.github.com> Date: Tue, 16 Jul 2024 11:19:53 +0200 Subject: [PATCH 392/671] fix typo in binutils package (#4670) --- packages/b/binutils/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/b/binutils/xmake.lua b/packages/b/binutils/xmake.lua index 38d960634..7d90883e6 100644 --- a/packages/b/binutils/xmake.lua +++ b/packages/b/binutils/xmake.lua @@ -22,7 +22,7 @@ package("binutils") on_fetch("@linux", "@macosx", "@msys", function (package, opt) if opt.system then if package:is_binary() then - local tools = {"lb", "ranlib", "objcopy"} + local tools = {"ld", "ranlib", "objcopy"} for _, tool in ipairs(tools) do if not package:find_tool(tool) then return From 8f0f029358fdb39c2468c04a17ba95d6ba3226bd Mon Sep 17 00:00:00 2001 From: 45degree <43808585+45degree@users.noreply.github.com> Date: Tue, 16 Jul 2024 22:14:54 +0800 Subject: [PATCH 393/671] fix abseil build error (#4469) (#4664) --- packages/a/abseil/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/a/abseil/xmake.lua b/packages/a/abseil/xmake.lua index 308603052..2e1db64f3 100644 --- a/packages/a/abseil/xmake.lua +++ b/packages/a/abseil/xmake.lua @@ -16,6 +16,9 @@ package("abseil") add_versions("20240116.1", "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a") add_versions("20240116.2", "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc") + add_patches("20240116.1", "https://github.com/abseil/abseil-cpp/commit/3335e58f198e899a500b744163f9b883035a5217.patch", "f83278086b42bc997846d2b931a266678f96e2727fce6ffd98b2b58ce75fa0a3") + add_patches("20240116.2", "https://github.com/abseil/abseil-cpp/commit/3335e58f198e899a500b744163f9b883035a5217.patch", "f83278086b42bc997846d2b931a266678f96e2727fce6ffd98b2b58ce75fa0a3") + add_deps("cmake") add_configs("cxx_standard", {description = "Select c++ standard to build.", default = "17", type = "string", values = {"14", "17", "20"}}) From eb5cd65377a79c4d4f9594bb7334d9e85faf3aae Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 16 Jul 2024 23:01:09 +0800 Subject: [PATCH 394/671] matplotplusplus: fix ninja build with debug mode on windows --- packages/m/matplotplusplus/xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/m/matplotplusplus/xmake.lua b/packages/m/matplotplusplus/xmake.lua index f4370667b..b99798f58 100644 --- a/packages/m/matplotplusplus/xmake.lua +++ b/packages/m/matplotplusplus/xmake.lua @@ -60,8 +60,11 @@ package("matplotplusplus") table.insert(configs, "-DCMAKE_DISABLE_FIND_PACKAGE_" .. config:upper() .. "=ON") end end - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") + end import("package.tools.cmake").install(package, configs) end) From 39695864189fddc9434a9b5006d2f4fdd968851a Mon Sep 17 00:00:00 2001 From: Linpeng Zhang <94288976+Arteiimis@users.noreply.github.com> Date: Tue, 16 Jul 2024 23:24:28 +0800 Subject: [PATCH 395/671] update yalantinglibs to 0.3.5 (#4645) * update yalantinglibs to 0.3.5 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/a/async_simple/xmake.lua | 4 ++++ packages/y/yalantinglibs/xmake.lua | 1 + 2 files changed, 5 insertions(+) diff --git a/packages/a/async_simple/xmake.lua b/packages/a/async_simple/xmake.lua index c66f2df6f..bae54acc1 100644 --- a/packages/a/async_simple/xmake.lua +++ b/packages/a/async_simple/xmake.lua @@ -16,6 +16,10 @@ package("async_simple") add_deps("cmake") + on_load("windows", function (package) + package:set("kind", "library", {headeronly = true}) + end) + on_install("windows", "linux", "macosx", function (package) if package:version():le("1.3") then io.replace("async_simple/CMakeLists.txt", diff --git a/packages/y/yalantinglibs/xmake.lua b/packages/y/yalantinglibs/xmake.lua index 650e93e06..568e1c5f8 100644 --- a/packages/y/yalantinglibs/xmake.lua +++ b/packages/y/yalantinglibs/xmake.lua @@ -8,6 +8,7 @@ package("yalantinglibs") "https://github.com/alibaba/yalantinglibs.git") add_versions("0.3.4", "dd5edd3f43f23cd4b0614896e6587b61bb38c981dc21c85a54bcc54800d0dfe8") + add_versions("0.3.5", "8d382573da01449c4f83fccbbc3bdc08d221651f3fc8b9137eb4fbdb703677c2") add_configs("ssl", {description = "Enable ssl support", default = false, type = "boolean"}) add_configs("pmr", {description = "Enable pmr support", default = false, type = "boolean"}) From d10b576ec03e55d4045a81ba680c5964324fff16 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 16 Jul 2024 23:27:13 +0800 Subject: [PATCH 396/671] aws-lc: fix mingw build (#4625) * aws-lc: fix mingw build * Update xmake.lua --- packages/a/aws-lc/xmake.lua | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/a/aws-lc/xmake.lua b/packages/a/aws-lc/xmake.lua index d759806a2..705b79117 100644 --- a/packages/a/aws-lc/xmake.lua +++ b/packages/a/aws-lc/xmake.lua @@ -5,13 +5,15 @@ package("aws-lc") add_urls("https://github.com/aws/aws-lc/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/aws-lc.git") - add_versions("v1.31.0", "f2dfe0ef8fe21482b6795da01a1b226f826e9a084833ff8d5371a02f9623c150") + add_versions("v1.32.0", "67fbb78659055c2289c9068bb4ca1c0f1b6ca27700c7f6d34c6bc2f27cd46314") add_configs("jitter", {description = "Enable FIPS entropy source: CPU Jitter", default = false, type = "boolean"}) + add_configs("go", {description = "Enable go", default = false, type = "boolean"}) + add_configs("perl", {description = "Enable perl", default = false, type = "boolean"}) add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) - + add_deps("cmake") - if is_plat("windows") then + if is_plat("windows", "mingw") or is_host("windows") then add_deps("nasm") end @@ -23,7 +25,16 @@ package("aws-lc") add_syslinks("pthread", "dl", "m") end - on_install(function (package) + on_load(function (package) + if package:config("go") then + package:add("deps", "go") + end + if package:config("perl") and package:is_plat() and (not package:is_precompiled()) then + package:add("deps", "strawberry-perl") + end + end) + + on_install("!cross and windows|!arm64", function (package) if package:config("shared") and package:is_plat("windows") then package:add("defines", "BORINGSSL_SHARED_LIBRARY") end @@ -32,14 +43,14 @@ package("aws-lc") "-DBUILD_TESTING=OFF", "-DCMAKE_INSTALL_INCLUDEDIR=include", "-DBUILD_LIBSSL=ON", - "-DDISABLE_GO=ON", "-DDISABLE_PERL=ON" } table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DBUILD_LIBSSL=ON") table.insert(configs, "-DENABLE_FIPS_ENTROPY_CPU_JITTER=" .. (package:config("jitter") and "ON" or "OFF")) + table.insert(configs, "-DDISABLE_GO=" .. (package:config("go") and "OFF" or "ON")) + table.insert(configs, "-DDISABLE_PERL=" .. (package:config("perl") and "OFF" or "ON")) table.insert(configs, "-DBUILD_TOOL=" .. (package:config("tools") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) From 1a000fc31d46707cfe5413880b7cf34bd66740de Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 16 Jul 2024 23:28:59 +0800 Subject: [PATCH 397/671] libyuv: rework (#4656) * libyuv: rework * fix c++11 * use c++14 * fix android/iphoneos * fix cross * disable cross --- packages/l/libyuv/patches/1891/cmake.patch | 79 ++++++++++++++++++++++ packages/l/libyuv/xmake.lua | 68 ++++++++++++++----- 2 files changed, 131 insertions(+), 16 deletions(-) create mode 100644 packages/l/libyuv/patches/1891/cmake.patch diff --git a/packages/l/libyuv/patches/1891/cmake.patch b/packages/l/libyuv/patches/1891/cmake.patch new file mode 100644 index 000000000..784e9ee69 --- /dev/null +++ b/packages/l/libyuv/patches/1891/cmake.patch @@ -0,0 +1,79 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f521e3..4d742f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,6 @@ if(MSVC) + endif() + + # Need to set PIC to allow creating shared libraries from object file libraries. +-SET(CMAKE_POSITION_INDEPENDENT_CODE ON) + + # Build the set of objects that do not need to be compiled with flags to enable + # particular architecture features. +@@ -120,19 +119,15 @@ if(NOT MSVC) + endif() + + # this creates the static library (.a) +-ADD_LIBRARY( ${ly_lib_static} STATIC ${ly_lib_parts}) +- +-# this creates the shared library (.so) +-ADD_LIBRARY( ${ly_lib_shared} SHARED ${ly_lib_parts}) +-SET_TARGET_PROPERTIES( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" ) +-SET_TARGET_PROPERTIES( ${ly_lib_shared} PROPERTIES PREFIX "lib" ) +-if(WIN32) +- SET_TARGET_PROPERTIES( ${ly_lib_shared} PROPERTIES IMPORT_PREFIX "lib" ) ++ADD_LIBRARY( ${ly_lib_static} ${ly_lib_parts}) ++if (BUILD_SHARED_LIBS) ++ add_definitions("-DLIBYUV_BUILDING_SHARED_LIBRARY") + endif() ++# this creates the shared library (.so) + ++option(BUILD_TOOLS "Build tools" OFF) ++if (BUILD_TOOLS) + # this creates the cpuid tool +-ADD_EXECUTABLE ( cpuid ${ly_base_dir}/util/cpuid.c ) +-TARGET_LINK_LIBRARIES ( cpuid ${ly_lib_static} ) + + # this creates the conversion tool + ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc ) +@@ -141,12 +136,22 @@ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) + # this creates the yuvconstants tool + ADD_EXECUTABLE ( yuvconstants ${ly_base_dir}/util/yuvconstants.c ) + TARGET_LINK_LIBRARIES ( yuvconstants ${ly_lib_static} ) ++include(CheckFunctionExists) ++check_function_exists(round HAVE_MATH_SYSTEM) ++if(NOT HAVE_MATH_SYSTEM) ++ target_link_libraries(yuvconstants m) ++endif() ++INSTALL(TARGETS yuvconvert yuvconstants DESTINATION bin) ++endif() + +-find_package ( JPEG ) +-if (JPEG_FOUND) +- include_directories( ${JPEG_INCLUDE_DIR} ) +- target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) +- add_definitions( -DHAVE_JPEG ) ++option(LIBYUV_WITH_JPEG "Build libyuv with jpeg" OFF) ++if (LIBYUV_WITH_JPEG) ++ find_package(JPEG REQUIRED) ++ target_link_libraries(${ly_lib_static} JPEG::JPEG ) ++ target_compile_definitions(${ly_lib_static} PRIVATE HAVE_JPEG) ++ if (BUILD_TOOLS) ++ target_compile_definitions(yuvconvert PRIVATE HAVE_JPEG) ++ endif() + endif() + + if(UNIT_TEST) +@@ -192,11 +197,8 @@ endif() + + + # install the conversion tool, .so, .a, and all the header files +-INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin ) +-INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib ) +-INSTALL ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) ++INSTALL ( TARGETS ${ly_lib_static} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) + INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include ) + + # create the .deb and .rpm packages using cpack +-INCLUDE ( CM_linux_packages.cmake ) + diff --git a/packages/l/libyuv/xmake.lua b/packages/l/libyuv/xmake.lua index 8a0d76cfe..4c8c6da11 100644 --- a/packages/l/libyuv/xmake.lua +++ b/packages/l/libyuv/xmake.lua @@ -1,28 +1,64 @@ package("libyuv") - set_homepage("https://chromium.googlesource.com/libyuv/libyuv/") set_description("libyuv is an open source project that includes YUV scaling and conversion functionality.") set_license("BSD-3-Clause") - set_urls("https://chromium.googlesource.com/libyuv/libyuv.git") - add_versions("2023.10.27", "31e1d6f896615342d5d5b6bde8f7b50b3fd698dc") + add_urls("https://chromium.googlesource.com/libyuv/libyuv.git", + "https://github.com/lemenkov/libyuv.git") + + add_urls("https://github.com/lemenkov/libyuv/archive/$(version).tar.gz", { + version = function (version) + -- Versions from LIBYUV_VERSION definition in include/libyuv/version.h + -- Pay attention to package commits incrementing this definition + local table = { + ["1891"] = "611806a1559b92c97961f51c78805d8d9d528c08", + } + return table[tostring(version)] + end}) + + add_versions("1891", "a8dddc6f45d6987cd3c08e00824792f3c72651fde29f475f572ee2292c03761f") + + add_patches("1891", "patches/1891/cmake.patch", "87086566b2180f65ff3d5ef9db7c59a6e51e2592aeeb787e45305beb4cf9d30d") + + add_configs("jpeg", {description = "Build with JPEG.", default = false, type = "boolean"}) + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) add_deps("cmake") - on_install("windows", "linux", "macosx", "android", "cross", "bsd", "mingw", function (package) - local configs = {"-DTEST=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - - io.replace("CMakeLists.txt", "INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )", "", {plain = true}) - import("package.tools.cmake").install(package, configs) - - if package:is_plat("macosx", "linux", "android") then - if package:config("shared") then - os.tryrm(package:installdir("lib", "*.a")) - else - os.tryrm(package:installdir("lib", "*.so")) - end + if is_plat("linux", "bsd") then + add_syslinks("m") + end + + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk"):config("ndkver") + assert(ndk and tonumber(ndk) > 22, "package(libyuv/arm64): need ndk version > 22") + end) + end + + on_load(function (package) + if package:config("jpeg") then + package:add("deps", "libjpeg") end + + if package:config("shared") then + package:add("defines", "LIBYUV_USING_SHARED_LIBRARY") + end + end) + + on_install("!cross", function (package) + if package:is_plat("iphoneos") then + io.replace("CMakeLists.txt", + [[STRING(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" arch_lowercase)]], + [[set(arch_lowercase "]] .. package:arch() .. [[")]], {plain = true}) + end + + local configs = {"-DCMAKE_CXX_STANDARD=14"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DLIBYUV_WITH_JPEG=" .. (package:config("jpeg") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_TOOLS=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) end) on_test(function (package) From dd07939b7c865b248edb205d1cb126d0247e3338 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 23:35:56 +0800 Subject: [PATCH 398/671] Update botan to 3.5.0 (#4658) --- packages/b/botan/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/botan/xmake.lua b/packages/b/botan/xmake.lua index 63cbf943e..c2c035f97 100644 --- a/packages/b/botan/xmake.lua +++ b/packages/b/botan/xmake.lua @@ -6,6 +6,7 @@ package("botan") set_urls("https://github.com/randombit/botan/archive/refs/tags/$(version).tar.gz", "https://github.com/randombit/botan.git") + add_versions("3.5.0", "7d91d3349e6029e1a6929a50ab587f9fd4e29a9af3f3d698553451365564001f") add_versions("3.4.0", "6ef2a16a0527b1cfc9648a644877f7b95c4d07e8ef237273b030c623418c5e5b") add_configs("tools", {description = "Build tools.", default = false, type = "boolean"}) From 2989c39b82d4ca991ec8327b8042029be2d8a91e Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 01:02:57 +0800 Subject: [PATCH 399/671] Auto-update blake3 to 1.5.2 (#4659) * Update blake3 to 1.5.2 * fix x86 dll export * add check --------- Co-authored-by: star9029 --- packages/b/blake3/port/xmake.lua | 29 ++++++++++++++++++++ packages/b/blake3/xmake.lua | 46 +++++++------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 packages/b/blake3/port/xmake.lua diff --git a/packages/b/blake3/port/xmake.lua b/packages/b/blake3/port/xmake.lua new file mode 100644 index 000000000..6e21b0040 --- /dev/null +++ b/packages/b/blake3/port/xmake.lua @@ -0,0 +1,29 @@ +add_rules("mode.release", "mode.debug") + +target("blake3") + set_kind("$(kind)") + add_files("c/blake3.c", "c/blake3_dispatch.c", "c/blake3_portable.c") + add_headerfiles("c/blake3.h") + + if is_arch("x86_64", "x64") then + if is_subhost("msys", "cygwin") then + add_files("c/*x86-64_windows_gnu.S") + elseif is_plat("windows") then + add_files("c/*x86-64_windows_msvc.asm") + else + add_files("c/*x86-64_unix.S") + end + elseif is_arch("x86", "i386") then + add_files("c/blake3_portable.c") + add_files("c/blake3_sse2.c") + add_files("c/blake3_sse41.c") + add_files("c/blake3_avx2.c") + add_files("c/blake3_avx512.c") + elseif is_arch("arm64", "arm64-v8a") then + add_files("c/blake3_neon.c") + add_defines("BLAKE3_USE_NEON=1") + end + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end diff --git a/packages/b/blake3/xmake.lua b/packages/b/blake3/xmake.lua index 8d54364f1..5a7629217 100644 --- a/packages/b/blake3/xmake.lua +++ b/packages/b/blake3/xmake.lua @@ -5,49 +5,21 @@ package("blake3") add_urls("https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/$(version).tar.gz", "https://github.com/BLAKE3-team/BLAKE3.git") + + add_versions("1.5.2", "1bc38cd3cc501458054c3bb473e5e00338d6175121424040079025ea305ddef3") add_versions("1.5.1", "822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37") add_versions("1.5.0", "f506140bc3af41d3432a4ce18b3b83b08eaa240e94ef161eb72b2e57cdc94c69") add_versions("1.3.3", "27d2bc4ee5945ba75434859521042c949463ee7514ff17aaef328e23ef83fec0") add_versions("1.3.1", "112becf0983b5c83efff07f20b458f2dbcdbd768fd46502e7ddd831b83550109") - on_install("windows|x64", "windows|x86", "linux", "macosx", "bsd", "mingw|x86_64", "android", "iphoneos", "cross", function (package) - local configs = {} - - io.writefile("xmake.lua", [[ - add_rules("mode.release", "mode.debug") - target("blake3") - set_kind("$(kind)") - add_files("c/blake3.c", "c/blake3_dispatch.c", "c/blake3_portable.c") - add_headerfiles("c/blake3.h") - - if is_arch("x86_64", "x64") then - if is_subhost("msys", "cygwin") then - add_files("c/*x86-64_windows_gnu.S") - elseif is_plat("windows") then - add_files("c/*x86-64_windows_msvc.asm") - - if is_kind("shared") then - add_rules("utils.symbols.export_all") - end - else - add_files("c/*x86-64_unix.S") - end - elseif is_arch("x86", "i386") then - add_files("c/blake3_portable.c") - add_files("c/blake3_sse2.c") - add_files("c/blake3_sse41.c") - add_files("c/blake3_avx2.c") - add_files("c/blake3_avx512.c") - elseif is_arch("arm64", "arm64-v8a") then - add_files("c/blake3_neon.c") - add_defines("BLAKE3_USE_NEON=1") - end - ]]) - - if package:config("shared") then - configs.kind = "shared" - end + if on_check then + on_check("mingw", function (package) + assert(package:is_arch("x86_64"), "package(blake3/mingw): Only suport x86_64 arch") + end) + end + on_install(function (package) + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") import("package.tools.xmake").install(package, configs) end) From e502e7591a4a80159f85a911bb0851365800c3da Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 10:52:33 +0800 Subject: [PATCH 400/671] Update gdal to 3.9.1 (#4674) --- packages/g/gdal/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 9a08a920c..122f071a6 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -4,6 +4,7 @@ package("gdal") set_license("MIT") add_urls("https://github.com/OSGeo/gdal/releases/download/v$(version)/gdal-$(version).tar.gz") + add_versions("3.9.1", "46cd95ad0f270af0cd317ddc28fa5e0a7ad0b0fd160a7bd22909150df53e3418") add_versions("3.9.0", "3b29b573b60d156cf160805290474b625c4197ca36a79fd14f83ec8f77f29ba0") add_versions("3.8.5", "0c865c7931c7e9bb4832f50fb53aec8676cbbaccd6e55945011b737fb89a49c2") add_versions("3.5.1", "7c4406ca010dc8632703a0a326f39e9db25d9f1f6ebaaeca64a963e3fac123d1") From 5b9cc1e6289ddf3904825f573aa9652c72c1d082 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 10:52:37 +0800 Subject: [PATCH 401/671] Update onednn to v3.5.1 (#4671) --- packages/o/onednn/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onednn/xmake.lua b/packages/o/onednn/xmake.lua index 501cb2afa..a530db459 100644 --- a/packages/o/onednn/xmake.lua +++ b/packages/o/onednn/xmake.lua @@ -6,6 +6,7 @@ package("onednn") add_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/$(version).tar.gz", "https://github.com/oneapi-src/oneDNN.git") + add_versions("v3.5.1", "f316368a0d8c5235d80704def93f0e8c28e08dfaa2231a3de558be0ae2b146e7") add_versions("v3.5", "8356aa9befde4d4ff93f1b016ac4310730b2de0cc0b8c6c7ce306690bc0d7b43") add_versions("v3.4.3", "b795dc07d0d83aaec531081e77d5fb2e503a143f4330eabe4f035d4117c191ae") add_versions("v3.4.2", "5131ac559a13daa6e2784d20ab24e4607e55aa6da973518086326a647d389425") From 38d9af510cf150e38093cc84b77c717e577b0a67 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 11:08:17 +0800 Subject: [PATCH 402/671] Update tracy to v0.11.0 (#4675) --- packages/t/tracy/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tracy/xmake.lua b/packages/t/tracy/xmake.lua index 3ae18c288..77d158a4f 100644 --- a/packages/t/tracy/xmake.lua +++ b/packages/t/tracy/xmake.lua @@ -5,6 +5,7 @@ package("tracy") add_urls("https://github.com/wolfpld/tracy/archive/refs/tags/$(version).tar.gz", "https://github.com/wolfpld/tracy.git") + add_versions("v0.11.0", "b591ef2820c5575ccbf17e2e7a1dc1f6b9a2708f65bfd00f4ebefad2a1ccf830") add_versions("v0.10", "a76017d928f3f2727540fb950edd3b736caa97b12dbb4e5edce66542cbea6600") add_versions("v0.9.1", "c2de9f35ab2a516a9689ff18f5b62a55b73b93b66514bd09ba013d7957993cd7") add_versions("v0.9", "93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc") From 2542e8c49010e62df78951aae81646779734729c Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 20:57:42 +0800 Subject: [PATCH 403/671] Update aws-crt-cpp to v0.27.4 (#4673) --- packages/a/aws-crt-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua index d256ea2e0..a37349e97 100644 --- a/packages/a/aws-crt-cpp/xmake.lua +++ b/packages/a/aws-crt-cpp/xmake.lua @@ -6,6 +6,7 @@ package("aws-crt-cpp") add_urls("https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-crt-cpp.git") + add_versions("v0.27.4", "0554776a4cbbea016075f4a28698ff22818c5b948296171e1f76d0a787576f83") add_versions("v0.27.2", "e17c82d7cc3b5e6e4300bc7e4794306e292b5281d212ead536000a8b5f5f1be4") add_versions("v0.27.0", "e7601c8c5e6391013b6ad164d2dd7b970bf5dbb3693b9cc80c424bd6f42b79c8") add_versions("v0.26.11", "23acb2b14019182dd73fe6779ec266ee4d8937f19a99803da6407937fa22db7d") From e9d2254128d523f26e7cfe41e5b24847e5623793 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 20:58:01 +0800 Subject: [PATCH 404/671] Update thorvg to v0.14.2 (#4672) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index 4e9e98dc8..cdb6d5bd1 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.14.2", "04202e8f5e17b427c3b16ae3b3d4be5d3f3cdac96d5c64ed3efd7b6db3ad731f") add_versions("v0.14.1", "9c0346fda8b62a3b13a764dda5784e0465c8cab54fb5342d0240c7fb40e415bd") add_versions("v0.13.8", "ce49929a94d1686d4f1436da6ef5fa7a8439901c22b5fa0879d7d5879b8ba2bd") add_versions("v0.13.6", "f24fd3647e1a309dec00f6455b32258c0dd0e0dbd1133233169467571f188bad") From a3999a579f32bc7588caadebf78cb5735c88ac81 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 17 Jul 2024 22:05:22 +0800 Subject: [PATCH 405/671] enable libzip for mingw (#4677) * enable libzip for mingw * fix mingw --- packages/l/libzip/patches/1.10.1/mingw.patch | 14 ++++++++++++++ packages/l/libzip/xmake.lua | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/l/libzip/patches/1.10.1/mingw.patch diff --git a/packages/l/libzip/patches/1.10.1/mingw.patch b/packages/l/libzip/patches/1.10.1/mingw.patch new file mode 100644 index 000000000..cd1726315 --- /dev/null +++ b/packages/l/libzip/patches/1.10.1/mingw.patch @@ -0,0 +1,14 @@ +diff --git a/lib/zip_source_file_win32.h b/lib/zip_source_file_win32.h +index d86069ec..86ef2651 100644 +--- a/lib/zip_source_file_win32.h ++++ b/lib/zip_source_file_win32.h +@@ -76,6 +76,9 @@ int _zip_win32_error_to_errno(DWORD win32err); + #ifdef __clang__ + #define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wincompatible-function-pointer-types\"") + #define DONT_WARN_INCOMPATIBLE_FN_PTR_END _Pragma("GCC diagnostic pop") ++#elif defined(__GNUC__) && __GNUC__ > 13 ++#define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wincompatible-pointer-types\"") ++#define DONT_WARN_INCOMPATIBLE_FN_PTR_END _Pragma("GCC diagnostic pop") + #else + #define DONT_WARN_INCOMPATIBLE_FN_PTR_BEGIN + #define DONT_WARN_INCOMPATIBLE_FN_PTR_END diff --git a/packages/l/libzip/xmake.lua b/packages/l/libzip/xmake.lua index 87f9006eb..e0566c2b4 100644 --- a/packages/l/libzip/xmake.lua +++ b/packages/l/libzip/xmake.lua @@ -13,6 +13,8 @@ package("libzip") add_versions("v1.8.0", "30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e") add_versions("v1.9.2", "fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f") + add_patches("<=1.10.1", "patches/1.10.1/mingw.patch", "17513dbef5feca0630ad16a2eacb507fd2ee3d3a47a7c9a660eba24b35ea3fa8") + add_deps("cmake", "zlib") local configdeps = {-- gnutls = "gnutls", @@ -29,7 +31,7 @@ package("libzip") add_syslinks("advapi32") end - on_load("windows", "macosx", "linux", function (package) + on_load(function (package) for config, dep in pairs(configdeps) do if package:config(config) then package:add("deps", dep) @@ -37,7 +39,7 @@ package("libzip") end end) - on_install("windows", "macosx", "linux", function (package) + on_install("windows", "macosx", "linux", "mingw", function (package) io.replace("CMakeLists.txt", "Dist(", "#Dist(", {plain = true}) local configs = {"-DBUILD_DOC=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_REGRESS=OFF", "-DBUILD_TOOLS=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) From f195a7203d01b6743b9e75679706b1d52e101ed7 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Jul 2024 09:57:01 +0800 Subject: [PATCH 406/671] Update vk-bootstrap to v1.3.290 (#4683) --- packages/v/vk-bootstrap/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index b44939aff..7bee05cd5 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -6,6 +6,7 @@ package("vk-bootstrap") add_urls("https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/$(version).tar.gz", "https://github.com/charles-lunarg/vk-bootstrap.git") + add_versions("v1.3.290", "225f61c850f4d2e242121249418db2f54b09cd799922547bdb3f6d9c00738fa8") add_versions("v1.3.289", "101c4b10aaf48f07c5aae955fab12d8a453970c13fa93e8fe5e5b0b58ea1ceac") add_versions("v1.3.285", "c86b12ac2a0a809f7bf2af009a612be188aa4bb3a669d5955b22007989b3e07c") add_versions("v1.3.284", "753a7cc337ae7dcfcbfad1547c010287fd4bec1237bf17f35349470c7430830c") From 7abd177d4dc6f7baca9ccc4b20498383e2a47f8f Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Jul 2024 09:57:04 +0800 Subject: [PATCH 407/671] Update fastgltf to v0.7.2 (#4682) --- packages/f/fastgltf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fastgltf/xmake.lua b/packages/f/fastgltf/xmake.lua index c08de04e2..a07b4569b 100644 --- a/packages/f/fastgltf/xmake.lua +++ b/packages/f/fastgltf/xmake.lua @@ -6,6 +6,7 @@ package("fastgltf") add_urls("https://github.com/spnda/fastgltf/archive/refs/tags/$(version).tar.gz", "https://github.com/spnda/fastgltf.git") + add_versions("v0.7.2", "292fc9d0d5a6726c90db88c1aadf09e6d152ffc0ebffe6fb968736c47288511c") add_versions("v0.7.1", "44bcb025dd5cd480236a3bc7a3f8c9a708a801ed773b7859677440d22e0e1e7c") add_patches("0.7.1", "patches/0.7.1/cmake-simdjson.patch", "943828708f0e011122249196dc70d9a1f026e3212e1c1c35f6988907a6ea4e49") From 09f3c2759c197ec60cee99061062a5692b6e8856 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Jul 2024 09:57:07 +0800 Subject: [PATCH 408/671] Update croaring to v4.1.0 (#4681) --- packages/c/croaring/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/croaring/xmake.lua b/packages/c/croaring/xmake.lua index 126e38c51..61221220c 100644 --- a/packages/c/croaring/xmake.lua +++ b/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.1.0", "0596c6e22bcccb56f38260142b435f1f72aef7721fa370fd9f2b88380245fc1d") add_versions("v4.0.0", "a8b98db3800cd10979561a1388e4e970886a24015bd6cfabb08ba7917f541b0d") add_versions("v3.0.1", "a1cac9489b1c806c5594073e5db36475e247604282a47b650f4166c185ab061f") add_versions("v2.0.4", "3c962c196ba28abf2639067f2e2fd25879744ba98152a4e0e74556ca515eda33") From c2fde1d46185170ec5028ccf76d5786279bd2d34 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Jul 2024 09:57:11 +0800 Subject: [PATCH 409/671] Update argparse to 3.1 (#4680) --- packages/a/argparse/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/argparse/xmake.lua b/packages/a/argparse/xmake.lua index 84caf01d3..3de95e353 100644 --- a/packages/a/argparse/xmake.lua +++ b/packages/a/argparse/xmake.lua @@ -6,6 +6,7 @@ package("argparse") add_urls("https://github.com/p-ranav/argparse/archive/refs/tags/v$(version).zip", "https://github.com/p-ranav/argparse.git") + add_versions("3.1", "3e5a59ab7688dcd1f918bc92051a10564113d4f36c3bbed3ef596c25e519a062") add_versions("3.0", "674e724c2702f0bfef1619161815257a407e1babce30d908327729fba6ce4124") add_versions("2.6", "ce4e58d527b83679bdcc4adfa852af7ec9df16b76c11637823ef642cb02d2618") add_versions("2.7", "58cf098fd195895aeb9b9120d96f1e310994b2f44d72934c438ec91bf2191f46") From 001bf620f454e95bf280540e7e31131dbfb15737 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 18 Jul 2024 10:28:31 +0800 Subject: [PATCH 410/671] Update itlib to v1.11.0 (#4684) --- packages/i/itlib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/itlib/xmake.lua b/packages/i/itlib/xmake.lua index 3ac9c6794..1ac730290 100644 --- a/packages/i/itlib/xmake.lua +++ b/packages/i/itlib/xmake.lua @@ -7,6 +7,7 @@ package("itlib") add_urls("https://github.com/iboB/itlib/archive/refs/tags/$(version).tar.gz", "https://github.com/iboB/itlib.git") + add_versions("v1.11.0", "871a96989b36560934ed86939e38ce8ff0a5a44303ed489dbde6444985702c73") add_versions("v1.10.3", "e533c44354d48b2251ca57f1502778033b38170d9d6aba6bb2bbad90f2bf9d27") on_install(function (package) From 6539cc8b4dc322fb6082fbdb675723c480682b8a Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 18 Jul 2024 11:04:47 +0800 Subject: [PATCH 411/671] [folly related] update to 07.15 (#4678) --- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 5 +++-- packages/m/mvfst/xmake.lua | 1 + packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index 2107b10a5..175085e12 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -15,6 +15,7 @@ package("fbthrift") add_versions("2024.06.24", "78bbc48d1dfa8948580b780b3e827b4562102d2b9ca87db11b5a03ba277ac0e5") add_versions("2024.07.01", "fa2302fdabf54780213cc3c5b7047226d7d9b91b8e1b9528330f1041c16b25eb") add_versions("2024.07.08", "5efada565a85057824c58784dedd2600a03e531d526021bfe8bb8b655f56f09e") + add_versions("2024.07.15", "2671ebe49d6d379cc0f43c95c08a173fd6da6f04a9f748acdcda4d7a185f27f4") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index d831ba8c8..31113c813 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -16,6 +16,7 @@ package("fizz") add_versions("2024.06.24", "b5fd5fb3fe1cf20519ea91d6a0127505596f8c74c82cde9d54ea6ae92df86a50") add_versions("2024.07.01", "002bca2765cb0889ec535eeb1950acf93af57638a2da9b2deacc522113625fcc") add_versions("2024.07.08", "dd80231fb79760ef0b15394364ddbe35d4da82a7e07238dbaaf2f98f267d3938") + add_versions("2024.07.15", "44da982621aa91f15f5b2ec7a27510aab4650383b3a135372586501f3f44fc6c") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 69ff9cbf0..97b85e2f6 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -24,11 +24,12 @@ package("folly") add_versions("2024.06.24", "05ce0aed45c3a8125334438564364fbf32cd0d80b2a58c010cc821f5f16def50") add_versions("2024.07.01", "a619f2759e821d4657aa9f1cae0dedcec2085e656e16a3c458e053a759d2ce83") add_versions("2024.07.08", "93c9c7c7e3cb30c1b4437ac3043c05a245383fbb6e558abda704d61f14dc67bd") + add_versions("2024.07.15", "cbdd4400999c86d7ba271fdf3c15485ec5e250302aa98aebbca6f7e5715e6d8a") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") - add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") - add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") + add_patches("<=2024.07.15", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") + add_patches("<=2024.07.15", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 8ccfe7247..12d68900c 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -15,6 +15,7 @@ package("mvfst") add_versions("2024.06.24", "0a8c9bf9c9e1e293e56c0bd05e60606b2b299245510442a2e9af01519c040041") add_versions("2024.07.01", "833fc3421cb8a17ab1c2b5542e76074bcb9cfd534ec5e459393dd1e774921907") add_versions("2024.07.08", "345080326a3a8a24439253f7029b8f3c0785d804a179757b94ea2a5a52f4013f") + add_versions("2024.07.15", "598ac31d018c980c60d19fd5bd625b79cc6235250fdb3210524cfaa6cf27bddb") add_patches(">=2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 777af3433..7585ac6a4 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -15,6 +15,7 @@ package("proxygen") add_versions("2024.06.24", "4087de735334ba50f1e9c8df7c2040718d3c1ba9f9da102db5bbb7328a56b94a") add_versions("2024.07.01", "eb5141c6e972b3957a15ab90feb3d56b68061b2ca8d463fe84776cce5c9629bb") add_versions("2024.07.08", "3980eceba8a353222f831a411feeeec8f4e8b846278abb915f20865765a2edbf") + add_versions("2024.07.15", "ab26ec9184980edf709547af5dd7f52030f60d2d4474b269c93a96e809c10c5f") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index ec0484445..73795d3bc 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -16,6 +16,7 @@ package("wangle") add_versions("2024.06.24", "a4e83d477ef3c8c208f30a811772f0d551e0728f42f45bf647a82f3b82d60baf") add_versions("2024.07.01", "596dff77b6d6adef64e7b86f0f3e019c2ac787c92da0ddc18fbdaa4eca02cb3d") add_versions("2024.07.08", "b620ba5dee2f6c47c1d3002cb795524b1efe30f2689088000f010ecc0f9b03b2") + add_versions("2024.07.15", "0b48e84db224ff090ab005ae8824af56d71cc3f86d05e996cae33235e6b0ccd0") add_deps("cmake", "folly", "fizz") From 7d1fe84677d8ca7ffa0bf754f08e8122a3793f07 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 18 Jul 2024 11:05:08 +0800 Subject: [PATCH 412/671] dav1d: add 1.4.3 version (#4676) * dav1d: support windows arm64 * fix xmake.lua * fix tools * fix bsd syslinks --- packages/d/dav1d/xmake.lua | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/packages/d/dav1d/xmake.lua b/packages/d/dav1d/xmake.lua index 1c4e65c5d..29c25c5bf 100644 --- a/packages/d/dav1d/xmake.lua +++ b/packages/d/dav1d/xmake.lua @@ -1,30 +1,43 @@ package("dav1d") - set_homepage("https://www.videolan.org/projects/dav1d.html") set_description("dav1d is a new AV1 cross-platform decoder, open-source, and focused on speed, size and correctness.") set_license("BSD-2-Clause") - add_urls("https://downloads.videolan.org/pub/videolan/dav1d/$(version)/dav1d-$(version).tar.xz") - add_versions("0.9.0", "cfae88e8067c9b2e5b96d95a7a00155c353376fe9b992a96b4336e0eab19f9f6") + add_urls("https://downloads.videolan.org/pub/videolan/dav1d/$(version)/dav1d-$(version).tar.xz", + "https://code.videolan.org/videolan/dav1d.git") + + add_versions("1.4.3", "42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19") add_versions("1.1.0", "fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1") + add_versions("0.9.0", "cfae88e8067c9b2e5b96d95a7a00155c353376fe9b992a96b4336e0eab19f9f6") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) add_deps("nasm", "meson", "ninja") - if is_plat("linux") then + if is_plat("linux", "bsd") then add_syslinks("pthread", "dl") end - on_install("windows", "macosx", "linux|x86_64", function (package) + on_install("!android and !wasm", function (package) + import("package.tools.meson") + local configs = {"-Denable_tests=false"} table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static")) - if package:is_plat("windows") and package:is_cross() then - table.insert(configs, "-Denable_asm=false") -- arm asm requires bash and gas-preprocessor + table.insert(configs, "-Denable_tools=" .. (package:config("tools") and "true" or "false")) + if package:config("tools") then + package:addenv("PATH", "bin") + end + + local opt = {} + opt.envs = meson.buildenvs(package) + -- add gas-preprocessor to PATH + if package:is_plat("windows") and package:is_arch("arm.*") then + opt.envs.PATH = path.join(os.programdir(), "scripts") .. path.envsep() .. opt.envs.PATH end - import("package.tools.meson").install(package, configs) - package:addenv("PATH", "bin") + meson.install(package, configs, opt) end) on_test(function (package) - if not package:is_cross() then + if package:config("tools") and (not package:is_cross()) then os.vrun("dav1d -v") end assert(package:has_cfuncs("dav1d_default_settings", {includes = "dav1d/dav1d.h"})) From 28eecb681952892a51f0c1520daba3c027f70d16 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 18 Jul 2024 23:13:19 +0800 Subject: [PATCH 413/671] dlpack: add package (#4687) --- packages/d/dlpack/xmake.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/d/dlpack/xmake.lua diff --git a/packages/d/dlpack/xmake.lua b/packages/d/dlpack/xmake.lua new file mode 100644 index 000000000..8810ba26c --- /dev/null +++ b/packages/d/dlpack/xmake.lua @@ -0,0 +1,31 @@ +package("dlpack") + set_homepage("https://dmlc.github.io/dlpack/latest") + set_description("common in-memory tensor structure ") + set_license("Apache-2.0") + + add_urls("https://github.com/dmlc/dlpack/archive/refs/tags/$(version).tar.gz", + "https://github.com/dmlc/dlpack.git") + + add_versions("v0.8", "cf965c26a5430ba4cc53d61963f288edddcd77443aa4c85ce722aaf1e2f29513") + + add_configs("contrib", {description = "Build in progress unstable libraries", default = false, type = "boolean"}) + + add_deps("cmake") + + on_load(function (package) + if not package:config("contrib") then + package:set("kind", "library", {headeronly = true}) + end + end) + + on_install(function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DBUILD_MOCK=" .. (package:config("contrib") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_ctypes("DLDevice", {includes = "dlpack/dlpack.h"})) + end) From 6e7aea3321ef0c39b5b6cf2042bc6c7c1f836691 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 19 Jul 2024 23:08:24 +0800 Subject: [PATCH 414/671] Update quill to v5.0.0 (#4690) --- packages/q/quill/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index 6c5d4c56f..f300d9bdf 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -6,6 +6,7 @@ package("quill") set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") + add_versions("v5.0.0", "c2fd2b090db7d2d7633d4ee5a8316e43b4f5a13d8e339721b8e830fb03c25129") add_versions("v4.5.0", "70e8f4a76fd8a83b60d378f31b70dd09a9381686ebafdcd0db08fe099f518309") add_versions("v4.3.0", "c97bf3bfac6dfb7ed77fa08d945a490e302ba07e405539fda61985b39750cb29") add_versions("v3.8.0", "d3e1b349c5d6904c9644e5b79ec65f21692e8094a3d75241a7fe071076eef4dd") From f6462d5106ba2652bb847c27684aa6583b11731d Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Fri, 19 Jul 2024 23:08:34 +0800 Subject: [PATCH 415/671] add the osip repo (#4685) * add the osip repo * add the shared/static option and add_links --- packages/o/osip/xmake.lua | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/o/osip/xmake.lua diff --git a/packages/o/osip/xmake.lua b/packages/o/osip/xmake.lua new file mode 100644 index 000000000..7c692543e --- /dev/null +++ b/packages/o/osip/xmake.lua @@ -0,0 +1,26 @@ +package("osip") + set_homepage("https://savannah.gnu.org/projects/osip") + set_description("oSIP is an LGPL implementation of SIP. It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.") + set_license("LGPL") + + add_urls("https://git.savannah.gnu.org/cgit/osip.git/snapshot/osip-$(version).tar.gz", + "https://git.savannah.gnu.org/git/osip.git") + + add_versions("5.3.0", "593c9d61150b230f7e757b652d70d5fe336c84db7e4db190658f9ef1597d59ed") + + add_deps("autoconf", "automake", "m4", "libtool") + add_links("osip2", "osipparser2") + + on_install("linux", "macosx", function (package) + local configs = {"--disable-trace"} + table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) + table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes")) + if not package:debug() then + table.insert(configs, "--disable-debug") + end + import("package.tools.autoconf").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("osip_cond_signal", {includes = "osip2/osip_condv.h"})) + end) From 8ae62d92005d3fee84b3477fc06183d33ef36584 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 19 Jul 2024 23:09:51 +0800 Subject: [PATCH 416/671] backward-cpp: improve deps (#4686) * backward-cpp: improve links * only support headeronly kind * improve configs and deps * disable windows arm64 * fix shared --- packages/b/backward-cpp/xmake.lua | 84 +++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 16 deletions(-) diff --git a/packages/b/backward-cpp/xmake.lua b/packages/b/backward-cpp/xmake.lua index 7bfdb784f..b566cc479 100644 --- a/packages/b/backward-cpp/xmake.lua +++ b/packages/b/backward-cpp/xmake.lua @@ -1,43 +1,95 @@ package("backward-cpp") - + set_kind("library", {headeronly = true}) set_homepage("https://github.com/bombela/backward-cpp") set_description("Backward is a beautiful stack trace pretty printer for C++.") set_license("MIT") - add_configs("bfd", {description = "Get stack trace with details about your sources by using libbfd from binutils.", default = false, type = "boolean"}) - add_urls("https://github.com/bombela/backward-cpp/archive/refs/tags/$(version).zip", "https://github.com/bombela/backward-cpp.git") + add_versions("v1.6", "9b07e12656ab9af8779a84e06865233b9e30fadbb063bf94dd81d318081db8c2") + add_configs("stack_walking", {description = "Choose stack walking library to use.", default = nil, type = "string", values = {"unwind", "libunwind", "backtrace"}}) + add_configs("stack_details", {description = "Choose stack details library to use.", default = nil, type = "string", values = {"dw", "bfd", "dwarf", "backtrace_symbol"}}) + if is_plat("mingw") then - add_patches("v1.6", path.join(os.scriptdir(), "patches", "v1.6", "link_to_imagehlp.patch"), "0a135b6d68970ff6609a3eb4deb2b10c317eee15ba980eb178b93402a97c957c") + add_patches("v1.6", "patches/v1.6/link_to_imagehlp.patch", "0a135b6d68970ff6609a3eb4deb2b10c317eee15ba980eb178b93402a97c957c") if is_arch("i386") then - add_patches("v1.6", path.join(os.scriptdir(), "patches", "v1.6", "fix_32bit_ssize_t_typedef.patch"), "fb372fe5934984aecb00b3153f737f63a542ff9359d159a9bcb79c5d54963b42") + add_patches("v1.6", "patches/v1.6/fix_32bit_ssize_t_typedef.patch", "fb372fe5934984aecb00b3153f737f63a542ff9359d159a9bcb79c5d54963b42") end end + if is_plat("windows", "mingw") then + add_syslinks("psapi", "dbghelp") + elseif is_plat("linux", "bsd", "android") then + add_syslinks("dl", "m") + end + add_deps("cmake") - on_load("linux", "mingw@msys", "macos", function (package) - if package:config("bfd") then - package:add("deps", "binutils") + on_load(function (package) + local stack_walking = package:config("stack_walking") + if stack_walking == "libunwind" then + package:add("deps", "libunwind") end - end) - on_install("linux", "mingw", "macosx", "windows|!arm*", function (package) - if package:config("bfd") and package:is_plat("linux", "mingw@msys", "macos") then + local stack_details = package:config("stack_details") + if stack_details == "dwarf" then + package:add("deps", "libdwarf", "libelf") + elseif stack_details == "dw" then + package:add("deps", "elfutils") + elseif stack_details == "bfd" then + package:add("deps", "binutils") package:add("syslinks", "bfd") - package:add("defines", "BACKWARD_HAS_BFD=1") end - local configs = {"-DBACKWARD_TESTS=OFF"} + + package:add("defines", "BACKWARD_HAS_UNWIND=" .. (stack_walking == "unwind" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_LIBUNWIND=" .. (stack_walking == "libunwind" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_BACKTRACE=" .. (stack_walking == "backtrace" and "1" or "0")) + + package:add("defines", "BACKWARD_HAS_BACKTRACE_SYMBOL=" .. (stack_details == "backtrace_symbol" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_DW=" .. (stack_details == "dw" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_BFD=" .. (stack_details == "bfd" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_DWARF=" .. (stack_details == "dwarf" and "1" or "0")) + package:add("defines", "BACKWARD_HAS_PDB_SYMBOL=" .. (is_plat("windows") and "1" or "0")) + end) + + on_install("windows|!arm64", function (package) + local configs = {"-DBACKWARD_TESTS=OFF", "-DSTACK_DETAILS_AUTO_DETECT=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBACKWARD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") then + table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''") + if package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + end + + local stack_walking = package:config("stack_walking") + local stack_details = package:config("stack_details") + + table.insert(configs, "-DSTACK_WALKING_UNWIND=" .. ((stack_walking == "unwind") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_WALKING_LIBUNWIND=" .. ((stack_walking == "libunwind") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_WALKING_BACKTRACE=" .. ((stack_walking == "backtrace") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_DETAILS_BACKTRACE_SYMBOL=" .. ((stack_walking == "backtrace_symbol") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_DETAILS_DW=" .. ((stack_walking == "dw") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_DETAILS_BFD=" .. ((stack_walking == "bfd") and "ON" or "OFF")) + table.insert(configs, "-DSTACK_DETAILS_DWARF=" .. ((stack_walking == "dwarf") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) - os.mv(package:installdir("include/*.hpp"), package:installdir("include/backward")) + + io.replace("backward.hpp", [[#pragma comment(lib, "psapi.lib")]], "", {plain = true}) + io.replace("backward.hpp", [[#pragma comment(lib, "dbghelp.lib")]], "", {plain = true}) + + os.cp(package:installdir("include/*.hpp"), package:installdir("include/backward")) + os.cp(package:installdir("include/*.hpp"), package:installdir("lib/backward")) end) on_test(function (package) - assert(package:has_cxxtypes("backward::SignalHandling", {configs = {languages = "c++11"}, includes = "backward/backward.hpp"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + backward::Printer printer; + backward::StackTrace st; + } + ]]}, {configs = {languages = "c++11"}, includes = "backward.hpp"})) end) - From c69986b999ec9736cc25290d2ce7464ed59506c3 Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Sat, 20 Jul 2024 01:08:37 +0100 Subject: [PATCH 417/671] backward-cpp: fix limits (#4693) * backward-cpp: fix limits * backward-cpp: add execinfo * backward-cpp: add syslinks for wasm * backward-cpp: fix add_syslinks * backward-cpp: exclude more plats * backward-cpp: exclude cross --- packages/b/backward-cpp/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/b/backward-cpp/xmake.lua b/packages/b/backward-cpp/xmake.lua index b566cc479..ae8615550 100644 --- a/packages/b/backward-cpp/xmake.lua +++ b/packages/b/backward-cpp/xmake.lua @@ -55,7 +55,7 @@ package("backward-cpp") package:add("defines", "BACKWARD_HAS_PDB_SYMBOL=" .. (is_plat("windows") and "1" or "0")) end) - on_install("windows|!arm64", function (package) + on_install("(!windows or windows|!arm64) and !android and !bsd and !wasm and !cross", function (package) local configs = {"-DBACKWARD_TESTS=OFF", "-DSTACK_DETAILS_AUTO_DETECT=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBACKWARD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) From 6c955eced4c583591bf630fab4e9c4fb2fbe31a9 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 20 Jul 2024 09:54:01 +0800 Subject: [PATCH 418/671] Update toml11 to v4.0.3 (#4694) --- packages/t/toml11/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/toml11/xmake.lua b/packages/t/toml11/xmake.lua index 969a8ff51..8e78e8cbb 100644 --- a/packages/t/toml11/xmake.lua +++ b/packages/t/toml11/xmake.lua @@ -7,6 +7,7 @@ package("toml11") add_urls("https://github.com/ToruNiina/toml11/archive/refs/tags/$(version).tar.gz", "https://github.com/ToruNiina/toml11.git") + add_versions("v4.0.3", "c8cbc7839cb3f235153045ce550e559f55a04554dfcab8743ba8a1e8ef6a54bf") add_versions("v4.0.2", "d1bec1970d562d328065f2667b23f9745a271bf3900ca78e92b71a324b126070") add_versions("v4.0.1", "96965cb00ca7757c611c169cd5a6fb15736eab1cd1c1a88aaa62ad9851d926aa") add_versions("v3.8.1", "6a3d20080ecca5ea42102c078d3415bef80920f6c4ea2258e87572876af77849") From 4ae153e7d8674d63f563927ec9843c545875fee9 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 20 Jul 2024 23:12:49 +0800 Subject: [PATCH 419/671] add cmake 3.30.1 (#4701) --- packages/c/cmake/xmake.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/c/cmake/xmake.lua b/packages/c/cmake/xmake.lua index 53c7b3130..eac5f3f0d 100644 --- a/packages/c/cmake/xmake.lua +++ b/packages/c/cmake/xmake.lua @@ -21,6 +21,7 @@ package("cmake") add_versions("3.28.1", "0e0942bb5ed7ee1aeda0c00b3cb7738f2590865f1d69fe1d5212cbc26fc040a5") add_versions("3.28.3", "d9e2c22fec920a4d1f6b0d0683c035d799475c179c91e41e1a7fbfab610a0305") add_versions("3.29.2", "0d670b59dddd064d24cf8c386abf3590bda2642bb169e11534cf1e3d1ae3a76a") + add_versions("3.30.1", "51e12618829b811bba6f033ee8f39f6192da1b6abb20d82a7899d5134e879a4c") elseif is_host("linux") then if os.arch():find("arm64.*") then add_urls("https://cmake.org/files/v$(version)-aarch64.tar.gz", {version = function (version) @@ -34,6 +35,7 @@ package("cmake") add_versions("3.28.1", "e84d88e46ed8c85fbe259bcd4ca07df7a928df87e84013e0da34d91b01a25d71") add_versions("3.28.3", "bbf023139f944cefe731d944f2864d8ea3ea0c4f9310b46ac72b3cb4e314b023") add_versions("3.29.2", "ca883c6dc3ce9eebd833804f0f940ecbbff603520cfd169ee58916dbbc23c2b8") + add_versions("3.30.1", "ad234996f8750f11d7bd0d17b03f55c434816adf1f1671aab9e8bab21a43286a") else add_urls("https://cmake.org/files/v$(version)-x86_64.tar.gz", {version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-linux" or "-Linux") @@ -52,6 +54,7 @@ package("cmake") add_versions("3.28.1", "f76398c24362ad87bad1a3d6f1e8f4377632b5b1c360c4ba1fd7cd205fd9d8d4") add_versions("3.28.3", "804d231460ab3c8b556a42d2660af4ac7a0e21c98a7f8ee3318a74b4a9a187a6") add_versions("3.29.2", "0416c70cf88e8f92efcbfe292e181bc09ead7d70e29ab37b697522c01121eab5") + add_versions("3.30.1", "ac31f077ef3378641fa25a3cb980d21b2f083982d3149a8f2eb9154f2b53696b") end elseif is_host("windows") then if os.arch() == "x64" then @@ -72,6 +75,7 @@ package("cmake") add_versions("3.28.1", "671332249bc7cc7424523d6c2b5edd3e3de90a43b8b82e8782f42da4fe4c562d") add_versions("3.28.3", "cac7916f7e1e73a25de857704c94fd5b72ba9fe2f055356b5602d2f960e50e5b") add_versions("3.29.2", "86b5de51f60a0e9d62be4d8ca76ea467d154083d356fcc9af1409606be341cd8") + add_versions("3.30.1", "cf7788ff9d92812da194847d4ec874fc576f34079987d0f20c96cd09e2a16220") elseif os.arch() == "x86" then add_urls("https://cmake.org/files/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-windows-i386" or "-win32-x86") @@ -90,6 +94,7 @@ package("cmake") add_versions("3.28.1", "e9591cfdb1d394eee84acdecf880cbd91cf0707dfd0d58bf3796b88475f46cb9") add_versions("3.28.3", "411812b6b29ac793faf69bdbd36c612f72659363c5491b9f0a478915db3fc58c") add_versions("3.29.2", "e51b281c9dfd1498834729b33bf49fc668ad1dadbc2eaba7b693d0f7d748450d") + add_versions("3.30.1", "f5fb1d93b82e9a5fbd5853d4b17a130605f0b4ed13a655d1371c2d6d55f9261d") elseif os.arch() == "arm64" then add_urls("https://cmake.org/files/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. "-windows-arm64" @@ -100,6 +105,7 @@ package("cmake") add_versions("3.28.1", "a839b8d32c11b24f078142b5b8c3361a955ebc65788f0f0353b2121fe2f74e49") add_versions("3.28.3", "cfe023b7e82812ef802fb1ec619f6cfa2fdcb58ee61165fc315086286fe9cdcc") add_versions("3.29.2", "5b16a0db4966c04582c40131038de49d5b0161fcd950dc9e955753dfab858882") + add_versions("3.30.1", "02b433f70aa549449be2d53046d0179590bf3b6290d9fda3fbbb23f96a4f2802") end else add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version).tar.gz") @@ -112,6 +118,7 @@ package("cmake") add_versions("3.28.1", "15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad") add_versions("3.28.3", "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1") add_versions("3.29.2", "36db4b6926aab741ba6e4b2ea2d99c9193222132308b4dc824d4123cb730352e") + add_versions("3.30.1", "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1") end if is_plat("mingw") and is_subhost("msys") then From b8c9b8153fdd7a266747f6d12feef8e4f7678a25 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 21 Jul 2024 10:14:51 +0800 Subject: [PATCH 420/671] Update thorvg to v0.14.3 (#4706) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index cdb6d5bd1..69b6c5a8d 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.14.3", "302e7bb2082a5c4528b6ec9b95d500b2c0f54f4333870a709cc122b5b393dcfe") add_versions("v0.14.2", "04202e8f5e17b427c3b16ae3b3d4be5d3f3cdac96d5c64ed3efd7b6db3ad731f") add_versions("v0.14.1", "9c0346fda8b62a3b13a764dda5784e0465c8cab54fb5342d0240c7fb40e415bd") add_versions("v0.13.8", "ce49929a94d1686d4f1436da6ef5fa7a8439901c22b5fa0879d7d5879b8ba2bd") From 822391c36c05c8fc039e299e5cd87eae75654dc4 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 21 Jul 2024 10:14:53 +0800 Subject: [PATCH 421/671] Update libheif to 1.18.0 (#4705) --- packages/l/libheif/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libheif/xmake.lua b/packages/l/libheif/xmake.lua index 761656ab9..9eb5f51c0 100644 --- a/packages/l/libheif/xmake.lua +++ b/packages/l/libheif/xmake.lua @@ -5,6 +5,7 @@ package("libheif") set_license("LGPL-3.0") add_urls("https://github.com/strukturag/libheif/releases/download/v$(version)/libheif-$(version).tar.gz") + add_versions("1.18.0", "3f25f516d84401d7c22a24ef313ae478781b95f235c250b06152701c401055c3") add_versions("1.17.6", "8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee") add_versions("1.12.0", "e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718") From 1373b15f8030bf8a11fb5b9dfcef6ef71d848262 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 21 Jul 2024 10:14:56 +0800 Subject: [PATCH 422/671] Update pyincpp to v2.4.1 (#4703) --- packages/p/pyincpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pyincpp/xmake.lua b/packages/p/pyincpp/xmake.lua index 321554f8a..b6f273b63 100644 --- a/packages/p/pyincpp/xmake.lua +++ b/packages/p/pyincpp/xmake.lua @@ -6,6 +6,7 @@ package("pyincpp") add_urls("https://github.com/chen-qingyu/pyincpp/archive/refs/tags/$(version).tar.gz", "https://github.com/chen-qingyu/pyincpp.git") + add_versions("v2.4.1", "766fc1dec895cf54803bf8ea7f9e86f9aa8e001b38c1f14a88907849e81f634b") add_versions("v2.4.0", "ae48bc62e9ed8f89e31235ee79385e59b0be6fd6720e8ebe0aa3d10ec7c9fee2") add_versions("v2.3.0", "e10640c03a6ae9365a299f57a68a5f2a873146b07f92fd33bc4f673e21d68072") add_versions("v1.6.1", "6a49657cb1f36f4fa400706a631c300771972015b4181f8cc352aa3de7e1a2a3") From c98f742cb59ad50db3b385903f0d528428656664 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 21 Jul 2024 11:08:16 +0800 Subject: [PATCH 423/671] Update moltenvk to v1.2.10 (#4707) --- packages/m/moltenvk/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/moltenvk/xmake.lua b/packages/m/moltenvk/xmake.lua index b884ab759..a913fad5f 100644 --- a/packages/m/moltenvk/xmake.lua +++ b/packages/m/moltenvk/xmake.lua @@ -6,6 +6,7 @@ package("moltenvk") add_urls("https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/$(version).tar.gz", "https://github.com/KhronosGroup/MoltenVK.git") + add_versions("v1.2.10", "3435d34ea2dafb043dd82ac5e9d2de7090462ab7cea6ad8bcc14d9c34ff99e9c") add_versions("v1.2.9", "f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e") add_versions("v1.2.8", "85beaf8abfcc54d9da0ff0257ae311abd9e7aa96e53da37e1c37d6bc04ac83cd") add_versions("v1.2.7", "3166edcfdca886b4be1a24a3c140f11f9a9e8e49878ea999e3580dfbf9fe4bec") From a8f0b7e12b86ccb07bf8fdf7510cb36a6aa57f5e Mon Sep 17 00:00:00 2001 From: Max Qian <64824374+AstroAir@users.noreply.github.com> Date: Sun, 21 Jul 2024 20:49:56 +0800 Subject: [PATCH 424/671] add oatpp-openssl (#4700) * Create xmake.lua * fix test --- packages/o/oatpp-openssl/xmake.lua | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/o/oatpp-openssl/xmake.lua diff --git a/packages/o/oatpp-openssl/xmake.lua b/packages/o/oatpp-openssl/xmake.lua new file mode 100644 index 000000000..aafc8dc6c --- /dev/null +++ b/packages/o/oatpp-openssl/xmake.lua @@ -0,0 +1,43 @@ +package("oatpp-openssl") + set_homepage("https://oatpp.io/") + set_description("It provides secure server and client connection providers for oatpp applications.") + set_license("Apache-2.0") + + add_urls("https://github.com/oatpp/oatpp-openssl/archive/$(version).tar.gz", + "https://github.com/oatpp/oatpp-openssl.git") + add_versions("1.3.0", "5925e8ba856fa71cda8937c4cb357508d4fdb3fb") + + if is_plat("windows") then + add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) + end + + add_deps("cmake") + add_deps("oatpp") + add_deps("openssl") + + on_load(function (package) + package:add("includedirs", path.join("include", "oatpp-" .. package:version_str(), "oatpp-openssl")) + package:add("linkdirs", path.join("lib", "oatpp-" .. package:version_str())) + end) + + on_install("linux", "macosx", "windows|x64", function (package) + local configs = {"-DOATPP_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") then + table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include "oatpp-openssl/server/ConnectionProvider.hpp" + #include "oatpp-openssl/Config.hpp" + #include "oatpp-openssl/configurer/TrustStore.hpp" + void test() { + const char* trust = "path/to/truststore"; + auto config = oatpp::openssl::Config::createDefaultClientConfigShared(); + } + ]]}, {configs = {languages = "c++11"}})) + end) From f3254fa16633cc79efb2441bfbddc9f27bc5c580 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 21 Jul 2024 23:03:05 +0800 Subject: [PATCH 425/671] Auto-update libavif to v1.1.0 (#4650) * Update libavif to v1.1.0 * add deps * add check * Update xmake.lua --------- Co-authored-by: star9029 --- packages/l/libavif/xmake.lua | 21 +++++++++++++++------ packages/l/libyuv/xmake.lua | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/l/libavif/xmake.lua b/packages/l/libavif/xmake.lua index a381a56ef..503fd42f0 100644 --- a/packages/l/libavif/xmake.lua +++ b/packages/l/libavif/xmake.lua @@ -1,30 +1,39 @@ package("libavif") - set_homepage("https://github.com/AOMediaCodec/libavif") set_description("libavif - Library for encoding and decoding .avif files") set_license("BSD-2-Clause") add_urls("https://github.com/AOMediaCodec/libavif/archive/refs/tags/$(version).tar.gz", "https://github.com/AOMediaCodec/libavif.git") + + add_versions("v1.1.0", "edb31951005d7a143be1724f24825809599a4832073add50eaf987733defb5c8") add_versions("v1.0.4", "dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146") add_versions("v0.9.1", "8526f3fff34a05a51d7c703cdcf1d0d38c939b5b6dd4bb7d3a3405ddad88186c") add_configs("dav1d", {description = "Use the dav1d codec for decoding.", default = false, type = "boolean"}) add_deps("cmake") + add_deps("libyuv") + + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk"):config("ndkver") + assert(ndk and tonumber(ndk) > 22, "package(libavif): library deps libyuv need ndk version > 22") + end) + end + on_load(function (package) if package:config("dav1d") then package:add("deps", "dav1d") end end) - on_install("windows", "linux", "macosx", function (package) + on_install("!cross and !wasm", function (package) local configs = {"-DAVIF_ENABLE_WERROR=OFF", "-DAVIF_BUILD_TESTS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - if package:config("dav1d") then - table.insert(configs, "-DAVIF_CODEC_DAV1D=ON") - end + + table.insert(configs, "-DAVIF_CODEC_DAV1D=" .. (package:config("dav1d") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) diff --git a/packages/l/libyuv/xmake.lua b/packages/l/libyuv/xmake.lua index 4c8c6da11..f31a5d7d1 100644 --- a/packages/l/libyuv/xmake.lua +++ b/packages/l/libyuv/xmake.lua @@ -32,7 +32,7 @@ package("libyuv") if on_check then on_check("android", function (package) local ndk = package:toolchain("ndk"):config("ndkver") - assert(ndk and tonumber(ndk) > 22, "package(libyuv/arm64): need ndk version > 22") + assert(ndk and tonumber(ndk) > 22, "package(libyuv): need ndk version > 22") end) end From 003f634465d7f1151d5454e62eb1a84f9605e6b4 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 22 Jul 2024 00:42:01 +0800 Subject: [PATCH 426/671] update fmt to 11.0.2 (#4712) --- packages/f/fmt/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index f3813724c..8f7973690 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -5,6 +5,7 @@ package("fmt") set_urls("https://github.com/fmtlib/fmt/releases/download/$(version)/fmt-$(version).zip", "https://github.com/fmtlib/fmt.git") + add_versions("11.0.2", "40fc58bebcf38c759e11a7bd8fdc163507d2423ef5058bba7f26280c5b9c5465") add_versions("11.0.1", "62ca45531814109b5d6cef0cf2fd17db92c32a30dd23012976e768c685534814") add_versions("11.0.0", "583ce480ef07fad76ef86e1e2a639fc231c3daa86c4aa6bcba524ce908f30699") add_versions("10.2.1", "312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9") From a6204e34abf99cc032f06107f71609471546989a Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 22 Jul 2024 00:46:12 +0800 Subject: [PATCH 427/671] boost: improve patch (#4710) --- .../b/boost/patches/1.85.0/fix-v144.patch | 22 ++++++++++++++++ packages/b/boost/xmake.lua | 26 ++++++++----------- 2 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 packages/b/boost/patches/1.85.0/fix-v144.patch diff --git a/packages/b/boost/patches/1.85.0/fix-v144.patch b/packages/b/boost/patches/1.85.0/fix-v144.patch new file mode 100644 index 000000000..d652e91d7 --- /dev/null +++ b/packages/b/boost/patches/1.85.0/fix-v144.patch @@ -0,0 +1,22 @@ +diff --git a/tools/build/src/tools/msvc.jam b/tools/build/src/tools/msvc.jam +index 54a6ced..bac3932 100644 +--- a/tools/build/src/tools/msvc.jam ++++ b/tools/build/src/tools/msvc.jam +@@ -1137,7 +1137,7 @@ local rule generate-setup-cmd ( version : command : parent : options * : cpu : g + } + else + { +- if [ MATCH "(14.3)" : $(version) ] ++ if [ MATCH "(14.[34])" : $(version) ] + { + if $(.debug-configuration) + { +@@ -1316,7 +1316,7 @@ local rule configure-really ( version ? : options * ) + # version from the path. + # FIXME: We currently detect both Microsoft Visual Studio 9.0 and + # 9.0express as 9.0 here. +- if [ MATCH "(MSVC\\\\14.3)" : $(command) ] ++ if [ MATCH "(MSVC\\\\14.[34])" : $(command) ] + { + version = 14.3 ; + } diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 8340919f6..4e6c08d32 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -153,6 +153,17 @@ package("boost") package:add("deps", "xz") end end + + if package:is_plat("windows") and package:version():le("1.85.0") then + local vs_toolset = package:toolchain("msvc"):config("vs_toolset") + if vs_toolset then + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + if minor and minor >= 40 then + package:add("patches", "<=1.85.0", "patches/1.85.0/fix-v144.patch", "1ba99cb2e2f03a4ba489a32596c62e1310b6c73ba4d19afa8796bcf180c84422") + end + end + end end) on_install("macosx", "linux", "windows", "bsd", "mingw", "cross", function (package) @@ -388,21 +399,6 @@ package("boost") if package:is_plat("linux") then table.insert(argv, "pch=off") end - - if package:is_plat("windows") and package:version():le("1.85.0") then - local vs_toolset = build_toolchain:config("vs_toolset") - if vs_toolset then - local vs_toolset_ver = import("core.base.semver").new(vs_toolset) - local minor = vs_toolset_ver:minor() - if minor and minor >= 40 then - io.replace("tools/build/src/engine/config_toolset.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/engine/build.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/engine/guess_toolset.bat", "vc143", "vc144", {plain = true}) - io.replace("tools/build/src/tools/intel-win.jam", "14.3", "14.4", {plain = true}) - io.replace("tools/build/src/tools/msvc.jam", "14.3", "14.4", {plain = true}) - end - end - end local ok = os.execv("./b2", argv, {envs = runenvs, try = true, stdout = "boost-log.txt"}) if ok ~= 0 then raise("boost build failed, please check log in " .. path.join(os.curdir(), "boost-log.txt")) From 0cc7120fcbd8e588a5d9516af87c4a6e4805b1fa Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 22 Jul 2024 00:46:38 +0800 Subject: [PATCH 428/671] glm: fix headeronly kind (#4713) --- packages/g/glm/xmake.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/g/glm/xmake.lua b/packages/g/glm/xmake.lua index 6fa5516f0..7d3e173a6 100644 --- a/packages/g/glm/xmake.lua +++ b/packages/g/glm/xmake.lua @@ -1,5 +1,4 @@ package("glm") - set_homepage("https://glm.g-truc.net/") set_description("OpenGL Mathematics (GLM)") set_license("MIT") @@ -7,7 +6,8 @@ package("glm") add_urls("https://github.com/g-truc/glm/archive/refs/tags/$(version).tar.gz", {version = function(version) return version:gsub("%+", ".") end}) add_urls("https://github.com/g-truc/glm.git") - add_versions("1.0.1", "55a195bacf76cc48226292ada71b26abc980cde53180120a7b2a4ea8718e1507") + + add_versions("1.0.1", "9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c") add_versions("1.0.0", "e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23") add_versions("0.9.9+8", "7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592") @@ -19,8 +19,9 @@ package("glm") if package:config("modules") then package:config_set("header_only", false) package:config_set("cxx_standard", "20") - end - if not package:config("header_only") and not package:config("modules") then + elseif package:config("header_only") then + package:set("kind", "library", {headeronly = true}) + else package:add("deps", "cmake") end end) From 1cc2f8ad34162664104d509b63a927000f6c00e0 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 Jul 2024 10:36:46 +0800 Subject: [PATCH 429/671] Update quill to v5.1.0 (#4716) --- packages/q/quill/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index f300d9bdf..708ca0317 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -6,6 +6,7 @@ package("quill") set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") + add_versions("v5.1.0", "0b4f34415c4b173f3d0466752fa3d3835e1a58f931bfce5281f817b5f997511f") add_versions("v5.0.0", "c2fd2b090db7d2d7633d4ee5a8316e43b4f5a13d8e339721b8e830fb03c25129") add_versions("v4.5.0", "70e8f4a76fd8a83b60d378f31b70dd09a9381686ebafdcd0db08fe099f518309") add_versions("v4.3.0", "c97bf3bfac6dfb7ed77fa08d945a490e302ba07e405539fda61985b39750cb29") From 36b9e7aa38956ac1edfbb9b08789922fb02e06d6 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 Jul 2024 10:36:49 +0800 Subject: [PATCH 430/671] Update blake3 to 1.5.3 (#4715) --- packages/b/blake3/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/blake3/xmake.lua b/packages/b/blake3/xmake.lua index 5a7629217..fe0f3cf58 100644 --- a/packages/b/blake3/xmake.lua +++ b/packages/b/blake3/xmake.lua @@ -6,6 +6,7 @@ package("blake3") add_urls("https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/$(version).tar.gz", "https://github.com/BLAKE3-team/BLAKE3.git") + add_versions("1.5.3", "ec9114480857334858e73b727199c573bfdbed6138a83be573f076d37e671fc1") add_versions("1.5.2", "1bc38cd3cc501458054c3bb473e5e00338d6175121424040079025ea305ddef3") add_versions("1.5.1", "822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37") add_versions("1.5.0", "f506140bc3af41d3432a4ce18b3b83b08eaa240e94ef161eb72b2e57cdc94c69") From 31eee5cfa9b7d99de23ea89bfd854a0aaa86182d Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 Jul 2024 11:09:57 +0800 Subject: [PATCH 431/671] Update aws-c-cal to v0.7.2 (#4718) --- packages/a/aws-c-cal/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-cal/xmake.lua b/packages/a/aws-c-cal/xmake.lua index 7bcaf4fc2..66840be00 100644 --- a/packages/a/aws-c-cal/xmake.lua +++ b/packages/a/aws-c-cal/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-cal") add_urls("https://github.com/awslabs/aws-c-cal/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-cal.git") + add_versions("v0.7.2", "265938e3f1d2baa6a555ec6b0a27c74d3f505cbe7c96f7539ada42d5a848dee9") add_versions("v0.7.1", "2fbdc04d72d1f3af28b80fe3917f03f20c0a62bc22b6c7b3450486ee9cbe77f6") add_versions("v0.6.15", "67dda8049a59bbb70cdb166f46f741bc3a8443c86009a1ae4cb7842964a76e0d") add_versions("v0.6.14", "2326304b15bec45b212f6b738020c21afa41f9da295936687e103f9f2efb7b5e") From a47e7e3eef297e72b1a21a66751f537cc3d257b6 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 Jul 2024 11:09:59 +0800 Subject: [PATCH 432/671] Update vcpkg to 2024.07.12 (#4717) --- packages/v/vcpkg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vcpkg/xmake.lua b/packages/v/vcpkg/xmake.lua index 64a4ed4bf..b738ad344 100644 --- a/packages/v/vcpkg/xmake.lua +++ b/packages/v/vcpkg/xmake.lua @@ -5,6 +5,7 @@ package("vcpkg") set_license("MIT") add_urls("https://github.com/microsoft/vcpkg/archive/refs/tags/$(version).tar.gz") + add_versions("2024.07.12", "7da785e42b7487fb0e7465188f12c6ce0dfa760ab334d0f4f708bd1fc54081b1") add_versions("2024.05.24", "3034e534d4ed13e6e6edad3c331c0e9e3280f579dd4ba86151aa1e2896b85d31") add_deps("zip", "unzip", "cmake", "ninja", "curl") From f84c0180eef3b191bab0f0036226646ac915c6ca Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:13:51 +0800 Subject: [PATCH 433/671] add exosip repo (#4696) * add exosip repo * add link to restrict the priority * specify the openssl version * add -pthread * add --enable-pthread=force * change the add_syslinks * change openssl to openssl3 and add_deps(pkg-config) for macosx * add on_check for macosx --- packages/e/exosip/xmake.lua | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 packages/e/exosip/xmake.lua diff --git a/packages/e/exosip/xmake.lua b/packages/e/exosip/xmake.lua new file mode 100644 index 000000000..768ce723c --- /dev/null +++ b/packages/e/exosip/xmake.lua @@ -0,0 +1,47 @@ +package("exosip") + set_homepage("https://savannah.nongnu.org/projects/exosip") + set_description("eXosip is a library that hides the complexity of using the SIP protocol for mutlimedia session establishement") + set_license("GPL-2.0") + + add_urls("https://git.savannah.nongnu.org/cgit/exosip.git/snapshot/exosip-$(version).tar.gz", + "git://git.savannah.gnu.org/exosip.git") + + add_versions("5.3.0", "66c2b2ddcfdc8807054fa31f72a6068ef66d98bedd9aedb25b9031718b9906a2") + + add_deps("autoconf", "m4", "libtool", "automake", "osip", "openssl3") + add_links("eXosip2", "osip2", "osipparser2") + + if is_plat("macosx") then + add_syslinks("resolv") + add_frameworks("CoreFoundation") + add_deps("pkg-config") + elseif is_plat("linux") then + add_syslinks("pthread", "resolv") + end + + on_check("macosx", function (package) + assert(package:check_cxxsnippets({test = [[ + #include "TargetConditionals.h" + #include + #include + #include + void test() { + SInt32 osx_version = 0; + OSErr res = Gestalt(gestaltSystemVersion, &osx_version); + } + ]]})) + end) + + on_install("macosx", "linux", function (package) + local configs = {"--disable-trace", "--enable-pthread=force"} + table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) + table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes")) + if not package:debug() then + table.insert(configs, "--disable-debug") + end + import("package.tools.autoconf").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("eXosip_lock", {includes = "eXosip2/eXosip.h", "eXosip2.h"})) + end) From 8b24cd9580bcfe7fba42659ab9812b7fe72a1304 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 23 Jul 2024 09:25:19 +0800 Subject: [PATCH 434/671] oatpp: fix url (#4720) --- packages/o/oatpp-openssl/xmake.lua | 9 +++++---- packages/o/oatpp-websocket/xmake.lua | 5 +++-- packages/o/oatpp/xmake.lua | 10 ++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/o/oatpp-openssl/xmake.lua b/packages/o/oatpp-openssl/xmake.lua index aafc8dc6c..3dd03c065 100644 --- a/packages/o/oatpp-openssl/xmake.lua +++ b/packages/o/oatpp-openssl/xmake.lua @@ -3,9 +3,10 @@ package("oatpp-openssl") set_description("It provides secure server and client connection providers for oatpp applications.") set_license("Apache-2.0") - add_urls("https://github.com/oatpp/oatpp-openssl/archive/$(version).tar.gz", + add_urls("https://github.com/oatpp/oatpp-openssl/archive/5925e8ba856fa71cda8937c4cb357508d4fdb3fb.tar.gz", "https://github.com/oatpp/oatpp-openssl.git") - add_versions("1.3.0", "5925e8ba856fa71cda8937c4cb357508d4fdb3fb") + + add_versions("1.3.0", "540ab736ca8f7b8a89c23ad51655e038b59c6df8a08a60b95125843c9643a405") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) @@ -22,7 +23,7 @@ package("oatpp-openssl") on_install("linux", "macosx", "windows|x64", function (package) local configs = {"-DOATPP_BUILD_TESTS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) @@ -32,7 +33,7 @@ package("oatpp-openssl") on_test(function (package) assert(package:check_cxxsnippets({test = [[ - #include "oatpp-openssl/server/ConnectionProvider.hpp" + #include "oatpp-openssl/server/ConnectionProvider.hpp" #include "oatpp-openssl/Config.hpp" #include "oatpp-openssl/configurer/TrustStore.hpp" void test() { diff --git a/packages/o/oatpp-websocket/xmake.lua b/packages/o/oatpp-websocket/xmake.lua index 8b202eda9..f512ebc5c 100644 --- a/packages/o/oatpp-websocket/xmake.lua +++ b/packages/o/oatpp-websocket/xmake.lua @@ -3,8 +3,9 @@ package("oatpp-websocket") set_description("It provides WebSocket functionality for oatpp applications.") set_license("Apache-2.0") - add_urls("https://github.com/oatpp/oatpp-websocket/archive/$(version).tar.gz", + add_urls("https://github.com/oatpp/oatpp-websocket/archive/refs/tags/$(version).tar.gz", "https://github.com/oatpp/oatpp-websocket.git") + add_versions("1.0.0", "2e4ed596d1e8c15f0b9c6d5ba994b8fde623a6dfd256a17c8f99d86427115981") add_versions("1.2.5", "b930034aaed40715ccc9b9df094292ea6e2a44f31bf830d1e15db5255ece9184") add_versions("1.3.0", "8215765238c595e296c9ea961670064ff9c44e3e0f9accda59d81b10cc29873b") @@ -23,7 +24,7 @@ package("oatpp-websocket") on_install("linux", "macosx", "windows|x64", function (package) local configs = {"-DOATPP_BUILD_TESTS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) diff --git a/packages/o/oatpp/xmake.lua b/packages/o/oatpp/xmake.lua index 327553f37..5472748ee 100644 --- a/packages/o/oatpp/xmake.lua +++ b/packages/o/oatpp/xmake.lua @@ -1,11 +1,11 @@ package("oatpp") - set_homepage("https://oatpp.io/") set_description("Modern Web Framework for C++. High performance, simple API, cross platform, zero dependency.") set_license("Apache-2.0") - add_urls("https://github.com/oatpp/oatpp/archive/$(version).tar.gz", + add_urls("https://github.com/oatpp/oatpp/archive/refs/tags/$(version).tar.gz", "https://github.com/oatpp/oatpp.git") + add_versions("1.0.0", "9ba7c75e3ada8ec894ec10beae712e775774a835fd3de89d8c34e17740202619") add_versions("1.2.5", "36276e8b23e68ece1e6093c3f06fc80e3d42a5f4e47cdeef5e7e63f36eeddaad") add_versions("1.3.0", "e1f80fa8fd7a74da6737e7fee1a4db68b4d7085a3f40e7d550752d6ff5714583") @@ -14,10 +14,12 @@ package("oatpp") add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end - add_deps("cmake") if is_plat("windows") then add_syslinks("ws2_32") end + + add_deps("cmake") + on_load(function (package) package:add("includedirs", path.join("include", "oatpp-" .. package:version_str(), "oatpp")) package:add("linkdirs", path.join("lib", "oatpp-" .. package:version_str())) @@ -25,7 +27,7 @@ package("oatpp") on_install("linux", "macosx", "windows|x64", function (package) local configs = {"-DOATPP_BUILD_TESTS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) From 54398e8bfe950630084aba2ed30d74375e2c3787 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 23 Jul 2024 10:05:09 +0800 Subject: [PATCH 435/671] Update trantor to v1.5.20 (#4727) --- packages/t/trantor/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/trantor/xmake.lua b/packages/t/trantor/xmake.lua index 6e71cdfe2..9c18d73e7 100644 --- a/packages/t/trantor/xmake.lua +++ b/packages/t/trantor/xmake.lua @@ -6,6 +6,7 @@ package("trantor") add_urls("https://github.com/an-tao/trantor/archive/refs/tags/$(version).tar.gz", "https://github.com/an-tao/trantor.git") + add_versions("v1.5.20", "4d3b98c228aafde1001cff581cf8d1a4a9f71f7b2a85a28978b560aefc21c038") add_versions("v1.5.19", "a2f55a98fd4b0737ba0e2cd77d2f237253e607b2047071be04a9ea76587bb608") add_versions("v1.5.18", "f8227eb5307671496db435736e0b856529afae420b148c60a2b36839d6738707") add_versions("v1.5.17", "10689dc1864a3fdb08cba824475996346a1bfb083575fd3d62858aaefa9044d9") From 31c650865004eb55d7ec7771c0cd8862b854c6e6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 23 Jul 2024 10:05:12 +0800 Subject: [PATCH 436/671] Update c-ares to 1.32.2 (#4726) --- packages/c/c-ares/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index e6a83807d..be97001bf 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -12,6 +12,7 @@ package("c-ares") end end}) + add_versions("1.32.2", "072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061") add_versions("1.31.0", "0167a33dba96ca8de29f3f598b1e6cabe531799269fd63d0153aa0e6f5efeabd") add_versions("1.30.0", "4fea312112021bcef081203b1ea020109842feb58cd8a36a3d3f7e0d8bc1138c") add_versions("1.29.0", "0b89fa425b825c4c7bc708494f374ae69340e4d1fdc64523bdbb2750bfc02ea7") From 0a9acca4e3bd04de67aaa8cbae1976fae389b21a Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 23 Jul 2024 10:30:25 +0800 Subject: [PATCH 437/671] Update nanoflann to v1.6.0 (#4728) --- packages/n/nanoflann/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/nanoflann/xmake.lua b/packages/n/nanoflann/xmake.lua index 740ad4d35..f18f6083b 100644 --- a/packages/n/nanoflann/xmake.lua +++ b/packages/n/nanoflann/xmake.lua @@ -7,6 +7,7 @@ package("nanoflann") add_urls("https://github.com/jlblancoc/nanoflann/archive/refs/tags/$(version).tar.gz", "https://github.com/jlblancoc/nanoflann.git") + add_versions("v1.6.0", "f889026fbcb241e1e9d71bab5dfb9cc35775bf18a6466a283e2cbcd60edb2705") add_versions("v1.5.5", "fd28045eabaf0e7f12236092f80905a1750e0e6b580bb40eadd64dc4f75d641d") add_versions("v1.3.2", "e100b5fc8d72e9426a80312d852a62c05ddefd23f17cbb22ccd8b458b11d0bea") add_versions("v1.4.2", "97fce650eb644a359a767af526cab9ba31842e53790a7279887e1ae2fffe7319") From 8f472047d3b90d263dc28d8806c817a193633936 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:25:28 +0800 Subject: [PATCH 438/671] update openblas (#4699) * update openblas * fix gfortran * use fortran on mingw * fix name issue --- .github/workflows/mingw_msys2.yml | 2 +- packages/g/gfortran/xmake.lua | 2 +- packages/o/openblas/xmake.lua | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mingw_msys2.yml b/.github/workflows/mingw_msys2.yml index 681d1ed1a..900234a6a 100644 --- a/.github/workflows/mingw_msys2.yml +++ b/.github/workflows/mingw_msys2.yml @@ -27,7 +27,7 @@ jobs: - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} - install: git base-devel unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain + install: git base-devel unzip p7zip mingw-w64-${{ matrix.arch }}-toolchain mingw-w64-${{ matrix.arch }}-gcc-fortran update: true - name: Prepare diff --git a/packages/g/gfortran/xmake.lua b/packages/g/gfortran/xmake.lua index eb7ab768e..ef2c9065f 100644 --- a/packages/g/gfortran/xmake.lua +++ b/packages/g/gfortran/xmake.lua @@ -11,7 +11,7 @@ package("gfortran") if not fortran then return end if package:is_binary() then - return true + return {} else local installdir = path.directory(path.directory(fortran.program)) local target diff --git a/packages/o/openblas/xmake.lua b/packages/o/openblas/xmake.lua index f21d165f6..fea5f285a 100644 --- a/packages/o/openblas/xmake.lua +++ b/packages/o/openblas/xmake.lua @@ -18,6 +18,7 @@ package("openblas") add_versions("0.3.23", "e3a82e60db8d6197228790567e7cf74f2c421a65b29f848977a07b5457debdaa") add_versions("0.3.24", "6335128ee7117ea2dd2f5f96f76dafc17256c85992637189a2d5f6da0c608163") add_versions("0.3.26", "859c510a962a30ef1b01aa93cde26fdb5fb1050f94ad5ab2802eba3731935e06") + add_versions("0.3.27", "7b4d7504f274f8e26001aab4e25ec05032d90b8785b0355dc0d09247858d9f1e") elseif is_arch("x86") then add_urls("https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version)-x86.zip") add_versions("0.3.15", "bcde933737b477813eaac290de5cb8756d3b42199e8ef5f44b23ae5f06fe0834") @@ -28,6 +29,7 @@ package("openblas") add_versions("0.3.21", "936416a0fec5506af9cf040c9de5c7edbd0ff18b53431799d1a43e47f9eba64e") add_versions("0.3.24", "92f8e0c73e1eec3c428b210fbd69b91e966f8cf1f998f3b60a52f024b2bf9d27") add_versions("0.3.26", "9c3d48c3c21cd2341d642a63ee8a655205587befdab46462df7e0104d6771f67") + add_versions("0.3.27", "0cb61cff9eac7fcc07036880dfeec7a2e194d0412524901bf03e55208f51f900") end add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true}) @@ -44,8 +46,9 @@ package("openblas") add_versions("0.3.23", "5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114") add_versions("0.3.24", "ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132") add_versions("0.3.26", "4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68") + add_versions("0.3.27", "aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897") - add_configs("fortran", {description = "Compile with fortran enabled.", default = is_plat("linux"), type = "boolean"}) + add_configs("fortran", {description = "Compile with fortran enabled.", default = not is_plat("macosx"), type = "boolean"}) add_configs("openmp", {description = "Compile with OpenMP enabled.", default = not is_plat("macosx"), type = "boolean"}) end From 7c4348bd2f876a11717c95ea6123e1bfc792c524 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Tue, 23 Jul 2024 21:16:49 +0800 Subject: [PATCH 439/671] spdlog: fix fmt_external_ho (#4731) --- packages/s/spdlog/xmake.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/s/spdlog/xmake.lua b/packages/s/spdlog/xmake.lua index 9904e746a..4cd2c536c 100644 --- a/packages/s/spdlog/xmake.lua +++ b/packages/s/spdlog/xmake.lua @@ -47,12 +47,12 @@ package("spdlog") assert(not (package:config("fmt_external") and package:config("fmt_external_ho")), "fmt_external and fmt_external_ho are mutually exclusive") if package:config("std_format") then package:add("defines", "SPDLOG_USE_STD_FORMAT") - elseif package:config("fmt_external") then + elseif package:config("fmt_external") or package:config("fmt_external_ho") then package:add("defines", "SPDLOG_FMT_EXTERNAL") - package:add("deps", "fmt") - elseif package:config("fmt_external_ho") then - package:add("defines", "SPDLOG_FMT_EXTERNAL_HO") - package:add("deps", "fmt", {configs = {header_only = true}}) + package:add("deps", "fmt", {configs = {header_only = package:config("header_only")}}) + end + if not package:config("header_only") and package:config("fmt_external_ho") then + package:add("defines", "FMT_HEADER_ONLY=1") end if package:config("noexcept") then package:add("defines", "SPDLOG_NO_EXCEPTIONS") From 2d383279a7de99eaed58b733ef82f654f0dd67df Mon Sep 17 00:00:00 2001 From: Andrey Viktorov Date: Tue, 23 Jul 2024 20:17:05 +0700 Subject: [PATCH 440/671] OpenEXR: fixed wrong includepaths (#4725) * OpenEXR: fixed wrong includepaths * Update xmake.lua --------- Co-authored-by: ruki --- packages/o/openexr/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/o/openexr/xmake.lua b/packages/o/openexr/xmake.lua index fbfd6df8f..7fe9ca89a 100644 --- a/packages/o/openexr/xmake.lua +++ b/packages/o/openexr/xmake.lua @@ -23,6 +23,8 @@ package("openexr") add_configs("build_both", {description = "Build both static library and shared library. (deprecated)", default = false, type = "boolean"}) + add_includedirs("include/OpenEXR", "include") + on_load("windows", "macosx", "linux", "mingw@windows", "mingw@msys", function (package) local ver = package:version() local suffix = format("-%d_%d", ver:major(), ver:minor()) @@ -41,7 +43,7 @@ package("openexr") end end) - on_install("macosx", "linux", "windows", "mingw@windows", "mingw@msys", function (package) + on_install("macosx", "linux", "windows|x64", "windows|x86", "mingw@windows", "mingw@msys", function (package) local configs = {"-DBUILD_TESTING=OFF", "-DINSTALL_OPENEXR_EXAMPLES=OFF", "-DINSTALL_OPENEXR_DOCS=OFF", "-DOPENEXR_BUILD_UTILS=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) if package:version():ge("3.0") then From 68520ff268ba570548684c05c559fe9c23af877e Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 23 Jul 2024 21:54:33 +0800 Subject: [PATCH 441/671] libwebm: add package (#4722) * libwebm: add package * remove targz, only use git ref * Update xmake.lua --------- Co-authored-by: ruki --- packages/l/libwebm/xmake.lua | 45 ++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 packages/l/libwebm/xmake.lua diff --git a/packages/l/libwebm/xmake.lua b/packages/l/libwebm/xmake.lua new file mode 100644 index 000000000..3a2507da1 --- /dev/null +++ b/packages/l/libwebm/xmake.lua @@ -0,0 +1,45 @@ +package("libwebm") + set_homepage("https://chromium.googlesource.com/webm/libwebm") + set_description("Library for muxing and demuxing WebM media container files") + set_license("BSD-3-Clause") + + add_urls("https://chromium.googlesource.com/webm/libwebm.git") + + add_versions("1.0.0+31", "6745fd29e0245fc584b0bb9f65018ea2366fe7fb") + + add_configs("webmts", {description = "Enables WebM PES/TS support.", default = false, type = "boolean"}) + add_configs("webm_info", {description = "Enables building webm_info.", default = false, type = "boolean"}) + add_configs("parser", {description = "Enables new parser API.", default = false, type = "boolean"}) + + add_deps("cmake") + + if is_plat("linux", "bsd") then + add_syslinks("m") + end + + on_install(function (package) + local configs = {"-DENABLE_SAMPLE_PROGRAMS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_WEBMTS=" .. (package:config("webmts") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_WEBMINFO=" .. (package:config("webm_info") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_WEBM_PARSER=" .. (package:config("parser") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #ifdef UNPREFIXED_HEADERS + #include + #include + #else + #include + #include + #endif + void test() { + int32_t major, minor, build, revision; + mkvparser::GetVersion(major, minor, build, revision); + mkvmuxer::GetVersion(&major, &minor, &build, &revision); + } + ]]}, {configs = {languages = "c++11"}})) + end) From 035d3bdec07488740036fe2da54a82ffd1f93966 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 24 Jul 2024 08:45:32 +0800 Subject: [PATCH 442/671] vmaf: add package (#4733) * vmaf: add package * add tools config --- packages/v/vmaf/xmake.lua | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 packages/v/vmaf/xmake.lua diff --git a/packages/v/vmaf/xmake.lua b/packages/v/vmaf/xmake.lua new file mode 100644 index 000000000..5028da71a --- /dev/null +++ b/packages/v/vmaf/xmake.lua @@ -0,0 +1,70 @@ +package("vmaf") + set_homepage("https://github.com/Netflix/vmaf") + set_description("Perceptual video quality assessment based on multi-method fusion.") + set_license("BSD-2-Clause") + + add_urls("https://github.com/Netflix/vmaf/archive/refs/tags/$(version).tar.gz", + "https://github.com/Netflix/vmaf.git") + + add_versions("v3.0.0", "7178c4833639e6b989ecae73131d02f70735fdb3fc2c7d84bc36c9c3461d93b1") + + add_configs("asm", {description = "Build asm files", default = false, type = "boolean"}) + add_configs("avx512", {description = "Build AVX-512 asm files, requires nasm 2.14", default = false, type = "boolean"}) + add_configs("built_in_models", {description = "Compile default vmaf models", default = false, type = "boolean"}) + add_configs("float", {description = "Compile floating-point feature extractors", default = false, type = "boolean"}) + add_configs("cuda", {description = "Enable CUDA support", default = false, type = "boolean"}) + add_configs("nvtx", {description = "Enable NVTX range support", default = false, type = "boolean"}) + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + if is_plat("wasm") then + add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) + end + + if is_plat("mingw") and is_subhost("msys") then + add_extsources("pacman::vmaf") + elseif is_plat("linux") then + add_extsources("pacman::vmaf") + elseif is_plat("macosx") then + add_extsources("brew::libvmaf") + end + + if is_plat("linux", "bsd") then + add_syslinks("pthread", "m") + end + + add_deps("meson", "ninja") + + on_load(function (package) + if package:config("asm") or package:config("avx512") then + package:add("deps", "nasm") + end + + if package:config("cuda") then + package:add("deps", "cuda") + end + + if package:config("nvtx") then + package:add("syslinks", "dl") + end + end) + + on_install("!windows and !android", function (package) + local configs = {"-Denable_tests=false", "-Denable_docs=false"} + table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static")) + + table.insert(configs, "-Denable_asm=" .. (package:config("asm") and "true" or "false")) + table.insert(configs, "-Denable_avx512=" .. (package:config("avx512") and "true" or "false")) + table.insert(configs, "-Dbuilt_in_models=" .. (package:config("built_in_models") and "true" or "false")) + table.insert(configs, "-Denable_float=" .. (package:config("float") and "true" or "false")) + table.insert(configs, "-Denable_cuda=" .. (package:config("cuda") and "true" or "false")) + table.insert(configs, "-Denable_nvtx=" .. (package:config("nvtx") and "true" or "false")) + + os.cd("libvmaf") + if not package:config("tools") then + io.replace("meson.build", [[subdir('tools')]], "", {plain = true}) + end + import("package.tools.meson").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("vmaf_init", {includes = "libvmaf/libvmaf.h"})) + end) From ff358b5acd36b627fb57286d7b3075afa548ce90 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Wed, 24 Jul 2024 08:46:08 +0800 Subject: [PATCH 443/671] trantor: add dep spdlog (#4730) * trantor: add dep spdlog * trantor: use headeronly fmt --- packages/t/trantor/xmake.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/t/trantor/xmake.lua b/packages/t/trantor/xmake.lua index 9c18d73e7..558c60f84 100644 --- a/packages/t/trantor/xmake.lua +++ b/packages/t/trantor/xmake.lua @@ -22,6 +22,8 @@ package("trantor") add_patches("v1.5.8", path.join(os.scriptdir(), "patches", "1.5.8", "skip_doc.patch" ), "4124f3cc1e486ad75bc5ec2fa454ea5319d68287d0b1d8cfa3b5ab865f8ca5fd") + add_configs("spdlog", {description = "Allow using the spdlog logging library", default = false, type = "boolean"}) + add_deps("cmake") add_deps("openssl", "c-ares", {optional = true}) if is_plat("windows", "mingw") then @@ -31,6 +33,15 @@ package("trantor") add_syslinks("pthread") end + on_load(function (package) + if package:version():le("v1.5.15") then + package:config_set("spdlog", false) + end + if package:config("spdlog") then + package:add("deps", "spdlog", {configs = {header_only = false, fmt_external_ho = true}}) + end + end) + on_install("windows", "macosx", "linux", "mingw@windows", function (package) io.replace("CMakeLists.txt", "\"${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/Findc-ares.cmake\"", "", {plain = true}) io.replace("CMakeLists.txt", "find_package(c-ares)", "find_package(c-ares CONFIG)", {plain = true}) @@ -40,6 +51,9 @@ package("trantor") if package:config("pic") ~= false then table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") end + if package:config("spdlog") then + table.insert(configs, "-DUSE_SPDLOG=ON") + end import("package.tools.cmake").install(package, configs) end) From 8ef30ec9bc43d60f3480334817e3b2b4e6ac5e38 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 24 Jul 2024 08:46:41 +0800 Subject: [PATCH 444/671] aom: add package (#4721) * libaom-av1: add package * fix windows deps * rename to aom --- packages/a/aom/xmake.lua | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/a/aom/xmake.lua diff --git a/packages/a/aom/xmake.lua b/packages/a/aom/xmake.lua new file mode 100644 index 000000000..2e9e077d6 --- /dev/null +++ b/packages/a/aom/xmake.lua @@ -0,0 +1,43 @@ +package("aom") + set_homepage("https://aomedia.googlesource.com/aom") + set_description("AV1 Codec Library") + set_license("BSD-2-Clause") + + add_urls("https://storage.googleapis.com/aom-releases/libaom-$(version).tar.gz", + "https://aomedia.googlesource.com/aom.git") + + add_versions("3.9.1", "dba99fc1c28aaade28dda59821166b2fa91c06162d1bc99fde0ddaad7cecc50e") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("pthread", "m") + end + + add_deps("cmake", "nasm") + if is_plat("windows") or (is_plat("mingw") and is_host("windows")) then + add_deps("strawberry-perl") + end + + on_install("!wasm and (!windows or windows|!arm64)", function (package) + local configs = { + "-DENABLE_EXAMPLES=OFF", + "-DENABLE_TESTS=OFF", + "-DENABLE_DOCS=OFF", + "-DCONFIG_LIBYUV=0", + "-DCONFIG_WEBM_IO=0", + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") and package:is_arch("arm.*") then + table.insert(configs, "-DCMAKE_SYSTEM_NAME=Windows") + table.insert(configs, "-DCMAKE_SYSTEM_PROCESSOR=" .. package:arch()) + end + + table.insert(configs, "-DENABLE_TOOLS=" .. (package:config("tools") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("aom_codec_version_str", {includes = "aom/aom_codec.h"})) + end) From a81353ec8015ef009a5d36f9ad4d1f4379f7541d Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 24 Jul 2024 08:47:08 +0800 Subject: [PATCH 445/671] libzen: add package (#4732) * libzen: add package * add check --- packages/l/libzen/xmake.lua | 53 +++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 packages/l/libzen/xmake.lua diff --git a/packages/l/libzen/xmake.lua b/packages/l/libzen/xmake.lua new file mode 100644 index 000000000..03a152772 --- /dev/null +++ b/packages/l/libzen/xmake.lua @@ -0,0 +1,53 @@ +package("libzen") + set_homepage("https://mediaarea.net") + set_description("Small C++ derivate classes to have an easier life") + set_license("zlib") + + add_urls("https://github.com/MediaArea/ZenLib/archive/refs/tags/$(version).tar.gz", + "https://github.com/MediaArea/ZenLib.git") + + add_versions("v0.4.41", "45d5173fa0278f5264daa6836ae297aa303984482227d00b35c4f03929494c8f") + + add_configs("unicode", {description = "Enable unicode support", default = true, type = "boolean"}) + add_configs("large_files", {description = "Enable large files support", default = true, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("pthread", "m") + end + + add_deps("cmake") + + if on_check then + on_check("android", function (package) + if package:is_arch("armeabi-v7a") then + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libzen/armeabi-v7a): need ndk api level >= 24 for android") + end + end) + end + + on_install(function (package) + local configs = {} + local shared = package:config("shared") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (shared and "ON" or "OFF")) + if package:is_plat("windows") and shared then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + + table.insert(configs, "-DENABLE_UNICODE=" .. (package:config("unicode") and "ON" or "OFF")) + table.insert(configs, "-DLARGE_FILES=" .. (package:config("large_files") and "ON" or "OFF")) + + os.cd("Project/CMake") + io.replace("CMakeLists.txt", "set(BUILD_SHARED_LIBS OFF)", "", {plain = true}) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + ZenLib::LittleEndian2int8s(""); + } + ]]}, {configs = {languages = "c++11"}, includes = "ZenLib/Utils.h"})) + end) From cd8b390c707e0174a43056529892859f44129c24 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:02:11 +0800 Subject: [PATCH 446/671] add package jom (#4737) * add package jom * jom: add on_test * Update xmake.lua --------- Co-authored-by: ruki --- packages/j/jom/xmake.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/j/jom/xmake.lua diff --git a/packages/j/jom/xmake.lua b/packages/j/jom/xmake.lua new file mode 100644 index 000000000..e8cecdc0e --- /dev/null +++ b/packages/j/jom/xmake.lua @@ -0,0 +1,20 @@ +package("jom") + set_kind("binary") + set_homepage("https://www.qt.io/") + set_description("the parallel make tool for Windows.") + set_license("GPL") + + add_urls("https://download.qt.io/official_releases/jom/jom_$(version).zip", {version = function (version) + return version:gsub("%.", "_") + end}) + + add_versions("1.1.4", "d533c1ef49214229681e90196ed2094691e8c4a0a0bef0b2c901debcb562682b") + add_versions("1.1.3", "128fdd846fe24f8594eed37d1d8929a0ea78df563537c0c1b1861a635013fff8") + + on_install("@windows", function (package) + os.cp("*", package:installdir("bin")) + end) + + on_test(function (package) + os.vrun("jom /VERSION") + end) From a6752bfd23c1329a64ea277e2ed0f8dab26dce40 Mon Sep 17 00:00:00 2001 From: Arthur <72025980+ArthurVasseur@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:50:10 +0200 Subject: [PATCH 447/671] update oatpp (#4739) --- packages/o/oatpp/xmake.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/o/oatpp/xmake.lua b/packages/o/oatpp/xmake.lua index 5472748ee..04c3a1000 100644 --- a/packages/o/oatpp/xmake.lua +++ b/packages/o/oatpp/xmake.lua @@ -9,6 +9,7 @@ package("oatpp") add_versions("1.0.0", "9ba7c75e3ada8ec894ec10beae712e775774a835fd3de89d8c34e17740202619") add_versions("1.2.5", "36276e8b23e68ece1e6093c3f06fc80e3d42a5f4e47cdeef5e7e63f36eeddaad") add_versions("1.3.0", "e1f80fa8fd7a74da6737e7fee1a4db68b4d7085a3f40e7d550752d6ff5714583") + add_versions("1.4.0-preview", "bbf9715eb8bc3ef58686c5b1fb844de4b73ba6d0") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) @@ -21,8 +22,9 @@ package("oatpp") add_deps("cmake") on_load(function (package) - package:add("includedirs", path.join("include", "oatpp-" .. package:version_str(), "oatpp")) - package:add("linkdirs", path.join("lib", "oatpp-" .. package:version_str())) + local version = package:version_str():gsub("-preview", "") + package:add("includedirs", path.join("include", "oatpp-" .. version, "oatpp")) + package:add("linkdirs", path.join("lib", "oatpp-" .. version)) end) on_install("linux", "macosx", "windows|x64", function (package) @@ -38,6 +40,7 @@ package("oatpp") on_test(function (package) assert(package:check_cxxsnippets({test = [[ #include "oatpp/encoding/Base64.hpp" + #include "oatpp/base/Log.hpp" void test() { oatpp::String message = "oat++ web framework"; oatpp::String messageEncoded = "b2F0Kysgd2ViIGZyYW1ld29yaw=="; @@ -48,5 +51,5 @@ package("oatpp") OATPP_ASSERT(message == decoded); } } - ]]}, {configs = {languages = "c++11"}})) + ]]}, {configs = {languages = "cxx11"}})) end) From e2164af9c2488e2d2e929f4359403af06654d8ed Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:24:42 +0800 Subject: [PATCH 448/671] openssl: use jom instead nmake (#4740) * openssl: use jom instead nmake * openssl: update xmake.lua --- packages/o/openssl/xmake.lua | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/o/openssl/xmake.lua b/packages/o/openssl/xmake.lua index 56a965bc5..9d0e1b761 100644 --- a/packages/o/openssl/xmake.lua +++ b/packages/o/openssl/xmake.lua @@ -37,6 +37,11 @@ package("openssl") -- the perl executable found in GitForWindows will fail to build OpenSSL -- see https://github.com/openssl/openssl/blob/master/NOTES-PERL.md#perl-on-windows package:add("deps", "strawberry-perl", { system = false, private = true }) + -- check xmake tool jom + import("package.tools.jom", {try = true}) + if jom then + package:add("deps", "jom", {private = true}) + end end end @@ -57,6 +62,8 @@ package("openssl") end) on_install("windows", function (package) + import("package.tools.jom", {try = true}) + import("package.tools.nmake") local configs = {"Configure", "no-tests"} local target if package:is_arch("x86", "i386") then @@ -72,11 +79,19 @@ package("openssl") table.insert(configs, package:config("shared") and "shared" or "no-shared") table.insert(configs, "--prefix=" .. package:installdir()) table.insert(configs, "--openssldir=" .. package:installdir()) + if jom then + table.insert(configs, "no-makedepend") + table.insert(configs, "/FS") + end os.vrunv("perl", configs) - local runenvs = import("package.tools.nmake").buildenvs(package) - local nmake = import("lib.detect.find_tool")("nmake", {envs = runenvs}) - os.vrunv(nmake.program, {"install_sw"}, {envs = runenvs}) + if jom then + jom.build(package) + jom.make(package, {"install_sw"}) + else + nmake.build(package) + nmake.make(package, {"install_sw"}) + end end) on_install("mingw", function (package) From d79da8c7fb34031a2ed570cc1e7803273ad7064f Mon Sep 17 00:00:00 2001 From: Elite-stay <344233108@qq.com> Date: Wed, 24 Jul 2024 23:47:36 +0800 Subject: [PATCH 449/671] add dorkbox/UDT (#4736) * add dorkbox/UDT * remove versions * move variables to outside of on_install and add pthread * Update xmake.lua * add mingw try try? * windows export symbols * Update xmake.lua --------- Co-authored-by: star9029 --- packages/u/udt/xmake.lua | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/u/udt/xmake.lua diff --git a/packages/u/udt/xmake.lua b/packages/u/udt/xmake.lua new file mode 100644 index 000000000..7a1179e38 --- /dev/null +++ b/packages/u/udt/xmake.lua @@ -0,0 +1,48 @@ +package("udt") + set_homepage("https://github.com/dorkbox/UDT") + set_description("UDP-based Data Transfer Protocol") + set_license("Apache-2.0") + + add_urls("https://github.com/dorkbox/UDT/archive/8272c251deb8bfd7289646b7604f1079b59194d0.tar.gz", + "https://github.com/dorkbox/UDT.git") + + add_versions("2017.12.03", "af743ffdb2e40225d7375df1a3d6320127b903322af4021460681f1052b7461e") + + if is_plat("windows", "mingw") then + add_defines("WINDOWS") + add_syslinks("Ws2_32") + elseif is_plat("linux", "bsd") then + add_syslinks("pthread", "m") + end + + on_install("!windows or windows|!x86", function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("udt") + set_kind("$(kind)") + if is_mode("debug") then + add_defines("_DEBUG") + end + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end + set_languages("cxx11") + if is_plat("windows", "mingw") then + add_defines("WINDOWS") + add_syslinks("Ws2_32") + elseif is_plat("linux", "bsd") then + add_syslinks("pthread", "m") + end + add_files("src/*.cpp") + add_headerfiles("src/udt.h") + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + UDT::startup(); + } + ]]}, {configs = {languages = "c++11"}, includes = "udt.h"})) + end) From b87af4f41e50debf35eb0d29da813a0feb1d0f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 25 Jul 2024 02:51:36 +0200 Subject: [PATCH 450/671] ffmpeg: Fix script with xmake dev (#4744) --- packages/f/ffmpeg/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index eb993774d..0e5b8781e 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -256,7 +256,7 @@ package("ffmpeg") else -- rename files from libxx.a to xx.lib for _, libfile in ipairs(os.files(package:installdir("lib", "*.a"))) do - os.vmv(libfile, libfile:gsub("^(.+[\\/])lib(.+)%.a$", "%1%2.lib")) + os.vmv(libfile, (libfile:gsub("^(.+[\\/])lib(.+)%.a$", "%1%2.lib"))) end end elseif package:is_plat("android") then From 05e5a1ecc9810f0ac53aaa095ae539fd346e23d1 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 25 Jul 2024 08:55:20 +0800 Subject: [PATCH 451/671] rttr: add latest version (#4743) --- packages/r/rttr/xmake.lua | 49 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/packages/r/rttr/xmake.lua b/packages/r/rttr/xmake.lua index f157eb85b..00aaa90ce 100644 --- a/packages/r/rttr/xmake.lua +++ b/packages/r/rttr/xmake.lua @@ -2,41 +2,40 @@ package("rttr") set_homepage("https://www.rttr.org") set_description("rttr: An open source library, which adds reflection to C++.") set_license("MIT") + + add_urls("https://github.com/rttrorg/rttr/archive/7edbd580cfad509a3253c733e70144e36f02ecd4.tar.gz", + "https://github.com/rttrorg/rttr.git") + -- 2021.08.11 + add_versions("0.9.7", "bba4b6fac2349fa6badc701aad5e7afb87504a7089a867b1a7cbed08fb2f3a90") + + add_configs("rtti", {description = "Build with RTTI support.", default = true, type = "boolean"}) if is_plat("macosx") then add_extsources("brew::rttr") end - - add_urls("https://www.rttr.org/releases/rttr-$(version)-src.tar.gz", - "https://github.com/rttrorg/rttr/releases/download/v$(version)/rttr-$(version)-src.tar.gz", - "https://github.com/rttrorg/rttr.git") - - add_versions("0.9.6", "f62caee43016489320f8a69145c9208cddd72e451ea95618bc26a49a4cd6c990") - add_versions("0.9.5", "caa8d404840b0e156f869a947e475b09f7b602ab53c290271f40ce028c8d7d91") add_deps("cmake") on_install(function (package) - local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_EXAMPLES=OFF") - table.insert(configs, "-DBUILD_DOCUMENTATION=OFF") - table.insert(configs, "-DBUILD_UNIT_TESTS=OFF") -- rttr has problem building unit tests on macosx. - -- rttr use BUILD_RTTR_DYNAMIC and BUILD_STATIC options to control whether to build dynamic or static libraries. - table.insert(configs, "-DBUILD_RTTR_DYNAMIC=" .. (package:config("shared") and "ON" or "OFF")) - table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON")) - local cxflags - if package:has_tool("cxx", "gcc", "gxx", "clang", "clangxx") then - if not package:is_plat("windows") then - -- Passing this flag to clang-cl may cause errors. - -- gcc does not seem to support -Wno-error options. - cxflags = "-Wno-implicit-float-conversion" - end - end - if package:is_plat("windows") and package:config("shared") then + io.replace("CMake/utility.cmake", "/WX", "", {plain = true}) + io.replace("CMake/utility.cmake", "-Werror", "", {plain = true}) + + local configs = { + "-DBUILD_EXAMPLES=OFF", + "-DBUILD_DOCUMENTATION=OFF", + "-DBUILD_UNIT_TESTS=OFF", + "-DBUILD_DOCUMENTATION=OFF", + "-DBUILD_PACKAGE=OFF", + } + local shared = package:config("shared") + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_RTTR_DYNAMIC=" .. (shared and "ON" or "OFF")) + table.insert(configs, "-DBUILD_STATIC=" .. (shared and "OFF" or "ON")) + table.insert(configs, "-DBUILD_WITH_RTTI=" .. (package:config("rtti") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + if package:is_plat("windows") and shared then package:add("defines", "RTTR_DLL") end - import("package.tools.cmake").install(package, configs, {cxflags = cxflags}) end) on_test(function (package) From 2856dc6b0e1f8c0ec6b9e9e39514ed89883a1a2a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 25 Jul 2024 10:33:03 +0800 Subject: [PATCH 452/671] Update c-ares to 1.32.3 (#4745) --- packages/c/c-ares/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index be97001bf..42342c884 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -12,6 +12,7 @@ package("c-ares") end end}) + add_versions("1.32.3", "5f02cc809aac3f6cc5edc1fac6c4423fd5616d7406ce47b904c24adf0ff2cd0f") add_versions("1.32.2", "072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061") add_versions("1.31.0", "0167a33dba96ca8de29f3f598b1e6cabe531799269fd63d0153aa0e6f5efeabd") add_versions("1.30.0", "4fea312112021bcef081203b1ea020109842feb58cd8a36a3d3f7e0d8bc1138c") From 88b2ec96ab12621a64aac7caf708a01a3d92f371 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 25 Jul 2024 11:56:56 +0800 Subject: [PATCH 453/671] Update cpptrace to v0.6.3 (#4748) --- packages/c/cpptrace/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index 91baaa88e..c490fe90e 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.6.3", "665bf76645ec7b9e6d785a934616f0138862c36cdb58b0d1c9dd18dd4c57395a") add_versions("v0.6.2", "02a0540b5b1be0788565f48b065b456d3eab81ae2323a50e75ed36449a0143ed") add_versions("v0.6.1", "4bb478eedbe4b2c0093ef7af4f64795304850e03312e658076b25ef8d6019c75") add_versions("v0.6.0", "7c2996f03d15f61016bc81fe7fa5220b1cc42498333c5c0e699ad2f96b918b96") From 13883fc6b7fd35aeed4031f08c4b538dfc38ee49 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 25 Jul 2024 11:56:59 +0800 Subject: [PATCH 454/671] Update s2n-tls to v1.4.18 (#4747) --- packages/s/s2n-tls/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/s2n-tls/xmake.lua b/packages/s/s2n-tls/xmake.lua index 632651562..28c4a3b9d 100644 --- a/packages/s/s2n-tls/xmake.lua +++ b/packages/s/s2n-tls/xmake.lua @@ -6,6 +6,7 @@ package("s2n-tls") add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/s2n-tls.git") + add_versions("v1.4.18", "a55b0b87eaaffc58bd44d90c5bf7903d11be816aa144296193e7d1a6bea5910e") add_versions("v1.4.17", "5235cd2c926b89ae795b1e6b5158dce598c9e79120208b4bcd8d19ce04d86986") add_versions("v1.4.16", "84fdbaa894c722bf13cac87b8579f494c1c2d66de642e5e6104638fddea76ad9") add_versions("v1.4.14", "90cd0b7b1e5ebc7e40ba5f810cc24a4d604aa534fac7260dee19a35678e38659") From 5556f4069b28f3dddff4aef883d21f1e3dbb90d6 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Thu, 25 Jul 2024 17:04:07 +0800 Subject: [PATCH 455/671] openssl3: use jom instead nmake (#4741) * openssl3: use jom instead nmake * openssl3: update xmake.lua * Update xmake.lua * openssl3: fix android@windows * openssl3: fix path on windows --------- Co-authored-by: ruki --- packages/o/openssl3/xmake.lua | 52 +++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/packages/o/openssl3/xmake.lua b/packages/o/openssl3/xmake.lua index 2c2804973..4a95d9c86 100644 --- a/packages/o/openssl3/xmake.lua +++ b/packages/o/openssl3/xmake.lua @@ -17,11 +17,21 @@ package("openssl3") on_fetch("fetch") on_load(function (package) - if package:is_plat("windows") and (not package.is_built or package:is_built()) then - package:add("deps", "nasm") - -- the perl executable found in GitForWindows will fail to build OpenSSL - -- see https://github.com/openssl/openssl/blob/master/NOTES-PERL.md#perl-on-windows - package:add("deps", "strawberry-perl", {system = false}) + if not package:is_precompiled() then + if package:is_plat("windows") then + package:add("deps", "nasm") + -- the perl executable found in GitForWindows will fail to build OpenSSL + -- see https://github.com/openssl/openssl/blob/master/NOTES-PERL.md#perl-on-windows + package:add("deps", "strawberry-perl", {system = false}) + -- check xmake tool jom + import("package.tools.jom", {try = true}) + if jom then + package:add("deps", "jom", {private = true}) + end + elseif package:is_plat("android") and is_subhost("windows") and os.arch() == "x64" then + -- when building for android on windows, use msys2 perl instead of strawberry-perl to avoid configure issue + package:add("deps", "msys2", {configs = {msystem = "MINGW64", base_devel = true}, private = true}) + end end -- @note we must use package:is_plat() instead of is_plat in description for supporting add_deps("openssl", {host = true}) in python @@ -35,7 +45,7 @@ package("openssl3") elseif package:is_plat("linux", "cross") then package:add("syslinks", "pthread", "dl") end - if package:is_plat("linux", "mingw", "bsd") and package:is_arch("x86_64") then + if package:is_plat("linux", "mingw") and package:is_arch("x86_64") then package:add("linkdirs", "lib64") end if package:is_plat("linux") then @@ -44,6 +54,8 @@ package("openssl3") end) on_install("windows", function (package) + import("package.tools.jom", {try = true}) + import("package.tools.nmake") local configs = {"Configure", "no-tests"} local target if package:is_arch("x86", "i386") then @@ -59,11 +71,19 @@ package("openssl3") table.insert(configs, package:config("shared") and "shared" or "no-shared") table.insert(configs, "--prefix=" .. package:installdir()) table.insert(configs, "--openssldir=" .. package:installdir()) + if jom then + table.insert(configs, "no-makedepend") + table.insert(configs, "/FS") + end os.vrunv("perl", configs) - local runenvs = import("package.tools.nmake").buildenvs(package) - local nmake = import("lib.detect.find_tool")("nmake", {envs = runenvs}) - os.vrunv(nmake.program, {"install_sw"}, {envs = runenvs}) + if jom then + jom.build(package) + jom.make(package, {"install_sw"}) + else + nmake.build(package) + nmake.make(package, {"install_sw"}) + end end) on_install("mingw", function (package) @@ -139,10 +159,18 @@ package("openssl3") "-DOPENSSL_NO_HEARTBEATS", "no-shared", "no-threads", - "--openssldir=" .. package:installdir(), - "--prefix=" .. package:installdir()} + "--openssldir=" .. package:installdir():gsub("\\", "/"), + "--prefix=" .. package:installdir():gsub("\\", "/")} local buildenvs = import("package.tools.autoconf").buildenvs(package) - os.vrunv("./Configure", configs, {envs = buildenvs}) + if package:is_cross() and package:is_plat("android") and is_subhost("windows") then + buildenvs.CFLAGS = buildenvs.CFLAGS:gsub("\\", "/") + buildenvs.CXXFLAGS = buildenvs.CXXFLAGS:gsub("\\", "/") + buildenvs.CPPFLAGS = buildenvs.CPPFLAGS:gsub("\\", "/") + buildenvs.ASFLAGS = buildenvs.ASFLAGS:gsub("\\", "/") + os.vrunv("perl", table.join("./Configure", configs), {envs = buildenvs}) + else + os.vrunv("./Configure", configs, {envs = buildenvs}) + end local makeconfigs = {CFLAGS = buildenvs.CFLAGS, ASFLAGS = buildenvs.ASFLAGS} import("package.tools.make").build(package, makeconfigs) import("package.tools.make").make(package, {"install_sw"}) From 85c9c7530d1a234eb3626d937827fc1829961d1b Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 25 Jul 2024 22:56:05 +0800 Subject: [PATCH 456/671] add mingw support for crashpad (#4751) --- packages/c/crashpad/xmake.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/c/crashpad/xmake.lua b/packages/c/crashpad/xmake.lua index 8a1652c62..180fcee32 100644 --- a/packages/c/crashpad/xmake.lua +++ b/packages/c/crashpad/xmake.lua @@ -8,16 +8,26 @@ package("crashpad") add_includedirs("include/crashpad", "include/crashpad/mini_chromium") add_links("crashpad_client", "crashpad_util", "mini_chromium") + if add_bindirs then + add_bindirs("bin") + end add_deps("cmake") add_deps("libcurl") - on_install("linux", "windows|x64", "windows|x86", function(package) + if is_plat("macosx") then + add_frameworks("CoreFoundation") + add_syslinks("bsm") + end + + on_install("linux", "windows|x64", "windows|x86", "macosx", function(package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs, {packagedeps = "libcurl"}) - package:addenv("PATH", "bin") + if not package:get("bindirs") then + package:addenv("PATH", "bin") + end end) on_test(function(package) From c5764f932529b1381c30f2311698351838600836 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Thu, 25 Jul 2024 23:29:27 +0800 Subject: [PATCH 457/671] upgrade openssl 3.0 to 3.0.14 (#4723) --- packages/o/openssl3/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/openssl3/xmake.lua b/packages/o/openssl3/xmake.lua index 4a95d9c86..357cc36ab 100644 --- a/packages/o/openssl3/xmake.lua +++ b/packages/o/openssl3/xmake.lua @@ -5,6 +5,7 @@ package("openssl3") add_urls("https://github.com/openssl/openssl/archive/refs/tags/openssl-$(version).zip") + add_versions("3.0.14", "9590b9ae18c4de183be74dfc9da5be1f1e8f85dd631a78bc74c0ebc3d7e27a93") add_versions("3.0.7", "fcb37203c6bf7376cfd3aeb0be057937b7611e998b6c0d664abde928c8af3eb7") add_versions("3.0.6", "9b45be41df0d6e9cf9e340a64525177662f22808ac69aee6bfb29c511284dae4") add_versions("3.0.5", "4313c91fb0412e6a600493eb7c59bd555c4ff2ea7caa247a98c8456ad6f9fc74") From 81507f3e79e3e04aa4da3369847f3fe874886467 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 26 Jul 2024 01:09:48 +0800 Subject: [PATCH 458/671] Auto-update reflect-cpp to v0.13.0 (#4746) * Update reflect-cpp to v0.13.0 * ctre: fix header only kind * ctre: remove incorrect config --------- Co-authored-by: star9029 --- packages/c/ctre/xmake.lua | 32 +++++++++++++++++--------------- packages/r/reflect-cpp/xmake.lua | 1 + 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/c/ctre/xmake.lua b/packages/c/ctre/xmake.lua index 96395e9a6..f1641e5d1 100644 --- a/packages/c/ctre/xmake.lua +++ b/packages/c/ctre/xmake.lua @@ -1,31 +1,33 @@ package("ctre") - + set_kind("library", {headeronly = true}) set_homepage("https://github.com/hanickadot/compile-time-regular-expressions/") set_description("ctre is a Compile time PCRE (almost) compatible regular expression matcher.") + set_license("Apache-2.0") + + set_urls("https://github.com/hanickadot/compile-time-regular-expressions/archive/refs/tags/$(version).zip", + "https://github.com/hanickadot/compile-time-regular-expressions.git") - set_urls("https://github.com/hanickadot/compile-time-regular-expressions/archive/refs/tags/v$(version).zip") - add_versions("3.4.1", "099d6503cddd8e086b71247321ac64d91976136aa727d0de3ad5f9fd1897c5c7") - add_versions("3.5", "335180eaa44d60cec0fec445bafad78509f03c6e8a8bd9d24591d4d38333f78d") - add_versions("3.6", "f99f9c8bd3154d76305ef4fbde2c6622ed309c5a3401168732048fbc31e93f5d") - add_versions("3.7.2", "1dbcd96d279b5be27e9c90d2952533db10bc0e5d8ff6224a3c6d538fd94ab18f") - add_versions("3.8.1", "7c7a936145defe56e886bac7731ea16a52de65d73bda2b56702d0d0a61101c76") - add_versions("3.9.0", "8d0c061faf6b41c6913cac39af1d8cc8272e693b442c32f4fa762b505490fb36") + add_versions("v3.4.1", "099d6503cddd8e086b71247321ac64d91976136aa727d0de3ad5f9fd1897c5c7") + add_versions("v3.5", "335180eaa44d60cec0fec445bafad78509f03c6e8a8bd9d24591d4d38333f78d") + add_versions("v3.6", "f99f9c8bd3154d76305ef4fbde2c6622ed309c5a3401168732048fbc31e93f5d") + add_versions("v3.7.2", "1dbcd96d279b5be27e9c90d2952533db10bc0e5d8ff6224a3c6d538fd94ab18f") + add_versions("v3.8.1", "7c7a936145defe56e886bac7731ea16a52de65d73bda2b56702d0d0a61101c76") + add_versions("v3.9.0", "8d0c061faf6b41c6913cac39af1d8cc8272e693b442c32f4fa762b505490fb36") - add_configs("header_only", {description = "Use header only version.", default = false, type = "boolean"}) + add_configs("cmake", {description = "Use cmake build system", default = false, type = "boolean"}) on_load(function (package) - if not package:config("header_only") then + if package:config("cmake") then package:add("deps", "cmake") end end) on_install(function (package) - if package:config("header_only") then - os.cp("single-header", package:installdir("include")) - return + if package:config("cmake") then + import("package.tools.cmake").install(package, {"-DCTRE_BUILD_TESTS=OFF"}) + else + os.cp("include", package:installdir()) end - local configs = {"-DCTRE_BUILD_TESTS=OFF"} - import("package.tools.cmake").install(package, configs) end) on_test(function (package) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 44daf6510..6d6608164 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -7,6 +7,7 @@ package("reflect-cpp") add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/getml/reflect-cpp.git") + add_versions("v0.13.0", "a7a31832fe8bbaa7f7299da46dfd4ccc8b99a13242e16a1d93f8669de1fca9c6") add_versions("v0.12.0", "13d448dd5eaee13ecb7ab5cb61cb263c7111ba75230503adc823a888f68e1eaa") add_versions("v0.11.1", "e45f112fb3f14507a4aa53b99ae2d4ab6a4e7b2d5f04dd06fec00bf7faa7bbdc") add_versions("v0.10.0", "d2c8876d993ddc8c57c5804e767786bdb46a2bdf1a6cd81f4b14f57b1552dfd7") From fbbce85d26cae2cd9153a929977e2537d7ac7b32 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 26 Jul 2024 08:06:57 +0800 Subject: [PATCH 459/671] enkits: support some platform (#4754) --- packages/e/enkits/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e/enkits/xmake.lua b/packages/e/enkits/xmake.lua index 56ba5dfc8..dffe3df0b 100644 --- a/packages/e/enkits/xmake.lua +++ b/packages/e/enkits/xmake.lua @@ -12,7 +12,7 @@ package("enkits") add_deps("cmake") add_linkdirs("lib/enkiTS") add_links("enkiTS") - if is_plat("linux") then + if is_plat("linux", "bsd") then add_syslinks("pthread", "rt") end @@ -22,13 +22,13 @@ package("enkits") end end) - on_install("windows", "macosx", "linux", function (package) + on_install(function (package) if package:is_plat("linux") then io.replace("src/TaskScheduler.h", "#include ", "#include \n#include \n", {plain = true}) end local configs = {"-DENKITS_BUILD_EXAMPLES=OFF", "-DENKITS_INSTALL=ON"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DENKITS_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) From 531d5d5dd871d36820dcdcedda2aaf305daa445e Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 26 Jul 2024 10:01:08 +0800 Subject: [PATCH 460/671] Update dynareadout to 24.07 (#4759) --- packages/d/dynareadout/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/dynareadout/xmake.lua b/packages/d/dynareadout/xmake.lua index 375bb9bfa..e252284cb 100644 --- a/packages/d/dynareadout/xmake.lua +++ b/packages/d/dynareadout/xmake.lua @@ -5,6 +5,7 @@ package("dynareadout") add_urls("https://github.com/PucklaJ/dynareadout/archive/refs/tags/$(version).tar.gz", "https://github.com/PucklaJ/dynareadout.git") + add_versions("24.07", "9b43e0e16d86b04f02d3bb45d7b999cb559ef229b85455a403b89415e761e7bb") add_versions("24.05", "86e045f23d1e1d3ed2e002774f8f04badc5c974c3441bdc07f3a82c5711328c9") add_versions("24.03", "d91feb2ebfa604b543dd6d98c3dd5aee5c489e6987159fef78dfcea1aad64bd5") add_versions("22.12", "2e430c718c610d4425e23d4c6c87fe4794bb8c76d3cc015988706dbf5027daa4") From 66ffc0140fb6e1b10282ad6376b50ec6ebe17333 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Fri, 26 Jul 2024 16:13:19 +0800 Subject: [PATCH 461/671] update vulkan related libraries to v1.3.290.0 (#4729) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update vulkan related libraries to v1.3.290.0 * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 Co-authored-by: Jérôme Leclercq --- packages/g/glslang/xmake.lua | 1 + packages/s/spirv-headers/xmake.lua | 1 + packages/s/spirv-reflect/xmake.lua | 1 + packages/s/spirv-tools/xmake.lua | 1 + packages/v/volk/xmake.lua | 1 + packages/v/vulkan-headers/xmake.lua | 6 +++++- packages/v/vulkan-hpp/xmake.lua | 1 + packages/v/vulkan-loader/xmake.lua | 1 + packages/v/vulkan-utility-libraries/xmake.lua | 1 + packages/v/vulkan-validationlayers/xmake.lua | 6 ++++-- 10 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/g/glslang/xmake.lua b/packages/g/glslang/xmake.lua index 0bdf75b6a..276d2f9b1 100644 --- a/packages/g/glslang/xmake.lua +++ b/packages/g/glslang/xmake.lua @@ -18,6 +18,7 @@ package("glslang") add_versions("1.3.275+0", "a91631b260cba3f22858d6c6827511e636c2458a") add_versions("1.3.280+0", "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60") add_versions("1.3.283+0", "e8dd0b6903b34f1879520b444634c75ea2deedf5") + add_versions("1.3.290+0", "fa9c3deb49e035a8abcabe366f26aac010f6cbfb") add_patches("1.3.246+1", "https://github.com/KhronosGroup/glslang/commit/1e4955adbcd9b3f5eaf2129e918ca057baed6520.patch", "47893def550f1684304ef7c49da38f0a8fe35c190a3452d3bf58370b3ee7165d") diff --git a/packages/s/spirv-headers/xmake.lua b/packages/s/spirv-headers/xmake.lua index 1b714848e..93f7c32a5 100644 --- a/packages/s/spirv-headers/xmake.lua +++ b/packages/s/spirv-headers/xmake.lua @@ -24,6 +24,7 @@ package("spirv-headers") add_versions("1.3.275+0", "d46b261f1fbc5e85022cb2fada9a6facb5b0c9932b45007a77fe05639a605bd1") add_versions("1.3.280+0", "a00906b6bddaac1e37192eff2704582f82ce2d971f1aacee4d51d9db33b0f772") add_versions("1.3.283+0", "a68a25996268841073c01514df7bab8f64e2db1945944b45087e5c40eed12cb9") + add_versions("1.3.290+0", "1b9ff8a33e07814671dee61fe246c67ccbcfc9be6581f229e251784499700e24") add_patches("1.3.261+1", "https://github.com/KhronosGroup/SPIRV-Headers/commit/c43effd54686240d8b13762279d5392058d10e27.patch", "b97a05c35c00620519a5f3638a974fc2a01f062bf6e86b74b49a234f82cc55ce") diff --git a/packages/s/spirv-reflect/xmake.lua b/packages/s/spirv-reflect/xmake.lua index 7144bef76..a97822d84 100644 --- a/packages/s/spirv-reflect/xmake.lua +++ b/packages/s/spirv-reflect/xmake.lua @@ -14,6 +14,7 @@ package("spirv-reflect") add_versions("1.3.275+0", "2f7460f0be0f73c9ffde719bc3e924b4250f4d98") add_versions("1.3.280+0", "8406f76dcf6cca11fe430058c4f0ed4b846f3be4") add_versions("1.3.283+0", "ee5b57fba6a986381f998567761bbc064428e645") + add_versions("1.3.290+0", "b4dc70d8e6ac30c719a2d05b8ad05e1d277c92b4") add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/s/spirv-tools/xmake.lua b/packages/s/spirv-tools/xmake.lua index 8940f4d8c..ad2a8a163 100644 --- a/packages/s/spirv-tools/xmake.lua +++ b/packages/s/spirv-tools/xmake.lua @@ -18,6 +18,7 @@ package("spirv-tools") add_versions("1.3.275+0", "vulkan-sdk-1.3.275.0") add_versions("1.3.280+0", "vulkan-sdk-1.3.280.0") add_versions("1.3.283+0", "vulkan-sdk-1.3.283.0") + add_versions("1.3.290+0", "vulkan-sdk-1.3.290.0") add_deps("cmake >=3.17.2") add_deps("python 3.x", {kind = "binary"}) diff --git a/packages/v/volk/xmake.lua b/packages/v/volk/xmake.lua index f678b8533..c938d2545 100644 --- a/packages/v/volk/xmake.lua +++ b/packages/v/volk/xmake.lua @@ -23,6 +23,7 @@ package("volk") add_versions("1.3.275+0", "b68d24e139190e49e5eafd72894f6e85c80472b8745bddc6ef91d6bf339df813") add_versions("1.3.280+0", "af9c98d09284eef29f6826bb1620bfe551a91a864fce707416b83c255efe3c25") add_versions("1.3.283+0", "872035f1f26c53b218632a3a8dbccbd276710aaabafb9bb1bc1a6c0633ee6aab") + add_versions("1.3.290+0", "bb6a6d616c0f2bbd5d180da982a6d92a0948581cec937de69f17883980c6ca06") add_deps("vulkan-headers") diff --git a/packages/v/vulkan-headers/xmake.lua b/packages/v/vulkan-headers/xmake.lua index 8208517af..0316d3b47 100644 --- a/packages/v/vulkan-headers/xmake.lua +++ b/packages/v/vulkan-headers/xmake.lua @@ -16,6 +16,7 @@ package("vulkan-headers") add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"}) -- when adding a new sdk version, please also update vulkan-hpp, vulkan-loader, vulkan-utility-libraries, spirv-headers, spirv-reflect, glslang and volk packages + add_versions("1.3.290+0", "5b186e1492d97c44102fe858fb9f222b55524a8b6da940a8795c9e326ae6d722") add_versions("1.3.283+0", "cf54a812911b4e3e4ff15716c222a8fb9a87c2771c0b86060cb0ca2570ea55a9") add_versions("1.3.280+0", "14caa991988be6451755ad1c81df112f4b6f2bea05f0cf2888a52d4d0f0910f6") add_versions("1.3.275+0", "fcd2136a9feb0402820b334d8242773462cc47ed397aa20c8f4d04f7ea18d810") @@ -48,7 +49,10 @@ package("vulkan-headers") on_install(function (package) if not package:config("modules") then - import("package.tools.cmake").install(package) + import("package.tools.cmake").install(package, { + "-DVULKAN_HEADERS_ENABLE_MODULE=OFF", + "-DVULKAN_HEADERS_ENABLE_TESTS=OFF" + }) else io.writefile("xmake.lua", [[ target("vulkan-headers") diff --git a/packages/v/vulkan-hpp/xmake.lua b/packages/v/vulkan-hpp/xmake.lua index 1f6afc351..3d0b23170 100644 --- a/packages/v/vulkan-hpp/xmake.lua +++ b/packages/v/vulkan-hpp/xmake.lua @@ -27,6 +27,7 @@ package("vulkan-hpp") add_versions("v1.3.281", "88d508b32f207ba85b37fe22fe3732322d1c248d") add_versions("v1.3.282", "4bf2835dd1a530291cd2b340a58dd7e369d5c86c") add_versions("v1.3.283", "2fbc146feefa43b8201af4b01eb3570110f9fa32") + add_versions("v1.3.290", "e3b0737d57e81875361bf1943f083eac902dacb7") add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"}) diff --git a/packages/v/vulkan-loader/xmake.lua b/packages/v/vulkan-loader/xmake.lua index 3342ceb2f..69c171bb4 100644 --- a/packages/v/vulkan-loader/xmake.lua +++ b/packages/v/vulkan-loader/xmake.lua @@ -11,6 +11,7 @@ package("vulkan-loader") return prefix .. version:gsub("%+", ".") end}) + add_versions("1.3.290+0", "0cd31fdb9b576e432a85ad4d555fac4f4e5ede22ca37ff534ab67c71cd172644") add_versions("1.3.283+0", "59151a3cdbf8dcfe9c2ce4b5bf33358255a197f48d8d0ee8a1d8642ed9ace80f") add_versions("1.3.280+0", "f9317667a180257381dcbc74726083af581189f51e10e0246adaa86df075fe16") add_versions("1.3.275+0", "f49a2653cd592439c5b4b987ffa0b2577b7fa72b7d344d7a2a89f7d6cb2b342e") diff --git a/packages/v/vulkan-utility-libraries/xmake.lua b/packages/v/vulkan-utility-libraries/xmake.lua index 924505307..97caa0326 100644 --- a/packages/v/vulkan-utility-libraries/xmake.lua +++ b/packages/v/vulkan-utility-libraries/xmake.lua @@ -12,6 +12,7 @@ package("vulkan-utility-libraries") return version:startswith("v") and version or prefix .. version:gsub("%+", ".") end}) + add_versions("v1.3.290", "5173690276d25e51b63132ed6907542b9bc2d64150db0fe057ff59067493e33c") add_versions("v1.3.283", "a446616dede2b0168726f4e1b51777ba5c20ec46c475b378e2c07fd4ab4375ee") add_versions("v1.3.280", "075e13f2fdeeca3bb6fb39155c8cc345cf216ab93661549b1a33368aa28a9dea") add_versions("v1.3.275", "96d3ec7bda7b6e9fabbb471c570104a7b1cb56928d097dd0441c96129468b888") diff --git a/packages/v/vulkan-validationlayers/xmake.lua b/packages/v/vulkan-validationlayers/xmake.lua index 958f00d81..ffe5691ac 100644 --- a/packages/v/vulkan-validationlayers/xmake.lua +++ b/packages/v/vulkan-validationlayers/xmake.lua @@ -18,6 +18,7 @@ package("vulkan-validationlayers") end end}) + add_versions("1.3.290+0", "eb26b4bf1f031e57d1624c53d489279076b893b0383fddccc79de7ee2caaa128") add_versions("1.3.275+0", "6e22fb13601c1e780c44a17497a3c999cc5207e52a09819e7c32ecd8439eff7a") add_versions("1.2.198+0", "5436e974d6b3133b3454edf1910f76b9f869db8bbe086859b2abe32fdb539cbc") add_versions("1.2.189+1", "b3e69b60a67a17b023825f9eb0ce1aef22e6b59d095afa204d883a9ce3d81021") @@ -30,6 +31,7 @@ package("vulkan-validationlayers") return version:startswith("v") and version or prefix .. version:gsub("%+", ".") end}) + add_versions("1.3.290+0", "59be2c0a5bdbfdbdebdcda48bd65ffa3b219f681c73a90fc683cd4708c1b79de") add_versions("1.3.275+0", "acfd84039109220129624b0ecb69980bbc3a858978c62b556dbe16efd0f26755") add_versions("1.2.198+0", "4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a") add_versions("1.2.189+1", "d169ae71ae3ba12159df355b58f86f5635062c695d1deac9b97d5653561d517d") @@ -51,7 +53,7 @@ package("vulkan-validationlayers") elseif is_plat("linux") then add_extsources("apt::vulkan-validationlayers-dev", "pacman::vulkan-validation-layers") add_deps("ninja") - add_deps("wayland", "libxrandr", "libxcb", "libxkbcommon") + add_deps("wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon") elseif is_plat("macosx") then add_extsources("brew::vulkan-validationlayers") end @@ -76,7 +78,7 @@ package("vulkan-validationlayers") if package:is_plat("linux") then local includes = {} local linkdirs = {} - for _, lib in ipairs({"wayland", "libxrandr", "libxcb", "libxkbcommon"}) do + for _, lib in ipairs({"wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon"}) do local fetchinfo = package:dep(lib):fetch() for _, dir in ipairs(fetchinfo.sysincludedirs or fetchinfo.includedirs) do table.insert(includes, dir) From e1b5abd42def91b4610a6a392060e6667413af77 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Fri, 26 Jul 2024 21:17:47 +0800 Subject: [PATCH 462/671] upgrade `openssl3` to 3.3.1 (#4755) * upgrade `openssl3` to 3.3.1 * Update xmake.lua --------- Co-authored-by: ruki --- packages/o/openssl3/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/o/openssl3/xmake.lua b/packages/o/openssl3/xmake.lua index 357cc36ab..93042b4ec 100644 --- a/packages/o/openssl3/xmake.lua +++ b/packages/o/openssl3/xmake.lua @@ -5,6 +5,7 @@ package("openssl3") add_urls("https://github.com/openssl/openssl/archive/refs/tags/openssl-$(version).zip") + add_versions("3.3.1", "307284f39bfb7061229c57e263e707655aa80aa9950bf6def28ed63fec91a726") add_versions("3.0.14", "9590b9ae18c4de183be74dfc9da5be1f1e8f85dd631a78bc74c0ebc3d7e27a93") add_versions("3.0.7", "fcb37203c6bf7376cfd3aeb0be057937b7611e998b6c0d664abde928c8af3eb7") add_versions("3.0.6", "9b45be41df0d6e9cf9e340a64525177662f22808ac69aee6bfb29c511284dae4") @@ -43,7 +44,7 @@ package("openssl3") end if package:is_plat("windows", "mingw") then package:add("syslinks", "ws2_32", "user32", "crypt32", "advapi32") - elseif package:is_plat("linux", "cross") then + elseif package:is_plat("linux", "bsd", "cross") then package:add("syslinks", "pthread", "dl") end if package:is_plat("linux", "mingw") and package:is_arch("x86_64") then From 2bfd548e19fcd84e83053c1bdc02bb54f32be7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 26 Jul 2024 16:13:47 +0200 Subject: [PATCH 463/671] Update lz4 to v1.10.0 (#4762) --- packages/l/lz4/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/lz4/xmake.lua b/packages/l/lz4/xmake.lua index 8af6da100..9be18d940 100644 --- a/packages/l/lz4/xmake.lua +++ b/packages/l/lz4/xmake.lua @@ -5,6 +5,7 @@ package("lz4") set_urls("https://github.com/lz4/lz4/archive/$(version).tar.gz", "https://github.com/lz4/lz4.git") + add_versions("v1.10.0", "537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b") add_versions("v1.9.4", "0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b") add_versions("v1.9.3", "030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1") From 3a7bd844fd0f9d9702b9bbd11710d1fa685c99e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 26 Jul 2024 16:14:03 +0200 Subject: [PATCH 464/671] Update fast_float to v6.1.3 (#4761) --- packages/f/fast_float/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fast_float/xmake.lua b/packages/f/fast_float/xmake.lua index f33737d4a..b5ab84404 100644 --- a/packages/f/fast_float/xmake.lua +++ b/packages/f/fast_float/xmake.lua @@ -14,6 +14,7 @@ package("fast_float") add_versions("v6.0.0", "7e98671ef4cc7ed7f44b3b13f80156c8d2d9244fac55deace28bd05b0a2c7c8e") add_versions("v6.1.0", "a9c8ca8ca7d68c2dbb134434044f9c66cfd4c383d5e85c36b704d30f6be82506") add_versions("v6.1.1", "10159a4a58ba95fe9389c3c97fe7de9a543622aa0dcc12dd9356d755e9a94cb4") + add_versions("v6.1.3", "7dd99cc2ff44e07dc2a42bed0c6b8c4a8ee4e3b1c330f77073b6cfdb48724c8e") if is_plat("wasm") then add_patches("v3.4.0", path.join(os.scriptdir(), "patches", "emscripten_fix.patch"), "482705431f67e6f0a375ed7bfe87d6856e7d13f071db6157e1d5659834b0eb50") From 9110cc1bfe707b69a1b47033dee1c5532a867df0 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 27 Jul 2024 09:43:53 +0800 Subject: [PATCH 465/671] Update rocksdb to v9.4.0 (#4765) --- packages/r/rocksdb/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rocksdb/xmake.lua b/packages/r/rocksdb/xmake.lua index 7fb0cb881..2d7478a27 100644 --- a/packages/r/rocksdb/xmake.lua +++ b/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("v9.4.0", "1f829976aa24b8ba432e156f52c9e0f0bd89c46dc0cc5a9a628ea70571c1551c") add_versions("v9.3.1", "e63f1be162998c0f49a538a7fe3fcac0e40cad77ee47d5592a65bca50f7c4620") add_versions("v9.2.1", "bb20fd9a07624e0dc1849a8e65833e5421960184f9c469d508b58ed8f40a780f") add_versions("v9.1.1", "54ca90dd782a988cd3ebc3e0e9ba9b4efd563d7eb78c5e690c2403f1b7d4a87a") From a753f71db61cb8d5f9c4b805ac908060451817da Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 27 Jul 2024 11:56:01 +0800 Subject: [PATCH 466/671] Update aws-c-common to v0.9.24 (#4768) --- packages/a/aws-c-common/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-common/xmake.lua b/packages/a/aws-c-common/xmake.lua index 652f9caa8..cdcef7377 100644 --- a/packages/a/aws-c-common/xmake.lua +++ b/packages/a/aws-c-common/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-common") add_urls("https://github.com/awslabs/aws-c-common/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-common.git") + add_versions("v0.9.24", "715a15399fe6dce2971c222ecabea4276e42ba3465a63c175724fc0c80d7a888") add_versions("v0.9.23", "adf838daf6a60aa31268522105b03262d745f529bc981d3ac665424133d6f91b") add_versions("v0.9.19", "196430fda1bca2c77df7d9199232956d371a92f49ee48fd6c29ff969410ca0ed") add_versions("v0.9.17", "82f1a88494c5563892f0e048f0f56acfe7e10e5aa3fe9267b956dbabcc043440") From 747299fca3d6b34c5bdd39686af45fee735f6612 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 27 Jul 2024 11:56:26 +0800 Subject: [PATCH 467/671] add patchelf (#4764) --- packages/p/patchelf/xmake.lua | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/p/patchelf/xmake.lua diff --git a/packages/p/patchelf/xmake.lua b/packages/p/patchelf/xmake.lua new file mode 100644 index 000000000..b8834df0a --- /dev/null +++ b/packages/p/patchelf/xmake.lua @@ -0,0 +1,24 @@ +package("patchelf") + set_kind("binary") + set_homepage("https://github.com/NixOS/patchelf") + set_description("A small utility to modify the dynamic linker and RPATH of ELF executables") + set_license("GPL-3.0") + + add_urls("https://github.com/NixOS/patchelf/archive/refs/tags/$(version).tar.gz", + "https://github.com/NixOS/patchelf.git") + + add_versions("0.18.0", "1451d01ee3a21100340aed867d0b799f46f0b1749680028d38c3f5d0128fb8a7") + + add_deps("autoconf", "automake", "libtool") + + on_install("linux", "bsd", "macosx", function (package) + local configs = {} + if package:is_debug() then + table.insert(configs, "--enable-debug") + end + import("package.tools.autoconf").install(package, configs) + end) + + on_test(function (package) + os.run("patchelf --version") + end) From 92d58a4ca3402980a98ed31534c0febb211db46f Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 27 Jul 2024 12:22:01 +0800 Subject: [PATCH 468/671] Update libfabric to 1.22.0 (#4770) --- packages/l/libfabric/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libfabric/xmake.lua b/packages/l/libfabric/xmake.lua index 9d2098b92..c439d7e3f 100644 --- a/packages/l/libfabric/xmake.lua +++ b/packages/l/libfabric/xmake.lua @@ -5,6 +5,7 @@ package("libfabric") set_license("BSD-2-Clause") add_urls("https://github.com/ofiwg/libfabric/releases/download/v$(version)/libfabric-$(version).tar.bz2") + add_versions("1.22.0", "485e6cafa66c9e4f6aa688d2c9526e274c47fda3a783cf1dd8f7c69a07e2d5fe") add_versions("1.20.2", "75b89252a0b8b3eae8e60f7098af1598445a99a99e8fc1ff458e2fd5d4ef8cde") add_versions("1.20.1", "fd88d65c3139865d42a6eded24e121aadabd6373239cef42b76f28630d6eed76") add_versions("1.13.0", "0c68264ae18de5c31857724c754023351614330bd61a50b40cef2b5e8f63ab28") From 95af5353abd6414dfc7ad1ec3a5b14a5f6906e0e Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 27 Jul 2024 13:19:09 +0800 Subject: [PATCH 469/671] Update boost_ut to v2.1.0 (#4772) --- packages/b/boost_ut/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/boost_ut/xmake.lua b/packages/b/boost_ut/xmake.lua index 85f30aa23..3d07da02f 100644 --- a/packages/b/boost_ut/xmake.lua +++ b/packages/b/boost_ut/xmake.lua @@ -6,6 +6,7 @@ package("boost_ut") add_urls("https://github.com/boost-ext/ut/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/boost-ext/ut.git") + add_versions("v2.1.0", "1c9c35c039ad3a9795a278447db6da0a4ec1a1d223bf7d64687ad28f673b7ae8") add_versions("v1.1.9", "1a666513157905aa0e53a13fac602b5673dcafb04a869100a85cd3f000c2ed0d") add_versions("v2.0.1", "1e43be17045a881c95cedc843d72fe9c1e53239b02ed179c1e39e041ebcd7dad") From 5b82ec769291ec71cd66b19c45e2988835440f97 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 27 Jul 2024 21:08:27 +0800 Subject: [PATCH 470/671] range-v3: fix header only kind --- packages/r/range-v3/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/r/range-v3/xmake.lua b/packages/r/range-v3/xmake.lua index 4970965db..f2b068004 100644 --- a/packages/r/range-v3/xmake.lua +++ b/packages/r/range-v3/xmake.lua @@ -1,5 +1,5 @@ package("range-v3") - + set_kind("library", {headeronly = true}) set_homepage("https://github.com/ericniebler/range-v3/") set_description("Range library for C++14/17/20, basis for C++20's std::ranges") set_license("BSL-1.0") From fee9f9dd315208a1252432c3854db3761bd9cea2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 28 Jul 2024 08:08:09 +0800 Subject: [PATCH 471/671] hidapi: support mingw (#4750) * hidapi: support mingw * libusb: update cmake script to latest commit * improve cmake find libusb.pc * fix find pc --- packages/h/hidapi/xmake.lua | 6 +++++- packages/l/libusb/xmake.lua | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/h/hidapi/xmake.lua b/packages/h/hidapi/xmake.lua index a527cc923..73fadfcd9 100644 --- a/packages/h/hidapi/xmake.lua +++ b/packages/h/hidapi/xmake.lua @@ -18,7 +18,11 @@ package("hidapi") add_deps("pkg-config") end - on_install("windows|x86", "windows|x64", "linux", "macosx", function (package) + on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", function (package) + io.replace("libusb/CMakeLists.txt", + "pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0>=1.0.9)", + "pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb)", {plain = true}) + local configs = { "-DHIDAPI_WITH_TESTS=OFF", "-DHIDAPI_BUILD_PP_DATA_DUMP=OFF", diff --git a/packages/l/libusb/xmake.lua b/packages/l/libusb/xmake.lua index cd972868c..f15ff0150 100644 --- a/packages/l/libusb/xmake.lua +++ b/packages/l/libusb/xmake.lua @@ -9,7 +9,7 @@ package("libusb") add_versions("v1.0.27", "e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de") add_versions("v1.0.26", "a09bff99c74e03e582aa30759cada218ea8fa03580517e52d463c59c0b25e240") - add_resources(">=1.0.26", "libusb-cmake", "https://github.com/libusb/libusb-cmake.git", "84fb1bba4dde4c266944e7c7aa641a8a15d18f31") + add_resources(">=1.0.26", "libusb-cmake", "https://github.com/libusb/libusb-cmake.git", "8f0b4a38fc3eefa2b26a99dff89e1c12bf37afd4") if is_plat("macosx") then add_frameworks("CoreFoundation", "IOKit", "Security") From 8aacf084b3f2264ecac818f6bdadbdece6ddc33e Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 28 Jul 2024 10:02:33 +0800 Subject: [PATCH 472/671] Update msgpack-c to 6.0.2 (#4775) --- packages/m/msgpack-c/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/msgpack-c/xmake.lua b/packages/m/msgpack-c/xmake.lua index 7e8c72406..630168676 100644 --- a/packages/m/msgpack-c/xmake.lua +++ b/packages/m/msgpack-c/xmake.lua @@ -5,6 +5,7 @@ package("msgpack-c") set_license("BSL-1.0") add_urls("https://github.com/msgpack/msgpack-c/releases/download/c-$(version)/msgpack-c-$(version).tar.gz") + add_versions("6.0.2", "5e90943f6f5b6ff6f4bda9146ada46e7e455af3a77568f6d503f35618c1b2a12") add_versions("6.0.1", "a349cd9af28add2334c7009e331335af4a5b97d8558b2e9804d05f3b33d97925") add_versions("4.0.0", "420fe35e7572f2a168d17e660ef981a589c9cbe77faa25eb34a520e1fcc032c8") From 3f0221f83d6629fc48e3054bf4c96fb03d5dc554 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 28 Jul 2024 10:02:37 +0800 Subject: [PATCH 473/671] Update cuda-samples to v12.5 (#4773) --- packages/c/cuda-samples/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cuda-samples/xmake.lua b/packages/c/cuda-samples/xmake.lua index 06383bd79..7ad6c9c5e 100644 --- a/packages/c/cuda-samples/xmake.lua +++ b/packages/c/cuda-samples/xmake.lua @@ -7,6 +7,7 @@ package("cuda-samples") add_urls("https://github.com/NVIDIA/cuda-samples/archive/refs/tags/$(version).tar.gz", "https://github.com/NVIDIA/cuda-samples.git") + add_versions("v12.5", "5c40cc096706045b067ec5897f039403014aa7a39b970905698466a2d029b972") add_versions("v12.4.1", "01bb311cc8f802a0d243700e4abe6a2d402132c9d97ecf2c64f3fbb1006c304c") add_versions("v11.8", "1bc02c0ca42a323f3c7a05b5682eae703681a91e95b135bfe81f848b2d6a2c51") add_versions("v12.3", "a40e4d3970185f38477dd8b5bdbd81642b04648d8b812af914333b8f83355efe") From f001d2f61c31850ae93da2c872d91e96a865e223 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 28 Jul 2024 11:08:28 +0800 Subject: [PATCH 474/671] Update toml11 to v4.1.0 (#4776) --- packages/t/toml11/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/toml11/xmake.lua b/packages/t/toml11/xmake.lua index 8e78e8cbb..9ef00a639 100644 --- a/packages/t/toml11/xmake.lua +++ b/packages/t/toml11/xmake.lua @@ -7,6 +7,7 @@ package("toml11") add_urls("https://github.com/ToruNiina/toml11/archive/refs/tags/$(version).tar.gz", "https://github.com/ToruNiina/toml11.git") + add_versions("v4.1.0", "fb4c02cc708ae28e6fc3496514e3625e4b6738ed4ce40897710ca4d7a29de4f7") add_versions("v4.0.3", "c8cbc7839cb3f235153045ce550e559f55a04554dfcab8743ba8a1e8ef6a54bf") add_versions("v4.0.2", "d1bec1970d562d328065f2667b23f9745a271bf3900ca78e92b71a324b126070") add_versions("v4.0.1", "96965cb00ca7757c611c169cd5a6fb15736eab1cd1c1a88aaa62ad9851d926aa") From 47a8bc3e7f549f91d7c2ef8ee74b87945132d5d7 Mon Sep 17 00:00:00 2001 From: KaoruXun Date: Sun, 28 Jul 2024 13:24:30 +0800 Subject: [PATCH 475/671] cute_headers: add package (#4777) --- packages/c/cute_headers/xmake.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/c/cute_headers/xmake.lua diff --git a/packages/c/cute_headers/xmake.lua b/packages/c/cute_headers/xmake.lua new file mode 100644 index 000000000..a45cb40d6 --- /dev/null +++ b/packages/c/cute_headers/xmake.lua @@ -0,0 +1,17 @@ +package("cute_headers") + + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/RandyGaul/cute_headers") + set_description("Collection of cross-platform one-file C/C++ libraries with no dependencies, primarily used for games") + set_license("Public Domain") + + add_urls("https://github.com/RandyGaul/cute_headers.git") + add_versions("2024.07.22", "cab36d7c6690e334720e705bd6cd3ce29b0b0844") + + on_install(function (package) + os.cp("*.h", package:installdir("include")) + end) + + on_test(function (package) + assert(package:has_cfuncs("cute_aseprite_load_from_file", {includes = "cute_aseprite.h", defines = "CUTE_ASEPRITE_IMPLEMENTATION"})) + end) \ No newline at end of file From 78b1d509711e8f0375198622f090e52082f698b1 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Sun, 28 Jul 2024 13:25:35 +0800 Subject: [PATCH 476/671] drogon: add config spdlog (#4752) --- packages/d/drogon/xmake.lua | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/d/drogon/xmake.lua b/packages/d/drogon/xmake.lua index 220050916..d0d7e2dbe 100644 --- a/packages/d/drogon/xmake.lua +++ b/packages/d/drogon/xmake.lua @@ -32,7 +32,7 @@ package("drogon") add_patches(">=1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "config.patch"), "67a921899a24c1646be6097943cc2ed8228c40f177493451f011539c6df0ed76") add_patches(">=1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "check.patch"), "e4731995bb754f04e1bb813bfe3dfb480a850fbbd5cdb48d5a53b32b4ed8669c") add_patches(">=1.8.2 <1.8.5", path.join(os.scriptdir(), "patches", "1.8.2", "gcc13.patch"), "d2842a734df52c590ab950414c7a95a1ac1be48f8680f909d0eeba5f36087cb0") - add_patches("1.9.1", path.join(os.scriptdir(), "patches", "1.9.1", "resolv.patch"), "2b511e60fe99062396accab6b25d0092e111a83db11cffc23ce8e790370d017c") + add_patches(">=1.9.1", path.join(os.scriptdir(), "patches", "1.9.1", "resolv.patch"), "2b511e60fe99062396accab6b25d0092e111a83db11cffc23ce8e790370d017c") add_configs("c_ares", {description = "Enable async DNS query support.", default = false, type = "boolean"}) add_configs("mysql", {description = "Enable mysql support.", default = false, type = "boolean"}) @@ -41,11 +41,14 @@ package("drogon") add_configs("sqlite3", {description = "Enable sqlite3 support.", default = false, type = "boolean"}) add_configs("redis", {description = "Enable redis support.", default = false, type = "boolean"}) add_configs("yaml", {description = "Enable yaml support.", default = false, type = "boolean"}) + add_configs("spdlog", {description = "Allow using the spdlog logging library", default = false, type = "boolean"}) add_deps("cmake") - add_deps("trantor", "jsoncpp", "brotli", "zlib") + add_deps("jsoncpp", "brotli", "zlib") if is_plat("windows") then + -- enable mtt for drogon + set_policy("package.msbuild.multi_tool_task", true) add_syslinks("ws2_32", "rpcrt4", "crypt32", "advapi32", "iphlpapi") else add_deps("libuuid") @@ -68,10 +71,18 @@ package("drogon") package:add("deps", dep) end end - + if package:version():le("v1.9.2") then + package:config_set("spdlog", false) + end + if package:config("spdlog") then + package:add("defines", "DROGON_SPDLOG_SUPPORT") + package:add("deps", "trantor", {configs = {spdlog = true}}) + else + package:add("deps", "trantor") + end end) - on_install("windows", "macosx", "linux", function (package) + on_install("windows|native", "macosx", "linux", function (package) io.replace("cmake/templates/config.h.in", "\"@COMPILATION_FLAGS@@DROGON_CXX_STANDARD@\"", "R\"(@COMPILATION_FLAGS@@DROGON_CXX_STANDARD@)\"", {plain = true}) io.replace("cmake_modules/FindMySQL.cmake", "PATH_SUFFIXES mysql", "PATH_SUFFIXES mysql mariadb", {plain = true}) From 94acda8148bf0b78775e8d1f9b10e711bf084e97 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Sun, 28 Jul 2024 19:44:45 +0800 Subject: [PATCH 477/671] add support of `libiconv` on `android@windows` (#4299) * add `MingW` support for `unistd_h` * Update xmake.lua * switch mingw and android for `libiconv` to xmake port * fix android for `libiconv`: define `O_BINARY` for android * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: ruki --- packages/l/libiconv/port/xmake.lua | 21 +++++++++++++-------- packages/l/libiconv/xmake.lua | 20 ++++++++------------ packages/u/unistd_h/xmake.lua | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/packages/l/libiconv/port/xmake.lua b/packages/l/libiconv/port/xmake.lua index 94881983c..52e36013b 100644 --- a/packages/l/libiconv/port/xmake.lua +++ b/packages/l/libiconv/port/xmake.lua @@ -31,11 +31,7 @@ if has_config("vers") then set_configvar("PACKAGE_STRING", "libiconv " .. get_config("vers")) end -includes("check_cfuncs.lua") -includes("check_ctypes.lua") -includes("check_macros.lua") -includes("check_cincludes.lua") -includes("check_csnippets.lua") +includes("@builtin/check") -- config.h variables option("__NO_BROKEN_WCHAR_H") @@ -101,11 +97,14 @@ set_configvar("GNULIB_TEST_REALPATH", 1) set_configvar("GNULIB_TEST_SIGPROCMASK", 1) set_configvar("GNULIB_TEST_STAT", 1) set_configvar("GNULIB_TEST_STRERROR", 1) -set_configvar("ssize_t", "int", {quote = false}) -set_configvar("uid_t", "int", {quote = false}) +if not is_plat("android") then + set_configvar("ssize_t", "int", {quote = false}) + set_configvar("uid_t", "int", {quote = false}) +end configvar_check_ctypes("USE_MBSTATE_T", "mbstate_t", {includes = "wchar.h", default = 0}) configvar_check_cincludes("ENABLE_NLS", "libintl.h", {default = 0}) configvar_check_cincludes("HAVE_DLFCN_H", "dlfcn.h") +configvar_check_cincludes("HAVE_FCNTL", "fcntl.h") configvar_check_cincludes("HAVE_INTTYPES_H", "inttypes.h") configvar_check_cincludes("HAVE_MACH_O_DYLD_H", "mach-o/dyld.h") configvar_check_cincludes("HAVE_MEMORY_H", "memory.h") @@ -194,7 +193,7 @@ configvar_check_csnippets("GNULIB_SIGPIPE", [[#include #error SIGPIPE not defined #endif]]) configvar_check_csnippets("HAVE_LANGINFO_CODESET", [[#include -int test() { char* cs = nl_langinfo(CODESET); return !cs; }]]) +int test() { char* cs = nl_langinfo(CODESET); return !cs; }]], {links = "c"}) configvar_check_csnippets("HAVE_ENVIRON_DECL=0", [[extern struct {int foo;} environ; void test() {environ.foo = 1;}]], {includes = has_config("__HAVE_UNISTD_H") and "unistd.h" or "stdlib.h", default = 1}) @@ -260,3 +259,9 @@ target("iconv_no_i18n") add_defines("LOCALEDIR=\"" .. path.join(get_config("installprefix"), "share", "locale"):gsub("\\", "\\\\") .. "\"") end add_files("src/iconv_no_i18n.c") + + if is_plat("android") then + -- Gnulib defines these macros to 0 on GNU and other platforms that do not distinguish between text and binary I/O. + -- https://www.gnu.org/software/gnulib/manual/html_node/fcntl_002eh.html + add_defines("O_BINARY=0") + end diff --git a/packages/l/libiconv/xmake.lua b/packages/l/libiconv/xmake.lua index 22a0ebe50..dc1ad39b7 100644 --- a/packages/l/libiconv/xmake.lua +++ b/packages/l/libiconv/xmake.lua @@ -13,9 +13,6 @@ package("libiconv") if is_plat("macosx") then add_patches("1.15", path.join(os.scriptdir(), "patches", "1.15", "patch-utf8mac.diff"), "e8128732f22f63b5c656659786d2cf76f1450008f36bcf541285268c66cabeab") - elseif is_plat("android") then - add_patches("1.x", path.join(os.scriptdir(), "patches", "1.16", "makefile.in.patch"), - "d09e4212040f5adf1faa5cf5a9a18f6f79d4cdce9affb05f2e75df2ea3b3d686") elseif is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end @@ -34,13 +31,17 @@ package("libiconv") package:addenv("PATH", "bin") end) - on_install("windows", "mingw", function (package) + on_install("windows", "mingw", "android", function (package) io.gsub("config.h.in", "%$", "") io.gsub("config.h.in", "# ?undef (.-)\n", "${define %1}\n") io.gsub("libcharset/config.h.in", "%$", "") io.gsub("libcharset/config.h.in", "# ?undef (.-)\n", "${define %1}\n") - io.gsub("srclib/safe-read.c", "#include ", "") - io.gsub("srclib/progreloc.c", "#include ", "") + + if package:is_plat("windows") then + io.gsub("srclib/safe-read.c", "#include ", "") + io.gsub("srclib/progreloc.c", "#include ", "") + end + os.cp(path.join(os.scriptdir(), "port", "xmake.lua"), ".") import("package.tools.xmake").install(package, { relocatable = true, @@ -49,17 +50,13 @@ package("libiconv") }) end) - on_install("macosx", "linux", "bsd", "cross", "android", "wasm", function (package) + on_install("macosx", "linux", "bsd", "cross", "wasm", function (package) local configs = {"--disable-dependency-tracking", "--enable-extra-encodings", "--enable-relocatable"} table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes")) if package:debug() then table.insert(configs, "--enable-debug") end - if package:is_plat("android") then - io.replace("./configure", "#define gid_t int", "") - io.replace("./configure", "#define uid_t int", "") - end os.vrunv("make", {"-f", "Makefile.devel", "CFLAGS=" .. (package:config("cflags") or "")}) import("package.tools.autoconf").install(package, configs) end) @@ -76,4 +73,3 @@ package("libiconv") } ]]})) end) - diff --git a/packages/u/unistd_h/xmake.lua b/packages/u/unistd_h/xmake.lua index c956cd483..c8aa776f0 100644 --- a/packages/u/unistd_h/xmake.lua +++ b/packages/u/unistd_h/xmake.lua @@ -7,7 +7,7 @@ package("unistd_h") add_urls("https://github.com/win32ports/unistd_h.git") add_versions("2019.07.30", "0dfc48c1bc67fa27b02478eefe0443b8d2750cc2") - on_install("windows", function (package) + on_install("windows", "mingw", function (package) os.cp("unistd.h", package:installdir("include")) end) From 5304191c145e65327435b73b864f7c8bfe8cea13 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Sun, 28 Jul 2024 22:18:35 +0800 Subject: [PATCH 478/671] fix the detection method of `GNU iconv` (#4708) * fix the detection method of `GNU iconv` * revert the use of `detect:has_*`, and add `linux clang` support for GNU iconv --- packages/l/libiconv/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/l/libiconv/xmake.lua b/packages/l/libiconv/xmake.lua index dc1ad39b7..b18b9d02e 100644 --- a/packages/l/libiconv/xmake.lua +++ b/packages/l/libiconv/xmake.lua @@ -19,8 +19,8 @@ package("libiconv") on_fetch("macosx", "linux", function (package, opt) if opt.system then - if package:is_plat("linux") and package:has_tool("cc", "gcc", "gxx") then - return {} -- on linux libiconv is already a part of glibc + if package:is_plat("linux") and package:has_tool("cc", "gcc", "gxx", "clang", "clangxx") then + return {} -- libiconv is already a part of glibc (GNU iconv) else return package:find_package("system::iconv", {includes = "iconv.h"}) end From eecec2c5970b95d29be235ddba8cbd017a55c6bb Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 28 Jul 2024 22:19:00 +0800 Subject: [PATCH 479/671] libelfin: add package (#4767) * libelfin: add package * port to xmake * limit plat * fix codegen --- packages/l/libelfin/port/xmake.lua | 73 ++++++++++++++++++++++++++++++ packages/l/libelfin/xmake.lua | 26 +++++++++++ 2 files changed, 99 insertions(+) create mode 100644 packages/l/libelfin/port/xmake.lua create mode 100644 packages/l/libelfin/xmake.lua diff --git a/packages/l/libelfin/port/xmake.lua b/packages/l/libelfin/port/xmake.lua new file mode 100644 index 000000000..791c10cee --- /dev/null +++ b/packages/l/libelfin/port/xmake.lua @@ -0,0 +1,73 @@ +add_requires("python 3.x", {kind = "binary"}) + +add_rules("mode.debug", "mode.release") + +set_languages("c++11") + +target("elf++") + set_kind("$(kind)") + add_files("elf/*.cc") + add_headerfiles("elf/elf++.hh", "elf/data.hh", "elf/common.hh", {prefixdir = "libelfin/elf"}) + + on_load(function (target) + local filename = "elf/to_string.cc" + local file = io.open(filename, "w") + file:print("// Automatically generated by xmake at " .. os.date("%y-%m-%d")) + file:print("// DO NOT EDIT") + file:print("") + file:print([[#include "data.hh"]]) + file:print([[#include "to_hex.hh"]]) + file:print("") + file:print("ELFPP_BEGIN_NAMESPACE") + file:print("") + + local python = assert(import("lib.detect.find_tool")("python3"), "python not found!") + local result = try { function() + return os.iorunv(python.program, + {"elf/enum-print.py", "-u", "--hex", "--no-type", "--mask", "shf", "--mask", "pf", "-x", "loos", "-x", "hios", "-x", "loproc", "-x", "hiproc"}, + {stdin = "elf/data.hh"}) + end } + if result then + file:print(result) + end + + file:print("ELFPP_END_NAMESPACE") + file:close() + target:add("files", path.join(os.projectdir(), filename)) + end) + +target("dwarf++") + set_kind("$(kind)") + add_files("dwarf/*.cc") + add_headerfiles("dwarf/dwarf++.hh", "dwarf/data.hh", "dwarf/small_vector.hh", {prefixdir = "libelfin/dwarf"}) + + on_load(function (target) + local filename = "dwarf/to_string.cc" + local file = io.open(filename, "w") + file:print("// Automatically generated by xmake at " .. os.date("%y-%m-%d")) + file:print("// DO NOT EDIT") + file:print("") + file:print([[#include "internal.hh"]]) + file:print("") + file:print("DWARFPP_BEGIN_NAMESPACE") + file:print("") + + local python = assert(import("lib.detect.find_tool")("python3"), "python not found!") + local result = try { function() return os.iorunv(python.program, {"elf/enum-print.py"}, {stdin = "dwarf/dwarf++.hh"}) end} + if result then + file:print(result) + end + + result = try { function() + return os.iorunv(python.program, + {"elf/enum-print.py", "-s", "_", "-u", "--hex", "-x", "hi_user", "-x", "lo_user"}, + {stdin = "dwarf/data.hh"}) + end } + if result then + file:print(result) + end + + file:print("DWARFPP_END_NAMESPACE") + file:close() + target:add("files", path.join(os.projectdir(), filename)) + end) diff --git a/packages/l/libelfin/xmake.lua b/packages/l/libelfin/xmake.lua new file mode 100644 index 000000000..d0bda0067 --- /dev/null +++ b/packages/l/libelfin/xmake.lua @@ -0,0 +1,26 @@ +package("libelfin") + set_homepage("https://github.com/aclements/libelfin") + set_description("C++11 ELF/DWARF parser") + set_license("MIT") + + add_urls("https://github.com/aclements/libelfin/archive/e0172767b79b76373044118ef0272b49b02a0894.tar.gz", + "https://github.com/aclements/libelfin.git") + -- 2024.03.11 + add_versions("v0.3", "0fb80f8a36b9b2563bd193ace5866972e739af306955e539310dc9dd870aef6c") + + add_deps("python 3.x", {kind = "binary"}) + + on_install("!windows and !mingw", function (package) + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + int fd = 0; + elf::elf ef(elf::create_mmap_loader(fd)); + } + ]]}, {configs = {languages = "c++11"}})) + end) From f8c46ece76fc5b710baf8743f298bdf2cd4266d9 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 29 Jul 2024 01:02:51 +0800 Subject: [PATCH 480/671] Auto-update drogon to v1.9.6 (#4766) * Update drogon to v1.9.6 * add patch for windows build --- packages/d/drogon/patches/1.9.6/windows-build.patch | 13 +++++++++++++ packages/d/drogon/xmake.lua | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 packages/d/drogon/patches/1.9.6/windows-build.patch diff --git a/packages/d/drogon/patches/1.9.6/windows-build.patch b/packages/d/drogon/patches/1.9.6/windows-build.patch new file mode 100644 index 000000000..48158bd30 --- /dev/null +++ b/packages/d/drogon/patches/1.9.6/windows-build.patch @@ -0,0 +1,13 @@ +diff --git a/lib/src/HttpServer.cc b/lib/src/HttpServer.cc +index dbd99a90..3d8ca852 100644 +--- a/lib/src/HttpServer.cc ++++ b/lib/src/HttpServer.cc +@@ -508,7 +508,7 @@ void HttpServer::requestPostRouting(const HttpRequestImplPtr &req, Pack &&pack) + else + { + req->quitStreamMode(); +- LOG_DEBUG << "Stop processing request due to stream error"; ++ LOG_ERROR << "Stop processing request due to stream error"; + pack.callback( + app().getCustomErrorHandler()(k400BadRequest, req)); + } diff --git a/packages/d/drogon/xmake.lua b/packages/d/drogon/xmake.lua index d0d7e2dbe..4d93c3d4f 100644 --- a/packages/d/drogon/xmake.lua +++ b/packages/d/drogon/xmake.lua @@ -6,6 +6,7 @@ package("drogon") add_urls("https://github.com/an-tao/drogon/archive/refs/tags/$(version).tar.gz", "https://github.com/an-tao/drogon.git") + add_versions("v1.9.6", "a81d0ea0e87b0214aa56f7fa7bb851011efe606af67891a0945825104505a08a") add_versions("v1.9.5", "ec17882835abeb0672db29cb36ab0c5523f144d5d8ff177861b8f5865803eaae") add_versions("v1.9.4", "b23d9d01d36fb1221298fcdbedcf7fd3e1b8b8821bf6fb8ed073c8b0c290d11d") add_versions("v1.9.3", "fb4ef351b3e4c06ed850cfbbf50c571502decb1738fb7d62a9d7d70077c9fc23") @@ -33,6 +34,9 @@ package("drogon") add_patches(">=1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "check.patch"), "e4731995bb754f04e1bb813bfe3dfb480a850fbbd5cdb48d5a53b32b4ed8669c") add_patches(">=1.8.2 <1.8.5", path.join(os.scriptdir(), "patches", "1.8.2", "gcc13.patch"), "d2842a734df52c590ab950414c7a95a1ac1be48f8680f909d0eeba5f36087cb0") add_patches(">=1.9.1", path.join(os.scriptdir(), "patches", "1.9.1", "resolv.patch"), "2b511e60fe99062396accab6b25d0092e111a83db11cffc23ce8e790370d017c") + if is_plat("windows") then + add_patches("1.9.6", path.join(os.scriptdir(), "patches", "1.9.6", "windows-build.patch"), "4a798dc3ba7df2f1541ecf66b1b03bab15f200d310ac63f7893770cb3b199453") + end add_configs("c_ares", {description = "Enable async DNS query support.", default = false, type = "boolean"}) add_configs("mysql", {description = "Enable mysql support.", default = false, type = "boolean"}) From c05eb260a8ff354b6226cdbbbb74c7e6ab313718 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 29 Jul 2024 09:12:45 +0800 Subject: [PATCH 481/671] update benchmark to 1.8.5 (#4779) * update benchmark to 1.8.5 * Update xmake.lua --- packages/b/benchmark/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/b/benchmark/xmake.lua b/packages/b/benchmark/xmake.lua index 7d375c12e..94ed5efa9 100644 --- a/packages/b/benchmark/xmake.lua +++ b/packages/b/benchmark/xmake.lua @@ -18,6 +18,7 @@ package("benchmark") add_versions("1.8.0", "ea2e94c24ddf6594d15c711c06ccd4486434d9cf3eca954e2af8a20c88f9f172") add_versions("1.8.3", "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce") add_versions("1.8.4", "3e7059b6b11fb1bbe28e33e02519398ca94c1818874ebed18e504dc6f709be45") + add_versions("1.8.5", "d26789a2b46d8808a48a4556ee58ccc7c497fcd4c0af9b90197674a81e04798a") if is_plat("mingw") and is_subhost("msys") then add_extsources("pacman::benchmark") @@ -60,4 +61,4 @@ package("benchmark") BENCHMARK(BM_empty); BENCHMARK(BM_empty)->ThreadPerCpu(); ]]}, {configs = {languages = "c++14"}, includes = "benchmark/benchmark.h"})) - end) \ No newline at end of file + end) From 5fe0269799c1f224f8a2b1a6cd69007fb7e50fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 29 Jul 2024 16:36:25 +0200 Subject: [PATCH 482/671] aqt: Add version 3.1.17 (#4782) * aqt: Add version 3.1.17 and drop support for signed versions as they're no longer produced * Update xmake.lua --- packages/a/aqt/xmake.lua | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/packages/a/aqt/xmake.lua b/packages/a/aqt/xmake.lua index 103640050..58c73aa2e 100644 --- a/packages/a/aqt/xmake.lua +++ b/packages/a/aqt/xmake.lua @@ -4,24 +4,31 @@ package("aqt") set_description("aqt: Another (unofficial) Qt CLI Installer on multi-platforms") set_license("MIT") + add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) + if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then - add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true}) add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true}) if os.arch() == "x86" then - add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86_signed.exe", { alias = "signed" }) - add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86.exe", { alias = "regular" }) - add_versions("signed:3.1.6", "dc675b64caceaacaf2d2bd711fb7a005ab2bcf7f6a28702e52408965f65718ec") - add_versions("regular:3.1.6", "093b536fab2e3726a792cdb60292313c0c8950b8aa9b56ccdeff7adb1146f964") - add_versions("regular:3.0.2", "aac5d8949eed3f231bfc589736afe0f88372dc590182c8b3a2bed7c78952b944") - add_versions("regular:2.0.6", "b980985cfeb1cefef1d2ebab91ae4e648873a27fae8831deff8144661480c56a") + add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86.exe") + add_versions("3.1.17", "d3abbd3378907f2e3ebf3af3387590245bb04175e1a720d04463b047732e1cd2") + add_versions("3.1.6", "093b536fab2e3726a792cdb60292313c0c8950b8aa9b56ccdeff7adb1146f964") + add_versions("3.0.2", "aac5d8949eed3f231bfc589736afe0f88372dc590182c8b3a2bed7c78952b944") + add_versions("2.0.6", "b980985cfeb1cefef1d2ebab91ae4e648873a27fae8831deff8144661480c56a") + else + add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64.exe") + add_versions("3.1.17", "02acc10c6317a2a9f76464d5c26b129b836531f81938b2b222498c495d69fcdb") + add_versions("3.1.6", "4f7e3fbc2d155f903ed9597b7929201681ffb7628e97765511cc7efa8a60f3e6") + add_versions("3.0.2", "96e46eca0d18a899db00a26facd20c799f2400645aef6445d49f4bd0aeab0a3f") + add_versions("2.0.6", "b0ad07fe8fd2c094425449f3053598959e467833dadf509da948571259510078") + end + elseif is_host("macosx") and (os.arch() == "arm64" or os.arch() == "x86_64") then + if os.arch() == "arm64" then + add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt-macos") + add_versions("3.1.17", "cb51decbc12500d2e3e4b743dd4abb86a91fd9f25a916cafe54572963acf0690") else - add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64_signed.exe", { alias = "signed" }) - add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64.exe", { alias = "regular" }) - add_versions("signed:3.1.6", "ca988c2aedaed379d1672e95ed38f91be5e803a5f2947b25c29e8b28fb2bd5c8") - add_versions("regular:3.1.6", "4f7e3fbc2d155f903ed9597b7929201681ffb7628e97765511cc7efa8a60f3e6") - add_versions("regular:3.0.2", "96e46eca0d18a899db00a26facd20c799f2400645aef6445d49f4bd0aeab0a3f") - add_versions("regular:2.0.6", "b0ad07fe8fd2c094425449f3053598959e467833dadf509da948571259510078") + add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt-macos") + add_versions("3.1.17", "cb51decbc12500d2e3e4b743dd4abb86a91fd9f25a916cafe54572963acf0690") end else add_deps("7z") @@ -31,6 +38,9 @@ package("aqt") on_install("@macosx", "@linux", "@windows", "@msys", function (package) if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then os.cp(package:originfile(), path.join(package:installdir("bin"), "aqt.exe")) + elseif is_host("macosx") and (os.arch() == "arm64" or os.arch() == "x86_64") then + os.cp(package:originfile(), path.join(package:installdir("bin"), "aqt")) + os.vrunv("chmod", {"+x", path.join(package:installdir("bin"), "aqt")}) else -- ensurepip has been dropped in recent releases try {function () os.vrunv("python3", {"-m", "ensurepip"}) end} From 672b94aab45714a578ab0856ea38e74cf35d0d9a Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 30 Jul 2024 00:33:42 +0800 Subject: [PATCH 483/671] fmt: fix cxxflags --- packages/f/fmt/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index 8f7973690..0485d32ac 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -51,7 +51,7 @@ package("fmt") package:add("defines", "FMT_EXPORT") end end - if package:is_plat("windows") and package:config("unicode") then + if package:has_tool("cxx", "cl") and package:config("unicode") then package:add("cxxflags", "/utf-8") end end) From 233b05c7431ef78d443969af006355f59817d011 Mon Sep 17 00:00:00 2001 From: Christian Kurz Date: Tue, 30 Jul 2024 03:33:05 +0200 Subject: [PATCH 484/671] yoga: Add missing include (#4785) --- packages/y/yoga/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/y/yoga/xmake.lua b/packages/y/yoga/xmake.lua index c4016f8c8..6da140adb 100644 --- a/packages/y/yoga/xmake.lua +++ b/packages/y/yoga/xmake.lua @@ -21,6 +21,7 @@ package("yoga") on_check(function (package) assert(package:check_cxxsnippets({test = [[ #include + #include void test() { constexpr double f64v = 19880124.0; constexpr auto u64v = std::bit_cast(f64v); From ff1ba85ec74a50d8719ff359eac6cecf4369daf4 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 Jul 2024 09:57:57 +0800 Subject: [PATCH 485/671] Update zlog to 1.2.18 (#4789) --- packages/z/zlog/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/z/zlog/xmake.lua b/packages/z/zlog/xmake.lua index 7b76c3410..7a7d25ad5 100644 --- a/packages/z/zlog/xmake.lua +++ b/packages/z/zlog/xmake.lua @@ -6,6 +6,7 @@ package("zlog") add_urls("https://github.com/HardySimpson/zlog/archive/refs/tags/$(version).tar.gz", "https://github.com/HardySimpson/zlog.git") + add_versions("1.2.18", "3977dc8ea0069139816ec4025b320d9a7fc2035398775ea91429e83cb0d1ce4e") add_versions("1.2.17", "7fe412130abbb75a0779df89ae407db5d8f594435cc4ff6b068d924e13fd5c68") add_patches("1.2.17", "patches/1.2.17/cmake.patch", "0558364a4a4a2d54375fffb1ae33877562058d90865712bb7519c9219b0f79e7") From 05b5202c19e7b6cbd25074f26036386a898da98c Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 Jul 2024 09:58:00 +0800 Subject: [PATCH 486/671] Update aws-c-io to v0.14.14 (#4788) --- packages/a/aws-c-io/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-io/xmake.lua b/packages/a/aws-c-io/xmake.lua index 14dcacddd..266e6b57e 100644 --- a/packages/a/aws-c-io/xmake.lua +++ b/packages/a/aws-c-io/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-io") add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-io.git") + add_versions("v0.14.14", "c62400e83232e6d7c04bacebf02d552f6699d90735d9b8b6ee5fae879735c458") add_versions("v0.14.13", "1c228b1ed327e3a8518b89702ac0d93265cf50788038091e187c697cace7fa5a") add_versions("v0.14.9", "3a3b7236f70209ac12b5bafa7dd81b75cc68b691a0aa0686d6d3b7e4bbe5fbc9") add_versions("v0.14.8", "d50e21fdbd5170a4071fe067ef4ce297b02cb058ad47e118305e25f6e07d9cf0") From 402f51201a4eb2c550cab1a7d3d83024a3fc192d Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 Jul 2024 09:58:03 +0800 Subject: [PATCH 487/671] Update fastgltf to v0.8.0 (#4787) --- packages/f/fastgltf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fastgltf/xmake.lua b/packages/f/fastgltf/xmake.lua index a07b4569b..1871ced2d 100644 --- a/packages/f/fastgltf/xmake.lua +++ b/packages/f/fastgltf/xmake.lua @@ -6,6 +6,7 @@ package("fastgltf") add_urls("https://github.com/spnda/fastgltf/archive/refs/tags/$(version).tar.gz", "https://github.com/spnda/fastgltf.git") + add_versions("v0.8.0", "0bc88a0858c88d94306443946a5a1606118b7d5e4960f1e6186a3632e9df38fb") add_versions("v0.7.2", "292fc9d0d5a6726c90db88c1aadf09e6d152ffc0ebffe6fb968736c47288511c") add_versions("v0.7.1", "44bcb025dd5cd480236a3bc7a3f8c9a708a801ed773b7859677440d22e0e1e7c") From 548f09ac9b951206fc0ec163a80f2e2b7880b3ae Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 Jul 2024 09:58:06 +0800 Subject: [PATCH 488/671] Update atomic_queue to v1.6.4 (#4786) --- packages/a/atomic_queue/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/atomic_queue/xmake.lua b/packages/a/atomic_queue/xmake.lua index 10073c886..8dab90a90 100644 --- a/packages/a/atomic_queue/xmake.lua +++ b/packages/a/atomic_queue/xmake.lua @@ -6,6 +6,7 @@ package("atomic_queue") add_urls("https://github.com/max0x7ba/atomic_queue/archive/refs/tags/$(version).tar.gz", "https://github.com/max0x7ba/atomic_queue.git") + add_versions("v1.6.4", "e9c3ae4b850dc6503ee484748701f06f3737ad177c5cb31030f74e3fef40e282") add_versions("v1.5", "599b76a0222e7b54118d6f0fb686845c9d323107f2de76b3f68292b057e5a99f") add_versions("v1.6.3", "0ad6e0203d90367f6a4e496449dfd9ad65b80168fadafef4eac08820c6bda79c") From 8f07dc75ee3a09c6095599465e20a60d7ec102a3 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 Jul 2024 10:30:50 +0800 Subject: [PATCH 489/671] Update glaze to v3.1.7 (#4790) --- packages/g/glaze/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/glaze/xmake.lua b/packages/g/glaze/xmake.lua index b9d282ce7..d8b45a77a 100644 --- a/packages/g/glaze/xmake.lua +++ b/packages/g/glaze/xmake.lua @@ -7,6 +7,7 @@ package("glaze") add_urls("https://github.com/stephenberry/glaze/archive/refs/tags/$(version).tar.gz", "https://github.com/stephenberry/glaze.git") + add_versions("v3.1.7", "388483bb3dfa1fe25c1dfec24f0afd1651e0303833cfa1b7f51020a2569e992a") add_versions("v2.9.5", "67fda0fb0cc701451c261bb1e0c94d63bafaaba13390527521e02a034eff085e") add_versions("v2.7.0", "8e3ee2ba725137cd4f61bc9ceb74e2225dc22b970da1c5a43d2a6833115adbfc") add_versions("v2.6.4", "79aff3370c6fe79be8e1774c4fab3e450a10444b91c2aa15aeebf5f54efedc5d") From dd45104700625e80e4261d160ad7ba86dfbf6cfe Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:21:24 +0800 Subject: [PATCH 490/671] update embree (#4792) --- packages/e/embree/xmake.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/e/embree/xmake.lua b/packages/e/embree/xmake.lua index 8c8967d6d..e6036fe48 100644 --- a/packages/e/embree/xmake.lua +++ b/packages/e/embree/xmake.lua @@ -4,14 +4,15 @@ package("embree") set_description("Intel® Embree is a collection of high-performance ray tracing kernels, developed at Intel.") set_license("Apache-2.0") - add_urls("https://github.com/embree/embree/archive/$(version).tar.gz", - "https://github.com/embree/embree.git") + add_urls("https://github.com/RenderKit/embree/archive/refs/tags/$(version).tar.gz", + "https://github.com/RenderKit/embree.git") add_versions("v3.12.1", "0c9e760b06e178197dd29c9a54f08ff7b184b0487b5ba8b8be058e219e23336e") add_versions("v3.13.0", "4d86a69508a7e2eb8710d571096ad024b5174834b84454a8020d3a910af46f4f") add_versions("v3.13.3", "74ec785afb8f14d28ea5e0773544572c8df2e899caccdfc88509f1bfff58716f") add_versions("v3.13.4", "e6a8d1d4742f60ae4d936702dd377bc4577a3b034e2909adb2197d0648b1cb35") add_versions("v3.13.5", "b8c22d275d9128741265537c559d0ea73074adbf2f2b66b0a766ca52c52d665b") add_versions("v4.3.0", "baf0a57a45837fc055ba828a139467bce0bc0c6a9a5f2dccb05163d012c12308") + add_versions("v4.3.3", "baf0a57a45837fc055ba828a139467bce0bc0c6a9a5f2dccb05163d012c12308") -- Not recommanded to build embree as a static library. add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"}) @@ -30,7 +31,7 @@ package("embree") table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DEMBREE_STATIC_LIB=" .. (package:config("shared") and "OFF" or "ON")) if package:is_plat("windows") then - table.insert(configs, "-DUSE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + table.insert(configs, "-DUSE_STATIC_RUNTIME=" .. (package:has_runtime("MT", "MTd") and "ON" or "OFF")) end if package:is_plat("macosx") and package:is_arch("x86_64") and not package:config("shared") then table.insert(configs, "-DEMBREE_MAX_ISA=DEFAULT") From 1894ddef3537d2405c9c1075d8e798b65f654101 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 31 Jul 2024 10:24:33 +0800 Subject: [PATCH 491/671] Update libwfkafka to v0.11.5 (#4798) --- packages/l/libwfkafka/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libwfkafka/xmake.lua b/packages/l/libwfkafka/xmake.lua index 5378403c8..9580edea1 100644 --- a/packages/l/libwfkafka/xmake.lua +++ b/packages/l/libwfkafka/xmake.lua @@ -6,6 +6,7 @@ package("libwfkafka") add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz", "https://github.com/sogou/workflow.git") + add_versions("v0.11.5", "e37ba93c59da1fbeadb4f1ca413e6d26a3d8979aa00a806c0129f84e92b7925a") add_versions("v0.10.6", "5701ef31518a7927e61b26cd6cc1d699cb43393bf1ffc77fa61e73e64d2dd28e") add_versions("v0.10.7", "aa9806983f32174597549db4a129e2ee8a3d1f005923fcbb924906bc70c0e123") add_versions("v0.10.8", "bb5654e8011822d4251a7a433cbe4c5ecfd2c65c8f997a8196685742d24bcaf0") From 974c349ff759ade7148ced2cea1345ae9e447cac Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 31 Jul 2024 11:08:46 +0800 Subject: [PATCH 492/671] Update c-blosc2 to v2.15.1 (#4799) --- packages/c/c-blosc2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-blosc2/xmake.lua b/packages/c/c-blosc2/xmake.lua index 6269d198c..8311df933 100644 --- a/packages/c/c-blosc2/xmake.lua +++ b/packages/c/c-blosc2/xmake.lua @@ -6,6 +6,7 @@ package("c-blosc2") add_urls("https://github.com/Blosc/c-blosc2/archive/refs/tags/$(version).tar.gz", "https://github.com/Blosc/c-blosc2.git") + add_versions("v2.15.1", "6cf32fcfc615542b9ba35e021635c8ab9fd3d328fd99d5bf04b7eebc80f1fae2") add_versions("v2.15.0", "1e7d9d099963ad0123ddd76b2b715b5aa1ea4b95c491d3a11508e487ebab7307") add_versions("v2.14.4", "b5533c79aacc9ac152c80760ed1295a6608938780c3e1eecd7e53ea72ad986b0") add_versions("v2.14.3", "2b94c2014ba455e8136e16bf0738ec64c246fcc1a77122d824257caf64aaf441") From 95d157c6a1741878f42ea02b4be0e36bfcc6d159 Mon Sep 17 00:00:00 2001 From: Latias94 Date: Wed, 31 Jul 2024 13:20:24 +0800 Subject: [PATCH 493/671] update imgui to v1.91.0 (#4800) --- packages/i/imgui/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 14c371a33..11cdac0d9 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -6,6 +6,7 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/ocornut/imgui.git", {alias = "git"}) + add_versions("v1.91.0", "6e62c87252e6b3725ba478a1c04dc604aa0aaeec78fedcf4011f1e52548f4cc9") add_versions("v1.90.9", "04943919721e874ac75a2f45e6eb6c0224395034667bf508923388afda5a50bf") add_versions("v1.90.8", "f606b4fb406aa0f8dad36d4a9dd3d6f0fd39f5f0693e7468abc02d545fb505ae") add_versions("v1.90.7", "872574217643d4ad7e9e6df420bb8d9e0d468fb90641c2bf50fd61745e05de99") From d8d3f600915822b16bb7c5b9ffc44d1d76b9b828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 31 Jul 2024 09:49:06 +0200 Subject: [PATCH 494/671] imgui: Add v1.91.0-docking (#4801) --- packages/i/imgui/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/i/imgui/xmake.lua b/packages/i/imgui/xmake.lua index 11cdac0d9..2dee442ec 100644 --- a/packages/i/imgui/xmake.lua +++ b/packages/i/imgui/xmake.lua @@ -6,6 +6,7 @@ package("imgui") add_urls("https://github.com/ocornut/imgui/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/ocornut/imgui.git", {alias = "git"}) + -- don't forget to add the docking versions as well add_versions("v1.91.0", "6e62c87252e6b3725ba478a1c04dc604aa0aaeec78fedcf4011f1e52548f4cc9") add_versions("v1.90.9", "04943919721e874ac75a2f45e6eb6c0224395034667bf508923388afda5a50bf") add_versions("v1.90.8", "f606b4fb406aa0f8dad36d4a9dd3d6f0fd39f5f0693e7468abc02d545fb505ae") @@ -41,6 +42,7 @@ package("imgui") add_versions("v1.76", "e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc") add_versions("v1.75", "1023227fae4cf9c8032f56afcaea8902e9bfaad6d9094d6e48fb8f3903c7b866") + add_versions("git:v1.91.0-docking", "v1.91.0-docking") add_versions("git:v1.90.9-docking", "v1.90.9-docking") add_versions("git:v1.90.8-docking", "v1.90.8-docking") add_versions("git:v1.90.7-docking", "v1.90.7-docking") From f8bae8b14d98c2d9f7c7ca367e76c25c9360cd93 Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:45:52 +0800 Subject: [PATCH 495/671] update libtorch (#4795) --- packages/l/libtorch/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libtorch/xmake.lua b/packages/l/libtorch/xmake.lua index e5a05dec1..888aaee72 100644 --- a/packages/l/libtorch/xmake.lua +++ b/packages/l/libtorch/xmake.lua @@ -16,6 +16,7 @@ package("libtorch") add_versions("v2.1.2", "a8e7c98cb95ff97bb30a728c6b2a1ce6bff946eb") add_versions("v2.2.2", "39901f229520a5256505ec24782f716ee7ddc843") add_versions("v2.3.1", "63d5e9221bedd1546b7d364b5ce4171547db12a9") + add_versions("v2.4.0", "d990dada86a8ad94882b5c23e859b88c0c255bda") add_patches("1.9.x", "patches/1.9.0/gcc11.patch", "4191bb3296f18f040c230d7c5364fb160871962d6278e4ae0f8bc481f27d8e4b") add_patches("1.11.0", "patches/1.11.0/gcc11.patch", "1404b0bc6ce7433ecdc59d3412e3d9ed507bb5fd2cd59134a254d7d4a8d73012") From b507b7a077578e551f5d78f0c5af1b052c4b223c Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Wed, 31 Jul 2024 21:46:56 +0800 Subject: [PATCH 496/671] relax conditions on building artifacts (#4802) --- scripts/build_artifacts.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/build_artifacts.lua b/scripts/build_artifacts.lua index c2b01949d..da8e5980c 100644 --- a/scripts/build_artifacts.lua +++ b/scripts/build_artifacts.lua @@ -14,6 +14,10 @@ function _load_package(packagename, packagedir, packagefile) end end +function _need_artifact(instance) + return (not instance:is_headeronly()) and (packages_util.is_supported(instance, "windows", "x64") or packages_util.is_supported(instance, "windows", "x86")) +end + function _build_artifacts(name, versions) local buildinfo = {name = name, versions = versions} print(buildinfo) @@ -60,8 +64,7 @@ function _get_latest_modified_packages() local packagename = path.filename(packagedir) if #path.filename(path.directory(packagedir)) == 1 then local instance = _load_package(packagename, packagedir, file) - if instance and packages_util.is_supported(instance, "windows") - and (instance.is_headeronly and not instance:is_headeronly()) then + if instance and _need_artifact(instance) then table.insert(instances, instance) print(" > %s", instance:name()) end @@ -86,8 +89,7 @@ function _get_all_packages() local basefile = path.join(basedir, "xmake.lua") instance._BASE = _load_package(basename, basedir, basefile) end - if instance and packages_util.is_supported(instance, "windows") - and (instance.is_headeronly and not instance:is_headeronly()) then + if instance and _need_artifact(instance) then table.insert(packages, instance) end end @@ -128,8 +130,7 @@ function _get_packagerefs_in_latest_24h() local packagename = path.filename(packagedir) if #path.filename(path.directory(packagedir)) == 1 then local instance = _load_package(packagename, packagedir, file) - if instance and packages_util.is_supported(instance, "windows") - and (instance.is_headeronly and not instance:is_headeronly()) then + if instance and _need_artifact(instance) then table.insert(instances, instance) end end From 59a56a1714060027607e98a26a87d1a4e070d31a Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 31 Jul 2024 21:47:30 +0800 Subject: [PATCH 497/671] glfw: support some platform (#4803) * glfw: support some platform * limit plat --- packages/g/glfw/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/g/glfw/xmake.lua b/packages/g/glfw/xmake.lua index 839c2d7f8..789c7cce7 100644 --- a/packages/g/glfw/xmake.lua +++ b/packages/g/glfw/xmake.lua @@ -48,9 +48,9 @@ package("glfw") end end) - on_install("macosx", "windows", "linux", "mingw", function (package) + on_install("!wasm and !iphoneos", function (package) local configs = {"-DGLFW_BUILD_DOCS=OFF", "-DGLFW_BUILD_TESTS=OFF", "-DGLFW_BUILD_EXAMPLES=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=" .. (package:config("vs_runtime"):startswith("MT") and "OFF" or "ON")) From 041296227f777017fb2897e6dfe5e80869fce984 Mon Sep 17 00:00:00 2001 From: Arnav Mehta <77837038+ArnavMehta3000@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:47:59 +0100 Subject: [PATCH 498/671] Add macosx platform support to directxmath (#4791) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add macosx platform support to directxmath * Update xmake.lua * limit arch --------- Co-authored-by: Jérôme Leclercq Co-authored-by: star9029 --- packages/d/directxmath/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/d/directxmath/xmake.lua b/packages/d/directxmath/xmake.lua index a21ef7c42..a5e3b0ead 100644 --- a/packages/d/directxmath/xmake.lua +++ b/packages/d/directxmath/xmake.lua @@ -14,15 +14,15 @@ package("directxmath") add_versions("2022.12", "2ed0ae7d7fe5d11ad11f6d3d9b31ce686024a551cf82ade723de86aa7b4b57e1") add_versions("2024.02", "214d71420107249dfb4bbc37a573f288b0951cc9ffe323dbf662101f3df4d766") - if is_plat("linux") then + if is_plat("linux", "macosx") then add_resources(">=2022.12", "headers", "https://raw.githubusercontent.com/dotnet/runtime/2201016c1e13bdb9abf49e2e38cadf4ee0568df2/src/coreclr/pal/inc/rt/sal.h", "7dae281adc3a09a691291fb90526f05e4f9ef8b16d7f33d716ba690f7241a492") end add_deps("cmake") add_includedirs("include/directxmath") - on_install("windows", "mingw", "linux", function (package) - if package:is_plat("linux") then + on_install("windows", "mingw|x86_64", "linux", "macosx", function (package) + if package:is_plat("linux", "macosx") then os.cp("../resources/headers/sal.h", package:installdir("include", "directxmath")) end import("package.tools.cmake").install(package, {"-DBUILD_TESTING=OFF"}) From 7a8cf2547161b19f620a0e7513220ba30759633c Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 31 Jul 2024 21:48:59 +0800 Subject: [PATCH 499/671] liba52: add package (#4784) * liba52: add package * improve autotools * fix autotools run * fix again * try again * fix macosx build * disable configs for unsupported plat * try to fix mingw@macosx * use vc++ config.h * limit plat --- packages/l/liba52/port/xmake.lua | 62 ++++++++++++++++++++++++++++++++ packages/l/liba52/xmake.lua | 55 ++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 packages/l/liba52/port/xmake.lua create mode 100644 packages/l/liba52/xmake.lua diff --git a/packages/l/liba52/port/xmake.lua b/packages/l/liba52/port/xmake.lua new file mode 100644 index 000000000..72810dcb6 --- /dev/null +++ b/packages/l/liba52/port/xmake.lua @@ -0,0 +1,62 @@ +option("tools", {default = false}) + +add_rules("mode.debug", "mode.release") + +add_includedirs("include") +if is_plat("windows", "mingw") or is_host("windows") then + add_includedirs("vc++") +end + +if is_plat("windows") and has_config("tools") then + add_requires("strings_h") +end + +if is_plat("macosx") or (is_host("macosx") and is_plat("mingw")) then + -- Fixes duplicate symbols + set_languages("gnu89") +end + +rule("tools") + on_load(function (target) + if not get_config("tools") then + target:set("enabled", false) + return + end + + target:add("kind", "binary") + target:add("files", "src/getopt.c") + target:add("includedirs", "src") + target:add("deps", "a52") + if target:is_plat("windows") then + target:add("packages", "strings_h") + end + end) + +target("a52") + set_kind("$(kind)") + add_files("liba52/*.c", "libao/*.c") + add_headerfiles( + "include/a52.h", + "include/attributes.h", + "include/audio_out.h", + "include/mm_accel.h", + "liba52/a52_internal.h", {prefixdir = "a52dec"} + ) + + if is_plat("windows", "mingw") then + add_syslinks("winmm") + elseif is_plat("linux", "bsd") then + add_syslinks("m") + end + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + +target("a52dec") + add_rules("tools") + add_files("src/a52dec.c", "src/gettimeofday.c") + +target("extract_a52") + add_rules("tools") + add_files("src/extract_a52.c") diff --git a/packages/l/liba52/xmake.lua b/packages/l/liba52/xmake.lua new file mode 100644 index 000000000..0c86eed01 --- /dev/null +++ b/packages/l/liba52/xmake.lua @@ -0,0 +1,55 @@ +package("liba52") + set_homepage("https://liba52.sourceforge.io") + set_description("Library for decoding ATSC A/52 (AC-3) audio streams") + set_license("GPL-2.0-or-later") + + add_urls("https://git.adelielinux.org/community/a52dec/-/archive/$(version)/a52dec-$(version).tar.bz2", + "https://git.adelielinux.org/community/a52dec.git", + "https://code.videolan.org/videolan/liba52.git", + "https://github.com/Distrotech/a52dec.git") + + add_versions("v0.8.0", "d4f26685d32a8c85f86a5cb800554160fb85400298a0a27151c3d1e63a170943") + + add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) + + if is_plat("mingw") and is_subhost("msys") then + add_extsources("pacman::a52dec") + elseif is_plat("linux") then + add_extsources("pacman::a52dec", "apt::liba52-dev") + elseif is_plat("macosx") then + add_extsources("brew::a52dec") + end + + if is_plat("windows", "mingw") then + add_syslinks("winmm") + elseif is_plat("linux", "bsd") then + add_syslinks("m") + end + + if not is_host("windows") then + add_deps("autoconf", "automake", "libtool", "m4") + end + + on_load("windows", function (package) + if package:config("tools") then + package:add("deps", "strings_h", {private = true}) + end + end) + + on_install("!iphoneos and (!android or android@!windows)", function (package) + if not is_host("windows")then + -- Generate config.h by autotools + local configs = {} + if package:is_plat("android", "bsd", "wasm") then + table.insert(configs, "--disable-oss") + table.insert(configs, "--disable-djbfft") + end + import("package.tools.autoconf").configure(package, configs) + end + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package, {tools = package:config("tools")}) + end) + + on_test(function (package) + assert(package:has_cfuncs("a52_init", {includes = {"inttypes.h", "a52dec/a52.h"}})) + end) From 07edd5339e2acb0a0a0830eeb0fd933060c118d1 Mon Sep 17 00:00:00 2001 From: zjyhjqs <141055431+zjyhjqs@users.noreply.github.com> Date: Wed, 31 Jul 2024 21:49:39 +0800 Subject: [PATCH 500/671] add options for xerces-c (#4702) * use `on_check` to limit the API requirements on `android|armeabi-v7a` * add `transcoder` option for `xerces-c` * add `xmlch_type` option for `xerces-c` * add `mutex_manager` option for `xerces-c` * add `message_loader` option for `xerces-c` * add `network_accessor` option for `xerces-c` * format --- packages/x/xerces-c/xmake.lua | 122 ++++++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 12 deletions(-) diff --git a/packages/x/xerces-c/xmake.lua b/packages/x/xerces-c/xmake.lua index 353a3bdd7..1a5575095 100644 --- a/packages/x/xerces-c/xmake.lua +++ b/packages/x/xerces-c/xmake.lua @@ -8,33 +8,131 @@ package("xerces-c") add_versions("3.2.5", "4aa0f7ed265a45d253f900fa145cc8cae10414d085695f1de03a2ec141a3358b") add_versions("3.2.4", "563a668b331ca5d1fc08ed52e5f62a13508b47557f88a068ad1db6f68e1f2eb2") + add_configs("xmlch_type", {description = "XMLCh type (UTF-16 character type)", default = "char16_t", type = "string", values = {"char16_t", "uint16_t", "wchar_t"}}) + add_configs("mutex_manager", {description = "Thread support", default = "standard", type = "string", values = {"standard", "posix", "windows", "nothreads"}}) + local is_system_transcoder_supported = is_plat("linux", "windows", "mingw", "macosx") + add_configs("transcoder", {description = "Transcoder (used to convert between internal UTF-16 and other encodings)", default = is_system_transcoder_supported and "system_transcoder" or "iconv", type = "string", values = {"system_transcoder", "iconv", "icu"}}) + add_configs("message_loader", {description = "Message Loader (used to access diagnostics messages)", default = "inmemory", type = "string", values = {"inmemory", "icu", "iconv"}}) + add_configs("network_accessor", {description = "Net Accessor (used to access network resources)", default = "off", type = "string", values = {"off", "curl", "sockets", "cfurl", "winsock"}}) + add_deps("cmake") - if is_plat("windows") then - add_syslinks("advapi32") - elseif is_plat("macosx") then - add_frameworks("CoreFoundation", "CoreServices") - elseif is_plat("android") then + if is_plat("android") then -- for NDK version less than 26 add_patches(">=3.2.4", path.join(os.scriptdir(), "patches", "patch-android.diff"), "f58fa2c89e1d4a17d5af193df3e3e5918986b71beb6ce055e9edd1546c20318a") end + on_check("android|armeabi-v7a", function (package) + import("core.tool.toolchain") + local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 26, "package(xerces-c): need ndk api level >= 26 for android armeabi-v7a") + end) + + on_check(function (package) + if package:config("xmlch_type") == "wchar_t" then + assert(package:is_plat("windows"), "Windows only") + end + if package:config("mutex_manager") == "windows" then + assert(package:is_plat("windows"), "Windows only") + elseif package:config("mutex_manager") == "posix" then + assert((not package:is_plat("windows")) or package:is_plat("cygwin"), "UNIX and Cygwin only") + end + end) + + on_load(function (package) + if package:config("transcoder") == "system_transcoder" then + if package:is_plat("linux") then + package:add("deps", "libiconv", {system = true}) + elseif package:is_plat("windows", "mingw") then + add_syslinks("advapi32") + elseif package:is_plat("macosx") then + add_frameworks("CoreFoundation", "CoreServices") + else + raise("`system_transcoder` only support GNU iconv library, macOS APIs and Windows APIs!") + end + elseif package:config("transcoder") == "iconv" then + package:add("deps", "libiconv", {system = false}) + elseif package:config("transcoder") == "icu" then + package:add("deps", "icu4c") + end + + if package:config("message_loader") == "iconv" then + package:add("deps", "libiconv") + elseif package:config("message_loader") == "icu" then + package:add("deps", "icu4c") + end + + if package:config("network_accessor") == "curl" then + assert(not package:is_plat("windows"), "UNIX only") + package:add("deps", "libcurl") + elseif package:config("network_accessor") == "sockets" then + assert(not package:is_plat("windows"), "UNIX only") + elseif package:config("network_accessor") == "cfurl" then + assert(package:is_plat("macosx"), "macOS only") + add_frameworks("CoreServices") + elseif package:config("network_accessor") == "winsock" then + assert(package:is_plat("windows", "cygwin", "mingw"), "Windows, Cygwin, MingGW only") + add_syslinks("advapi32") + end + end) + on_install("windows", "macosx", "linux", "android", function (package) - if package:is_plat("android") and package:is_arch("armeabi-v7a") then - import("core.tool.toolchain") - local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) - local ndk_sdkver = ndk:config("ndk_sdkver") - assert(ndk_sdkver and tonumber(ndk_sdkver) >= 26, "package(xerces-c): need ndk api level >= 26 for android armeabi-v7a") + local configs = { + "-Dxmlch-type=" .. package:config("xmlch_type"), + "-Dmutex-manager=" .. package:config("mutex_manager"), + "-Dmessage-loader=" .. package:config("message_loader") + } + if package:config("mutex_manager") == "nothreads" then + table.insert(configs, "-Dthreads:BOOL=OFF") + end + + if package:config("transcoder") == "system_transcoder" then + if package:is_plat("linux") then + table.insert(configs, "-Dtranscoder=gnuiconv") + elseif package:is_plat("windows", "mingw") then + table.insert(configs, "-Dtranscoder=windows") + elseif package:is_plat("macosx") then + table.insert(configs, "-Dtranscoder=macosunicodeconverter") + end + elseif package:config("transcoder") == "iconv" then + table.insert(configs, "-Dtranscoder=iconv") + elseif package:config("transcoder") == "icu" then + table.insert(configs, "-Dtranscoder=icu") + end + + if package:config("network_accessor") == "off" then + table.insert(configs, "-Dnetwork:BOOL=OFF") + else + table.insert(configs, "-Dnetwork-accessor=" .. package:config("network_accessor")) + end + + local packagedeps = {} + if package:config("transcoder") == "iconv" or package:config("message_loader") == "iconv" then + table.insert(packagedeps, "libiconv") + end + if package:config("transcoder") == "icu" or package:config("message_loader") == "icu" then + table.insert(packagedeps, "icu4c") + io.replace( + "cmake/FindICU.cmake", + "add_library(${_ICU_imported_target} UNKNOWN IMPORTED)", + [[ + add_library(${_ICU_imported_target} UNKNOWN IMPORTED) + target_compile_features(${_ICU_imported_target} INTERFACE cxx_std_17) + ]], + {plain = true}) + end + if package:config("network_accessor") == "curl" then + table.insert(packagedeps, "libcurl") end - local configs = {"-Dnetwork=OFF", "-DCMAKE_DISABLE_FIND_PACKAGE_ICU=ON", "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:config("pic") ~= false then table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") end - import("package.tools.cmake").install(package, configs) + import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps}) end) on_test(function (package) From 8c27be5beb47b69610f892b9984077e0cd6476fd Mon Sep 17 00:00:00 2001 From: HapiFive <1143910315@qq.com> Date: Wed, 31 Jul 2024 23:50:30 +0800 Subject: [PATCH 501/671] usockets: support openssl3 (#4804) --- packages/u/usockets/port/xmake.lua | 2 +- packages/u/usockets/xmake.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/u/usockets/port/xmake.lua b/packages/u/usockets/port/xmake.lua index 468c127e6..1005395d7 100644 --- a/packages/u/usockets/port/xmake.lua +++ b/packages/u/usockets/port/xmake.lua @@ -9,7 +9,7 @@ local ssl = get_config("ssl") if ssl then add_requires(ssl) add_packages(ssl) - if ssl == "openssl" or ssl == "boringssl" then + if ssl == "openssl" or ssl == "openssl3" or ssl == "boringssl" then add_defines("LIBUS_USE_OPENSSL") elseif ssl == "wolfssl" then add_defines("LIBUS_USE_WOLFSSL") diff --git a/packages/u/usockets/xmake.lua b/packages/u/usockets/xmake.lua index b3cb3845f..e5e20a39b 100644 --- a/packages/u/usockets/xmake.lua +++ b/packages/u/usockets/xmake.lua @@ -8,7 +8,7 @@ package("usockets") add_versions("v0.8.8", "d14d2efe1df767dbebfb8d6f5b52aa952faf66b30c822fbe464debaa0c5c0b17") - add_configs("ssl", {description = "Select ssl library", default = nil, type = "string", values = {"openssl", "wolfssl", "boringssl"}}) + add_configs("ssl", {description = "Select ssl library", default = nil, type = "string", values = {"openssl", "openssl3", "wolfssl", "boringssl"}}) add_configs("uv", {description = "Enable libuv", default = false, type = "boolean"}) add_configs("uring", {description = "Enable liburing", default = false, type = "boolean"}) add_configs("quic", {description = "Enable lsquic", default = false, type = "boolean"}) @@ -17,7 +17,7 @@ package("usockets") local ssl = package:config("ssl") if ssl then package:add("deps", ssl) - if ssl == "openssl" or ssl == "boringssl" then + if ssl == "openssl" or ssl == "openssl3" or ssl == "boringssl" then package:add("defines", "LIBUS_USE_OPENSSL") elseif ssl == "wolfssl" then package:add("defines", "LIBUS_USE_WOLFSSL") From 68c1115429703cd3193bc61f47bac8ee417c3de1 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Aug 2024 10:37:57 +0800 Subject: [PATCH 502/671] Update croaring to v4.1.1 (#4813) --- packages/c/croaring/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/croaring/xmake.lua b/packages/c/croaring/xmake.lua index 61221220c..775e3a026 100644 --- a/packages/c/croaring/xmake.lua +++ b/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.1.1", "42804cc2bb5c9279ec4fcaa56d2d6b389da934634abcce8dbc4e4c1d60e1468d") add_versions("v4.1.0", "0596c6e22bcccb56f38260142b435f1f72aef7721fa370fd9f2b88380245fc1d") add_versions("v4.0.0", "a8b98db3800cd10979561a1388e4e970886a24015bd6cfabb08ba7917f541b0d") add_versions("v3.0.1", "a1cac9489b1c806c5594073e5db36475e247604282a47b650f4166c185ab061f") From 9329834159f559e46a2db614f0d2aed1ad3460fc Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Aug 2024 10:38:00 +0800 Subject: [PATCH 503/671] Update actor-framework to 1.0.1 (#4812) --- packages/a/actor-framework/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/actor-framework/xmake.lua b/packages/a/actor-framework/xmake.lua index 9579d30c2..66848565f 100644 --- a/packages/a/actor-framework/xmake.lua +++ b/packages/a/actor-framework/xmake.lua @@ -6,6 +6,7 @@ package("actor-framework") add_urls("https://github.com/actor-framework/actor-framework/archive/refs/tags/$(version).tar.gz", "https://github.com/actor-framework/actor-framework.git") + add_versions("1.0.1", "635bdd6e3b70886f1d9aa75c48e5bdb4084afae1f159bbfe5ea91f99b0460f6b") add_versions("1.0.0", "602018239d23a1805d35ebda704fd5c969a0693fc513fcf7459063b628459e5b") add_versions("0.19.6", "48dc4c4abf5ab5a7c6f84b9259cc8be1b02c601d31893647ab44e143cdc4b6d5") add_versions("0.19.2", "aa3fcc494424e0e20b177125458a6a6ed39c751a3d3d5193054e88bdf8a146d2") From fa73dd4724e8d322ac07bf8bb5e71d6d58a5e0f0 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Aug 2024 10:38:03 +0800 Subject: [PATCH 504/671] Update onednn to v3.5.2 (#4811) --- packages/o/onednn/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onednn/xmake.lua b/packages/o/onednn/xmake.lua index a530db459..edd396ea2 100644 --- a/packages/o/onednn/xmake.lua +++ b/packages/o/onednn/xmake.lua @@ -6,6 +6,7 @@ package("onednn") add_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/$(version).tar.gz", "https://github.com/oneapi-src/oneDNN.git") + add_versions("v3.5.2", "e6af4a8869c9a06fa0806ed8c93faa8f8a57118ba7a36a93b93a5c2285a3a49f") add_versions("v3.5.1", "f316368a0d8c5235d80704def93f0e8c28e08dfaa2231a3de558be0ae2b146e7") add_versions("v3.5", "8356aa9befde4d4ff93f1b016ac4310730b2de0cc0b8c6c7ce306690bc0d7b43") add_versions("v3.4.3", "b795dc07d0d83aaec531081e77d5fb2e503a143f4330eabe4f035d4117c191ae") From ecda6a10d4c76d16a1043e2ee0a2f6fde6700f07 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 1 Aug 2024 11:09:16 +0800 Subject: [PATCH 505/671] Update meson to 1.5.1 (#4814) --- packages/m/meson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/meson/xmake.lua b/packages/m/meson/xmake.lua index 6ca3aef24..929067b04 100644 --- a/packages/m/meson/xmake.lua +++ b/packages/m/meson/xmake.lua @@ -6,6 +6,7 @@ package("meson") add_urls("https://github.com/mesonbuild/meson/releases/download/$(version)/meson-$(version).tar.gz", "https://github.com/mesonbuild/meson.git") + add_versions("1.5.1", "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed") add_versions("1.4.2", "ea2546a26f4a171a741c1fd036f22c9c804d6198e3259f1df588e01f842dd69f") add_versions("1.4.1", "1b8aad738a5f6ae64294cc8eaba9a82988c1c420204484ac02ef782e5bba5f49") add_versions("1.4.0", "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d") From 2ffa8e2df9508a7ea974d685ccd4703bd5b6bdc5 Mon Sep 17 00:00:00 2001 From: Conscat Date: Thu, 1 Aug 2024 00:26:03 -0500 Subject: [PATCH 506/671] Support Stringzilla 3.0 C++ bindings. (#4809) --- packages/s/stringzilla/xmake.lua | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/s/stringzilla/xmake.lua b/packages/s/stringzilla/xmake.lua index 28476e802..fb029581c 100644 --- a/packages/s/stringzilla/xmake.lua +++ b/packages/s/stringzilla/xmake.lua @@ -40,6 +40,13 @@ package("stringzilla") add_versions("v1.2.2", "2e17c49965841647a1c371247f53b2f576e5fb32fe4b84a080d425b12f17703c") on_install("android|!armeabi-v7a or !android",function (package) + if package:version():gt("3.0.0") then + os.cp("include/stringzilla/experimental.h", package:installdir("include/stringzilla")) + if package:config("cpp") then + os.cp("include/stringzilla/stringzilla.hpp", package:installdir("include/stringzilla")) + end + end + if package:version():gt("2.0.4") then os.cp("include/stringzilla/stringzilla.h", package:installdir("include")) else @@ -48,7 +55,18 @@ package("stringzilla") end) on_test(function (package) - if package:version():gt("2.0.0") then + if package:version():gt("3.0.0") then + if package:config("cpp") then + assert(package:check_cxxsnippets({test = [[ + #include + static void test() { + ashvardanian::stringzilla::string s = "hello"; + assert(s == "hello"); + } + ]]}, {configs = {languages = "c++11"}, includes = "stringzilla/stringzilla.hpp"})) + assert(package:has_cfuncs("sz_sort", {includes = "stringzilla/stringzilla.h"})) + end + elseif package:version():gt("2.0.0") then assert(package:has_cfuncs("sz_sort", {includes = "stringzilla.h"})) else assert(package:has_cxxfuncs("strzl_sort", {includes = "stringzilla.h", configs = {languages = "c++17"}})) From 8e7b009c5105cafc7d7e698fed02c70ec8706946 Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:16:30 +0100 Subject: [PATCH 507/671] fmtlog: set fmt version to 10 (#4808) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fmtlog: set fmt version to 10.2.1 * fmtlog: use `fmt 10` * fmtlog: >=10 * fmtlog: 10 * fmtlog: use version range for fmt * Update xmake.lua * Update xmake.lua --------- Co-authored-by: Jérôme Leclercq --- packages/f/fmtlog/xmake.lua | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/packages/f/fmtlog/xmake.lua b/packages/f/fmtlog/xmake.lua index 93d329362..6cfb53257 100644 --- a/packages/f/fmtlog/xmake.lua +++ b/packages/f/fmtlog/xmake.lua @@ -5,14 +5,39 @@ package("fmtlog") add_urls("https://github.com/MengRao/fmtlog/archive/refs/tags/$(version).tar.gz", "https://github.com/MengRao/fmtlog.git") + add_versions("v2.2.2", "31e8341093e45fc999dbeeecfe9cdc118cc8f1e64a184cc3f194f5701d5eaec9") add_versions("v2.2.1", "9bc2f1ea37eece0f4807689962b529d2d4fa07654baef184f051319b4eac9304") add_versions("v2.1.2", "d286184e04c3c3286417873dd2feac524c53babc6cd60f10179aa5b10416ead7") - add_deps("cmake", "fmt") + add_deps("cmake") if is_plat("linux") then add_syslinks("pthread") end + on_load(function (package) + local fmtver = "" + local packagever = package:version() + if packagever then + local version_mapping = { + {pkgver = "2.2.2", fmtver = " 10.2.1"}, + {pkgver = "2.2.1", fmtver = " 9.1.0"}, + {pkgver = "2.1.2", fmtver = " 8.1.0"} + } + -- find lowest matching version (or exact match) + for _, ver in ipairs(version_mapping) do + if packagever:lt(ver.pkgver) then + fmtver = ver.fmtver + else + if packagever:eq(ver.pkgver) then + fmtver = ver.fmtver + end + break + end + end + end + package:add("deps", "fmt" .. fmtver) + end) + on_install("linux", "macosx", "windows|!arm64", function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) From dd88c6288d7117ffd8693dc79ce9ad28b39cfbf1 Mon Sep 17 00:00:00 2001 From: Denis <43519306+urasssopretty@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:17:00 +0300 Subject: [PATCH 508/671] fixed xmake warning for GLFW package (#4807) * fixed xmake warning for GLFW package warning: please use package:runtimes() or package:has_runtime() instead of package:config("vs_runtime") * Update xmake.lua --------- Co-authored-by: ruki --- packages/g/glfw/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/g/glfw/xmake.lua b/packages/g/glfw/xmake.lua index 789c7cce7..9a5efd7df 100644 --- a/packages/g/glfw/xmake.lua +++ b/packages/g/glfw/xmake.lua @@ -53,7 +53,7 @@ package("glfw") table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then - table.insert(configs, "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=" .. (package:config("vs_runtime"):startswith("MT") and "OFF" or "ON")) + table.insert(configs, "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=" .. (package:has_runtime("MT") and "OFF" or "ON")) end table.insert(configs, "-DGLFW_BUILD_X11=" .. (package:config("x11") and "ON" or "OFF")) table.insert(configs, "-DGLFW_BUILD_WAYLAND=" .. (package:config("wayland") and "ON" or "OFF")) From fe429cdbf36817a0b17598d720ea4809093fd93d Mon Sep 17 00:00:00 2001 From: jj683 <87266000+jj683@users.noreply.github.com> Date: Thu, 1 Aug 2024 17:50:23 +0200 Subject: [PATCH 509/671] Add missed headeronly option for rapidcsv (#4816) --- packages/r/rapidcsv/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rapidcsv/xmake.lua b/packages/r/rapidcsv/xmake.lua index 3faf23016..c2a170a89 100644 --- a/packages/r/rapidcsv/xmake.lua +++ b/packages/r/rapidcsv/xmake.lua @@ -1,5 +1,6 @@ package("rapidcsv") + set_kind("library", {headeronly = true}) set_homepage("https://github.com/d99kris/rapidcsv") set_description("C++ header-only library for CSV parsing (by d99kris)") From 59044d027ed76f1f85f02fe67eef6051fcc49725 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 2 Aug 2024 01:03:57 +0800 Subject: [PATCH 510/671] Auto-update fbgemm to v0.8.0 (#4810) * Update fbgemm to v0.8.0 * add patch * fix msvc v142 bug --------- Co-authored-by: star9029 --- .../f/fbgemm/patches/0.8.0/dep-unbundle.patch | 55 +++++++++++++++++++ .../f/fbgemm/patches/0.8.0/msvc-omp.patch | 12 ++++ packages/f/fbgemm/xmake.lua | 6 ++ 3 files changed, 73 insertions(+) create mode 100644 packages/f/fbgemm/patches/0.8.0/dep-unbundle.patch create mode 100644 packages/f/fbgemm/patches/0.8.0/msvc-omp.patch diff --git a/packages/f/fbgemm/patches/0.8.0/dep-unbundle.patch b/packages/f/fbgemm/patches/0.8.0/dep-unbundle.patch new file mode 100644 index 000000000..3e3f126a2 --- /dev/null +++ b/packages/f/fbgemm/patches/0.8.0/dep-unbundle.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35f0a967..bac7b4a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -246,7 +246,8 @@ message(WARNING "CMAKE_CXX_FLAGS_DEBUG is ${CMAKE_CXX_FLAGS_DEBUG}") + message(WARNING "CMAKE_CXX_FLAGS_RELEASE is ${CMAKE_CXX_FLAGS_RELEASE}") + message(WARNING "==========") + +-if(NOT TARGET asmjit) ++find_package(asmjit CONFIG REQUIRED) ++if(0) + # Download asmjit from github if ASMJIT_SRC_DIR is not specified. + if(NOT DEFINED ASMJIT_SRC_DIR) + set(ASMJIT_SRC_DIR "${FBGEMM_SOURCE_DIR}/third_party/asmjit" +@@ -279,7 +280,8 @@ if(NOT TARGET asmjit) + endif() + endif() + +-if(NOT TARGET cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++if(0) + #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. + if(NOT DEFINED CPUINFO_SOURCE_DIR) + set(CPUINFO_SOURCE_DIR "${FBGEMM_SOURCE_DIR}/third_party/cpuinfo" +@@ -363,12 +365,7 @@ target_include_directories(fbgemm BEFORE + PUBLIC $ + PUBLIC $) + +-target_link_libraries(fbgemm +- $ +- $) +-add_dependencies(fbgemm +- asmjit +- cpuinfo) ++target_link_libraries(fbgemm asmjit cpuinfo) + + if(OpenMP_FOUND) + target_link_libraries(fbgemm OpenMP::OpenMP_CXX) +@@ -392,12 +389,12 @@ install( + + if(MSVC) + if(FBGEMM_LIBRARY_TYPE STREQUAL "shared") +- install( +- FILES $ $ +- DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) ++ # install( ++ # FILES $ $ ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL) + endif() + install(TARGETS fbgemm DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ # install(TARGETS asmjit DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + #Make project importable from the build directory diff --git a/packages/f/fbgemm/patches/0.8.0/msvc-omp.patch b/packages/f/fbgemm/patches/0.8.0/msvc-omp.patch new file mode 100644 index 000000000..71e01bf60 --- /dev/null +++ b/packages/f/fbgemm/patches/0.8.0/msvc-omp.patch @@ -0,0 +1,12 @@ +diff --git a/src/Utils.cc b/src/Utils.cc +index bd970432..a3829247 100644 +--- a/src/Utils.cc ++++ b/src/Utils.cc +@@ -801,6 +801,7 @@ std::pair radix_sort_parallel( + std::swap(input_keys, output_keys); + std::swap(input_values, output_values); + #pragma omp barrier ++{} + } + } + #ifdef _MSC_VER diff --git a/packages/f/fbgemm/xmake.lua b/packages/f/fbgemm/xmake.lua index a22bc9b32..428124da7 100644 --- a/packages/f/fbgemm/xmake.lua +++ b/packages/f/fbgemm/xmake.lua @@ -6,10 +6,16 @@ package("fbgemm") add_urls("https://github.com/pytorch/FBGEMM/archive/refs/tags/$(version).tar.gz", "https://github.com/pytorch/FBGEMM.git") + add_versions("v0.8.0", "f754dbc6becf8ece0474872c4e797445b55c21799c1f1d219470c0c5818207dd") add_versions("v0.7.0", "c51ac26bc0aa8fef7e80631c4abdd3a7c33d1a097359cef9b008bf9e1203c071") + add_patches("0.8.0", "patches/0.8.0/dep-unbundle.patch", "505ccda3b12ec519cb0732352b223862b3470c207e03e84889b977cbdc1d9aae") add_patches("0.7.0", "patches/0.7.0/dep-unbundle.patch", "f3117ff728989146d5ab0c370fe410c73459091f65cae5f6b304e5637889fb8f") + if is_plat("windows") then + add_patches("0.8.0", "patches/0.8.0/msvc-omp.patch", "d4a7830e40a476ffdeda00d2f7901a7db6e7950392ff672144d5e9f3c37ced2f") + end + -- need libtorch add_configs("gpu", {description = "Build fbgemm_gpu library", default = false, type = "boolean"}) add_configs("cpu", {description = "Build FBGEMM_GPU without GPU support", default = false, type = "boolean"}) From da7a18e6190ffa633243de06414d2d8f9550093d Mon Sep 17 00:00:00 2001 From: Bruno Meneguello <1322552+bkmeneguello@users.noreply.github.com> Date: Thu, 1 Aug 2024 21:49:13 -0300 Subject: [PATCH 511/671] Add more versions to qt6lib and qt6base (#4817) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add more versions to qt6lib and qt6base * Update xmake.lua * Update xmake.lua --------- Co-authored-by: Jérôme Leclercq --- packages/q/qt6base/xmake.lua | 13 +++++++++++++ packages/q/qt6lib/xmake.lua | 13 +++++++++++++ packages/q/qtbase/xmake.lua | 27 +++++++++++++++++++-------- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/packages/q/qt6base/xmake.lua b/packages/q/qt6base/xmake.lua index 184daeefd..4612dae12 100644 --- a/packages/q/qt6base/xmake.lua +++ b/packages/q/qt6base/xmake.lua @@ -3,11 +3,24 @@ package("qt6base") set_base("qtbase") add_versions("6.3.0", "dummy") + add_versions("6.3.1", "dummy") + add_versions("6.3.2", "dummy") + add_versions("6.4.0", "dummy") + add_versions("6.4.1", "dummy") + add_versions("6.4.2", "dummy") + add_versions("6.4.3", "dummy") add_versions("6.5.0", "dummy") add_versions("6.5.1", "dummy") add_versions("6.5.2", "dummy") add_versions("6.5.3", "dummy") add_versions("6.6.0", "dummy") + add_versions("6.6.1", "dummy") + add_versions("6.6.2", "dummy") + add_versions("6.6.3", "dummy") + add_versions("6.7.0", "dummy") + add_versions("6.7.1", "dummy") + add_versions("6.7.2", "dummy") + add_versions("6.8.0", "dummy") on_install("windows|x64", "linux|x86_64", "macosx|x86_64", "mingw|x86_64", function (package) package:base():script("install")(package) diff --git a/packages/q/qt6lib/xmake.lua b/packages/q/qt6lib/xmake.lua index 18ba888d3..0c10724b3 100644 --- a/packages/q/qt6lib/xmake.lua +++ b/packages/q/qt6lib/xmake.lua @@ -8,11 +8,24 @@ package("qt6lib") add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true}) add_versions("6.3.0", "dummy") + add_versions("6.3.1", "dummy") + add_versions("6.3.2", "dummy") + add_versions("6.4.0", "dummy") + add_versions("6.4.1", "dummy") + add_versions("6.4.2", "dummy") + add_versions("6.4.3", "dummy") add_versions("6.5.0", "dummy") add_versions("6.5.1", "dummy") add_versions("6.5.2", "dummy") add_versions("6.5.3", "dummy") add_versions("6.6.0", "dummy") + add_versions("6.6.1", "dummy") + add_versions("6.6.2", "dummy") + add_versions("6.6.3", "dummy") + add_versions("6.7.0", "dummy") + add_versions("6.7.1", "dummy") + add_versions("6.7.2", "dummy") + add_versions("6.8.0", "dummy") on_load(function (package) package:add("deps", "qt6base", {debug = package:is_debug(), version = package:version_str()}) diff --git a/packages/q/qtbase/xmake.lua b/packages/q/qtbase/xmake.lua index 7e63910f2..809c6eb21 100644 --- a/packages/q/qtbase/xmake.lua +++ b/packages/q/qtbase/xmake.lua @@ -84,8 +84,10 @@ package("qtbase") local compiler_version if package:is_plat("windows") then - local vs = toolchain.load("msvc"):config("vs") - if tonumber(vs) >= 2019 or version:ge("6.0") then + local vs = package:toolchain("msvc"):config("vs") + if version:ge("6.8") then + compiler_version = "msvc2022" + elseif tonumber(vs) >= 2019 or version:ge("6.0") then compiler_version = "msvc2019" elseif vs == "2017" or vs == "2015" then compiler_version = "msvc" .. vs @@ -116,7 +118,11 @@ package("qtbase") end arch = "win" .. winarch .. "_" .. compiler_version elseif package:is_plat("linux") then - arch = "gcc_64" + if version:ge("6.7.0") then + arch = "linux_gcc_64" + else + arch = "gcc_64" + end elseif package:is_plat("macosx") then arch = "clang_64" elseif package:is_plat("android") then @@ -167,8 +173,10 @@ package("qtbase") end local compiler_version - local vs = toolchain.load("msvc"):config("vs") - if tonumber(vs) >= 2019 or version:ge("6.0") then + local vs = package:toolchain("msvc"):config("vs") + if version:ge("6.8") then + compiler_version = "msvc2022" + elseif tonumber(vs) >= 2019 or version:ge("6.0") then compiler_version = "msvc2019" elseif vs == "2017" or vs == "2015" then compiler_version = "msvc" .. vs @@ -183,14 +191,17 @@ package("qtbase") end hostarch = "win" .. winarch .. "_" .. compiler_version elseif is_host("linux") then - hostarch = "gcc_64" + if version:ge("6.7.0") then + arch = "linux_gcc_64" + else + arch = "gcc_64" + end elseif is_host("macosx") then hostarch = "clang_64" end -- download qtbase to bin_host folder - os.vrunv("aqt", {"install-qt", "-O", path.join(installdir, "bin_host"), - runhost, "desktop", versionstr, hostarch}) + os.vrunv("aqt", {"install-qt", "-O", path.join(installdir, "bin_host"), runhost, "desktop", versionstr, hostarch}) -- add symbolic links for useful tools local tool_folders = {} From a88228a9bb46e77230308191bf1474caee4973bb Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 2 Aug 2024 10:16:54 +0800 Subject: [PATCH 512/671] Update aws-c-io to v0.14.16 (#4819) --- packages/a/aws-c-io/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-io/xmake.lua b/packages/a/aws-c-io/xmake.lua index 266e6b57e..a3bad445c 100644 --- a/packages/a/aws-c-io/xmake.lua +++ b/packages/a/aws-c-io/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-io") add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-io.git") + add_versions("v0.14.16", "bf78ab5dbeeaec2f55cb035e18c49ce8ba4e2ea7519e8b94e18ccd8851e39f4d") add_versions("v0.14.14", "c62400e83232e6d7c04bacebf02d552f6699d90735d9b8b6ee5fae879735c458") add_versions("v0.14.13", "1c228b1ed327e3a8518b89702ac0d93265cf50788038091e187c697cace7fa5a") add_versions("v0.14.9", "3a3b7236f70209ac12b5bafa7dd81b75cc68b691a0aa0686d6d3b7e4bbe5fbc9") From accc7523f7f8b4837ba51cc6aae341273430571a Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 2 Aug 2024 10:31:36 +0800 Subject: [PATCH 513/671] Update protobuf-cpp to 27.3 (#4822) --- packages/p/protobuf-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/protobuf-cpp/xmake.lua b/packages/p/protobuf-cpp/xmake.lua index 379cdfccd..695088b1c 100644 --- a/packages/p/protobuf-cpp/xmake.lua +++ b/packages/p/protobuf-cpp/xmake.lua @@ -11,6 +11,7 @@ package("protobuf-cpp") end end}) + add_versions("27.3", "a49147217f69e8d19aab0cc5c0059d6201261f5cb62145f8ab4ac8b94e7ffa86") add_versions("27.2", "7b4554f730a41f5c595cef3502038a69b8954c30d8ec9c62a167d5e1ebd8c210") add_versions("27.0", "3e1148db090ff21226c1888ef39fa7bc7790042be21ff4289fd21ce1735f3455") add_versions("26.1", "e15c272392df84ae95797759c685a9225fe5e88838bab3e0650c29239bdfccdd") From bfd2b847f0b006b17aae9fdac2064e2039739cfb Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 2 Aug 2024 11:08:14 +0800 Subject: [PATCH 514/671] Update dlib to v19.24.5 (#4821) --- packages/d/dlib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/d/dlib/xmake.lua b/packages/d/dlib/xmake.lua index 19cb17b06..14473d440 100644 --- a/packages/d/dlib/xmake.lua +++ b/packages/d/dlib/xmake.lua @@ -6,6 +6,7 @@ package("dlib") add_urls("https://github.com/davisking/dlib/archive/refs/tags/$(version).tar.gz", "https://github.com/davisking/dlib.git") + add_versions("v19.24.5", "01cab8fb880cf4d1cb9c84cb74c6ce291a78c69f443dced5aa2a88fb20bdc3bd") add_versions("v19.24.4", "d881911d68972d11563bb9db692b8fcea0ac1b3fd2e3f03fa0b94fde6c739e43") add_versions("v19.22", "5f44b67f762691b92f3e41dcf9c95dd0f4525b59cacb478094e511fdacb5c096") From 68e08386b71fa6337a6b1bc39a313a92a0d9e2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 2 Aug 2024 17:59:49 +0200 Subject: [PATCH 515/671] fmt: Set license (#4825) https://github.com/fmtlib/fmt/issues/3721 --- packages/f/fmt/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index 0485d32ac..ddf064bb0 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -1,6 +1,7 @@ package("fmt") set_homepage("https://fmt.dev") set_description("fmt is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams.") + set_license("MIT") set_urls("https://github.com/fmtlib/fmt/releases/download/$(version)/fmt-$(version).zip", "https://github.com/fmtlib/fmt.git") From 55d96d2f7edddd5a13993ddebba40fd991a39d0e Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 3 Aug 2024 07:37:09 +0800 Subject: [PATCH 516/671] liba52: improve config.h (#4826) * liba52: improve config.h * improve set_configvar * fix bsd --- packages/l/liba52/port/config.h.in | 151 +++++++++++++++++++++++++++++ packages/l/liba52/port/xmake.lua | 71 ++++++++++---- packages/l/liba52/xmake.lua | 16 +-- 3 files changed, 205 insertions(+), 33 deletions(-) create mode 100644 packages/l/liba52/port/config.h.in diff --git a/packages/l/liba52/port/config.h.in b/packages/l/liba52/port/config.h.in new file mode 100644 index 000000000..4a32d9552 --- /dev/null +++ b/packages/l/liba52/port/config.h.in @@ -0,0 +1,151 @@ +/* Suppress spurious compiler warnings */ +#ifdef _MSC_VER +#pragma warning (disable: 4098 4244 4305 4761) +#endif + +/* a52dec profiling */ +// ${define A52DEC_GPROF} + +/* maximum supported data alignment */ +// ${define ATTRIBUTE_ALIGNED_MAX} + +/* debug mode configuration */ +// ${define DEBUG} + +/* Define if you have the `__builtin_expect' function. */ +${define HAVE_BUILTIN_EXPECT} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_DLFCN_H} + +/* Define to 1 if you have the `ftime' function. */ +${define HAVE_FTIME} + +/* Define to 1 if you have the `gettimeofday' function. */ +${define HAVE_GETTIMEOFDAY} + +/* Define to 1 if you have the header file. */ +${define HAVE_INTTYPES_H} + +/* Define to 1 if you have the header file. */ +${define HAVE_IO_H} + +/* Define to 1 if you have the `memalign' function. */ +${define HAVE_MEMALIGN} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_MEMORY_H} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_STDINT_H} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_STDLIB_H} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_STRINGS_H} + +/* Define to 1 if you have the header file. */ +${define HAVE_STRING_H} + +/* Define to 1 if the system has the type `struct timeval'. */ +// ${define HAVE_STRUCT_TIMEVAL} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_SYS_STAT_H} + +/* Define to 1 if you have the header file. */ +${define HAVE_SYS_TIMEB_H} + +/* Define to 1 if you have the header file. */ +${define HAVE_SYS_TIME_H} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_SYS_TYPES_H} + +/* Define to 1 if you have the header file. */ +${define HAVE_TIME_H} + +/* Define to 1 if you have the header file. */ +// ${define HAVE_UNISTD_H} + +/* liba52 djbfft support */ +${define LIBA52_DJBFFT} + +/* a52 sample precision */ +// ${define LIBA52_DOUBLE} + +/* use fixed-point arithmetic */ +// ${define LIBA52_FIXED} + +/* libao al support */ +// ${define LIBAO_AL} + +/* libao OSS support */ +${define LIBAO_OSS} + +/* libao solaris support */ +// ${define LIBAO_SOLARIS} + +/* libao win support */ +${define LIBAO_WIN} + +/* Name of package */ +#define PACKAGE "a52dec" + +/* Define to the address where bug reports for this package should be sent. */ +// #define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +// #define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +// #define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +// #define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +// #define PACKAGE_VERSION "" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* The size of a `char', as computed by sizeof. */ +// #define SIZEOF_CHAR 1 + +/* The size of a `int', as computed by sizeof. */ +// #define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +// #define SIZEOF_LONG 4 + +/* The size of a `short', as computed by sizeof. */ +// #define SIZEOF_SHORT 2 + +/* The size of a `void*', as computed by sizeof. */ +// #define SIZEOF_VOIDP 4 + +/* Define to 1 if you have the ANSI C header files. */ +// #define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "0.8.0" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +// #define inline __inline + +/* Define as `__restrict' if that's what the C compiler calls it, or to + nothing if it is not supported. */ +// #define restrict __restrict + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ diff --git a/packages/l/liba52/port/xmake.lua b/packages/l/liba52/port/xmake.lua index 72810dcb6..6b98d76cc 100644 --- a/packages/l/liba52/port/xmake.lua +++ b/packages/l/liba52/port/xmake.lua @@ -2,11 +2,6 @@ option("tools", {default = false}) add_rules("mode.debug", "mode.release") -add_includedirs("include") -if is_plat("windows", "mingw") or is_host("windows") then - add_includedirs("vc++") -end - if is_plat("windows") and has_config("tools") then add_requires("strings_h") end @@ -16,21 +11,43 @@ if is_plat("macosx") or (is_host("macosx") and is_plat("mingw")) then set_languages("gnu89") end -rule("tools") - on_load(function (target) - if not get_config("tools") then - target:set("enabled", false) - return - end +add_includedirs("include") - target:add("kind", "binary") - target:add("files", "src/getopt.c") - target:add("includedirs", "src") - target:add("deps", "a52") - if target:is_plat("windows") then - target:add("packages", "strings_h") - end - end) +set_configdir("include") +add_configfiles("config.h.in") + +includes("@builtin/check") +-- set_configvar("ATTRIBUTE_ALIGNED_MAX", 4) +configvar_check_cfuncs("HAVE_BUILTIN_EXPECT", "__builtin_expect") +-- configvar_check_cincludes("HAVE_DLFCN_H", "dlfcn.h") +configvar_check_cfuncs("HAVE_FTIME", "ftime", {includes = "time.h"}) +configvar_check_cfuncs("HAVE_GETTIMEOFDAY", "gettimeofday", {includes = "time.h"}) +configvar_check_cincludes("HAVE_INTTYPES_H", "inttypes.h") +configvar_check_cincludes("HAVE_IO_H", "io.h") +configvar_check_cfuncs("HAVE_MEMALIGN", "memalign", {includes = "stdlib.h"}) +-- configvar_check_cincludes("HAVE_MEMORY_H", "memory.h") +-- configvar_check_cincludes("HAVE_STDINT_H", "stdint.h") +-- configvar_check_cincludes("HAVE_STDLIB_H", "stdlib.h") +-- configvar_check_cincludes("HAVE_STRINGS_H", "strings.h") +configvar_check_cincludes("HAVE_STRING_H", "string.h") +configvar_check_cincludes("HAVE_STRUCT_TIMEVAL", ".h") +-- configvar_check_cincludes("HAVE_SYS_STAT_H", "sys/stat.h") +configvar_check_cincludes("HAVE_SYS_TIMEB_H", "sys/timeb.h") +configvar_check_cincludes("HAVE_SYS_TIME_H", "sys/time.h") +-- configvar_check_cincludes("HAVE_SYS_TYPES_H", "sys/types.h") +configvar_check_cincludes("HAVE_TIME_H", "time.h") +-- configvar_check_cincludes("HAVE_UNISTD_H", "unistd.h") + +configvar_check_cincludes("LIBA52_DJBFFT", "fftc4.h") +-- set_configvar("LIBA52_DOUBLE", "1") +-- set_configvar("LIBA52_FIXED", "1") +-- set_configvar("LIBAO_AL", "1") +if is_plat("linux") then + set_configvar("LIBAO_OSS", "1") +end +if is_plat("windows", "mingw", "msys", "cygwin") then + set_configvar("LIBAO_WIN", 1) +end target("a52") set_kind("$(kind)") @@ -53,6 +70,22 @@ target("a52") add_rules("utils.symbols.export_all") end +rule("tools") + on_load(function (target) + if not get_config("tools") then + target:set("enabled", false) + return + end + + target:add("kind", "binary") + target:add("files", "src/getopt.c") + target:add("includedirs", "src") + target:add("deps", "a52") + if target:is_plat("windows") then + target:add("packages", "strings_h") + end + end) + target("a52dec") add_rules("tools") add_files("src/a52dec.c", "src/gettimeofday.c") diff --git a/packages/l/liba52/xmake.lua b/packages/l/liba52/xmake.lua index 0c86eed01..860b24776 100644 --- a/packages/l/liba52/xmake.lua +++ b/packages/l/liba52/xmake.lua @@ -26,26 +26,14 @@ package("liba52") add_syslinks("m") end - if not is_host("windows") then - add_deps("autoconf", "automake", "libtool", "m4") - end - on_load("windows", function (package) if package:config("tools") then package:add("deps", "strings_h", {private = true}) end end) - on_install("!iphoneos and (!android or android@!windows)", function (package) - if not is_host("windows")then - -- Generate config.h by autotools - local configs = {} - if package:is_plat("android", "bsd", "wasm") then - table.insert(configs, "--disable-oss") - table.insert(configs, "--disable-djbfft") - end - import("package.tools.autoconf").configure(package, configs) - end + on_install(function (package) + os.cp(path.join(package:scriptdir(), "port", "config.h.in"), "config.h.in") os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") import("package.tools.xmake").install(package, {tools = package:config("tools")}) end) From 5eebb1de82d89bbe109ad463365db6a9f01a5979 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 3 Aug 2024 10:26:42 +0800 Subject: [PATCH 517/671] Update yalantinglibs to 0.3.6 (#4828) --- packages/y/yalantinglibs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/y/yalantinglibs/xmake.lua b/packages/y/yalantinglibs/xmake.lua index 568e1c5f8..d33acb31e 100644 --- a/packages/y/yalantinglibs/xmake.lua +++ b/packages/y/yalantinglibs/xmake.lua @@ -7,6 +7,7 @@ package("yalantinglibs") set_urls("https://github.com/alibaba/yalantinglibs/archive/refs/tags/$(version).tar.gz", "https://github.com/alibaba/yalantinglibs.git") + add_versions("0.3.6", "92f694ad42537f95535efc648fc5e73e82f840dae4f54524a096050db398214b") add_versions("0.3.4", "dd5edd3f43f23cd4b0614896e6587b61bb38c981dc21c85a54bcc54800d0dfe8") add_versions("0.3.5", "8d382573da01449c4f83fccbbc3bdc08d221651f3fc8b9137eb4fbdb703677c2") From 412d725c7044e941e8cf85e0fe846630301681b0 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 3 Aug 2024 10:26:44 +0800 Subject: [PATCH 518/671] Update onednn to v3.5.3 (#4827) --- packages/o/onednn/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onednn/xmake.lua b/packages/o/onednn/xmake.lua index edd396ea2..6a75c535a 100644 --- a/packages/o/onednn/xmake.lua +++ b/packages/o/onednn/xmake.lua @@ -6,6 +6,7 @@ package("onednn") add_urls("https://github.com/oneapi-src/oneDNN/archive/refs/tags/$(version).tar.gz", "https://github.com/oneapi-src/oneDNN.git") + add_versions("v3.5.3", "ddbc26c75978c5e864050f699dbefbf5bff9c0b8d2af827845708e1376471f17") add_versions("v3.5.2", "e6af4a8869c9a06fa0806ed8c93faa8f8a57118ba7a36a93b93a5c2285a3a49f") add_versions("v3.5.1", "f316368a0d8c5235d80704def93f0e8c28e08dfaa2231a3de558be0ae2b146e7") add_versions("v3.5", "8356aa9befde4d4ff93f1b016ac4310730b2de0cc0b8c6c7ce306690bc0d7b43") From f1cb5e837b19526fd9776d2995a55f4e7872824c Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 3 Aug 2024 11:07:32 +0800 Subject: [PATCH 519/671] Update itlib to v1.11.1 (#4831) --- packages/i/itlib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/itlib/xmake.lua b/packages/i/itlib/xmake.lua index 1ac730290..0c2fc67d4 100644 --- a/packages/i/itlib/xmake.lua +++ b/packages/i/itlib/xmake.lua @@ -7,6 +7,7 @@ package("itlib") add_urls("https://github.com/iboB/itlib/archive/refs/tags/$(version).tar.gz", "https://github.com/iboB/itlib.git") + add_versions("v1.11.1", "2c60e02660ea63dfb7a39237e29b30a066670cef228d22e8d0908e1fff2fa7f1") add_versions("v1.11.0", "871a96989b36560934ed86939e38ce8ff0a5a44303ed489dbde6444985702c73") add_versions("v1.10.3", "e533c44354d48b2251ca57f1502778033b38170d9d6aba6bb2bbad90f2bf9d27") From 631631a841a1ea683b3a4510cf7964cc608113f1 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 3 Aug 2024 14:20:29 +0800 Subject: [PATCH 520/671] Auto-update brpc to 1.10.0 (#4820) * Update brpc to 1.10.0 * patch --------- Co-authored-by: c8ef --- packages/b/brpc/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/b/brpc/xmake.lua b/packages/b/brpc/xmake.lua index 27bc743f3..8f8f36068 100644 --- a/packages/b/brpc/xmake.lua +++ b/packages/b/brpc/xmake.lua @@ -1,10 +1,11 @@ package("brpc") - set_homepage("https://github.com/apache/incubator-brpc") + set_homepage("https://brpc.apache.org") set_description("brpc is an Industrial-grade RPC framework using C++ Language, which is often used in high performance system such as Search, Storage, Machine learning, Advertisement, Recommendation etc.") set_license("Apache-2.0") add_urls("https://github.com/apache/brpc/archive/refs/tags/$(version).tar.gz") + add_versions("1.10.0", "fe4eb10b4ca1a59e0f71086552b2d8897afd66df93b53c18ad83f6a93717cc2d") add_versions("1.8.0", "13ffb2f1f57c679379a20367c744b3e597614a793ec036cd7580aae90798019d") add_versions("1.7.0", "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42") add_versions("1.6.1", "d9eb93683b0e4cb583aacdf2357c3e3e613fbf797c4fafd0eae1d09d5ea50964") @@ -12,6 +13,7 @@ package("brpc") add_versions("1.5.0", "5ce178e3070ecdf9576a8917e3f65d96085f437bfbf9f1d09d46bca1375938cf") add_versions("1.3.0", "b9d638b76725552ed11178c650d7fc95e30f252db7972a93dc309a0698c7d2b8") + add_patches("1.10.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee") add_patches("1.8.0", path.join(os.scriptdir(), "patches", "1.8.0", "cmake.patch"), "315889dcca66331932a8ce90bbdc5f71e336ca39d625ff85a589ee2bf10155ee") add_patches("1.7.0", path.join(os.scriptdir(), "patches", "1.7.0", "cmake.patch"), "801920d6fcd20f3da68c1846dc22d26d2d320e48b06b6b5bd38bbed11e5ebd2c") add_patches("1.6.1", path.join(os.scriptdir(), "patches", "1.6.1", "cmake.patch"), "046e590994ad302127d4cb7b1b2d8231db5f7c30c3948a0172d0dca9bef1da0b") From b758151d07d8fa22e962dafa76c2318ce464d8c3 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 3 Aug 2024 15:16:05 +0800 Subject: [PATCH 521/671] double-conversion: support some platform (#4832) --- packages/d/double-conversion/xmake.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/d/double-conversion/xmake.lua b/packages/d/double-conversion/xmake.lua index 4a009eadc..9aabdef1b 100644 --- a/packages/d/double-conversion/xmake.lua +++ b/packages/d/double-conversion/xmake.lua @@ -1,22 +1,27 @@ package("double-conversion") - set_homepage("https://github.com/google/double-conversion") set_description("Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.") set_license("BSD-3-Clause") add_urls("https://github.com/google/double-conversion/archive/refs/tags/$(version).tar.gz", "https://github.com/google/double-conversion.git") + add_versions("v3.3.0", "04ec44461850abbf33824da84978043b22554896b552c5fd11a9c5ae4b4d296e") add_versions("v3.1.5", "a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13") add_deps("cmake") - on_install("windows", "linux", "macosx", function (package) + + on_install(function (package) local configs = {"-DBUILD_TESTING=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cxxtypes("double_conversion::Double", {includes = "double-conversion/ieee.h"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + double_conversion::Double x; + } + ]]}, {configs = {languages = "c++11"}, includes = "double-conversion/ieee.h"})) end) From cf467b2eb7df94581ecdc205547f1934f9ed6349 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 3 Aug 2024 16:01:51 +0800 Subject: [PATCH 522/671] libb2: add package (#4833) * libb2: add package * add configs * rename to b2 * fix openmp * blake2: add package --- packages/b/blake2/port/xmake.lua | 54 ++++++++++++++++++++++++++++++++ packages/b/blake2/xmake.lua | 37 ++++++++++++++++++++++ packages/l/libb2/port/xmake.lua | 36 +++++++++++++++++++++ packages/l/libb2/xmake.lua | 44 ++++++++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 packages/b/blake2/port/xmake.lua create mode 100644 packages/b/blake2/xmake.lua create mode 100644 packages/l/libb2/port/xmake.lua create mode 100644 packages/l/libb2/xmake.lua diff --git a/packages/b/blake2/port/xmake.lua b/packages/b/blake2/port/xmake.lua new file mode 100644 index 000000000..1bb9a0d9b --- /dev/null +++ b/packages/b/blake2/port/xmake.lua @@ -0,0 +1,54 @@ +option("openmp", {default = false}) +option("sse", {default = false}) +option("neno", {default = false}) + +if has_config("openmp") then + add_requires("openmp") + add_packages("openmp") +end + +add_rules("mode.debug", "mode.release") + +target("blake2") + set_kind("$(kind)") + add_headerfiles("ref/blake2.h") + add_files("src/blake2bp.c", "src/blake2sp.c") + + if has_config("sse") then + add_files( + "sse/blake2b.c", + "sse/blake2bp.c", + "sse/blake2s.c", + "sse/blake2sp.c", + "sse/blake2xb.c", + "sse/blake2xs.c" + ) + add_vectorexts("all") + elseif has_config("neno") then + add_files( + "neon/blake2b-neon.c", + "neon/blake2bp.c", + "neon/blake2s-neon", + "neon/blake2xb.c", + "neon/blake2sp.c", + "neon/blake2xs.c" + ) + add_vectorexts("all") + else + add_files( + "ref/blake2bp-ref.c", + "ref/blake2b-ref.c", + "ref/blake2sp-refon", + "ref/blake2s-ref.c", + "ref/blake2xb-ref.c", + "ref/blake2xs-ref.c" + ) + end + + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + + if is_plat("linux", "bsd") then + add_syslinks("m") + end diff --git a/packages/b/blake2/xmake.lua b/packages/b/blake2/xmake.lua new file mode 100644 index 000000000..12daf90de --- /dev/null +++ b/packages/b/blake2/xmake.lua @@ -0,0 +1,37 @@ +package("blake2") + set_homepage("https://blake2.net") + set_description("BLAKE2 official implementations") + set_license("CC0-1.0") + + add_urls("https://github.com/BLAKE2/BLAKE2/archive/ed1974ea83433eba7b2d95c5dcd9ac33cb847913.tar.gz", + "https://github.com/BLAKE2/BLAKE2.git") + + add_versions("2023.02.12", "e1d1194cde9fec0f150961cca8f3d9bdf7c5a5cbe020d1cdfb962b4887793124") + + add_configs("openmp", {description = "Enable Openmp", default = false, type = "boolean"}) + add_configs("sse", {description = "Enable SSE", default = false, type = "boolean"}) + add_configs("neno", {description = "Enable neno", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("m") + end + + on_load(function (package) + if package:config("openmp") then + package:add("deps", "openmp") + end + end) + + on_install(function (package) + local configs = { + openmp = package:config("openmp"), + sse = package:config("sse"), + neno = package:config("neno"), + } + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("blake2", {includes = "blake2.h"})) + end) diff --git a/packages/l/libb2/port/xmake.lua b/packages/l/libb2/port/xmake.lua new file mode 100644 index 000000000..657098fcf --- /dev/null +++ b/packages/l/libb2/port/xmake.lua @@ -0,0 +1,36 @@ +option("openmp", {default = false}) +option("sse", {default = false}) + +if has_config("openmp") then + add_requires("openmp") + add_packages("openmp") +end + +add_rules("mode.debug", "mode.release") + +target("b2") + set_kind("$(kind)") + add_headerfiles("src/blake2.h") + add_files("src/blake2bp.c", "src/blake2sp.c") + + if has_config("sse") then + add_files( + "src/blake2s.c", + "src/blake2b.c" + ) + add_vectorexts("all") + else + add_files( + "src/blake2s-ref.c", + "src/blake2b-ref.c" + ) + end + + if is_kind("shared") then + add_defines("BLAKE2_DLL_EXPORTS") + add_defines("BLAKE2_DLL", {public = true}) + end + + if is_plat("linux", "bsd") then + add_syslinks("m") + end diff --git a/packages/l/libb2/xmake.lua b/packages/l/libb2/xmake.lua new file mode 100644 index 000000000..c965edd18 --- /dev/null +++ b/packages/l/libb2/xmake.lua @@ -0,0 +1,44 @@ +package("libb2") + set_homepage("https://blake2.net") + set_description("C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp") + set_license("CC0-1.0") + + add_urls("https://github.com/BLAKE2/libb2/archive/643decfbf8ae600c3387686754d74c84144950d1.tar.gz", + "https://github.com/BLAKE2/libb2.git") + + add_versions("v0.98.1", "9eb776149c41a34619e801adeae8056ca68faadc7cea3a68a54b2a4d93ef1937") + + add_configs("openmp", {description = "Enable Openmp", default = false, type = "boolean"}) + add_configs("sse", {description = "Enable SSE", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("m") + end + + on_load(function (package) + if package:config("openmp") then + package:add("deps", "openmp") + end + end) + + on_install(function (package) + if package:config("shared") then + package:add("defines", "BLAKE2_DLL") + end + + local configs = { + openmp = package:config("openmp"), + sse = package:config("sse"), + } + + io.writefile("src/config.h") + io.replace("src/blake2-impl.h", + "#define BLAKE2_IMPL_NAME(fun) BLAKE2_IMPL_EVAL(fun, SUFFIX)", + "#define BLAKE2_IMPL_NAME", {plain = true}) + os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") + import("package.tools.xmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("blake2", {includes = "blake2.h"})) + end) From 9dad2d48c3b3954fdad4e20c91099852d7050b2e Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 3 Aug 2024 16:08:43 +0800 Subject: [PATCH 523/671] Auto-update cppfront to v0.7.2 (#4829) * Update cppfront to v0.7.2 * patch * patch * Update xmake.lua * Update xmake.lua * Update xmake.lua --------- Co-authored-by: c8ef --- packages/c/cppfront/xmake.lua | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/packages/c/cppfront/xmake.lua b/packages/c/cppfront/xmake.lua index 7ba0726f1..4dd722363 100644 --- a/packages/c/cppfront/xmake.lua +++ b/packages/c/cppfront/xmake.lua @@ -5,6 +5,7 @@ package("cppfront") add_urls("https://github.com/hsutter/cppfront/archive/refs/tags/$(version).tar.gz") add_urls("https://github.com/hsutter/cppfront.git") + add_versions("v0.7.2", "fb44c6a65fa19b185ddf385dd3bfea05afe0bc8260382b7a8e3c75b3c9004cd6") add_versions("v0.7.0", "d4ffb37d19a2b7c054d005cf4687439577ef2f3d93b340a342704e064cd1d047") on_fetch(function (package, opt) @@ -13,6 +14,19 @@ package("cppfront") end end) + on_check(function (package) + if package:is_plat("windows") then + local vs = package:toolchain("msvc"):config("vs") + assert(vs and tonumber(vs) >= 2022, "package(cppfront): need vs >= 2022.") + end + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + std::compare_three_way{}; + } + ]]}, {configs = {languages = "c++20"}}), "package(cppfront): requires at least C++20.") + end) + on_install("windows", "linux", "macosx|x86_64", function (package) local configs = {} io.writefile("xmake.lua", [[ @@ -29,12 +43,13 @@ package("cppfront") on_test(function (package) io.writefile("main.cpp2", [[ - main: () -> int = - println("Hello world!\n"); - - println: (msg: _) -> int = { - std::cout << "msg: " << msg; - return 0; - }]]) + main: () -> int = + println("Hello world!\n"); + + println: (msg: _) -> int = { + std::cout << "msg: " << msg; + return 0; + } + ]]) os.vrun("cppfront -o main.cpp main.cpp2") end) From 7a54dc447466bae140ce7338e2372bef7d76f79f Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 3 Aug 2024 20:13:13 +0800 Subject: [PATCH 524/671] libcron: add package (#4835) --- packages/l/libcron/xmake.lua | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/l/libcron/xmake.lua diff --git a/packages/l/libcron/xmake.lua b/packages/l/libcron/xmake.lua new file mode 100644 index 000000000..ae37b9b84 --- /dev/null +++ b/packages/l/libcron/xmake.lua @@ -0,0 +1,40 @@ +package("libcron") + set_homepage("https://github.com/PerMalmberg/libcron") + set_description("A C++ scheduling library using cron formatting.") + set_license("MIT") + + add_urls("https://github.com/PerMalmberg/libcron/archive/refs/tags/$(version).tar.gz", + "https://github.com/PerMalmberg/libcron.git") + + add_versions("v1.3.1", "cf5af6af392df29c8fc61fcc5a8e452118f31f47d7aa92eb7d4f4183dea227c8") + + add_deps("cmake") + add_deps("date") + + on_install(function (package) + io.replace("CMakeLists.txt", "add_subdirectory(test)", "", {plain = true}) + io.replace("CMakeLists.txt", "add_dependencies(cron_test libcron)", "", {plain = true}) + io.replace("CMakeLists.txt", "install(DIRECTORY libcron/externals/date/include/date DESTINATION include)", "", {plain = true}) + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + + local opt = {packagedeps = "date"} + if package:is_plat("windows") then + opt.cxflags = "-DWIN32" + if package:config("shared") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + end + import("package.tools.cmake").install(package, configs, opt) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + libcron::CronData cron; + cron.create(""); + } + ]]}, {configs = {languages = "c++11"}, includes = "libcron/CronData.h"})) + end) From 3c322c667d4b4f5185cf3163e926e594938b430a Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 4 Aug 2024 10:27:45 +0800 Subject: [PATCH 525/671] Update c-ares to 1.33.0 (#4839) --- packages/c/c-ares/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/c-ares/xmake.lua b/packages/c/c-ares/xmake.lua index 42342c884..2f4ade7c3 100644 --- a/packages/c/c-ares/xmake.lua +++ b/packages/c/c-ares/xmake.lua @@ -12,6 +12,7 @@ package("c-ares") end end}) + add_versions("1.33.0", "3e41df2f172041eb4ecb754a464c11ccc5046b2a1c8b1d6a40dac45d3a3b2346") add_versions("1.32.3", "5f02cc809aac3f6cc5edc1fac6c4423fd5616d7406ce47b904c24adf0ff2cd0f") add_versions("1.32.2", "072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061") add_versions("1.31.0", "0167a33dba96ca8de29f3f598b1e6cabe531799269fd63d0153aa0e6f5efeabd") From 2d8f2d02acc82f0fcb795a8d4d8cdad08ee5ffbb Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 4 Aug 2024 10:27:48 +0800 Subject: [PATCH 526/671] Update antlr4-runtime to 4.13.2 (#4837) --- packages/a/antlr4-runtime/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/antlr4-runtime/xmake.lua b/packages/a/antlr4-runtime/xmake.lua index f29af086a..c2663b664 100644 --- a/packages/a/antlr4-runtime/xmake.lua +++ b/packages/a/antlr4-runtime/xmake.lua @@ -6,6 +6,7 @@ package("antlr4-runtime") add_urls("https://github.com/antlr/antlr4/archive/refs/tags/$(version).tar.gz", "https://github.com/antlr/antlr4.git") + add_versions("4.13.2", "9f18272a9b32b622835a3365f850dd1063d60f5045fb1e12ce475ae6e18a35bb") add_versions("4.13.1", "da20d487524d7f0a8b13f73a8dc326de7fc2e5775f5a49693c0a4e59c6b1410c") if is_plat("mingw") and is_subhost("msys") then From b886c447c3b8f6306816e2a40351879875399f8d Mon Sep 17 00:00:00 2001 From: ShrBox <53301243+ShrBox@users.noreply.github.com> Date: Sun, 4 Aug 2024 13:10:11 +0800 Subject: [PATCH 527/671] Fix rapidjson (#4842) --- packages/r/rapidjson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rapidjson/xmake.lua b/packages/r/rapidjson/xmake.lua index 8c2fb2d44..dfb7d82be 100644 --- a/packages/r/rapidjson/xmake.lua +++ b/packages/r/rapidjson/xmake.lua @@ -1,5 +1,6 @@ package("rapidjson") + set_kind("library", { headeronly = true }) set_homepage("https://github.com/Tencent/rapidjson") set_description("RapidJSON is a JSON parser and generator for C++.") set_license("MIT") From 5f0b31861dd60f5b6d0feed79deeae8147145458 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 4 Aug 2024 14:09:35 +0800 Subject: [PATCH 528/671] Update tinyexr to v1.0.9 (#4841) --- packages/t/tinyexr/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tinyexr/xmake.lua b/packages/t/tinyexr/xmake.lua index 3b816b1e6..5218c6d75 100644 --- a/packages/t/tinyexr/xmake.lua +++ b/packages/t/tinyexr/xmake.lua @@ -6,6 +6,7 @@ package("tinyexr") add_urls("https://github.com/syoyo/tinyexr/archive/refs/tags/$(version).tar.gz", "https://github.com/syoyo/tinyexr.git") + add_versions("v1.0.9", "f9e05127c3db23f9c4269c9a922ed0d3d911486efd884883e1f01b0ee19de91e") add_versions("v1.0.1", "4dbbd8c7d17597ad557518de5eb923bd02683d26d0de765f9224e8d57d121677") add_versions("v1.0.8", "b56446533f36496c3c76b8e4f664f04736b173c5e3f4903f6edff3753f363302") From 9bdbb15b7e817922f855538ac4217e686d8d8876 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Sun, 4 Aug 2024 18:58:14 +0800 Subject: [PATCH 529/671] Add missing licenses (#4843) Add licenses to some packages. Only well-known licenses were added (GPL, MIT, BSD, etc.); custom licenses were not. --- packages/c/cgetopt/xmake.lua | 1 + packages/c/cli/xmake.lua | 1 + packages/c/cosmocc/xmake.lua | 1 + packages/c/cpp-lazy/xmake.lua | 1 + packages/c/cutlass/xmake.lua | 1 + packages/d/daw_header_libraries/xmake.lua | 1 + packages/d/debugbreak/xmake.lua | 1 + packages/d/doctest/xmake.lua | 1 + packages/d/dynareadout/xmake.lua | 1 + packages/e/expresscpp/xmake.lua | 1 + packages/f/faac/xmake.lua | 1 + packages/f/functionalplus/xmake.lua | 1 + packages/h/handy/xmake.lua | 1 + packages/h/highfive/xmake.lua | 1 + packages/h/hopscotch-map/xmake.lua | 1 + packages/i/icbc/xmake.lua | 1 + packages/i/inja/xmake.lua | 1 + packages/j/jsmn/xmake.lua | 1 + packages/j/jsoncons/xmake.lua | 1 + packages/k/kcp/xmake.lua | 1 + packages/l/leveldb/xmake.lua | 1 + packages/l/lexy/xmake.lua | 1 + packages/l/libaco/xmake.lua | 1 + packages/l/libfiber/xmake.lua | 1 + packages/l/libfswatch/xmake.lua | 1 + packages/l/libhv/xmake.lua | 1 + packages/l/libnet/xmake.lua | 1 + packages/l/libpeconv/xmake.lua | 1 + packages/l/libredwg/xmake.lua | 1 + packages/l/libsvm/xmake.lua | 1 + packages/l/linenoise/xmake.lua | 1 + packages/l/linmath.h/xmake.lua | 1 + packages/l/littlefs/xmake.lua | 1 + packages/m/mdns/xmake.lua | 1 + packages/m/mem/xmake.lua | 1 + packages/m/meowhash/xmake.lua | 1 + packages/m/mman_win32/xmake.lua | 1 + packages/m/mongo-cxx-driver/xmake.lua | 1 + packages/m/mpmcqueue/xmake.lua | 1 + packages/m/mujs/xmake.lua | 1 + packages/p/phnt/xmake.lua | 1 + packages/p/pprint/xmake.lua | 1 + packages/r/rapidcsv/xmake.lua | 1 + packages/r/rest_rpc/xmake.lua | 1 + packages/s/simde/xmake.lua | 1 + packages/s/sqlpp11/xmake.lua | 1 + packages/s/srt/xmake.lua | 1 + packages/s/stackwalker/xmake.lua | 1 + packages/t/toml++/xmake.lua | 1 + packages/u/units/xmake.lua | 1 + 50 files changed, 50 insertions(+) diff --git a/packages/c/cgetopt/xmake.lua b/packages/c/cgetopt/xmake.lua index dbcd0f31c..c419ab043 100644 --- a/packages/c/cgetopt/xmake.lua +++ b/packages/c/cgetopt/xmake.lua @@ -2,6 +2,7 @@ package("cgetopt") set_homepage("https://github.com/xq114/cgetopt/") set_description("A GNU getopt() implementation written in pure C.") + set_license("zlib") add_urls("https://github.com/xq114/cgetopt/archive/v$(version).tar.gz") add_versions("1.0", "c93fe91041752f4231e07894d24354ee079317e40c30897bd664766ef4872279") diff --git a/packages/c/cli/xmake.lua b/packages/c/cli/xmake.lua index e46d36e35..f9d06bbc3 100644 --- a/packages/c/cli/xmake.lua +++ b/packages/c/cli/xmake.lua @@ -2,6 +2,7 @@ package("cli") set_kind("library", {headeronly = true}) set_homepage("https://github.com/daniele77/cli") set_description("A library for interactive command line interfaces in modern C++") + set_license("BSL-1.0") add_urls("https://github.com/daniele77/cli/archive/refs/tags/$(version).tar.gz", "https://github.com/daniele77/cli.git") diff --git a/packages/c/cosmocc/xmake.lua b/packages/c/cosmocc/xmake.lua index e6fbe6f21..63f705674 100644 --- a/packages/c/cosmocc/xmake.lua +++ b/packages/c/cosmocc/xmake.lua @@ -2,6 +2,7 @@ package("cosmocc") set_kind("toolchain") set_homepage("https://github.com/jart/cosmopolitan") set_description("build-once run-anywhere c library") + set_license("ISC") add_urls("https://cosmo.zip/pub/cosmocc/cosmocc-$(version).zip", "https://github.com/xmake-mirror/cosmopolitan/releases/download/$(version)/cosmocc-$(version).zip") diff --git a/packages/c/cpp-lazy/xmake.lua b/packages/c/cpp-lazy/xmake.lua index 1eea636c4..c63ef4642 100644 --- a/packages/c/cpp-lazy/xmake.lua +++ b/packages/c/cpp-lazy/xmake.lua @@ -2,6 +2,7 @@ package("cpp-lazy") set_kind("library", {headeronly = true}) set_homepage("https://github.com/MarcDirven/cpp-lazy") set_description("A fast C++11/14/17/20 header only library for lazy evaluation and function tools") + set_license("MIT") set_urls("https://github.com/MarcDirven/cpp-lazy/archive/refs/tags/v$(version).tar.gz", "https://github.com/MarcDirven/cpp-lazy.git") diff --git a/packages/c/cutlass/xmake.lua b/packages/c/cutlass/xmake.lua index fee32bc04..07aa5639f 100644 --- a/packages/c/cutlass/xmake.lua +++ b/packages/c/cutlass/xmake.lua @@ -2,6 +2,7 @@ package("cutlass") set_kind("library", {headeronly = true}) set_homepage("https://github.com/NVIDIA/cutlass") set_description("CUDA Templates for Linear Algebra Subroutines") + set_license("BSD-3-Clause") add_urls("https://github.com/NVIDIA/cutlass/archive/refs/tags/$(version).tar.gz", "https://github.com/NVIDIA/cutlass.git") diff --git a/packages/d/daw_header_libraries/xmake.lua b/packages/d/daw_header_libraries/xmake.lua index 841f6ba37..31558c5ac 100644 --- a/packages/d/daw_header_libraries/xmake.lua +++ b/packages/d/daw_header_libraries/xmake.lua @@ -2,6 +2,7 @@ package("daw_header_libraries") set_kind("library", {headeronly = true}) set_homepage("https://beached.github.io/header_libraries/") set_description("Various header libraries mostly future std lib, replacements for(e.g. visit), or some misc ") + set_license("BSL-1.0") add_urls("https://github.com/beached/header_libraries/archive/refs/tags/$(version).tar.gz", "https://github.com/beached/header_libraries.git") diff --git a/packages/d/debugbreak/xmake.lua b/packages/d/debugbreak/xmake.lua index f7c166b02..8217d61df 100644 --- a/packages/d/debugbreak/xmake.lua +++ b/packages/d/debugbreak/xmake.lua @@ -2,6 +2,7 @@ package("debugbreak") set_kind("library", {headeronly = true}) set_homepage("https://github.com/scottt/debugbreak") set_description("break into the debugger programmatically") + set_license("BSD-2-Clause") add_urls("https://github.com/scottt/debugbreak/archive/refs/tags/$(version).tar.gz", "https://github.com/scottt/debugbreak.git") diff --git a/packages/d/doctest/xmake.lua b/packages/d/doctest/xmake.lua index d58f67f6f..ebf47abae 100644 --- a/packages/d/doctest/xmake.lua +++ b/packages/d/doctest/xmake.lua @@ -3,6 +3,7 @@ package("doctest") set_kind("library", {headeronly = true}) set_homepage("http://bit.ly/doctest-docs") set_description("The fastest feature-rich C++11/14/17/20 single-header testing framework for unit tests and TDD") + set_license("MIT") set_urls("https://github.com/doctest/doctest/archive/refs/tags/v$(version).tar.gz", "https://github.com/doctest/doctest/archive/refs/tags/$(version).tar.gz", diff --git a/packages/d/dynareadout/xmake.lua b/packages/d/dynareadout/xmake.lua index e252284cb..4242c0425 100644 --- a/packages/d/dynareadout/xmake.lua +++ b/packages/d/dynareadout/xmake.lua @@ -2,6 +2,7 @@ package("dynareadout") set_homepage("https://github.com/PucklaJ/dynareadout") set_description("High-Performance C/C++ library for parsing binary output files and key files of LS Dyna (d3plot, binout, input deck)") + set_license("zlib") add_urls("https://github.com/PucklaJ/dynareadout/archive/refs/tags/$(version).tar.gz", "https://github.com/PucklaJ/dynareadout.git") diff --git a/packages/e/expresscpp/xmake.lua b/packages/e/expresscpp/xmake.lua index 18f0ba438..842b3eea9 100644 --- a/packages/e/expresscpp/xmake.lua +++ b/packages/e/expresscpp/xmake.lua @@ -2,6 +2,7 @@ package("expresscpp") set_homepage("https://github.com/expresscpp/expresscpp.git") set_description("Fast, unopinionated, minimalist web framework for C++ Perfect for building REST APIs.") + set_license("MIT") set_urls("https://github.com/expresscpp/expresscpp/archive/$(version).tar.gz", "https://github.com/expresscpp/expresscpp.git") diff --git a/packages/f/faac/xmake.lua b/packages/f/faac/xmake.lua index 70b0b680c..631425969 100644 --- a/packages/f/faac/xmake.lua +++ b/packages/f/faac/xmake.lua @@ -1,6 +1,7 @@ package("faac") set_homepage("https://sourceforge.net/projects/faac/") set_description("Freeware Advanced Audio Coder faac mirror") + set_license("LGPL-2.1") add_urls("https://github.com/knik0/faac/archive/refs/tags/$(version).tar.gz", {version = function (version) return version:gsub("%.", "_") diff --git a/packages/f/functionalplus/xmake.lua b/packages/f/functionalplus/xmake.lua index 8295bc633..a245484d9 100644 --- a/packages/f/functionalplus/xmake.lua +++ b/packages/f/functionalplus/xmake.lua @@ -2,6 +2,7 @@ package("functionalplus") set_kind("library", {headeronly = true}) set_homepage("http://www.editgym.com/fplus-api-search/") set_description("Functional Programming Library for C++. Write concise and readable C++ code.") + set_license("BSL-1.0") add_urls("https://github.com/Dobiasd/FunctionalPlus/archive/refs/tags/$(version).tar.gz", "https://github.com/Dobiasd/FunctionalPlus.git") diff --git a/packages/h/handy/xmake.lua b/packages/h/handy/xmake.lua index bbd600920..d7366abef 100644 --- a/packages/h/handy/xmake.lua +++ b/packages/h/handy/xmake.lua @@ -1,6 +1,7 @@ package("handy") set_homepage("https://github.com/yedf2/handy") set_description("A simple C++11 network server framework") + set_license("BSD-2-Clause") add_urls("https://github.com/yedf2/handy/archive/refs/tags/$(version).tar.gz", "https://github.com/yedf2/handy.git") diff --git a/packages/h/highfive/xmake.lua b/packages/h/highfive/xmake.lua index e7209bab0..bb3c01249 100644 --- a/packages/h/highfive/xmake.lua +++ b/packages/h/highfive/xmake.lua @@ -2,6 +2,7 @@ package("highfive") set_kind("library", {headeronly = true}) set_homepage("https://github.com/BlueBrain/HighFive") set_description("HighFive - Header-only C++ HDF5 interface") + set_license("BSL-1.0") add_urls("https://github.com/BlueBrain/HighFive/archive/refs/tags/$(version).tar.gz", "https://github.com/BlueBrain/HighFive.git") diff --git a/packages/h/hopscotch-map/xmake.lua b/packages/h/hopscotch-map/xmake.lua index 84bed9fc0..55bee216b 100644 --- a/packages/h/hopscotch-map/xmake.lua +++ b/packages/h/hopscotch-map/xmake.lua @@ -2,6 +2,7 @@ package("hopscotch-map") set_kind("library", {headeronly = true}) set_homepage("https://github.com/Tessil/hopscotch-map") set_description("A C++ implementation of a fast hash map and hash set using hopscotch hashing") + set_license("MIT") set_urls("https://github.com/Tessil/hopscotch-map/archive/$(version).zip", "https://github.com/Tessil/hopscotch-map.git") diff --git a/packages/i/icbc/xmake.lua b/packages/i/icbc/xmake.lua index 853238997..22ee8bb9f 100644 --- a/packages/i/icbc/xmake.lua +++ b/packages/i/icbc/xmake.lua @@ -2,6 +2,7 @@ package("icbc") set_homepage("https://github.com/castano/icbc") set_description("A High Quality SIMD BC1 Encoder") + set_license("MIT") add_urls("https://github.com/castano/icbc/archive/refs/tags/$(version).tar.gz", "https://github.com/castano/icbc.git") diff --git a/packages/i/inja/xmake.lua b/packages/i/inja/xmake.lua index 352322fb4..7f0bf3482 100644 --- a/packages/i/inja/xmake.lua +++ b/packages/i/inja/xmake.lua @@ -2,6 +2,7 @@ package("inja") set_homepage("https://pantor.github.io/inja/") set_description("A Template Engine for Modern C++") + set_license("MIT") add_urls("https://github.com/pantor/inja/archive/$(version).tar.gz", "https://github.com/pantor/inja.git") diff --git a/packages/j/jsmn/xmake.lua b/packages/j/jsmn/xmake.lua index f4dc5e0f4..6335cb5e0 100644 --- a/packages/j/jsmn/xmake.lua +++ b/packages/j/jsmn/xmake.lua @@ -3,6 +3,7 @@ package("jsmn") set_kind("library", {headeronly = true}) set_homepage("https://github.com/zserge/jsmn") set_description("Jsmn is a world fastest JSON parser/tokenizer") + set_license("MIT") set_urls("https://github.com/zserge/jsmn/archive/refs/tags/$(version).tar.gz", "https://github.com/zserge/jsmn.git") diff --git a/packages/j/jsoncons/xmake.lua b/packages/j/jsoncons/xmake.lua index e9d9ad6cc..c381f2390 100644 --- a/packages/j/jsoncons/xmake.lua +++ b/packages/j/jsoncons/xmake.lua @@ -3,6 +3,7 @@ package("jsoncons") set_kind("library", {headeronly = true}) set_homepage("https://danielaparker.github.io/jsoncons/") set_description("A C++, header-only library for constructing JSON and JSON-like data formats, with JSON Pointer, JSON Patch, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON") + set_license("BSL-1.0") set_urls("https://github.com/danielaparker/jsoncons/archive/$(version).zip", "https://github.com/danielaparker/jsoncons.git") diff --git a/packages/k/kcp/xmake.lua b/packages/k/kcp/xmake.lua index 6b8fbaec5..0589eeef2 100644 --- a/packages/k/kcp/xmake.lua +++ b/packages/k/kcp/xmake.lua @@ -2,6 +2,7 @@ package("kcp") set_homepage("https://github.com/skywind3000/kcp") set_description("A Fast and Reliable ARQ Protocol.") + set_license("MIT") add_urls("https://github.com/skywind3000/kcp/archive/$(version).tar.gz", "https://github.com/skywind3000/kcp.git") diff --git a/packages/l/leveldb/xmake.lua b/packages/l/leveldb/xmake.lua index af891d85b..0e6d865af 100644 --- a/packages/l/leveldb/xmake.lua +++ b/packages/l/leveldb/xmake.lua @@ -2,6 +2,7 @@ package("leveldb") set_homepage("https://github.com/google/leveldb") set_description("LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.") + set_license("BSD-3-Clause") add_urls("https://github.com/google/leveldb/archive/$(version).tar.gz", "https://github.com/google/leveldb.git") diff --git a/packages/l/lexy/xmake.lua b/packages/l/lexy/xmake.lua index bf8fb57ce..9c7100702 100644 --- a/packages/l/lexy/xmake.lua +++ b/packages/l/lexy/xmake.lua @@ -2,6 +2,7 @@ package("lexy") set_kind("library", {headeronly = true}) set_homepage("https://lexy.foonathan.net") set_description("C++ parsing DSL") + set_license("BSL-1.0") add_urls("https://github.com/foonathan/lexy.git") add_versions("2022.12.1", "f68737b725116d00e5582602e22604a14fc26547") diff --git a/packages/l/libaco/xmake.lua b/packages/l/libaco/xmake.lua index ca9c55bd5..97a827393 100644 --- a/packages/l/libaco/xmake.lua +++ b/packages/l/libaco/xmake.lua @@ -2,6 +2,7 @@ package("libaco") set_homepage("https://github.com/hnes/libaco") set_description("A blazing fast and lightweight C asymmetric coroutine library") + set_license("Apache-2.0") add_urls("https://github.com/hnes/libaco/archive/refs/tags/$(version).tar.gz", "https://github.com/hnes/libaco.git") diff --git a/packages/l/libfiber/xmake.lua b/packages/l/libfiber/xmake.lua index f792a74f5..ee052ce59 100644 --- a/packages/l/libfiber/xmake.lua +++ b/packages/l/libfiber/xmake.lua @@ -1,6 +1,7 @@ package("libfiber") set_homepage("https://github.com/iqiyi/libfiber") set_description("The high performance coroutine library for Linux/FreeBSD/MacOS/Windows, supporting select/poll/epoll/kqueue/iocp/windows GUI") + set_license("LGPL-3.0") add_urls("https://github.com/iqiyi/libfiber/archive/refs/tags/$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") diff --git a/packages/l/libfswatch/xmake.lua b/packages/l/libfswatch/xmake.lua index 32e0160ea..c7a15b8df 100644 --- a/packages/l/libfswatch/xmake.lua +++ b/packages/l/libfswatch/xmake.lua @@ -1,6 +1,7 @@ package("libfswatch") set_homepage("https://emcrisostomo.github.io/fswatch/") set_description("A cross-platform file change monitor with multiple backends: Apple OS X File System Events, *BSD kqueue, Solaris/Illumos File Events Notification, Linux inotify, Microsoft Windows and a stat()-based backend.") + set_license("GPL-3.0") add_urls("https://github.com/emcrisostomo/fswatch/archive/refs/tags/$(version).tar.gz", "https://github.com/emcrisostomo/fswatch.git") diff --git a/packages/l/libhv/xmake.lua b/packages/l/libhv/xmake.lua index 530b428a9..71ba302e9 100644 --- a/packages/l/libhv/xmake.lua +++ b/packages/l/libhv/xmake.lua @@ -1,6 +1,7 @@ package("libhv") set_homepage("https://github.com/ithewei/libhv") set_description("Like libevent, libev, and libuv, libhv provides event-loop with non-blocking IO and timer, but simpler api and richer protocols.") + set_license("BSD-3-Clause") add_urls("https://github.com/ithewei/libhv/archive/v$(version).zip", {excludes = {"*/html/*"}}) add_versions("1.0.0", "39adb77cc7addaba82b69fa9a433041c8288f3d9c773fa360162e3391dcf6a7b") diff --git a/packages/l/libnet/xmake.lua b/packages/l/libnet/xmake.lua index b4d37632b..d575bb3e1 100644 --- a/packages/l/libnet/xmake.lua +++ b/packages/l/libnet/xmake.lua @@ -1,6 +1,7 @@ package("libnet") set_homepage("https://codedocs.xyz/libnet/libnet/") set_description("A portable framework for low-level network packet construction") + set_license("MIT") add_urls("https://github.com/libnet/libnet/releases/download/$(version).tar.gz", {version = function (version) return version .. "/libnet-" .. (version:gsub("v", "")) diff --git a/packages/l/libpeconv/xmake.lua b/packages/l/libpeconv/xmake.lua index aa1d02be7..8b8bed506 100644 --- a/packages/l/libpeconv/xmake.lua +++ b/packages/l/libpeconv/xmake.lua @@ -1,6 +1,7 @@ package("libpeconv") set_homepage("https://hasherezade.github.io/libpeconv") set_description("A library to load, manipulate, dump PE files. See also: https://github.com/hasherezade/libpeconv_tpl") + set_license("BSD-2-Clause") add_urls("https://github.com/hasherezade/libpeconv.git") add_versions("2023.05.31", "709a9b40fa6420c6cd7aa1145b0ff1a154858358") diff --git a/packages/l/libredwg/xmake.lua b/packages/l/libredwg/xmake.lua index 9e20e3a9d..c7d354819 100644 --- a/packages/l/libredwg/xmake.lua +++ b/packages/l/libredwg/xmake.lua @@ -1,6 +1,7 @@ package("libredwg") set_homepage("https://github.com/LibreDWG/libredwg") set_description("A library to allow reading data from a DWG file.") + set_license("GPL-3.0") add_urls("https://github.com/LibreDWG/libredwg.git") add_versions("0.13.3", "97c7225596c17430b82fd0161e7eff6beb5b1034") diff --git a/packages/l/libsvm/xmake.lua b/packages/l/libsvm/xmake.lua index 7606638b5..54e9bfe3d 100644 --- a/packages/l/libsvm/xmake.lua +++ b/packages/l/libsvm/xmake.lua @@ -2,6 +2,7 @@ package("libsvm") set_homepage("https://github.com/cjlin1/libsvm") set_description("A simple, easy-to-use, and efficient software for SVM classification and regression") + set_license("BSD-3-Clause") add_urls("https://github.com/cjlin1/libsvm/archive/refs/tags/$(version).tar.gz", "https://github.com/cjlin1/libsvm.git") diff --git a/packages/l/linenoise/xmake.lua b/packages/l/linenoise/xmake.lua index 8b4b4f236..391d53566 100644 --- a/packages/l/linenoise/xmake.lua +++ b/packages/l/linenoise/xmake.lua @@ -2,6 +2,7 @@ package("linenoise") set_homepage("https://github.com/antirez/linenoise") set_description("A small self-contained alternative to readline and libedit") + set_license("BSD-2-Clause") add_urls("https://github.com/antirez/linenoise.git") diff --git a/packages/l/linmath.h/xmake.lua b/packages/l/linmath.h/xmake.lua index 62664c41c..58a764124 100644 --- a/packages/l/linmath.h/xmake.lua +++ b/packages/l/linmath.h/xmake.lua @@ -2,6 +2,7 @@ package("linmath.h") set_kind("library", {headeronly = true}) set_homepage("https://github.com/datenwolf/linmath.h") set_description("a lean linear math library, aimed at graphics programming. Supports vec3, vec4, mat4x4 and quaternions") + set_license("WTFPL") add_urls("https://github.com/datenwolf/linmath.h.git") add_versions("2022.06.19", "3eef82841046507e16a0f6194a61cee2eadd34b3") diff --git a/packages/l/littlefs/xmake.lua b/packages/l/littlefs/xmake.lua index 5a543632d..9b53c804b 100644 --- a/packages/l/littlefs/xmake.lua +++ b/packages/l/littlefs/xmake.lua @@ -1,6 +1,7 @@ package("littlefs") set_homepage("https://github.com/littlefs-project/littlefs") set_description("A little fail-safe filesystem designed for microcontrollers") + set_license("BSD-3-Clause") add_urls("https://github.com/littlefs-project/littlefs/archive/refs/tags/$(version).tar.gz", "https://github.com/littlefs-project/littlefs.git") diff --git a/packages/m/mdns/xmake.lua b/packages/m/mdns/xmake.lua index 6b038ca08..c922cfd9b 100644 --- a/packages/m/mdns/xmake.lua +++ b/packages/m/mdns/xmake.lua @@ -2,6 +2,7 @@ package("mdns") set_kind("library", {headeronly = true}) set_homepage("https://github.com/mjansson/mdns") set_description("Public domain mDNS/DNS-SD library in C") + set_license("Unlicense") add_urls("https://github.com/mjansson/mdns/archive/refs/tags/$(version).tar.gz", "https://github.com/mjansson/mdns.git") diff --git a/packages/m/mem/xmake.lua b/packages/m/mem/xmake.lua index 408d73d11..abbc81bac 100644 --- a/packages/m/mem/xmake.lua +++ b/packages/m/mem/xmake.lua @@ -3,6 +3,7 @@ package("mem") set_kind("library", {headeronly = true}) set_homepage("https://github.com/0x1F9F1/mem") set_description("A collection of C++11 headers useful for reverse engineering") + set_license("MIT") add_urls("https://github.com/0x1F9F1/mem/archive/refs/tags/$(version).tar.gz", "https://github.com/0x1F9F1/mem.git") diff --git a/packages/m/meowhash/xmake.lua b/packages/m/meowhash/xmake.lua index 91ce01a7a..02ae2a004 100644 --- a/packages/m/meowhash/xmake.lua +++ b/packages/m/meowhash/xmake.lua @@ -3,6 +3,7 @@ package("meowhash") set_kind("library", {headeronly = true}) set_homepage("https://mollyrocket.com/meowhash") set_description("Official version of the Meow hash, an extremely fast level 1 hash") + set_license("zlib") add_urls("https://github.com/cmuratori/meow_hash.git") diff --git a/packages/m/mman_win32/xmake.lua b/packages/m/mman_win32/xmake.lua index d561c0aa0..d43c45675 100644 --- a/packages/m/mman_win32/xmake.lua +++ b/packages/m/mman_win32/xmake.lua @@ -1,6 +1,7 @@ package("mman_win32") set_homepage("https://github.com/alitrack/mman-win32") set_description("mman library for Windows. mirror of https://code.google.com/p/mman-win32/") + set_license("MIT") add_urls("https://github.com/alitrack/mman-win32.git") add_versions("2019.10.11", "2d1c576e62b99e85d99407e1a88794c6e44c3310") diff --git a/packages/m/mongo-cxx-driver/xmake.lua b/packages/m/mongo-cxx-driver/xmake.lua index 182903ca4..59c7d1646 100644 --- a/packages/m/mongo-cxx-driver/xmake.lua +++ b/packages/m/mongo-cxx-driver/xmake.lua @@ -2,6 +2,7 @@ package("mongo-cxx-driver") set_homepage("https://github.com/mongodb/mongo-cxx-driver") set_description("mongodb c++ driver") + set_license("Apache-2.0") add_urls("https://github.com/mongodb/mongo-cxx-driver/archive/r$(version).zip") add_versions("3.6.6", "4413de483c5070b48dc5b5c8ee3e32c8e7a2b74b892fe2a55ef78fb758bc01e0") diff --git a/packages/m/mpmcqueue/xmake.lua b/packages/m/mpmcqueue/xmake.lua index b23a5cfa1..c3334a488 100644 --- a/packages/m/mpmcqueue/xmake.lua +++ b/packages/m/mpmcqueue/xmake.lua @@ -2,6 +2,7 @@ package("mpmcqueue") set_kind("library", {headeronly = true}) set_homepage("https://github.com/rigtorp/MPMCQueue") set_description("A bounded multi-producer multi-consumer concurrent queue written in C++11") + set_license("MIT") add_urls("https://github.com/rigtorp/MPMCQueue/archive/refs/tags/$(version).tar.gz", "https://github.com/rigtorp/MPMCQueue.git") diff --git a/packages/m/mujs/xmake.lua b/packages/m/mujs/xmake.lua index 11c760551..efd360701 100644 --- a/packages/m/mujs/xmake.lua +++ b/packages/m/mujs/xmake.lua @@ -1,6 +1,7 @@ package("mujs") set_homepage("http://mujs.com/") set_description("An embeddable Javascript interpreter in C.") + set_license("ISC") add_urls("https://mujs.com/downloads/mujs-$(version).tar.gz") add_urls("https://github.com/ccxvii/mujs/archive/refs/tags/$(version).tar.gz", diff --git a/packages/p/phnt/xmake.lua b/packages/p/phnt/xmake.lua index 82f3e057a..441907cfc 100644 --- a/packages/p/phnt/xmake.lua +++ b/packages/p/phnt/xmake.lua @@ -3,6 +3,7 @@ package("phnt") set_kind("library", {headeronly = true}) set_homepage("https://github.com/winsiderss/systeminformer") set_description("Native API header files for the System Informer project.") + set_license("MIT") set_urls("https://github.com/winsiderss/phnt.git") add_versions("2023.6.18", "7c1adb8a7391939dfd684f27a37e31f18d303944") diff --git a/packages/p/pprint/xmake.lua b/packages/p/pprint/xmake.lua index e02f92e72..047a3b8ba 100644 --- a/packages/p/pprint/xmake.lua +++ b/packages/p/pprint/xmake.lua @@ -2,6 +2,7 @@ package("pprint") set_kind("library", {headeronly = true}) set_homepage("https://github.com/p-ranav/pprint") set_description("Pretty Printer for Modern C++") + set_license("MIT") add_urls("https://github.com/p-ranav/pprint.git") diff --git a/packages/r/rapidcsv/xmake.lua b/packages/r/rapidcsv/xmake.lua index c2a170a89..63403ef9f 100644 --- a/packages/r/rapidcsv/xmake.lua +++ b/packages/r/rapidcsv/xmake.lua @@ -3,6 +3,7 @@ package("rapidcsv") set_kind("library", {headeronly = true}) set_homepage("https://github.com/d99kris/rapidcsv") set_description("C++ header-only library for CSV parsing (by d99kris)") + set_license("BSD-3-Clause") add_urls("https://github.com/d99kris/rapidcsv/archive/refs/tags/v$(version).zip") add_versions("8.83", "ca7e99a7229d50a8d7e59d77f31b53970579429c71bf05bc53729d15135c9b6f") diff --git a/packages/r/rest_rpc/xmake.lua b/packages/r/rest_rpc/xmake.lua index 741b808e5..a5b7ede88 100644 --- a/packages/r/rest_rpc/xmake.lua +++ b/packages/r/rest_rpc/xmake.lua @@ -2,6 +2,7 @@ package("rest_rpc") set_kind("library", {headeronly = true}) set_homepage("https://github.com/qicosmos/rest_rpc") set_description("c++11, high performance, cross platform, easy to use rpc framework.") + set_license("MIT") add_urls("https://github.com/qicosmos/rest_rpc.git") add_versions("2023.6.14", "8782f1d341e1dd18f9fe3a77b8335fd17a5ba585") diff --git a/packages/s/simde/xmake.lua b/packages/s/simde/xmake.lua index ad8811f9e..de6f0c890 100644 --- a/packages/s/simde/xmake.lua +++ b/packages/s/simde/xmake.lua @@ -3,6 +3,7 @@ package("simde") set_kind("library", {headeronly = true}) set_homepage("simd-everywhere.github.io/blog/") set_description("Implementations of SIMD instruction sets for systems which don't natively support them.") + set_license("MIT") set_urls("https://github.com/simd-everywhere/simde/releases/download/v$(version)/simde-amalgamated-$(version).tar.xz") diff --git a/packages/s/sqlpp11/xmake.lua b/packages/s/sqlpp11/xmake.lua index 1fb3fd738..c3ddd5108 100644 --- a/packages/s/sqlpp11/xmake.lua +++ b/packages/s/sqlpp11/xmake.lua @@ -2,6 +2,7 @@ package("sqlpp11") set_kind("library", {headeronly = true}) set_homepage("https://github.com/rbock/sqlpp11") set_description("A type safe SQL template library for C++") + set_license("BSD-2-Clause") add_urls("https://github.com/rbock/sqlpp11/archive/refs/tags/$(version).tar.gz", "https://github.com/rbock/sqlpp11.git") diff --git a/packages/s/srt/xmake.lua b/packages/s/srt/xmake.lua index efe6dc3ca..abaecd171 100644 --- a/packages/s/srt/xmake.lua +++ b/packages/s/srt/xmake.lua @@ -2,6 +2,7 @@ package("srt") set_homepage("https://www.srtalliance.org/") set_description("Secure Reliable Transport (SRT) Protocol") + set_license("MPL-2.0") add_urls("https://github.com/Haivision/srt/archive/refs/tags/$(version).tar.gz", "https://github.com/Haivision/srt.git") diff --git a/packages/s/stackwalker/xmake.lua b/packages/s/stackwalker/xmake.lua index f814c727a..f75aa09ff 100644 --- a/packages/s/stackwalker/xmake.lua +++ b/packages/s/stackwalker/xmake.lua @@ -2,6 +2,7 @@ package("stackwalker") set_homepage("https://github.com/JochenKalmbach/StackWalker") set_description("A library to walk the callstack in windows applications.") + set_license("BSD-2-Clause") set_urls("https://github.com/JochenKalmbach/StackWalker/archive/$(version).zip", "https://github.com/JochenKalmbach/StackWalker.git") diff --git a/packages/t/toml++/xmake.lua b/packages/t/toml++/xmake.lua index 9e6ff0a4a..b3b45fab0 100644 --- a/packages/t/toml++/xmake.lua +++ b/packages/t/toml++/xmake.lua @@ -2,6 +2,7 @@ package("toml++") set_homepage("https://marzer.github.io/tomlplusplus/") set_description("toml++ is a header-only TOML config file parser and serializer for C++17 (and later!).") + set_license("MIT") add_urls("https://github.com/marzer/tomlplusplus/archive/refs/tags/$(version).tar.gz", "https://github.com/marzer/tomlplusplus.git") diff --git a/packages/u/units/xmake.lua b/packages/u/units/xmake.lua index 213ee4f5d..44a68809e 100644 --- a/packages/u/units/xmake.lua +++ b/packages/u/units/xmake.lua @@ -2,6 +2,7 @@ package("units") set_kind("library", {headeronly = true}) set_homepage("https://nholthaus.github.io/units/") set_description("A compile-time, header-only, dimensional analysis library built on c++14 with no dependencies.") + set_license("MIT") add_urls("https://github.com/nholthaus/units/archive/refs/tags/$(version).tar.gz", "https://github.com/nholthaus/units.git") add_versions("v2.3.3", "b1f3c1dd11afa2710a179563845ce79f13ebf0c8c090d6aa68465b18bd8bd5fc") From 7500d5e4d3d120f7371ae501683fe42214b278d0 Mon Sep 17 00:00:00 2001 From: PumpkinXD <54535387+PumpkinXD@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:23:46 +0800 Subject: [PATCH 530/671] Update cosmocc to version 3.6.2 (#4847) --- packages/c/cosmocc/xmake.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/c/cosmocc/xmake.lua b/packages/c/cosmocc/xmake.lua index 63f705674..a570870d8 100644 --- a/packages/c/cosmocc/xmake.lua +++ b/packages/c/cosmocc/xmake.lua @@ -19,6 +19,20 @@ package("cosmocc") add_versions("3.4.0", "475e24b84a18973312433f5280e267acbe1b4dac1b2e2ebb3cfce46051a8c08c") add_versions("3.5.0", "6c8443078ce43bf15bb835c8317d6d44e694e1572023263359c082afb7ec2224") add_versions("3.5.1", "ea1f47cd4ead6ce3038551be164ad357bd45a4b5b7824871c561d2af23f871d6") + add_versions("3.5.2", "69d319eb6f5e9f2581949e60cea8e419e0d7d4095c0c79ac627f5a77490f6240") + add_versions("3.5.3", "4f0850a01a2d83417de21ee79bea09ffddeab4bf9061b072ddbe5522a28d73c6") + add_versions("3.5.4", "1e822906021a5eb56172b4e89840c0b0cd7db97b718355a41414b4ca913171e0") + add_versions("3.5.5", "c48f405298885fbd37737b4cc75e75ead9bd159346c948068cf6e724a01c40e9") + add_versions("3.5.6", "efdc021d1825a27830a45e88d408668c08f22dcb7f6a1ca289fdaf77a937aa66") + add_versions("3.5.7", "596876951b62ad2530c63afc40edd805d751fcb2416e544d249af04ad00bb4ed") + add_versions("3.5.8", "80bea0e523b666d4d4e74fb729ac1e4bd924d1b9f2892d939af62ae2c4a0f622") + add_versions("3.5.9", "1f66831de4bf2d82e138d8993e9ee84a7559afc47aeeb2e2de51872401790a0a") + add_versions("3.6.0", "4918c45ac3e0972ff260e2a249e25716881e39fb679d5e714ae216a2ef6c3f7e") + add_versions("3.6.1", "5f46bdfa4db8326794306d1a0348efc01e199f53b262bc05aa92b37be09a3f3a") + add_versions("3.6.2", "268aa82d9bfd774f76951b250f87b8edcefd5c754b8b409e1639641e8bd8d5bc") + + + on_load("@windows|x64", function (package) package:add("deps", "msys2") From 560a9c9bf08b005ec371ed7b9f152b409424a0c5 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 5 Aug 2024 10:00:20 +0800 Subject: [PATCH 531/671] Update aws-c-io to v0.14.18 (#4850) --- packages/a/aws-c-io/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-io/xmake.lua b/packages/a/aws-c-io/xmake.lua index a3bad445c..91d3fd89d 100644 --- a/packages/a/aws-c-io/xmake.lua +++ b/packages/a/aws-c-io/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-io") add_urls("https://github.com/awslabs/aws-c-io/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-io.git") + add_versions("v0.14.18", "44e9dee181ed7d867d1cc2944f4b4669259b569fc56bdd6dd4c7c30440fc4bf8") add_versions("v0.14.16", "bf78ab5dbeeaec2f55cb035e18c49ce8ba4e2ea7519e8b94e18ccd8851e39f4d") add_versions("v0.14.14", "c62400e83232e6d7c04bacebf02d552f6699d90735d9b8b6ee5fae879735c458") add_versions("v0.14.13", "1c228b1ed327e3a8518b89702ac0d93265cf50788038091e187c697cace7fa5a") From 4d5f86f960e8ab17923ba81fc2a2a2697cc8fb86 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 5 Aug 2024 10:00:23 +0800 Subject: [PATCH 532/671] Update libavif to v1.1.1 (#4849) --- packages/l/libavif/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libavif/xmake.lua b/packages/l/libavif/xmake.lua index 503fd42f0..1d0f58cc1 100644 --- a/packages/l/libavif/xmake.lua +++ b/packages/l/libavif/xmake.lua @@ -6,6 +6,7 @@ package("libavif") add_urls("https://github.com/AOMediaCodec/libavif/archive/refs/tags/$(version).tar.gz", "https://github.com/AOMediaCodec/libavif.git") + add_versions("v1.1.1", "914662e16245e062ed73f90112fbb4548241300843a7772d8d441bb6859de45b") add_versions("v1.1.0", "edb31951005d7a143be1724f24825809599a4832073add50eaf987733defb5c8") add_versions("v1.0.4", "dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146") add_versions("v0.9.1", "8526f3fff34a05a51d7c703cdcf1d0d38c939b5b6dd4bb7d3a3405ddad88186c") From 99bec44e528ea401d9244b89ddc97d06bbf0ed4f Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 5 Aug 2024 10:00:25 +0800 Subject: [PATCH 533/671] Update re-flex to v4.5.0 (#4848) --- packages/r/re-flex/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/re-flex/xmake.lua b/packages/r/re-flex/xmake.lua index 9dfbcd1e5..c04b9b634 100644 --- a/packages/r/re-flex/xmake.lua +++ b/packages/r/re-flex/xmake.lua @@ -6,6 +6,7 @@ package("re-flex") add_urls("https://github.com/Genivia/RE-flex/archive/refs/tags/$(version).tar.gz", "https://github.com/Genivia/RE-flex.git") + add_versions("v4.5.0", "30a503087c4ea7c2f81ef8b7f1c54ea10c3f26ab3a372d2c874273ee5e643472") add_versions("v4.4.0", "3b34d0c88f91db6b5387355a64a84bfa6464d90fb182aab05c367605db28d2e8") add_versions("v4.3.0", "1658c1be9fa95bf948a657d75d2cef0df81b614bc6052284935774d4d8551d95") From bc255afa1043a64ac61ad2bebb67a4c6f3da4a10 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 5 Aug 2024 22:17:50 +0800 Subject: [PATCH 534/671] brynet: fix header only kind (#4845) * brynet: fix header only kind * limit plat --- packages/b/brynet/xmake.lua | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/b/brynet/xmake.lua b/packages/b/brynet/xmake.lua index 50b2bcf87..45f5b93d1 100644 --- a/packages/b/brynet/xmake.lua +++ b/packages/b/brynet/xmake.lua @@ -1,24 +1,31 @@ package("brynet") - + set_kind("library", {headeronly = true}) set_homepage("https://github.com/IronsDu/brynet") - set_description("Header Only Cross platform high performance TCP network library using C++ 11") + set_description("A Header-Only cross-platform C++ TCP network library") + set_license("MIT") + + add_urls("https://github.com/IronsDu/brynet/archive/337c9f375800b46da77116687a61c00ce534b60f.tar.gz", + "https://github.com/IronsDu/brynet") - set_urls("https://github.com/IronsDu/brynet/archive/v$(version).zip") - add_urls("https://github.com/IronsDu/brynet.git") - add_versions("1.0.9", "a264a6aaf3ec9fd5aa4029a8857be813be203ee7b93997b0c1c5c5e2c5f89a2a") + add_versions("2024.06.03", "d35271b8f635959c6507c3bba24ff1ee121c6f27db177564012e54654e813ab8") - if is_plat("windows") then - add_syslinks("ws2_32") - end + add_configs("openssl", {description = "Enable openssl", default = false, type = "boolean"}) + + on_load(function (package) + if package:config("openssl") then + package:add("deps", "openssl") + package:add("defines", "BRYNET_USE_OPENSSL") + end + end) - on_install("windows", "linux", "android", "cross", function (package) + on_install("!wasm", function (package) os.cp("include", package:installdir()) end) on_test(function (package) assert(package:check_cxxsnippets({test = [[ - void test(int argc, char** argv) { - auto service = brynet::net::TcpService::Create(); + void test() { + auto service = brynet::net::IOThreadTcpService::Create(); } ]]}, {configs = {languages = "c++17"}, includes = "brynet/net/TcpService.hpp"})) end) From a4505526b8257468e55952d869289676e8d6b961 Mon Sep 17 00:00:00 2001 From: nk125 Date: Mon, 5 Aug 2024 08:20:55 -0600 Subject: [PATCH 535/671] DPP: De-const have_voice option and add coroutines support. (#4824) * fix(dpp): Remove repeated have_voice condition * feat(dpp): Make have_voice option modifiable De-const have_voice option and enables optional download of voice libraries * feat(dpp): Add coroutine support Adds a configurable option to enable coroutine support * fix(dpp)!: Change have_voice to voice inside package As mentioned in the same pull request, prefixes like have_ are discouraged in xmake packages. BREAKING CHANGES: This WILL break xmake scripts that use the have_voice flag, IMO it's better to keep the previous have_voice flag as a deprecated alias of the new voice flag, and in the next version of D++ completely remove it from the package. * fix(dpp): Add C++ minimum version for test If coroutines are enabled, C++20 is required or the compilation will fail even though the test only requires C++17 to work, as dpp automatically includes coroutines if the macro is defined without checking C++ version * fix(dpp): Set C++ language for library dinamically The current configuration wasn't proper and when coroutines were enabled, the C++ version would change to C++17 sporadically, ignoring the later C++20 specification that was done later. Now the C++ version will adjust correctly to the coro flag. * style(dpp): Remove requested empty lines * feat(dpp): Re-add have_voice flag with deprecated warning This will bring up again have_voice to avoid codebase breakage, but with many deprecation warnings around to prevent new users to define it. --- packages/d/dpp/port/xmake.lua | 27 ++++++++++++++++++++++---- packages/d/dpp/xmake.lua | 36 +++++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/packages/d/dpp/port/xmake.lua b/packages/d/dpp/port/xmake.lua index 22d9e0f31..83dd198db 100644 --- a/packages/d/dpp/port/xmake.lua +++ b/packages/d/dpp/port/xmake.lua @@ -1,14 +1,33 @@ add_rules("mode.debug", "mode.release") - -add_requires("fmt", "nlohmann_json", "libsodium", "libopus", "openssl", "zlib") +add_requires("fmt", "nlohmann_json", "openssl", "zlib") +option("coro", {default = false}) +option("voice", {default = true}) +if has_config("voice") then + add_requires("libopus", "libsodium") +end target("dpp") set_kind("$(kind)") - set_languages("c++17") add_includedirs("include", "include/dpp") add_headerfiles("include/(dpp/**.h)") add_files("src/dpp/**.cpp") - add_packages("fmt", "nlohmann_json", "libsodium", "libopus", "openssl", "zlib") + add_packages("fmt", "nlohmann_json", "openssl", "zlib") + + if has_config("voice") then + add_packages("libopus", "libsodium") + add_defines("HAVE_VOICE") + end + + if has_config("coro") then + add_defines("DPP_CORO") + end + + local target_cpp_lang = "c++17" + if has_config("coro") then + target_cpp_lang = "c++20" + end + + set_languages(target_cpp_lang) add_defines("DPP_BUILD", "DPP_USE_EXTERNAL_JSON") diff --git a/packages/d/dpp/xmake.lua b/packages/d/dpp/xmake.lua index fc0d40de5..aba68b11a 100644 --- a/packages/d/dpp/xmake.lua +++ b/packages/d/dpp/xmake.lua @@ -53,7 +53,9 @@ package("dpp") add_deps("nlohmann_json", "openssl", "zlib") - add_configs("have_voice", { description = "Enable voice support for the library.", default = true, type = "boolean" , readonly = true}) + add_configs("voice", { description = "Enable voice support for the library.", default = true, type = "boolean" , readonly = false}) + add_configs("have_voice", { description = "Enable voice support for the library (Deprecated flag, move out to newer version 'voice').", default = false, type = "boolean" , readonly = false}) + add_configs("coro", { description = "Enable experimental coroutines support for the library.", default = false, type = "boolean" , readonly = false}) if is_plat("linux", "macosx") then add_syslinks("pthread") @@ -64,13 +66,27 @@ package("dpp") package:add("defines", "DPP_STATIC") end if package:config("have_voice") then + wprint([[ + === Deprecation Warning === + You should move out to use voice flag, instead of have_voice + Deprecated: + add_requires("dpp", { + configs = {have_voice = true} + }) + New (Recommended): + add_requires("dpp", { + configs = {voice = true} + }) + This flag will be removed soon, please migrate ASAP! + ]]) + end + if package:config("voice") then package:add("defines", "HAVE_VOICE") package:add("deps", "libsodium", "libopus") end - if package:config("have_voice") then - package:add("defines", "HAVE_VOICE") - package:add("deps", "libsodium", "libopus") + if package:config("coro") then + package:add("defines", "DPP_CORO") end if package:version():le("v10.0.13") then @@ -103,7 +119,11 @@ package("dpp") io.replace("include/dpp/restrequest.h", "#include ", "#include ", {plain = true}) os.rmdir("include/dpp/nlohmann") - local configs = {} + local configs = { + voice = package:config("voice") or package:config("have_voice"), + coro = package:config("coro") + } + if package:version():ge("v10.0.29") and package:is_plat("windows") then configs.cxflags = "/bigobj /Gy" end @@ -112,6 +132,10 @@ package("dpp") end) on_test(function (package) + local test_cpp_ver = "c++17" + if package:config("coro") then + test_cpp_ver = "c++20" + end assert(package:check_cxxsnippets({test = [[ void test() { dpp::cluster bot(std::getenv("BOT_TOKEN")); @@ -124,5 +148,5 @@ package("dpp") }); bot.start(false); } - ]]}, {configs = {languages = "c++17"}, includes = "dpp/dpp.h"})) + ]]}, {configs = {languages = test_cpp_ver}, includes = "dpp/dpp.h"})) end) From 18cb6e505696a5fef1e3bef38b7b5cac54c2039a Mon Sep 17 00:00:00 2001 From: Tab Ye <135727531+TabNahida@users.noreply.github.com> Date: Mon, 5 Aug 2024 22:31:09 +0800 Subject: [PATCH 536/671] Update UVW (#4852) * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * libuv: add v1.43.0 v1.45.0 * add tar * libuv: use cmake from v1.42.0 * libuv: fix version * libuv: patch ios for v144.1 * uvw: fix test * libuv: fix v1.43.0 linkdirs on windows * Update xmake.lua * Update xmake.lua * libuv: static library only for v1.43.0 --------- Co-authored-by: star9029 --- packages/l/libuv/xmake.lua | 18 ++++++--- packages/u/uvw/xmake.lua | 77 ++++++++++++++++++++++++++++---------- 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/packages/l/libuv/xmake.lua b/packages/l/libuv/xmake.lua index acc2e4a8b..c6a9185ed 100644 --- a/packages/l/libuv/xmake.lua +++ b/packages/l/libuv/xmake.lua @@ -9,7 +9,9 @@ package("libuv") add_versions("v1.48.0", "6dd637af0c23bee06b685a94e22f7e695f4ea7a9ab705485e32e658d4fd0125b") add_versions("v1.47.0", "d50af7e6d72526db137e66fad812421c8a1cae09d146b0ec2bb9a22c5f23ba93") add_versions("v1.46.0", "45953dc9b64db7f4f47561f9e4543b762c52adfe7c9b6f8e9efbc3b4dd7d3081") + add_versions("v1.45.0", "969d2c7c1110c5c47666a149501f29f7e4948c4a5b4add0f8ffe6b2203282638") add_versions("v1.44.1", "d233a9c522a9f4afec47b0d12f302d93d114a9e3ea104150e65f55fd931518e6") + add_versions("v1.43.0", "5d60a506981bcb340333b9d47d5faa8a49f2382da33073972383a02f79173b7b") add_versions("v1.42.0", "031130768b25ae18c4b9d4a94ba7734e2072b11c6fce3e554612c516c3241402") add_versions("v1.41.0", "cb89a8b9f686c5ccf7ed09a9e0ece151a73ebebc17af3813159c335b02181794") add_versions("v1.40.0", "61366e30d8484197dc9e4a94dbd98a0ba52fb55cb6c6d991af1f3701b10f322b") @@ -24,6 +26,8 @@ package("libuv") add_versions("v1.23.0", "ffa1aacc9e8374b01d1ff374b1e8f1e7d92431895d18f8e9d5e59a69a2a00c30") add_versions("v1.22.0", "1e8e51531732f8ef5867ae3a40370814ce2e4e627537e83ca519d40b424dced0") + add_patches("1.44.1", "https://github.com/libuv/libuv/pull/3563/commits/88930d52c1dd60f87445fdc26f0c22b2078299ea.patch", "ab61f14e35fbf6f54c854484b3766046da2dd0368bf71ec12471b89dd3739b1d") + if is_plat("macosx", "iphoneos") then add_frameworks("CoreFoundation") elseif is_plat("linux", "bsd") then @@ -35,23 +39,27 @@ package("libuv") -- https://github.com/libuv/libuv/issues/3411 if on_check then on_check("android", function (package) - if package:version():ge("1.47.0") then + if package:version():ge("1.45.0") then local ndk = package:toolchain("ndk") local ndk_sdkver = ndk:config("ndk_sdkver") - assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libuv): need ndk api level >= 24 after v1.47.0") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(libuv): need ndk api level >= 24 after v1.45.0") end end) end on_load(function (package) local version = package:version() - if version:ge("1.46.0") or is_host("windows") then + if version:ge("1.42.0") or is_host("windows") then package:add("deps", "cmake") else package:add("autoconf", "automake", "libtool", "pkg-config") end if package:is_plat("windows") then + if version:eq("1.43.0") then + package:config_set("shared", false) + wprint("package(libuv/1.43.0) only support static library") + end if version:ge("1.45") then package:add("links", package:config("shared") and "uv" or "libuv") else @@ -60,7 +68,7 @@ package("libuv") if package:config("shared") then package:add("defines", "USING_UV_SHARED") end - if version:ge("1.40") and version:lt("1.44") then + if version:ge("1.40") and version:lt("1.43") then package:add("linkdirs", path.join("lib", package:is_debug() and "Debug" or "Release")) end end @@ -72,7 +80,7 @@ package("libuv") end local version = package:version() - if version:ge("1.46.0") or is_host("windows") then + if version:ge("1.42.0") or is_host("windows") then local configs = {"-DLIBUV_BUILD_TESTS=OFF", "-DLIBUV_BUILD_BENCH=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DLIBUV_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) diff --git a/packages/u/uvw/xmake.lua b/packages/u/uvw/xmake.lua index 6b82af7c5..107dfa106 100644 --- a/packages/u/uvw/xmake.lua +++ b/packages/u/uvw/xmake.lua @@ -2,32 +2,69 @@ package("uvw") set_kind("library", {headeronly = true}) set_homepage("https://github.com/skypjack/uvw") set_description("Header-only, event based, tiny and easy to use libuv wrapper in modern C++") + set_license("MIT") + local versions = { + ["v3.4.0"] = "v1.48.0", + ["v3.3.0"] = "v1.47.0", + ["v3.2.0"] = "v1.46.0", + ["v3.1.0"] = "v1.45.0", + ["v3.0.0"] = "v1.44.1", + ["v2.12.1"] = "v1.44.1", + ["v2.11.0"] = "v1.43.0", + ["v2.10.0"] = "v1.42.0", + } + add_urls("https://github.com/skypjack/uvw.git") + add_urls("https://github.com/skypjack/uvw/archive/refs/tags/$(version).tar.gz", { + version = function (version) + local v = tostring(version) + return format("%s_libuv_%s", v, string.sub(versions[v], 1, -3)) + end}) - add_versions("2.10.0", "v2.10.0_libuv_v1.42") + add_versions("v3.4.0", "c16600573871a5feeb524234b378ab832c8971b2a68d030c6bd0e3077d416ade") + add_versions("v3.3.0", "aabb17d3d8f0b3481b44e981c889dd4a2a6a3f1a96a4d01055e669f4b7d37d0e") + add_versions("v3.2.0", "bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714") + add_versions("v3.1.0", "0a612bd243150fbbe1365cdaf48203d32061c1d14f93825a31876b183922f93b") + add_versions("v3.0.0", "aca0ffcbcc27a3cca2c9be608b99a75db85c91e9f1735e2abb5269e8c22c6e61") + add_versions("v2.12.1", "3460842778e91e7d2fae4201e49e4521e9d94fbbf3891ae6c52d3c9fc0673598") + add_versions("v2.11.0", "3af4efa2842299490ec764f2148f85f4426dfb4f8d8aa436cc2d049db2b7b514") + add_versions("v2.10.0", "30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf") - add_deps("cmake", "libuv") + add_deps("cmake") - on_install("macosx", "linux", "iphoneos", "android@linux,macosx", "mingw@linux,macosx", "windows", function (package) - local configs = {} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - if package:config("shared") then - table.insert(configs, "-DBUILD_SHARED_LIBS=on") - else - table.insert(configs, "-DBUILD_SHARED_LIBS=off") - end - import("package.tools.cmake").install(package, configs) + if on_check then + on_check("android", function (package) + if package:version():ge("3.1.0") then + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(uvw): deps(libuv) need ndk api level >= 24 after v1.45.0") + end + end) + end + + on_load(function (package) + package:add("deps", "libuv " .. versions[package:version_str()]) + end) + + on_install("!wasm", function (package) + import("package.tools.cmake").install(package) end) on_test(function (package) - assert(package:check_cxxsnippets({ - test = [[ - #include - void test() { - auto loop = uvw::Loop::getDefault(); - } - ]]}, - {configs = {languages = "c++17"} - })) + local code + if package:version() and package:version():lt("3.0.0") then + code = [[ + void test() { + auto loop = uvw::Loop::getDefault(); + } + ]] + else + code = [[ + void test() { + auto loop = uvw::loop::get_default(); + } + ]] + end + assert(package:check_cxxsnippets({test = code}, {configs = {languages = "c++17"}, includes = "uvw.hpp"})) end) From b079b806ecd7eb0c88792abab25f0bc531af04a6 Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 6 Aug 2024 09:34:04 +0800 Subject: [PATCH 537/671] update abseil to 20240722.0 (#4853) * Update xmake.lua * Update xmake.lua --- packages/a/abseil/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/a/abseil/xmake.lua b/packages/a/abseil/xmake.lua index 2e1db64f3..8ca20172e 100644 --- a/packages/a/abseil/xmake.lua +++ b/packages/a/abseil/xmake.lua @@ -15,6 +15,7 @@ package("abseil") add_versions("20230802.1", "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed") add_versions("20240116.1", "3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a") add_versions("20240116.2", "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc") + add_versions("20240722.0", "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3") add_patches("20240116.1", "https://github.com/abseil/abseil-cpp/commit/3335e58f198e899a500b744163f9b883035a5217.patch", "f83278086b42bc997846d2b931a266678f96e2727fce6ffd98b2b58ce75fa0a3") add_patches("20240116.2", "https://github.com/abseil/abseil-cpp/commit/3335e58f198e899a500b744163f9b883035a5217.patch", "f83278086b42bc997846d2b931a266678f96e2727fce6ffd98b2b58ce75fa0a3") @@ -38,6 +39,8 @@ package("abseil") io.replace(path.join("absl", "synchronization", "internal", "pthread_waiter.h"), "#ifndef _WIN32", "#if !defined(_WIN32) && !defined(__MINGW32__)", {plain = true}) io.replace(path.join("absl", "synchronization", "internal", "win32_waiter.h"), "#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", "#if defined(_WIN32) && !defined(__MINGW32__) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", {plain = true}) end + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>")]], "", {plain = true}) + io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL")]], "", {plain = true}) local configs = {"-DCMAKE_CXX_STANDARD=" .. package:config("cxx_standard"), "-DABSL_ENABLE_INSTALL=ON", "-DABSL_PROPAGATE_CXX_STD=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From 56c462fa87ac7124f8e5f583afb0fb11ba60840a Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 6 Aug 2024 09:34:37 +0800 Subject: [PATCH 538/671] inja: fix header only kind (#4844) * inja: fix header only kind * limit plat * fix test.lua --- packages/i/inja/xmake.lua | 18 ++++++++++++------ scripts/test.lua | 3 --- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/i/inja/xmake.lua b/packages/i/inja/xmake.lua index 7f0bf3482..ce66a3d74 100644 --- a/packages/i/inja/xmake.lua +++ b/packages/i/inja/xmake.lua @@ -1,19 +1,25 @@ package("inja") - + set_kind("library", {headeronly = true}) set_homepage("https://pantor.github.io/inja/") set_description("A Template Engine for Modern C++") set_license("MIT") - add_urls("https://github.com/pantor/inja/archive/$(version).tar.gz", + add_urls("https://github.com/pantor/inja/archive/refs/tags/$(version).tar.gz", "https://github.com/pantor/inja.git") - add_versions("v2.1.0", "038ecde8f6dbad5d3cedb6ceb0853fd0e488d5dc57593a869633ecb30b0dfa6e") add_versions("v3.4.0", "7155f944553ca6064b26e88e6cae8b71f8be764832c9c7c6d5998e0d5fd60c55") + add_versions("v2.1.0", "038ecde8f6dbad5d3cedb6ceb0853fd0e488d5dc57593a869633ecb30b0dfa6e") - add_deps("nlohmann_json") + add_deps("cmake") + add_deps("nlohmann_json", {configs = {cmake = true}}) - on_install(function (package) - os.cp("single_include/inja", package:installdir("include")) + on_install("!wasm", function (package) + import("package.tools.cmake").install(package, { + "-DINJA_INSTALL=ON", + "-DINJA_USE_EMBEDDED_JSON=OFF", + "-DBUILD_TESTING=OFF", + "-DBUILD_BENCHMARK=OFF" + }) end) on_test(function (package) diff --git a/scripts/test.lua b/scripts/test.lua index 15196826d..604affff2 100644 --- a/scripts/test.lua +++ b/scripts/test.lua @@ -235,9 +235,6 @@ function get_modified_packages() if #packages > 0 and version then local lastpackage = packages[#packages] local splitinfo = lastpackage:split("%s+") - if #splitinfo == 1 then - table.remove(packages) - end table.insert(packages, splitinfo[1] .. " " .. version) end end From a2c49c8a32b2ae8d04ae6b440619841ed336ba5c Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 6 Aug 2024 09:34:59 +0800 Subject: [PATCH 539/671] Update nativefiledialog-extended to v1.2.1 (#4854) --- packages/n/nativefiledialog-extended/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/n/nativefiledialog-extended/xmake.lua b/packages/n/nativefiledialog-extended/xmake.lua index 17225f90d..2f4e2e666 100644 --- a/packages/n/nativefiledialog-extended/xmake.lua +++ b/packages/n/nativefiledialog-extended/xmake.lua @@ -5,6 +5,7 @@ package("nativefiledialog-extended") add_urls("https://github.com/btzy/nativefiledialog-extended/archive/refs/tags/$(version).zip", "https://github.com/btzy/nativefiledialog-extended.git") + add_versions("v1.2.1", "fc359b212e56011931b90bf4241057eddec45308bb4d8b9aab4dfb2f70e3b211") add_versions("v1.2.0", "27dc13320816392d0d9905c60645aa684784c7c2559d656b504021edd40f07ed") add_versions("v1.1.1", "7003001d36235db2c2062cd992e61c59c77a5ad3ca5e5ed8175e56502513886e") add_versions("v1.1.0", "5827d17b6bddc8881406013f419c534e8459b38f34c2f266d9c1da8a7a7464bc") From 526c64636d036bd30a73a06b9dd628ba3074be3e Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 6 Aug 2024 09:58:23 +0800 Subject: [PATCH 540/671] Update fast-cdr to v2.2.3 (#4856) --- packages/f/fast-cdr/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/fast-cdr/xmake.lua b/packages/f/fast-cdr/xmake.lua index 07b435a3c..ca0fa60fd 100644 --- a/packages/f/fast-cdr/xmake.lua +++ b/packages/f/fast-cdr/xmake.lua @@ -6,6 +6,7 @@ package("fast-cdr") add_urls("https://github.com/eProsima/Fast-CDR/archive/refs/tags/$(version).tar.gz", "https://github.com/eProsima/Fast-CDR.git") + add_versions("v2.2.3", "2501ef0930727d3b3ac1819672a6df8631a58fbcf7f005947046c2de46e8da69") add_versions("v2.2.2", "ae8b78a23c2929f26813d791757d0ef63a5e47e00ccfd3482743af1e837d9556") add_versions("v2.2.1", "11079a534cda791a8fc28d93ecb518bbd3804c0d4e9ca340ab24dcc21ad69a04") add_versions("v2.1.3", "9a992cf20d8df727df1cd389cc36039c92bbe86762b2c17a479f4f59a499b1ea") From a1a5ca1ff583456ed9519703bdcdf00ce3fa2c0b Mon Sep 17 00:00:00 2001 From: Dozingfiretruck <1473454180@qq.com> Date: Tue, 6 Aug 2024 22:26:10 +0800 Subject: [PATCH 541/671] update:sdl update to SDL2-2.30.6 (#4860) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add:llvm-arm * update:sdl update to SDL2-2.30.6 * fix: checksum in lowercase * libsdl: Fix compilation in static mode * Update xmake.lua --------- Co-authored-by: Jérôme Leclercq --- packages/l/libsdl/xmake.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/l/libsdl/xmake.lua b/packages/l/libsdl/xmake.lua index 0428512f0..fff3e6af7 100644 --- a/packages/l/libsdl/xmake.lua +++ b/packages/l/libsdl/xmake.lua @@ -42,6 +42,8 @@ package("libsdl") add_versions("archive:2.30.3", "c5d78a9e0346c6695f03df8ba25e5e111a1e23c8aefa8372a1c5a0dd79acaf10") add_versions("archive:2.30.4", "292d5e2f897aa3acb6b365b605c3249c92916fbe7eba4a2e57573ada3855d7cb") add_versions("archive:2.30.5", "688d3da2bf7e887d0ba8e0f81c926119f85029544f4f6da8dea96db70f9d28e3") + add_versions("archive:2.30.6", "6d4e00fcbee9fd8985cc2869edeb0b1a751912b87506cf2fb6471e73d981e1f4") + add_versions("github:2.0.8", "release-2.0.8") add_versions("github:2.0.12", "release-2.0.12") add_versions("github:2.0.14", "release-2.0.14") @@ -69,8 +71,10 @@ package("libsdl") add_versions("github:2.30.3", "release-2.30.3") add_versions("github:2.30.4", "release-2.30.4") add_versions("github:2.30.5", "release-2.30.5") + add_versions("github:2.30.6", "release-2.30.6") add_patches("2.30.0", path.join(os.scriptdir(), "patches", "2.30.0", "fix_mingw.patch"), "ab54eebc2e58d88653b257bc5b48a232c5fb0e6fad5d63661b6388215a7b0cd0") + add_patches("2.30.6", "https://github.com/libsdl-org/SDL/commit/7cf3234efeb7a68636bcfdfb3b1507b43fbb0845.patch", "c2fba1e76f8f10631544b63e8ce105a67d582b23bba7c96bdef5f135bd6b4cad") add_deps("cmake") From 67455efd9dc279f2212b2c0c88a4d16cca0d8387 Mon Sep 17 00:00:00 2001 From: jj683 <87266000+jj683@users.noreply.github.com> Date: Tue, 6 Aug 2024 16:36:51 +0200 Subject: [PATCH 542/671] zlib-ng is non-compat by default (#4859) * zlib-ng is non-compat by default * Fix libbigwig+zlib-ng deps * Rename flag --- packages/l/libbigwig/xmake.lua | 6 +++++- packages/z/zlib-ng/xmake.lua | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/packages/l/libbigwig/xmake.lua b/packages/l/libbigwig/xmake.lua index 97b35d060..4aaa0629b 100644 --- a/packages/l/libbigwig/xmake.lua +++ b/packages/l/libbigwig/xmake.lua @@ -21,7 +21,11 @@ package("libbigwig") if package:config("curl") then package:add("deps", "libcurl") end - package:add("deps", (package:config("zlib_ng") and "zlib-ng" or "zlib")) + if package:config("zlib_ng") then + package:add("deps", "zlib-ng", {configs = {zlib_compat = true}}) + else + package:add("deps", "zlib") + end end) on_install("linux", "macosx", "bsd", "mingw", "msys", "android", "iphoneos", "cross", function (package) diff --git a/packages/z/zlib-ng/xmake.lua b/packages/z/zlib-ng/xmake.lua index 2da133b0f..4268cab61 100644 --- a/packages/z/zlib-ng/xmake.lua +++ b/packages/z/zlib-ng/xmake.lua @@ -12,6 +12,8 @@ package("zlib-ng") add_versions("2.0.6", "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6") add_versions("2.0.5", "eca3fe72aea7036c31d00ca120493923c4d5b99fe02e6d3322f7c88dbdcd0085") + add_configs("zlib_compat", {description = "Compile with zlib compatible API", default = false, type = "boolean"}) + add_deps("cmake") if on_check then @@ -27,23 +29,20 @@ package("zlib-ng") end end - if package:version():eq("2.1.6") and package:is_arch("i386") and package:is_cross() then - assert(false, "package(zlib-ng/i386): Unsupported cross compilation") + if package:version():ge("2.1.6") and package:is_arch("i386") and package:is_cross() then + assert(false, "package(zlib-ng/i386 >= 2.1.6): Unsupported cross compilation") end end) - end - on_load(function (package) - if package:version():eq("2.1.5") then - if package:is_plat("android") or package:is_arch("arm.*") then - raise("zlib-ng 2.1.5 not support android and arm.") + on_check("android", function (package) + if package:version():ge("2.1.5") and package:is_arch("arm.*") then + assert(false, "package(zlib-ng/android >= 2.1.5): Unsupported android and arm") end - end - end) + end) + end on_install("windows", "macosx", "linux", "android", "mingw", function (package) local configs = { - "-DZLIB_COMPAT=ON", "-DZLIB_ENABLE_TESTS=OFF", "-DZLIBNG_ENABLE_TESTS=OFF", "-DWITH_GTEST=OFF", @@ -52,9 +51,14 @@ package("zlib-ng") table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DINC_INSTALL_DIR=" .. package:installdir("include")) table.insert(configs, "-DLIB_INSTALL_DIR=" .. package:installdir("lib")) + table.insert(configs, "-DZLIB_COMPAT=" .. (package:config("zlib_compat") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cfuncs("inflate", {includes = "zlib.h"})) + if package:config("zlib_compat") then + assert(package:has_cfuncs("inflate", {includes = "zlib.h"})) + else + assert(package:has_cfuncs("zng_inflate", {includes = "zlib-ng.h"})) + end end) From ee927d304d00356980a9ecac0426f364da7868a6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 6 Aug 2024 23:37:52 +0800 Subject: [PATCH 543/671] Auto-update aws-c-sdkutils to v0.1.19 (#4851) * Update aws-c-sdkutils to v0.1.19 * aws-c-common: bump v0.9.25 * limit plat --------- Co-authored-by: star9029 --- packages/a/aws-c-common/xmake.lua | 4 ++-- packages/a/aws-c-sdkutils/xmake.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/a/aws-c-common/xmake.lua b/packages/a/aws-c-common/xmake.lua index cdcef7377..aa17a5d07 100644 --- a/packages/a/aws-c-common/xmake.lua +++ b/packages/a/aws-c-common/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-common") add_urls("https://github.com/awslabs/aws-c-common/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-common.git") + add_versions("v0.9.25", "443f3268387715e6e2c417a87114a6b42873aeeebc793d3f6f631323e7c48a80") add_versions("v0.9.24", "715a15399fe6dce2971c222ecabea4276e42ba3465a63c175724fc0c80d7a888") add_versions("v0.9.23", "adf838daf6a60aa31268522105b03262d745f529bc981d3ac665424133d6f91b") add_versions("v0.9.19", "196430fda1bca2c77df7d9199232956d371a92f49ee48fd6c29ff969410ca0ed") @@ -15,7 +16,6 @@ package("aws-c-common") add_versions("v0.9.13", "6d2044fc58e5d7611610976602f3fc2173676726b00eed026526962c599ece1d") add_versions("v0.9.3", "389eaac7f64d7d5a91ca3decad6810429eb5a65bbba54798b9beffcb4d1d1ed6") - add_configs("asan", {description = "Enable Address Sanitize.", default = false, type = "boolean"}) if is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end @@ -30,7 +30,7 @@ package("aws-c-common") add_deps("cmake") - on_install("windows|x64", "windows|x86", "linux", "macosx", "bsd", "msys", "android", "iphoneos", "cross", "wasm", function (package) + on_install("!mingw or mingw|!i386", function (package) local configs = {"-DBUILD_TESTING=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) diff --git a/packages/a/aws-c-sdkutils/xmake.lua b/packages/a/aws-c-sdkutils/xmake.lua index e7ab511d0..d11fd6b0e 100644 --- a/packages/a/aws-c-sdkutils/xmake.lua +++ b/packages/a/aws-c-sdkutils/xmake.lua @@ -6,18 +6,18 @@ package("aws-c-sdkutils") add_urls("https://github.com/awslabs/aws-c-sdkutils/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-sdkutils.git") + add_versions("v0.1.19", "66bd7a8679703386aec1539407aaed0942a78032fe340ab44e810a3cf6d7e505") add_versions("v0.1.16", "4a818563d7c6636b5b245f5d22d4d7c804fa33fc4ea6976e9c296d272f4966d3") add_versions("v0.1.15", "15fa30b8b0a357128388f2f40ab0ba3df63742fd333cc2f89cb91a9169f03bdc") add_versions("v0.1.12", "c876c3ce2918f1181c24829f599c8f06e29733f0bd6556d4c4fb523390561316") - add_configs("asan", {description = "Enable Address Sanitize.", default = false, type = "boolean"}) if is_plat("wasm") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) end add_deps("cmake", "aws-c-common") - on_install("windows|x64", "windows|x86", "linux", "macosx", "bsd", "msys", "android", "iphoneos", "cross", "wasm", function (package) + on_install("!mingw or mingw|!i386", function (package) local aws_cmakedir = package:dep("aws-c-common"):installdir("lib", "cmake") local aws_c_common_configdir = package:dep("aws-c-common"):installdir("lib", "aws-c-common", "cmake") if is_host("windows") then From c48a92c8ca13623b08fa72e32c016b7be292f228 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 7 Aug 2024 10:00:17 +0800 Subject: [PATCH 544/671] Update uwebsockets to v20.65.0 (#4863) --- packages/u/uwebsockets/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/u/uwebsockets/xmake.lua b/packages/u/uwebsockets/xmake.lua index 1087eb8f0..9d13f1a2a 100644 --- a/packages/u/uwebsockets/xmake.lua +++ b/packages/u/uwebsockets/xmake.lua @@ -7,6 +7,7 @@ package("uwebsockets") add_urls("https://github.com/uNetworking/uWebSockets/archive/refs/tags/$(version).tar.gz", "https://github.com/uNetworking/uWebSockets.git") + add_versions("v20.65.0", "e261f7c124b3b9e217fc766d6e51d4fdc4b227aa52c7a0ca5952a9e65cea4213") add_versions("v20.64.0", "bb81fa773dcbd6bc738904ad496554fd131a33269570e0e86fa09213d82ba9ef") add_versions("v20.62.0", "03dfc8037cf43856a41e64bbc7fc5a7cf5e6369c9158682753074ecbbe09eed1") add_versions("v20.61.0", "94778209571f832740fe1a4f19dbc059990b6acc34b8789f39cda6a158178d1f") From 24aa5e4bf17914d64b4fcff4fc061bfe0160e9fd Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 7 Aug 2024 10:00:20 +0800 Subject: [PATCH 545/671] Update etl to 20.39.1 (#4862) --- packages/e/etl/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/etl/xmake.lua b/packages/e/etl/xmake.lua index 7c49b2bfc..e597a9540 100644 --- a/packages/e/etl/xmake.lua +++ b/packages/e/etl/xmake.lua @@ -7,6 +7,7 @@ package("etl") add_urls("https://github.com/ETLCPP/etl/archive/refs/tags/$(version).tar.gz", "https://github.com/ETLCPP/etl.git") + add_versions("20.39.1", "3fb193011450d5d25b9b221d68f74b9baa970c7fb03ff03426cad56fdead93d6") add_versions("20.38.17", "5b490aca3faad3796a48bf0980e74f2a67953967fad3c051a6d4981051cb0b9a") add_versions("20.38.16", "6d05e33d6e7eb2c8d4654c77dcd083adc70da29aba808f471ba7c6e2b8fcbf03") add_versions("20.38.13", "e606083e189a8fe6211c30c8c579b60c29658a531b5cafbb511daab1a2861a69") From bbc24db246a2801980f1c06dbb517d504df8fdf5 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 7 Aug 2024 11:53:25 +0800 Subject: [PATCH 546/671] poselib: add package (#4861) * eigen: support some platform * poselib: add package * limit plat * Update xmake.lua --- packages/e/eigen/xmake.lua | 2 +- packages/p/poselib/xmake.lua | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 packages/p/poselib/xmake.lua diff --git a/packages/e/eigen/xmake.lua b/packages/e/eigen/xmake.lua index 7a4f3f0b8..f19841065 100644 --- a/packages/e/eigen/xmake.lua +++ b/packages/e/eigen/xmake.lua @@ -24,7 +24,7 @@ package("eigen") add_includedirs("include") add_includedirs("include/eigen3") - on_install("macosx", "linux", "windows", "mingw", "cross", function (package) + on_install(function (package) import("package.tools.cmake").install(package, {"-DBUILD_TESTING=OFF"}) end) diff --git a/packages/p/poselib/xmake.lua b/packages/p/poselib/xmake.lua new file mode 100644 index 000000000..b42994ce3 --- /dev/null +++ b/packages/p/poselib/xmake.lua @@ -0,0 +1,36 @@ +package("poselib") + set_homepage("https://github.com/PoseLib/PoseLib") + set_description("Minimal solvers for calibrated camera pose estimation") + set_license("BSD-3-Clause") + + add_urls("https://github.com/PoseLib/PoseLib/archive/refs/tags/$(version).tar.gz", + "https://github.com/PoseLib/PoseLib.git") + + add_versions("v2.0.4", "caa0c1c9b882f6e36b5ced6f781406ed97d4c1f0f61aa31345ebe54633d67c16") + + add_deps("cmake") + add_deps("eigen") + + on_install("!wasm and (!windows or windows|!arm64)", function (package) + io.replace("CMakeLists.txt", "-march=native", "", {plain = true}) + io.replace("CMakeLists.txt", "-Wall -Werror -fPIC", "", {plain = true}) + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:config("shared") and package:is_plat("windows") then + table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + std::vector x1(10, Eigen::Vector3d{}); + std::vector x2(10, Eigen::Vector3d{}); + Eigen::Matrix3d h; + int res = poselib::homography_4pt(x1, x2, &h); + } + ]]}, {configs = {languages = "c++17"}, includes = "PoseLib/poselib.h"})) + end) From b2c7f361ef5c16e9c4ba610c7c46a68fd9167c13 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 8 Aug 2024 00:59:05 +0800 Subject: [PATCH 547/671] libsmb2: add package (#4836) * libsmb2: add package * fix size_t * fix mingw * fix type * fix includedirs * add check * remove conflicting types for mingw/i386 --- packages/l/libsmb2/xmake.lua | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/l/libsmb2/xmake.lua diff --git a/packages/l/libsmb2/xmake.lua b/packages/l/libsmb2/xmake.lua new file mode 100644 index 000000000..086f181a7 --- /dev/null +++ b/packages/l/libsmb2/xmake.lua @@ -0,0 +1,48 @@ +package("libsmb2") + set_homepage("https://github.com/sahlberg/libsmb2") + set_description("SMB2/3 userspace client") + set_license("LGPL-2.1") + + add_urls("https://github.com/sahlberg/libsmb2/archive/9e4b679ff32141fdddfe97f08d530f539162847b.tar.gz", + "https://github.com/sahlberg/libsmb2.git") + + add_versions("2024.07.16", "49ac50058af28612da3fead14f9566fcd3ed334c8afc33f94d5cd790c745ea9c") + + if is_plat("windows", "mingw") then + add_syslinks("ws2_32") + end + + add_includedirs("include", "include/smb2") + + add_deps("cmake") + + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 26, "package(libsmb2): need ndk api level >= 26 for android") + end) + end + + on_install(function (package) + if package:is_plat("mingw") then + io.replace("lib/compat.h", "_WINDOWS", "_WIN32", {plain = true}) + io.replace("lib/compat.c", "_WINDOWS", "_WIN32", {plain = true}) + io.replace("lib/socket.c", "_WINDOWS", "_WIN32", {plain = true}) + io.replace("include/smb2/libsmb2.h", "_WINDOWS", "_WIN32", {plain = true}) + io.replace("include/asprintf.h", "vasprintf", "vasprintf_", {plain = true}) + io.replace("include/asprintf.h", "asprintf", "asprintf_", {plain = true}) + if package:is_arch("i386") then + io.replace("lib/compat.h", "typedef SSIZE_T ssize_t;", "", {plain = true}) + end + end + + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("smb2_init_context", {includes = {"stddef.h", "stdint.h", "smb2/libsmb2.h"}})) + end) From a7ac7e43c27f972261145c65f762c2873d32799a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 8 Aug 2024 10:10:53 +0800 Subject: [PATCH 548/671] Update pdfio to v1.3.1 (#4867) --- packages/p/pdfio/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pdfio/xmake.lua b/packages/p/pdfio/xmake.lua index caf28c479..c9a017582 100644 --- a/packages/p/pdfio/xmake.lua +++ b/packages/p/pdfio/xmake.lua @@ -6,6 +6,7 @@ package("pdfio") add_urls("https://github.com/michaelrsweet/pdfio/archive/refs/tags/$(version).tar.gz", "https://github.com/michaelrsweet/pdfio.git") + add_versions("v1.3.1", "0f2933f2d5d0a8c0152510fe5b565715cee8146f3d0d10024e3c597268928574") add_versions("v1.3.0", "aae5b4850560869021f6af1700a0681f0d19299554f24abf890a1a78188ddf02") if is_plat("windows", "mingw") then From 9d1ede210fa3e452d0ddd0506e4cd69367db2be3 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 8 Aug 2024 10:29:07 +0800 Subject: [PATCH 549/671] fix python for linux (#4869) --- packages/p/python/xmake.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/p/python/xmake.lua b/packages/p/python/xmake.lua index 73234eaec..89730ba3a 100644 --- a/packages/p/python/xmake.lua +++ b/packages/p/python/xmake.lua @@ -237,6 +237,11 @@ package("python") os.mkdir(package:installdir("lib", pyver)) end + -- fix ssl module detect, e.g. gcc conftest.c -ldl -lcrypto >&5 + if package:is_plat("linux") then + io.replace("./configure", "-lssl -lcrypto", "-lssl -lcrypto -ldl", {plain = true}) + end + -- unset these so that installing pip and setuptools puts them where we want -- and not into some other Python the user has installed. import("package.tools.autoconf").configure(package, configs, {envs = {PYTHONHOME = "", PYTHONPATH = ""}}) From 3ea4568ece5eeeed93b14e4d7108efaa6f9c1cf7 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 8 Aug 2024 10:30:26 +0800 Subject: [PATCH 550/671] fix boost (#4868) --- packages/b/boost/xmake.lua | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 4e6c08d32..775122533 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -86,6 +86,7 @@ package("boost") add_configs("lzma", {description = "enable lzma for iostreams", default = false, type = "boolean"}) on_load(function (package) + local function get_linkname(package, libname) local linkname if package:is_plat("windows") then @@ -145,13 +146,11 @@ package("boost") end package:add("deps", "python " .. package:config("pyver") .. ".x", {configs = {headeronly = true}}) end - if package:is_plat("linux") then - if package:config("zstd") then - package:add("deps", "zstd") - end - if package:config("lzma") then - package:add("deps", "xz") - end + if package:config("zstd") then + package:add("deps", "zstd") + end + if package:config("lzma") then + package:add("deps", "xz") end if package:is_plat("windows") and package:version():le("1.85.0") then From 90bd76abf0bb31d16517d7dc58ba949074fcce7c Mon Sep 17 00:00:00 2001 From: Elite-stay <344233108@qq.com> Date: Thu, 8 Aug 2024 20:35:32 +0800 Subject: [PATCH 551/671] update gdal test (#4870) * update gdal test * Update xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 --- packages/g/gdal/xmake.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 122f071a6..e730d0ac7 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -118,9 +118,5 @@ package("gdal") end) on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - #include - void test(int argc, char** argv) { - GDALAllRegister(); - }]]}, {configs = {languages = "c++11"}, includes = "ogrsf_frmts.h"})) + assert(package:has_cxxfuncs("GDALAllRegister", {configs = {languages = "c++11"}, includes = "ogrsf_frmts.h"})) end) From aee03950d1a752988155b309b65d91f633623a45 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 8 Aug 2024 22:48:14 +0800 Subject: [PATCH 552/671] boost: fix lzma config on windows --- packages/b/boost/xmake.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 775122533..5aa1cff3a 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -273,7 +273,11 @@ package("boost") local dep = package:dep(depname) local info = dep:fetch({external = false}) if info then - local usingstr = format("\nusing %s : : \"%s\" \"%s\" ;",rule, info.includedirs[1], info.linkdirs[1]) + local usingstr = format("\nusing %s : %s : %s %s %s ;", + rule, dep:version(), + path.unix(info.includedirs[1]), + path.unix(info.linkdirs[1]), + info.links[1]) file:write(usingstr) end end @@ -309,7 +313,12 @@ package("boost") "runtime-debugging=" .. (package:is_debug() and "on" or "off") } - if not package:config("lzma") then + local cxxflags = {} + if package:config("lzma") then + if package:is_plat("windows") and not package:dep("xz"):config("shared") then + table.insert(cxxflags, "-DLZMA_API_STATIC") + end + else table.insert(argv, "-sNO_LZMA=1") end if not package:config("zstd") then @@ -328,7 +337,6 @@ package("boost") table.insert(argv, "address-model=32") end - local cxxflags = {} local linkflags = {} table.join2(cxxflags, table.wrap(package:config("cxflags"))) table.join2(cxxflags, table.wrap(package:config("cxxflags"))) From 55adb2193d2fe28d19514e7ad92f353d4abad5a6 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 9 Aug 2024 00:02:50 +0800 Subject: [PATCH 553/671] intx: add package (#4871) * intx: add package * add check --- packages/i/intx/xmake.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/i/intx/xmake.lua diff --git a/packages/i/intx/xmake.lua b/packages/i/intx/xmake.lua new file mode 100644 index 000000000..b527c8a1e --- /dev/null +++ b/packages/i/intx/xmake.lua @@ -0,0 +1,31 @@ +package("intx") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/chfast/intx") + set_description("Extended precision integer C++ library") + set_license("Apache-2.0") + + add_urls("https://github.com/chfast/intx/archive/refs/tags/$(version).tar.gz", + "https://github.com/chfast/intx.git") + + add_versions("v0.11.0", "bff2a78e3a9a3b9bbabf50500feae65bc0ec50a2364f4a83768277d6eba7a844") + + add_deps("cmake") + + on_check(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test(std::signed_integral auto x) {} + ]]}, {configs = {languages = "c++20"}}), "package(intx) Require at least C++20.") + end) + + on_install(function (package) + import("package.tools.cmake").install(package, {"-DINTX_TESTING=OFF"}) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + auto x = static_cast(intx::uint512{1} / (intx::uint512{1} << 111)); + } + ]]}, {configs = {languages = "c++20"}, includes = {"intx/intx.hpp"}})) + end) From e0afd6d0eb790e466d8eb6b46924b5fa213a37f1 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 9 Aug 2024 09:23:47 +0800 Subject: [PATCH 554/671] argz: add package (#4873) --- packages/a/argz/xmake.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/a/argz/xmake.lua diff --git a/packages/a/argz/xmake.lua b/packages/a/argz/xmake.lua new file mode 100644 index 000000000..9f9a1d97f --- /dev/null +++ b/packages/a/argz/xmake.lua @@ -0,0 +1,31 @@ +package("argz") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/stephenberry/argz") + set_description("A light weight C++ in memory argument parser") + set_license("Apache-2.0") + + add_urls("https://github.com/stephenberry/argz/archive/refs/tags/$(version).tar.gz", + "https://github.com/stephenberry/argz.git") + + add_versions("v0.2.1", "1a9d85ef7e4722f81ce426c2cf8ceaa0a10cc42e7762cdf2465ae6484ece9c7e") + + add_includedirs("include/argz") + + add_deps("cmake") + + on_install(function (package) + if package:has_tool("cxx", "cl") then + package:add("cxxflags", "/Zc:preprocessor", "/GL", "/permissive-", "/Zc:lambda") + end + io.replace("CMakeLists.txt", "include(cmake/dev-mode.cmake)", "", {plain = true}) + import("package.tools.cmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + constexpr std::string_view version = "1.2.3"; + argz::about about{ "My program description", version }; + } + ]]}, {configs = {languages = "c++20"}, includes = {"argz/argz.hpp"}})) + end) From 2565721b35dce693aa479d50326dae9715faa578 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 9 Aug 2024 10:04:03 +0800 Subject: [PATCH 555/671] Update jsbsim to v1.2.1 (#4876) --- packages/j/jsbsim/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/j/jsbsim/xmake.lua b/packages/j/jsbsim/xmake.lua index 55ff48e33..be473b37f 100644 --- a/packages/j/jsbsim/xmake.lua +++ b/packages/j/jsbsim/xmake.lua @@ -6,6 +6,7 @@ package("jsbsim") add_urls("https://github.com/JSBSim-Team/jsbsim/archive/refs/tags/$(version).tar.gz", "https://github.com/JSBSim-Team/jsbsim.git") + add_versions("v1.2.1", "21990b6130fce9368592caff79421b275780e04868fc05b1c3e2aa2a6f8d7459") add_versions("v1.2.0", "1ac7d594ba4de3582ec1bff972a298af8d65651dd5fc547240ea407b25396d80") if is_plat("windows", "mingw") then From 600cd9d0ded33781936d99cd18ef375661b55da8 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 10 Aug 2024 10:16:37 +0800 Subject: [PATCH 556/671] Update libheif to 1.18.2 (#4885) --- packages/l/libheif/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libheif/xmake.lua b/packages/l/libheif/xmake.lua index 9eb5f51c0..1fc5d0224 100644 --- a/packages/l/libheif/xmake.lua +++ b/packages/l/libheif/xmake.lua @@ -5,6 +5,7 @@ package("libheif") set_license("LGPL-3.0") add_urls("https://github.com/strukturag/libheif/releases/download/v$(version)/libheif-$(version).tar.gz") + add_versions("1.18.2", "c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf") add_versions("1.18.0", "3f25f516d84401d7c22a24ef313ae478781b95f235c250b06152701c401055c3") add_versions("1.17.6", "8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee") add_versions("1.12.0", "e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718") From 718c3968156fafd66e81c2c0485991078298d596 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 10 Aug 2024 10:16:41 +0800 Subject: [PATCH 557/671] Update etl to 20.39.2 (#4883) --- packages/e/etl/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e/etl/xmake.lua b/packages/e/etl/xmake.lua index e597a9540..8126f4924 100644 --- a/packages/e/etl/xmake.lua +++ b/packages/e/etl/xmake.lua @@ -7,6 +7,7 @@ package("etl") add_urls("https://github.com/ETLCPP/etl/archive/refs/tags/$(version).tar.gz", "https://github.com/ETLCPP/etl.git") + add_versions("20.39.2", "b1faad1b83382bc7e06df0892b0efe1bd62e8dafe490878b601188f144bef063") add_versions("20.39.1", "3fb193011450d5d25b9b221d68f74b9baa970c7fb03ff03426cad56fdead93d6") add_versions("20.38.17", "5b490aca3faad3796a48bf0980e74f2a67953967fad3c051a6d4981051cb0b9a") add_versions("20.38.16", "6d05e33d6e7eb2c8d4654c77dcd083adc70da29aba808f471ba7c6e2b8fcbf03") From 193aab3a94c28a30d8d509b1c21ee9ec1db458bf Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 10 Aug 2024 11:09:17 +0800 Subject: [PATCH 558/671] Update simdutf to v5.3.4 (#4887) --- packages/s/simdutf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdutf/xmake.lua b/packages/s/simdutf/xmake.lua index c966cc00b..64d2c1dc1 100644 --- a/packages/s/simdutf/xmake.lua +++ b/packages/s/simdutf/xmake.lua @@ -6,6 +6,7 @@ package("simdutf") add_urls("https://github.com/simdutf/simdutf/archive/refs/tags/$(version).tar.gz", "https://github.com/simdutf/simdutf.git") + add_versions("v5.3.4", "ccc9dab0c38bf0ee67374592707c6e6002148b99fb225a6b0c4604e90cfcbbc4") add_versions("v5.3.0", "9b568d6e66b14810bdbcf645f19b103475ab8175201b5c85828222c0ff0a735c") add_versions("v5.2.8", "2706f1bef85a6d8598f82defd3848f1c5100e2e065c5d416d993118b53ea8d77") add_versions("v5.2.6", "ab9e56facf7cf05f4e9d062a0adef310fc6a0f82a8132e8ec1e1bb7ab5e234df") From c0db5d0907c57e1621f9ac68684cb03336efe512 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 11 Aug 2024 06:42:28 +0800 Subject: [PATCH 559/671] update openblas & upgrade clang ci (#4882) --- .github/workflows/ubuntu_clang.yml | 4 ++-- packages/o/openblas/xmake.lua | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu_clang.yml b/.github/workflows/ubuntu_clang.yml index e652c5d57..d35bfb85a 100644 --- a/.github/workflows/ubuntu_clang.yml +++ b/.github/workflows/ubuntu_clang.yml @@ -36,8 +36,8 @@ jobs: # https://apt.llvm.org/ wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 17 all + sudo ./llvm.sh 20 all - name: Tests run: | - xmake l ./scripts/test.lua -D --toolchain=clang-17 -k ${{ matrix.kind }} + xmake l ./scripts/test.lua -D --toolchain=clang-20 -k ${{ matrix.kind }} diff --git a/packages/o/openblas/xmake.lua b/packages/o/openblas/xmake.lua index fea5f285a..ce2edb6a4 100644 --- a/packages/o/openblas/xmake.lua +++ b/packages/o/openblas/xmake.lua @@ -47,6 +47,7 @@ package("openblas") add_versions("0.3.24", "ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132") add_versions("0.3.26", "4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68") add_versions("0.3.27", "aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897") + add_versions("0.3.28", "f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1") add_configs("fortran", {description = "Compile with fortran enabled.", default = not is_plat("macosx"), type = "boolean"}) add_configs("openmp", {description = "Compile with OpenMP enabled.", default = not is_plat("macosx"), type = "boolean"}) @@ -153,10 +154,10 @@ package("openblas") on_test(function (package) assert(package:check_csnippets({test = [[ void test() { - double A[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0}; - double B[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0}; - double C[9] = {.5,.5,.5,.5,.5,.5,.5,.5,.5}; - cblas_dgemm(CblasColMajor,CblasNoTrans,CblasTrans,3,3,2,1,A,3,B,3,2,C,3); + double A[6] = {1.0, 2.0, 1.0, -3.0, 4.0, -1.0}; + double B[6] = {1.0, 2.0, 1.0, -3.0, 4.0, -1.0}; + double C[9] = {.5, .5, .5, .5, .5, .5, .5, .5, .5}; + cblas_dgemm(CblasColMajor, CblasNoTrans, CblasTrans, 3, 3, 2, 1, A, 3, B, 3, 2, C, 3); } ]]}, {includes = "cblas.h"})) end) From 23b9cdf5b76deff7f03b78459287220f420a4078 Mon Sep 17 00:00:00 2001 From: fasiondog Date: Sun, 11 Aug 2024 06:43:50 +0800 Subject: [PATCH 560/671] sqlite add "safe_mode" config (#4890) --- packages/s/sqlite3/xmake.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/s/sqlite3/xmake.lua b/packages/s/sqlite3/xmake.lua index 20e2d3d14..f085c7ef1 100644 --- a/packages/s/sqlite3/xmake.lua +++ b/packages/s/sqlite3/xmake.lua @@ -42,6 +42,7 @@ package("sqlite3") add_configs("dbstat_vtab", { description = "Enable the dbstat virtual table.", default = true, type = "boolean"}) add_configs("math_functions", { description = "Enable the built-in SQL math functions.", default = true, type = "boolean"}) add_configs("rtree", { description = "Enable R-Tree.", default = false, type = "boolean"}) + add_configs("safe_mode", { description = "Use thread safe mode in 0 (single thread) | 1 (serialize) | 2 (mutli thread).", default = "1", type = "string", values = {"0", "1", "2"}}) if is_plat("macosx", "linux", "bsd") then add_syslinks("pthread", "dl") @@ -58,6 +59,7 @@ package("sqlite3") option("dbstat_vtab", {default = false, defines = "SQLITE_ENABLE_DBSTAT_VTAB"}) option("math_functions", {default = false, defines = "SQLITE_ENABLE_MATH_FUNCTIONS"}) option("rtree", {default = false, defines = "SQLITE_ENABLE_RTREE"}) + option("safe_mode", {default = "1"}) target("sqlite3") set_kind("$(kind)") @@ -65,6 +67,10 @@ package("sqlite3") add_headerfiles("sqlite3.h", "sqlite3ext.h") add_options("explain_comments", "dbpage_vtab", "stmt_vtab", "dbstat_vtab", "math_functions", "rtree") + if has_config("safe_mode") then + add_defines("SQLITE_THREADSAFE=" .. get_config("safe_mode")) + end + if is_kind("shared") and is_plat("windows") then add_defines("SQLITE_API=__declspec(dllexport)") end From 0bd7c18c7ebbaf9fc9754ffe1ca9982325a06e24 Mon Sep 17 00:00:00 2001 From: fasiondog Date: Sun, 11 Aug 2024 06:44:15 +0800 Subject: [PATCH 561/671] update boost package:config("vs_runtime") to package:has_runtime (#4889) --- packages/b/boost/xmake.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 5aa1cff3a..3c8df0a54 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -101,16 +101,15 @@ package("boost") linkname = linkname .. "-mt" end if package:is_plat("windows") then - local vs_runtime = package:config("vs_runtime") if package:config("shared") then if package:debug() then linkname = linkname .. "-gd" end - elseif package:config("asan") or vs_runtime == "MTd" then + elseif package:config("asan") or package:has_runtime("MTd") then linkname = linkname .. "-sgd" - elseif vs_runtime == "MT" then + elseif package:has_runtime("MT") then linkname = linkname .. "-s" - elseif package:config("asan") or vs_runtime == "MDd" then + elseif package:config("asan") or package:has_runtime("MDd") then linkname = linkname .. "-gd" end else @@ -341,10 +340,9 @@ package("boost") table.join2(cxxflags, table.wrap(package:config("cxflags"))) table.join2(cxxflags, table.wrap(package:config("cxxflags"))) if package:is_plat("windows") then - local vs_runtime = package:config("vs_runtime") if package:config("shared") then table.insert(argv, "runtime-link=shared") - elseif vs_runtime and vs_runtime:startswith("MT") then + elseif package:has_runtime("MT", "MTd") then table.insert(argv, "runtime-link=static") else table.insert(argv, "runtime-link=shared") From 75d9094c1229d4ed470a5d059b83bd11c02ea9a0 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 07:00:28 +0800 Subject: [PATCH 562/671] Update highfive to v2.10.0 (#4877) --- packages/h/highfive/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/h/highfive/xmake.lua b/packages/h/highfive/xmake.lua index bb3c01249..ba28ac101 100644 --- a/packages/h/highfive/xmake.lua +++ b/packages/h/highfive/xmake.lua @@ -7,6 +7,7 @@ package("highfive") add_urls("https://github.com/BlueBrain/HighFive/archive/refs/tags/$(version).tar.gz", "https://github.com/BlueBrain/HighFive.git") + add_versions("v2.10.0", "c29e8e1520e7298fabb26545f804e35bb3af257005c1c2df62e39986458d7c38") add_versions("v2.9.0", "6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e") add_versions("v2.6.1", "b5002c1221cf1821e02fb2ab891b0160bac88b43f56655bd844a472106ca3397") add_versions("v2.3.1", "41728a1204bdfcdcef8cbc3ddffe5d744c5331434ce3dcef35614b831234fcd7") From 2409679d58f274b0f726ced24eb91fabc0b7a300 Mon Sep 17 00:00:00 2001 From: SFGrenade <25555417+SFGrenade@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:05:40 +0200 Subject: [PATCH 563/671] add ZmqPb v0.10.2 (#4881) * add ZmqPb v0.10 - it's also headeronly now adjust repo link, since i renamed it * hotfix v0.10 with v0.10.1 * hotfix v0.10.1 with v0.10.2 add hedley dep add shared define not only windows native --- packages/z/zmqpb/xmake.lua | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/z/zmqpb/xmake.lua b/packages/z/zmqpb/xmake.lua index d28473f88..a6d1285a3 100644 --- a/packages/z/zmqpb/xmake.lua +++ b/packages/z/zmqpb/xmake.lua @@ -1,29 +1,38 @@ package("zmqpb") - set_homepage("https://github.com/SFGrenade/ZmqPb/") + set_homepage("https://github.com/SFGrenade/ZmqPb-Cpp/") set_description("A helper to use zeromq and protobuf together") set_license("MPL-2.0") - set_urls("https://github.com/SFGrenade/ZmqPb/archive/refs/tags/v$(version).tar.gz", - "https://github.com/SFGrenade/ZmqPb.git") + set_urls("https://github.com/SFGrenade/ZmqPb-Cpp/archive/refs/tags/v$(version).tar.gz", + "https://github.com/SFGrenade/ZmqPb-Cpp.git") add_versions("0.1", "4a34ec92faa381306356e84e2a2000093d8f76cfa037db1f4cd0adb0205faebb") add_versions("0.2", "5dfa4d4cebb10cb7ae03943e18e8d48c8ff215e80371f24c5ade212be7f20721") add_versions("0.3", "343c57c9f72facca47082422a259ec8c531f5c6e332a3828835080c4a96b9064") add_versions("0.4", "7c0001db73b19e65b007adf6c9c5092c3589f043ab3e95a16b3ec2b2a87fa244") add_versions("0.8", "93433dfe60b09add321d5f6fd467724409929211010963ad63be6c68494446ed") add_versions("0.9", "c4192777fd7d62b3624a6389efea68a772c4f2820c3d85128961c3dd5ee94a67") + add_versions("0.10.2", "3dc82384cb79cc46262a2ba4007351be8606fadda7b8f399df3cbde9dd77560b") add_deps("cppzmq") add_deps("protobuf-cpp") - -- protobuf needs it and somehow just doesn't publicizes the linkage - add_deps( "utf8_range" ) on_load("windows", "macosx", "linux", function (package) if not package:gitref() and package:version():lt("0.3") then package:add("deps", "fmt") end + if package:gitref() or package:version():gt("0.8") then + package:add("deps", "hedley") + if package:config("shared") then + package:add("defines", "ZMQPB_IS_SHARED") + end + end + if not package:gitref() and package:version():lt("0.10.2") then + -- protobuf needed it and somehow just didn't publicizes the linkage + package:add("deps", "utf8_range") + end end) - on_install("windows|native", "macosx", "linux", function (package) + on_install("windows", "macosx", "linux", function (package) local configs = {} import("package.tools.xmake").install(package, configs) end) From 7afcf42903d7e7ac1610a4578d84b0ae673d840f Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 08:02:01 +0800 Subject: [PATCH 564/671] Auto-update daw_json_link to v3.26.0 (#4886) * Update daw_json_link to v3.26.0 * add check --------- Co-authored-by: star9029 --- packages/d/daw_json_link/xmake.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/d/daw_json_link/xmake.lua b/packages/d/daw_json_link/xmake.lua index 5d878a26c..97bb8c8eb 100644 --- a/packages/d/daw_json_link/xmake.lua +++ b/packages/d/daw_json_link/xmake.lua @@ -7,6 +7,7 @@ package("daw_json_link") add_urls("https://github.com/beached/daw_json_link/archive/refs/tags/$(version).tar.gz", "https://github.com/beached/daw_json_link.git") + add_versions("v3.26.0", "c3eb3e37eba2eb919a908ef0be4c0f1c02460a677248a1b4298bfbe1bb2d9239") add_versions("v3.24.1", "439b4678377950f165e3d49d472c0676f0ef2fae3c5e6e7febddd5633f6e4f39") add_versions("v3.24.0", "7cecb2acde88028043e343ed4da7cde84c565a38125d3edb90db90daf881240a") add_versions("v3.23.2", "fd1234a14c126c79076e0b6e6eceae42afd465c419dc7a7393c69c28aa7f53d4") @@ -14,14 +15,16 @@ package("daw_json_link") add_deps("cmake") - on_install("windows", "linux", "macosx", "bsd", "mingw", "msys", "android@linux,macosx", "iphoneos", "cross", function (package) - if package:is_plat("android") then - import("core.tool.toolchain") - local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk") local ndk_sdkver = ndk:config("ndk_sdkver") assert(ndk_sdkver and tonumber(ndk_sdkver) > 21, "package(daw_json_link): need ndk api level > 21 for android") - end - import("package.tools.cmake").install(package, configs) + end) + end + + on_install("windows", "linux", "macosx", "bsd", "mingw", "msys", "android@linux,macosx", "iphoneos", "cross", function (package) + import("package.tools.cmake").install(package) end) on_test(function (package) From 3a79d28c5d3486024a6f16d657554ecbe01627e6 Mon Sep 17 00:00:00 2001 From: Yassine Sen <61026912+01Pollux@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:02:36 +0100 Subject: [PATCH 565/671] Add zlib and bzip2 support to boost iostreams (#4880) #4866 --- packages/b/boost/xmake.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 3c8df0a54..002b901a2 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -84,6 +84,8 @@ package("boost") end add_configs("zstd", {description = "enable zstd for iostreams", default = false, type = "boolean"}) add_configs("lzma", {description = "enable lzma for iostreams", default = false, type = "boolean"}) + add_configs("zlib", {description = "enable zlib for iostreams", default = false, type = "boolean"}) + add_configs("bzip2", {description = "enable bzip2 for iostreams", default = false, type = "boolean"}) on_load(function (package) @@ -151,6 +153,12 @@ package("boost") if package:config("lzma") then package:add("deps", "xz") end + if package:config("zlib") then + package:add("deps", "zlib") + end + if package:config("bzip2") then + package:add("deps", "bzip2") + end if package:is_plat("windows") and package:version():le("1.85.0") then local vs_toolset = package:toolchain("msvc"):config("vs_toolset") @@ -289,6 +297,12 @@ package("boost") if package:config("zstd") then config_deppath(file, "zstd", "zstd") end + if package:config("zlib") then + config_deppath(file, "zlib", "zlib") + end + if package:config("bzip2") then + config_deppath(file, "bzip2", "bzip2") + end file:close() end os.vrun("./b2 headers") @@ -323,6 +337,12 @@ package("boost") if not package:config("zstd") then table.insert(argv, "-sNO_ZSTD=1") end + if not package:config("zlib") then + table.insert(argv, "-sNO_ZLIB=1") + end + if not package:config("bzip2") then + table.insert(argv, "-sNO_BZIP2=1") + end if package:config("lto") then table.insert(argv, "lto=on") From 7bd2b0b1a06f3e4a1940ba87a82bea594110ae42 Mon Sep 17 00:00:00 2001 From: Peter Richmond <3448039+burdockcascade@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:16:06 +0100 Subject: [PATCH 566/671] Squirrel: Add new package (#4874) * add squirrel lang * add patch & fix shared/static --------- Co-authored-by: star9029 --- packages/s/squirrel/xmake.lua | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/s/squirrel/xmake.lua diff --git a/packages/s/squirrel/xmake.lua b/packages/s/squirrel/xmake.lua new file mode 100644 index 000000000..26a69090c --- /dev/null +++ b/packages/s/squirrel/xmake.lua @@ -0,0 +1,29 @@ +package("squirrel") + set_homepage("http://www.squirrel-lang.org") + set_description("Official repository for the programming language Squirrel") + set_license("MIT") + + add_urls("https://github.com/albertodemichelis/squirrel/archive/refs/tags/$(version).tar.gz", + "https://github.com/albertodemichelis/squirrel.git") + + add_versions("v3.2", "02805414cfadd5bbb921891d3599b83375a40650abd6404a8ab407dc5e86a996") + + add_patches("3.2", "https://github.com/albertodemichelis/squirrel/commit/79711c69e2c4193b4b6f98c9162856d61ddaeb9f.patch", "908ef342bda194216d4d2c08f0ecdbd1518e368ef3b6ccdc15e3593c5b7725c2") + + add_deps("cmake") + + on_install("!wasm and !iphoneos", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:config("shared") then + table.join2(configs, {"-DDISABLE_STATIC=ON", "-DDISABLE_DYNAMIC=OFF"}) + else + table.join2(configs, {"-DDISABLE_STATIC=OFF", "-DDISABLE_DYNAMIC=ON"}) + end + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("sq_open", {includes = "squirrel.h"})) + end) From e9f15cd28ecf529f743489f79841a009b73ea035 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 10:17:50 +0800 Subject: [PATCH 567/671] Update onnx to v1.16.2 (#4895) --- packages/o/onnx/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/o/onnx/xmake.lua b/packages/o/onnx/xmake.lua index ebdb62e7b..508f58d83 100644 --- a/packages/o/onnx/xmake.lua +++ b/packages/o/onnx/xmake.lua @@ -6,6 +6,7 @@ package("onnx") add_urls("https://github.com/onnx/onnx/archive/refs/tags/$(version).tar.gz", "https://github.com/onnx/onnx.git") + add_versions("v1.16.2", "84fc1c3d6133417f8a13af6643ed50983c91dacde5ffba16cc8bb39b22c2acbb") add_versions("v1.16.1", "0e6aa2c0a59bb2d90858ad0040ea1807117cc2f05b97702170f18e6cd6b66fb3") add_versions("v1.16.0", "0ce153e26ce2c00afca01c331a447d86fbf21b166b640551fe04258b4acfc6a4") add_versions("v1.15.0", "c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68") From 74034df2ec6c77df5e89de5237aa3369d7279806 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 10:17:52 +0800 Subject: [PATCH 568/671] Update simdjson to v3.10.0 (#4894) --- packages/s/simdjson/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/simdjson/xmake.lua b/packages/s/simdjson/xmake.lua index b917280ce..734d0bcb6 100644 --- a/packages/s/simdjson/xmake.lua +++ b/packages/s/simdjson/xmake.lua @@ -6,6 +6,7 @@ package("simdjson") add_urls("https://github.com/simdjson/simdjson/archive/refs/tags/$(version).tar.gz", "https://github.com/simdjson/simdjson.git") + add_versions("v3.10.0", "9c30552f1dd0ee3d0832bb1c6b7b97d813b18d5ef294c10dcb6fc242e5947de8") add_versions("v3.9.5", "3d9e894a0ded85c000ec5b6ed1450ab4b037f44ba95eb3b0fefb4cda72cd9dab") add_versions("v3.9.4", "9bf13be00fa1e1c5891a90dbc39b983e09972f0972a8956c20a9974cedfcca2f") add_versions("v3.9.3", "2e3d10abcde543d3dd8eba9297522cafdcebdd1db4f51b28f3bc95bf1d6ad23c") From 711b7b22ae4c4235b12e782f41f14c47085aa6a7 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 10:17:55 +0800 Subject: [PATCH 569/671] Update reflect-cpp to v0.14.0 (#4893) --- packages/r/reflect-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 6d6608164..1e9338fb4 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -7,6 +7,7 @@ package("reflect-cpp") add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/getml/reflect-cpp.git") + add_versions("v0.14.0", "ea92a2460a71184b7d4fa4e9baad9910efad092df78b114459a7d6b0ee558d3c") add_versions("v0.13.0", "a7a31832fe8bbaa7f7299da46dfd4ccc8b99a13242e16a1d93f8669de1fca9c6") add_versions("v0.12.0", "13d448dd5eaee13ecb7ab5cb61cb263c7111ba75230503adc823a888f68e1eaa") add_versions("v0.11.1", "e45f112fb3f14507a4aa53b99ae2d4ab6a4e7b2d5f04dd06fec00bf7faa7bbdc") From 4c629f10c689f01cdd86c1222a562b26402f036e Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2024 15:06:08 +0800 Subject: [PATCH 570/671] Auto-update libdeflate to v1.21 (#4896) * Update libdeflate to v1.21 * add check --------- Co-authored-by: star9029 --- packages/l/libdeflate/xmake.lua | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/l/libdeflate/xmake.lua b/packages/l/libdeflate/xmake.lua index 7a203d3dd..2d403db35 100644 --- a/packages/l/libdeflate/xmake.lua +++ b/packages/l/libdeflate/xmake.lua @@ -1,11 +1,12 @@ package("libdeflate") - set_homepage("https://github.com/ebiggers/libdeflate") set_description("libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.") set_license("MIT") add_urls("https://github.com/ebiggers/libdeflate/archive/refs/tags/$(version).tar.gz", "https://github.com/ebiggers/libdeflate.git") + + add_versions("v1.21", "50827d312c0413fbd41b0628590cd54d9ad7ebf88360cba7c0e70027942dbd01") add_versions("v1.20", "ed1454166ced78913ff3809870a4005b7170a6fd30767dc478a09b96847b9c2a") add_versions("v1.8", "50711ad4e9d3862f8dfb11b97eb53631a86ee3ce49c0e68ec2b6d059a9662f61") add_versions("v1.10", "5c1f75c285cd87202226f4de49985dcb75732f527eefba2b3ddd70a8865f2533") @@ -15,6 +16,18 @@ package("libdeflate") add_versions("v1.19", "27bf62d71cd64728ff43a9feb92f2ac2f2bf748986d856133cc1e51992428c25") add_deps("cmake") + + if on_check then + on_check("windows", function (package) + local vs_toolset = package:toolchain("msvc"):config("vs_toolset") + if vs_toolset and package:is_arch("arm.*") then + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + assert(minor and minor >= 30, "package(libdeflate/arm): requires vs_toolset >= 14.3") + end + end) + end + on_load("windows", function (package) if package:config("shared") then package:add("defines", "LIBDEFLATE_DLL") @@ -22,12 +35,8 @@ package("libdeflate") end) on_install("windows", "macosx", "linux", "android", "mingw", "bsd", function (package) - if package:is_plat("windows") and package:is_arch("arm.*") then - local vs = import("core.tool.toolchain").load("msvc"):config("vs") - assert(tonumber(vs) > 2019, "libdeflate requires Visual Studio 2022 and later for arm targets") - end local configs = {"-DLIBDEFLATE_BUILD_GZIP=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DLIBDEFLATE_BUILD_STATIC_LIB=" .. (package:config("shared") and "OFF" or "ON")) table.insert(configs, "-DLIBDEFLATE_BUILD_SHARED_LIB=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) From 27d880f7018609a4311c4786a907aa5b2f4ee439 Mon Sep 17 00:00:00 2001 From: Simon Pribylski <66266021+Persson-dev@users.noreply.github.com> Date: Sun, 11 Aug 2024 13:56:56 +0200 Subject: [PATCH 571/671] godotcpp4: fix python scripts (#4888) * godotcpp4: fix python scripts * update 4.2 commit hash --- packages/g/godotcpp4/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/g/godotcpp4/xmake.lua b/packages/g/godotcpp4/xmake.lua index bab1635e0..995e76ce3 100644 --- a/packages/g/godotcpp4/xmake.lua +++ b/packages/g/godotcpp4/xmake.lua @@ -4,7 +4,7 @@ package("godotcpp4") set_license("MIT") set_urls("https://github.com/godotengine/godot-cpp.git") - add_versions("4.2", "2b6eb6832e1dba2816229917dd2a6d54184e1bf4") + add_versions("4.2", "d6e5286cc19bbd5b2c626207d3b01a8f145c0f76") add_versions("4.1", "32becf6a13681119ad63b6d7cc4e816c9a0cc86b") add_versions("4.0", "9d1c396c54fc3bdfcc7da4f3abcb52b14f6cce8f") From 5d0f6dd017f2644acd917303c03491f6ad88f493 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 12 Aug 2024 10:06:15 +0800 Subject: [PATCH 572/671] Update s2n-tls to v1.5.0 (#4900) --- packages/s/s2n-tls/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/s2n-tls/xmake.lua b/packages/s/s2n-tls/xmake.lua index 28c4a3b9d..43f049774 100644 --- a/packages/s/s2n-tls/xmake.lua +++ b/packages/s/s2n-tls/xmake.lua @@ -6,6 +6,7 @@ package("s2n-tls") add_urls("https://github.com/aws/s2n-tls/archive/refs/tags/$(version).tar.gz", "https://github.com/aws/s2n-tls.git") + add_versions("v1.5.0", "5e86d97d8f24653ef3dff3abe6165169f0ba59cdf52b5264987125bba070174d") add_versions("v1.4.18", "a55b0b87eaaffc58bd44d90c5bf7903d11be816aa144296193e7d1a6bea5910e") add_versions("v1.4.17", "5235cd2c926b89ae795b1e6b5158dce598c9e79120208b4bcd8d19ce04d86986") add_versions("v1.4.16", "84fdbaa894c722bf13cac87b8579f494c1c2d66de642e5e6104638fddea76ad9") From 576e980c2a9a79de9524d03fed3c53c0b04cf620 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 12 Aug 2024 11:08:59 +0800 Subject: [PATCH 573/671] Update tinygltf to v2.9.3 (#4904) --- packages/t/tinygltf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/tinygltf/xmake.lua b/packages/t/tinygltf/xmake.lua index 5b1b1a296..1797d982a 100644 --- a/packages/t/tinygltf/xmake.lua +++ b/packages/t/tinygltf/xmake.lua @@ -7,6 +7,7 @@ package("tinygltf") add_urls("https://github.com/syoyo/tinygltf/archive/refs/tags/$(version).tar.gz", "https://github.com/syoyo/tinygltf.git") + add_versions("v2.9.3", "f5f282508609a0098048c8ff25d72f4ef0995bc1d46bc7a5d740e559d80023d2") add_versions("v2.9.2", "b34d1456bb1d63bbb4e05ea1e4d8691d0253a03ef72385a8bffd2fae4b743feb") add_versions("v2.8.22", "97c3eb1080c1657cd749d0b49af189c6a867d5af30689c48d5e19521e7b5a070") add_versions("v2.8.21", "e567257d7addde58b0a483832cbaa5dd8f15e5bcaee6f023831e215d1a2c0502") From 7efb937bfce8f756e5cb0c6b535a91aa5334f10a Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 12 Aug 2024 11:09:02 +0800 Subject: [PATCH 574/671] Update quill to v6.1.0 (#4903) --- packages/q/quill/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index 708ca0317..962dea4fc 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -6,6 +6,7 @@ package("quill") set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") + add_versions("v6.1.0", "3893ab422c746d93ff47bbcd61dd5e60bee37974b0d81cdab9cf9a4b10c58477") add_versions("v5.1.0", "0b4f34415c4b173f3d0466752fa3d3835e1a58f931bfce5281f817b5f997511f") add_versions("v5.0.0", "c2fd2b090db7d2d7633d4ee5a8316e43b4f5a13d8e339721b8e830fb03c25129") add_versions("v4.5.0", "70e8f4a76fd8a83b60d378f31b70dd09a9381686ebafdcd0db08fe099f518309") From 6a5bde98d5593dac68c845442282425b4f004572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 12 Aug 2024 10:10:43 +0200 Subject: [PATCH 575/671] Auto-update joltphysics to v5.1.0 (#4898) * Update joltphysics to v5.1.0 * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua * Update xmake.lua --- packages/j/joltphysics/xmake.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/j/joltphysics/xmake.lua b/packages/j/joltphysics/xmake.lua index 708c05c71..a4c85f715 100644 --- a/packages/j/joltphysics/xmake.lua +++ b/packages/j/joltphysics/xmake.lua @@ -5,6 +5,7 @@ package("joltphysics") add_urls("https://github.com/jrouwe/JoltPhysics/archive/refs/tags/$(version).tar.gz", "https://github.com/jrouwe/JoltPhysics.git") + add_versions("v5.1.0", "525c9d6fb79471b3995f9d621c9f843e71470aed286872c4d4065c1f7b7d049a") add_versions("v5.0.0", "5231953d1b1d5b9cb617facf86341a11337e1cd04456949af6911b917a1646cb") add_versions("v4.0.2", "046baf71d05e47de7a530ce5d58a587a93ea7e9ea1ef8bf3ff80238fb95650ae") add_versions("v4.0.1", "e0bb4fa07047ca9c38bd71262427ad2972a7f45f8dff74587f73457f3b60df82") @@ -76,6 +77,9 @@ package("joltphysics") if package:config("shared") then package:add("defines", "JPH_SHARED_LIBRARY") end + if not package:is_debug() then + package:add("defines", "JPH_NO_DEBUG") + end if package:is_arch("i386", "x86", "x64", "x86_64") then -- add instruction sets (from https://github.com/jrouwe/JoltPhysics/blob/4cd52055e09160affcafa557b39520331bf0d034/Jolt/Jolt.cmake#L602) if package:has_tool("cxx", "cl") then @@ -205,8 +209,23 @@ package("joltphysics") on_test(function (package) assert(package:check_cxxsnippets({test = [[ + #include + void trace_impl(const char* fmt, ...) { + va_list list; + va_start(list, fmt); + char buffer[1024]; + vsnprintf(buffer, sizeof(buffer), fmt, list); + va_end(list); + }; + bool AssertFailedImpl(const char *inExpression, const char *inMessage, const char *inFile, JPH::uint inLine) + { + // Breakpoint + return true; + }; void test() { JPH::RegisterDefaultAllocator(); + JPH::Trace = &trace_impl; + JPH_IF_ENABLE_ASSERTS(JPH::AssertFailed = &AssertFailedImpl;) JPH::PhysicsSystem physics_system; physics_system.OptimizeBroadPhase(); } From a721993b79b33a0da7ccbb5fd56ee7c1a4c7964f Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 12 Aug 2024 19:58:16 +0800 Subject: [PATCH 576/671] update gtest to 1.15.2 (#4905) --- packages/g/gtest/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/gtest/xmake.lua b/packages/g/gtest/xmake.lua index fe133a502..08c521474 100644 --- a/packages/g/gtest/xmake.lua +++ b/packages/g/gtest/xmake.lua @@ -17,6 +17,7 @@ package("gtest") add_versions("archive:v1.12.1", "24564e3b712d3eb30ac9a85d92f7d720f60cc0173730ac166f27dda7fed76cb2") add_versions("v1.13.0", "ffa17fbc5953900994e2deec164bb8949879ea09b411e07f215bfbb1f87f4632") add_versions("v1.14.0", "1f357c27ca988c3f7c6b4bf68a9395005ac6761f034046e9dde0896e3aba00e4") + add_versions("v1.15.2", "f179ec217f9b3b3f3c6e8b02d3e7eda997b49e4ce26d6b235c9053bec9c0bf9f") add_configs("main", {description = "Link to the gtest_main entry point.", default = false, type = "boolean"}) add_configs("gmock", {description = "Link to the googlemock library.", default = true, type = "boolean"}) From ad5fd80e8e79a458b8105795fe31680058f20938 Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Mon, 12 Aug 2024 20:53:20 +0800 Subject: [PATCH 577/671] breakpad: add support for linux and macosx (#4783) * breakpad: add support for linux and macosx * breakpad: add support for linux and macosx * configure the debug option * change the patch * delete log and redundant options * fix c++ version and delete macosx * fix cxxflags * change the autoconf envs and include dir * repair autoconf configs * replace gnu++17 to c++17 * add algrithm to module.cc at patch * fix checksum --- .../v2023.06.01/linux_syscall_support.patch | 334 ++++++++++++++++++ packages/b/breakpad/xmake.lua | 16 +- packages/l/linux-syscall-support/xmake.lua | 2 + 3 files changed, 351 insertions(+), 1 deletion(-) create mode 100644 packages/b/breakpad/patches/v2023.06.01/linux_syscall_support.patch diff --git a/packages/b/breakpad/patches/v2023.06.01/linux_syscall_support.patch b/packages/b/breakpad/patches/v2023.06.01/linux_syscall_support.patch new file mode 100644 index 000000000..3ffb9a8c8 --- /dev/null +++ b/packages/b/breakpad/patches/v2023.06.01/linux_syscall_support.patch @@ -0,0 +1,334 @@ +diff --git a/Makefile.in b/Makefile.in +index 1845638..76f632c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -314,8 +314,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__includecl_HEADERS_DIST) $(am__includeclc_HEADERS_DIST) \ + $(am__includecldwc_HEADERS_DIST) \ + $(am__includeclh_HEADERS_DIST) $(am__includeclm_HEADERS_DIST) \ +- $(includegbc_HEADERS) $(am__includelss_HEADERS_DIST) \ +- $(includep_HEADERS) $(am__DIST_COMMON) ++ $(includegbc_HEADERS) $(includep_HEADERS) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno + mkinstalldirs = $(install_sh) -d +@@ -340,7 +339,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ + "$(DESTDIR)$(includecldir)" "$(DESTDIR)$(includeclcdir)" \ + "$(DESTDIR)$(includecldwcdir)" "$(DESTDIR)$(includeclhdir)" \ + "$(DESTDIR)$(includeclmdir)" "$(DESTDIR)$(includegbcdir)" \ +- "$(DESTDIR)$(includelssdir)" "$(DESTDIR)$(includepdir)" ++ "$(DESTDIR)$(includepdir)" + @DISABLE_PROCESSOR_FALSE@am__EXEEXT_5 = src/common/test_assembler_unittest$(EXEEXT) \ + @DISABLE_PROCESSOR_FALSE@ src/common/dwarf/dwarf2reader_lineinfo_unittest$(EXEEXT) \ + @DISABLE_PROCESSOR_FALSE@ src/common/dwarf/dwarf2reader_splitfunctions_unittest$(EXEEXT) \ +@@ -1926,12 +1925,10 @@ am__includeclh_HEADERS_DIST = \ + $(top_srcdir)/src/client/linux/handler/*.h + am__includeclm_HEADERS_DIST = \ + $(top_srcdir)/src/client/linux/minidump_writer/*.h +-am__includelss_HEADERS_DIST = $(top_srcdir)/src/third_party/lss/*.h + HEADERS = $(includec_HEADERS) $(includecl_HEADERS) \ + $(includeclc_HEADERS) $(includecldwc_HEADERS) \ + $(includeclh_HEADERS) $(includeclm_HEADERS) \ +- $(includegbc_HEADERS) $(includelss_HEADERS) \ +- $(includep_HEADERS) ++ $(includegbc_HEADERS) $(includep_HEADERS) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +@@ -9914,8 +9911,7 @@ install-data-am: install-dist_docDATA install-includecHEADERS \ + install-includeclHEADERS install-includeclcHEADERS \ + install-includecldwcHEADERS install-includeclhHEADERS \ + install-includeclmHEADERS install-includegbcHEADERS \ +- install-includelssHEADERS install-includepHEADERS \ +- install-pkgconfigDATA ++ install-includepHEADERS install-pkgconfigDATA + + install-dvi: install-dvi-am + +@@ -10274,8 +10270,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ + uninstall-includecHEADERS uninstall-includeclHEADERS \ + uninstall-includeclcHEADERS uninstall-includecldwcHEADERS \ + uninstall-includeclhHEADERS uninstall-includeclmHEADERS \ +- uninstall-includegbcHEADERS uninstall-includelssHEADERS \ +- uninstall-includepHEADERS uninstall-libLIBRARIES \ ++ uninstall-includegbcHEADERS uninstall-includepHEADERS uninstall-libLIBRARIES \ + uninstall-libexecPROGRAMS uninstall-pkgconfigDATA + + .MAKE: check-am install-am install-strip +@@ -10297,7 +10292,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ + install-includeclHEADERS install-includeclcHEADERS \ + install-includecldwcHEADERS install-includeclhHEADERS \ + install-includeclmHEADERS install-includegbcHEADERS \ +- install-includelssHEADERS install-includepHEADERS install-info \ ++ install-includepHEADERS install-info \ + install-info-am install-libLIBRARIES install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ +@@ -10309,7 +10304,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ + uninstall-includecHEADERS uninstall-includeclHEADERS \ + uninstall-includeclcHEADERS uninstall-includecldwcHEADERS \ + uninstall-includeclhHEADERS uninstall-includeclmHEADERS \ +- uninstall-includegbcHEADERS uninstall-includelssHEADERS \ ++ uninstall-includegbcHEADERS \ + uninstall-includepHEADERS uninstall-libLIBRARIES \ + uninstall-libexecPROGRAMS uninstall-pkgconfigDATA + +diff --git a/src/client/linux/crash_generation/crash_generation_client.cc b/src/client/linux/crash_generation/crash_generation_client.cc +index 020c614..85320eb 100644 +--- a/src/client/linux/crash_generation/crash_generation_client.cc ++++ b/src/client/linux/crash_generation/crash_generation_client.cc +@@ -40,7 +40,7 @@ + + #include "common/linux/eintr_wrapper.h" + #include "common/linux/ignore_ret.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc +index 9e23c11..6afbf63 100644 +--- a/src/client/linux/handler/exception_handler.cc ++++ b/src/client/linux/handler/exception_handler.cc +@@ -98,7 +98,7 @@ + #include "client/linux/minidump_writer/linux_dumper.h" + #include "client/linux/minidump_writer/minidump_writer.h" + #include "common/linux/eintr_wrapper.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + #if defined(__ANDROID__) + #include "linux/sched.h" +diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc +index b2d8d46..5d4204a 100644 +--- a/src/client/linux/handler/exception_handler_unittest.cc ++++ b/src/client/linux/handler/exception_handler_unittest.cc +@@ -53,7 +53,7 @@ + #include "common/linux/linux_libc_support.h" + #include "common/tests/auto_tempdir.h" + #include "common/using_std_string.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + #include "google_breakpad/processor/minidump.h" + + using namespace google_breakpad; +diff --git a/src/client/linux/log/log.cc b/src/client/linux/log/log.cc +index 2a48d7f..2d49581 100644 +--- a/src/client/linux/log/log.cc ++++ b/src/client/linux/log/log.cc +@@ -36,7 +36,7 @@ + #include + #include + #else +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + #endif + + namespace logger { +diff --git a/src/client/linux/minidump_writer/cpu_set.h b/src/client/linux/minidump_writer/cpu_set.h +index 70c1c75..9e198c0 100644 +--- a/src/client/linux/minidump_writer/cpu_set.h ++++ b/src/client/linux/minidump_writer/cpu_set.h +@@ -34,7 +34,7 @@ + #include + + #include "common/linux/linux_libc_support.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/client/linux/minidump_writer/directory_reader.h b/src/client/linux/minidump_writer/directory_reader.h +index 62bba87..30daa74 100644 +--- a/src/client/linux/minidump_writer/directory_reader.h ++++ b/src/client/linux/minidump_writer/directory_reader.h +@@ -37,7 +37,7 @@ + #include + + #include "common/linux/linux_libc_support.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/client/linux/minidump_writer/line_reader.h b/src/client/linux/minidump_writer/line_reader.h +index d54a67d..999f3e3 100644 +--- a/src/client/linux/minidump_writer/line_reader.h ++++ b/src/client/linux/minidump_writer/line_reader.h +@@ -34,7 +34,7 @@ + #include + + #include "common/linux/linux_libc_support.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc +index 85922a9..d78dce3 100644 +--- a/src/client/linux/minidump_writer/linux_dumper.cc ++++ b/src/client/linux/minidump_writer/linux_dumper.cc +@@ -54,7 +54,7 @@ + #include "common/linux/memory_mapped_file.h" + #include "common/linux/safe_readlink.h" + #include "google_breakpad/common/minidump_exception_linux.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + using google_breakpad::elf::FileID; + +diff --git a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +index 5a135fd..e66dc46 100644 +--- a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc ++++ b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +@@ -42,7 +42,7 @@ + #include + + #include "common/scoped_ptr.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + #if defined(__ARM_EABI__) + #define TID_PTR_REGISTER "r3" +diff --git a/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +index 2adc39e..7572315 100644 +--- a/src/client/linux/minidump_writer/linux_ptrace_dumper.cc ++++ b/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +@@ -60,7 +60,7 @@ + #include "client/linux/minidump_writer/directory_reader.h" + #include "client/linux/minidump_writer/line_reader.h" + #include "common/linux/linux_libc_support.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + // Suspends a thread by attaching to it. + static bool SuspendThread(pid_t pid) { +diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc +index a95dd25..ce0d07f 100644 +--- a/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/src/client/linux/minidump_writer/minidump_writer.cc +@@ -82,7 +82,7 @@ + #include "common/linux/linux_libc_support.h" + #include "common/minidump_type_helper.h" + #include "google_breakpad/common/minidump_format.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace { + +diff --git a/src/client/linux/minidump_writer/proc_cpuinfo_reader.h b/src/client/linux/minidump_writer/proc_cpuinfo_reader.h +index 5ae16df..4278341 100644 +--- a/src/client/linux/minidump_writer/proc_cpuinfo_reader.h ++++ b/src/client/linux/minidump_writer/proc_cpuinfo_reader.h +@@ -35,7 +35,7 @@ + + #include "client/linux/minidump_writer/line_reader.h" + #include "common/linux/linux_libc_support.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/client/minidump_file_writer.cc b/src/client/minidump_file_writer.cc +index c00af36..c05f2e9 100644 +--- a/src/client/minidump_file_writer.cc ++++ b/src/client/minidump_file_writer.cc +@@ -44,7 +44,7 @@ + #include "common/linux/linux_libc_support.h" + #include "common/string_conversion.h" + #if defined(__linux__) && __linux__ +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + #endif + + #if defined(__ANDROID__) +diff --git a/src/common/linux/file_id.cc b/src/common/linux/file_id.cc +index d8fcbd8..ef13264 100644 +--- a/src/common/linux/file_id.cc ++++ b/src/common/linux/file_id.cc +@@ -49,7 +49,7 @@ + #include "common/linux/linux_libc_support.h" + #include "common/linux/memory_mapped_file.h" + #include "common/using_std_string.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + namespace elf { +diff --git a/src/common/linux/memory_mapped_file.cc b/src/common/linux/memory_mapped_file.cc +index a7b96eb..042915c 100644 +--- a/src/common/linux/memory_mapped_file.cc ++++ b/src/common/linux/memory_mapped_file.cc +@@ -43,7 +43,7 @@ + #include + + #include "common/memory_range.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/common/linux/safe_readlink.cc b/src/common/linux/safe_readlink.cc +index a42b01a..7093951 100644 +--- a/src/common/linux/safe_readlink.cc ++++ b/src/common/linux/safe_readlink.cc +@@ -35,7 +35,7 @@ + + #include + +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace google_breakpad { + +diff --git a/src/common/memory_allocator.h b/src/common/memory_allocator.h +index 1c99913..37a3471 100644 +--- a/src/common/memory_allocator.h ++++ b/src/common/memory_allocator.h +@@ -46,7 +46,7 @@ + #define sys_munmap munmap + #define MAP_ANONYMOUS MAP_ANON + #else +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + #endif + + namespace google_breakpad { +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/src/processor/testdata/linux_test_app.cc b/src/processor/testdata/linux_test_app.cc +index b0bbb66..38dffb5 100644 +--- a/src/processor/testdata/linux_test_app.cc ++++ b/src/processor/testdata/linux_test_app.cc +@@ -49,7 +49,7 @@ + #include + + #include "client/linux/handler/exception_handler.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + + namespace { + +diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc +index 3e310bc..e2f02a4 100644 +--- a/src/tools/linux/md2core/minidump-2-core.cc ++++ b/src/tools/linux/md2core/minidump-2-core.cc +@@ -55,7 +55,7 @@ + #include "common/using_std_string.h" + #include "google_breakpad/common/breakpad_types.h" + #include "google_breakpad/common/minidump_format.h" +-#include "third_party/lss/linux_syscall_support.h" ++#include "lss//linux_syscall_support.h" + #include "tools/linux/md2core/minidump_memory_range.h" + + #if ULONG_MAX == 0xffffffffffffffff diff --git a/packages/b/breakpad/xmake.lua b/packages/b/breakpad/xmake.lua index d24ca8c05..8b6e04f70 100644 --- a/packages/b/breakpad/xmake.lua +++ b/packages/b/breakpad/xmake.lua @@ -6,6 +6,7 @@ package("breakpad") "https://github.com/google/breakpad.git", "https://chromium.googlesource.com/breakpad/breakpad.git") + add_versions("v2023.06.01", "81555be3595e25e8be0fe6dd34e9490beba224296e0a8a858341e7bced67674d") add_versions("v2023.01.27", "f187e8c203bd506689ce4b32596ba821e1e2f034a83b8e07c2c635db4de3cc0b") if is_plat("windows") then @@ -19,8 +20,12 @@ package("breakpad") if is_plat("windows") then add_syslinks("wininet", "dbghelp", "imagehlp") elseif is_plat("linux") then + add_deps("autoconf", "automake", "m4", "libtool", "linux-syscall-support") + add_includedirs("include", "include/breakpad") add_syslinks("pthread") + add_patches("v2023.06.01", path.join(os.scriptdir(), "patches", "v2023.06.01", "linux_syscall_support.patch"), "7e4c3b3e643d861155c956548a592f2a6bb54e13107cadb7cc0b0700dc1b2ae4") elseif is_plat("macosx") then + add_deps("autoconf", "automake", "m4", "libtool") add_frameworks("CoreFoundation") end @@ -33,6 +38,15 @@ package("breakpad") import("package.tools.xmake").install(package, configs) end) + on_install("linux", function (package) + io.replace("configure", "WARN_CXXFLAGS \" -Werror\"", "WARN_CXXFLAGS ", {plain = true}) + local configs = {"--disable-dependency-tracking", "CXXFLAGS=-std=gnu++17"} + if package:is_debug() then + table.insert(configs, "CXXFLAGS=-g") + end + import("package.tools.autoconf").install(package, configs, {packagedeps = "linux-syscall-support"}) + end) + on_test(function (package) local plat local snippets @@ -63,5 +77,5 @@ package("breakpad") end local header = "client/" .. plat .. "/handler/exception_handler.h" - assert(package:check_cxxsnippets({test = snippets}, {configs = {languages = "c++11"}, includes = header})) + assert(package:check_cxxsnippets({test = snippets}, {configs = {languages = "c++17"}, includes = header})) end) diff --git a/packages/l/linux-syscall-support/xmake.lua b/packages/l/linux-syscall-support/xmake.lua index de863271a..92830ff28 100644 --- a/packages/l/linux-syscall-support/xmake.lua +++ b/packages/l/linux-syscall-support/xmake.lua @@ -6,6 +6,8 @@ package("linux-syscall-support") add_urls("https://chromium.googlesource.com/linux-syscall-support.git") add_versions("v2022.10.12", "9719c1e1e676814c456b55f5f070eabad6709d31") + set_kind("library", {headeronly = true}) + on_install("linux", function (package) os.cp("linux_syscall_support.h", package:installdir("include/lss")) end) From 5c5c44648ab654a8fdaedb190a8f68ee2d866514 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 12 Aug 2024 21:27:33 +0800 Subject: [PATCH 578/671] kvazaar: add package (#4879) * kvazaar: add package * limit plat --- packages/k/kvazaar/xmake.lua | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/k/kvazaar/xmake.lua diff --git a/packages/k/kvazaar/xmake.lua b/packages/k/kvazaar/xmake.lua new file mode 100644 index 000000000..c57087485 --- /dev/null +++ b/packages/k/kvazaar/xmake.lua @@ -0,0 +1,38 @@ +package("kvazaar") + set_homepage("https://github.com/ultravideo/kvazaar") + set_description("An open-source HEVC encoder") + set_license("BSD-3-Clause") + + add_urls("https://github.com/ultravideo/kvazaar/archive/refs/tags/$(version).tar.gz", + "https://github.com/ultravideo/kvazaar.git") + + add_versions("v2.3.1", "c5a1699d0bd50bc6bdba485b3438a5681a43d7b2c4fd6311a144740bfa59c9cc") + + add_configs("cryptopp", {description = "Use crypto library", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("m", "pthread") + end + + add_deps("cmake") + + on_load(function (package) + if package:config("cryptopp") then + package:add("deps", "cryptopp") + end + if not package:config("shared") then + package:add("defines", "KVZ_STATIC_LIB") + end + end) + + on_install("windows", "linux", "macosx", "mingw", function (package) + local configs = {"-DBUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DUSE_CRYPTO=" .. (package:config("cryptopp") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("kvz_api_get", {includes = "kvazaar.h"})) + end) From 2cbdfd47db2870570aed30a3bff0d5c0de384d29 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 12 Aug 2024 21:28:13 +0800 Subject: [PATCH 579/671] ctrack: add package (#4907) * ctrack: add package * fix parallel config --- packages/c/ctrack/xmake.lua | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 packages/c/ctrack/xmake.lua diff --git a/packages/c/ctrack/xmake.lua b/packages/c/ctrack/xmake.lua new file mode 100644 index 000000000..32f7131c2 --- /dev/null +++ b/packages/c/ctrack/xmake.lua @@ -0,0 +1,36 @@ +package("ctrack") + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/Compaile/ctrack") + set_description("A lightweight, high-performance C++ benchmarking and tracking library for effortless function profiling in both development and production environments.") + set_license("MIT") + + add_urls("https://github.com/Compaile/ctrack/archive/refs/tags/$(version).tar.gz", + "https://github.com/Compaile/ctrack.git") + + add_versions("v1.0.2", "cbe19d0a852e43da4fe675abc751464cd871b5a50af2ef7f315c0d0d68690092") + + add_configs("parallel", {description = "Enable parallel processing", default = false, type = "boolean"}) + + add_deps("cmake") + + on_load(function (package) + if package:config("parallel") then + package:add("deps", "tbb") + else + package:add("defines", "CTRACK_DISABLE_EXECUTION_POLICY") + end + end) + + on_install(function (package) + local configs = {"-DDISABLE_EXAMPLES=ON"} + table.insert(configs, "-DDISABLE_PAR=" .. (package:config("parallel") and "OFF" or "ON")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + CTRACK; + } + ]]}, {configs = {languages = "c++17"}, includes = "ctrack.hpp"})) + end) From 47fcf13bde2f367b1baae14c29a7413d3a94acc6 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 12 Aug 2024 21:28:37 +0800 Subject: [PATCH 580/671] re-spirv: add package (#4906) --- packages/r/re-spirv/xmake.lua | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/r/re-spirv/xmake.lua diff --git a/packages/r/re-spirv/xmake.lua b/packages/r/re-spirv/xmake.lua new file mode 100644 index 000000000..2123200d1 --- /dev/null +++ b/packages/r/re-spirv/xmake.lua @@ -0,0 +1,38 @@ +package("re-spirv") + set_homepage("https://github.com/rt64/re-spirv") + set_description("Lightweight and fast SPIR-V re-optimizer designed around spec constant usage.") + set_license("MIT") + + add_urls("https://github.com/rt64/re-spirv.git", {submodules = false}) + add_versions("2024.08.07", "f0ad27a50339e72d4c86b3436b9f74de83a20544") + + add_deps("spirv-headers") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_requires("spirv-headers") + add_rules("mode.debug", "mode.release") + set_languages("c++17") + target("re-spirv") + set_kind("$(kind)") + add_files("re-spirv.cpp") + add_headerfiles("re-spirv.h") + add_packages("spirv-headers") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end + target("re-spirv-cli") + set_kind("binary") + add_files("re-spirv-cli.cpp") + add_deps("re-spirv") + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + respv::Shader shader; + } + ]]}, {configs = {languages = "c++17"}, includes = "re-spirv.h"})) + end) From bab76682e8aae4a005ccad1656b22112855187e2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 12 Aug 2024 21:28:57 +0800 Subject: [PATCH 581/671] fast_obj: add v1.3 version (#4897) --- packages/f/fast_obj/xmake.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/f/fast_obj/xmake.lua b/packages/f/fast_obj/xmake.lua index 90851d7fc..a4a211003 100644 --- a/packages/f/fast_obj/xmake.lua +++ b/packages/f/fast_obj/xmake.lua @@ -3,9 +3,10 @@ package("fast_obj") set_description("Fast C OBJ parser") set_license("MIT") - add_urls("https://github.com/thisistherk/fast_obj.git") + add_urls("https://github.com/thisistherk/fast_obj/archive/refs/tags/$(version).tar.gz", + "https://github.com/thisistherk/fast_obj.git") - add_versions("2023.08.08", "2bb0b1f6509a4f63f04df5019b805f14e199a681") + add_versions("v1.3", "f0f175edbe60db2099b3d8266ff0085b21862a17d9a1dc00fd195258c5b622b1") add_configs("header_only", {description = "Use header only version.", default = true, type = "boolean"}) From 13b9ac4fc8665fe9b23dff037e4466f27cbb6f6e Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 12 Aug 2024 22:58:32 +0800 Subject: [PATCH 582/671] tbb: fix 2020.3 (#4892) * tbb: fix 2020.3 * fix debug links --- packages/t/tbb/patches/2020.3/gcc13.patch | 13 +++++++++ packages/t/tbb/xmake.lua | 33 ++++++++++++++++------- 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 packages/t/tbb/patches/2020.3/gcc13.patch diff --git a/packages/t/tbb/patches/2020.3/gcc13.patch b/packages/t/tbb/patches/2020.3/gcc13.patch new file mode 100644 index 000000000..f78c649ed --- /dev/null +++ b/packages/t/tbb/patches/2020.3/gcc13.patch @@ -0,0 +1,13 @@ +diff --git a/include/tbb/task.h b/include/tbb/task.h +index 5e137c69..b5fb1ac3 100644 +--- a/include/tbb/task.h ++++ b/include/tbb/task.h +@@ -249,7 +249,7 @@ namespace internal { + #if __TBB_TASK_PRIORITY + //! Pointer to the next offloaded lower priority task. + /** Used to maintain a list of offloaded tasks inside the scheduler. **/ +- task* next_offloaded; ++ tbb::task* next_offloaded; + #endif + + #if __TBB_PREVIEW_RESUMABLE_TASKS diff --git a/packages/t/tbb/xmake.lua b/packages/t/tbb/xmake.lua index 3ca49861c..2c171f448 100644 --- a/packages/t/tbb/xmake.lua +++ b/packages/t/tbb/xmake.lua @@ -1,12 +1,13 @@ package("tbb") - set_homepage("https://software.intel.com/en-us/tbb/") set_description("Threading Building Blocks (TBB) lets you easily write parallel C++ programs that take full advantage of multicore performance, that are portable, composable and have future-proof scalability.") + set_license("Apache-2.0") + add_urls("https://github.com/oneapi-src/oneTBB.git") if is_plat("windows") then add_urls("https://github.com/oneapi-src/oneTBB/$(version)", {version = function (version) if version:ge("2021.0") then - return "archive/v" .. version .. ".tar.gz" + return "archive/refs/tags/v" .. version .. ".tar.gz" else return "releases/download/v" .. version .. "/tbb-" .. version .. "-win.zip" end @@ -21,7 +22,7 @@ package("tbb") add_versions("2021.11.0", "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363") add_versions("2021.12.0", "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f") else - add_urls("https://github.com/oneapi-src/oneTBB/archive/v$(version).tar.gz") + add_urls("https://github.com/oneapi-src/oneTBB/archive/refs/tags/v$(version).tar.gz") add_versions("2020.3", "ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3") add_versions("2021.2.0", "cee20b0a71d977416f3e3b4ec643ee4f38cedeb2a9ff015303431dd9d8d79854") add_versions("2021.3.0", "8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e") @@ -32,8 +33,9 @@ package("tbb") add_versions("2021.11.0", "782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363") add_versions("2021.12.0", "c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f") - add_patches("2021.2.0", path.join(os.scriptdir(), "patches", "2021.2.0", "gcc11.patch"), "181511cf4878460cb48ac0531d3ce8d1c57626d698e9001a0951c728fab176fb") - add_patches("2021.5.0", path.join(os.scriptdir(), "patches", "2021.5.0", "i386.patch"), "1a1c11724839cf98b1b8f4d415c0283ec7719c330b11503c578739eb02889ec0") + add_patches("2020.3", "patches/2020.3/gcc13.patch", "419557beb877a72fa394c886fbb674c1b0c300fee7f2ec4e2de39ceeeb6b95fd") + add_patches("2021.2.0", "patches/2021.2.0/gcc11.patch", "181511cf4878460cb48ac0531d3ce8d1c57626d698e9001a0951c728fab176fb") + add_patches("2021.5.0", "patches/2021.5.0/i386.patch", "1a1c11724839cf98b1b8f4d415c0283ec7719c330b11503c578739eb02889ec0") if is_plat("macosx") then add_configs("compiler", {description = "Compiler used to compile tbb." , default = "clang", type = "string", values = {"clang", "gcc", "icc", "cl", "icl", "[others]"}}) @@ -46,16 +48,29 @@ package("tbb") on_fetch("fetch") - add_links("tbb", "tbbmalloc", "tbbmalloc_proxy") + if on_check then + on_check("macosx", function (package) + assert(package:is_arch("arm64") and package:version():ge("2021.0"), + "package(tbb <2021.0) unsupported version on macosx/arm64") + end) + end on_load(function (package) - if package:version():ge("2021.0") then + if package:has_tool("cxx", "cl", "clang_cl") then + package:add("defines", "__TBB_NO_IMPLICIT_LINKAGE") + end + if package:is_debug() then + package:add("links", "tbb_debug", "tbbmalloc_debug", "tbbmalloc_proxy_debug") + else + package:add("links", "tbb", "tbbmalloc", "tbbmalloc_proxy") + end + if package:gitref() or package:version():ge("2021.0") then package:add("deps", "cmake") end end) on_install("macosx", "linux", "mingw@windows", "mingw@msys", "android", function (package) - if package:version():ge("2021.0") then + if package:gitref() or package:version():ge("2021.0") then if package:version():le("2021.4") and package:is_plat("mingw") then raise("mingw build is not supported in this version") end @@ -110,7 +125,7 @@ package("tbb") end) on_install("windows", function (package) - if package:version():ge("2021.0") then + if package:gitref() or package:version():ge("2021.0") then local configs = {"-DTBB_TEST=OFF", "-DTBB_STRICT=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) import("package.tools.cmake").install(package, configs) From d49caa2a25da942ef1ea51486007000ccc020381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 12 Aug 2024 22:34:52 +0200 Subject: [PATCH 583/671] joltphysics: Add object_stream config and JPH_OBJECT_STREAM define --- packages/j/joltphysics/xmake.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/j/joltphysics/xmake.lua b/packages/j/joltphysics/xmake.lua index a4c85f715..5c081c29e 100644 --- a/packages/j/joltphysics/xmake.lua +++ b/packages/j/joltphysics/xmake.lua @@ -30,6 +30,7 @@ package("joltphysics") add_configs("debug_renderer", { description = "Adds support to draw lines and triangles, used to be able to debug draw the state of the world", default = true, type = "boolean" }) add_configs("double_precision", { description = "Compiles the library so that all positions are stored in doubles instead of floats. This makes larger worlds possible", default = false, type = "boolean" }) add_configs("object_layer_bits", {description = "Number of bits to use in ObjectLayer. Can be 16 or 32.", default = "16", type = "string", values = {"16", "32"}}) + add_configs("object_stream", { description = "Compile the ObjectStream class and RTTI attribute information", default = true, type = "boolean" }) add_configs("symbols", { description = "When turning this option on, the library will be compiled with debug symbols", default = false, type = "boolean" }) if is_arch("i386", "x86", "x64", "x86_64") then @@ -80,6 +81,9 @@ package("joltphysics") if not package:is_debug() then package:add("defines", "JPH_NO_DEBUG") end + if package:config("object_stream") then + package:add("defines", "JPH_OBJECT_STREAM") + end if package:is_arch("i386", "x86", "x64", "x86_64") then -- add instruction sets (from https://github.com/jrouwe/JoltPhysics/blob/4cd52055e09160affcafa557b39520331bf0d034/Jolt/Jolt.cmake#L602) if package:has_tool("cxx", "cl") then @@ -168,6 +172,7 @@ package("joltphysics") table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DCROSS_PLATFORM_DETERMINISTIC=" .. (package:config("cross_platform_deterministic") and "ON" or "OFF")) table.insert(configs, "-DDOUBLE_PRECISION=" .. (package:config("double_precision") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_OBJECT_STREAM" .. (package:config("object_stream") and "ON" or "OFF")) table.insert(configs, "-DGENERATE_DEBUG_SYMBOLS=" .. ((package:debug() or package:config("symbols")) and "ON" or "OFF")) table.insert(configs, "-DOBJECT_LAYER_BITS=" .. package:config("object_layer_bits")) table.insert(configs, "-DUSE_AVX=" .. (package:config("inst_avx") and "ON" or "OFF")) From 5917776f0e50e43ac2bfed3f33434ac4abf8e552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Mon, 12 Aug 2024 23:11:00 +0200 Subject: [PATCH 584/671] Fix missing = --- packages/j/joltphysics/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/j/joltphysics/xmake.lua b/packages/j/joltphysics/xmake.lua index 5c081c29e..40d4222a1 100644 --- a/packages/j/joltphysics/xmake.lua +++ b/packages/j/joltphysics/xmake.lua @@ -172,7 +172,7 @@ package("joltphysics") table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DCROSS_PLATFORM_DETERMINISTIC=" .. (package:config("cross_platform_deterministic") and "ON" or "OFF")) table.insert(configs, "-DDOUBLE_PRECISION=" .. (package:config("double_precision") and "ON" or "OFF")) - table.insert(configs, "-DENABLE_OBJECT_STREAM" .. (package:config("object_stream") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_OBJECT_STREAM=" .. (package:config("object_stream") and "ON" or "OFF")) table.insert(configs, "-DGENERATE_DEBUG_SYMBOLS=" .. ((package:debug() or package:config("symbols")) and "ON" or "OFF")) table.insert(configs, "-DOBJECT_LAYER_BITS=" .. package:config("object_layer_bits")) table.insert(configs, "-DUSE_AVX=" .. (package:config("inst_avx") and "ON" or "OFF")) From a1ef12f9aa94465bc37b2dd3e2cd61bec03298bf Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 13 Aug 2024 09:14:41 +0800 Subject: [PATCH 585/671] Update cpp-httplib to 0.16.2 (#4911) --- packages/c/cpp-httplib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpp-httplib/xmake.lua b/packages/c/cpp-httplib/xmake.lua index 7496eb217..4cb8e264d 100644 --- a/packages/c/cpp-httplib/xmake.lua +++ b/packages/c/cpp-httplib/xmake.lua @@ -19,6 +19,7 @@ package("cpp-httplib") add_versions("0.15.1", "8d6a4a40ee8fd3f553b7e895882e60e674bd910883fc1857587dbbabee3cdb91") add_versions("0.15.2", "4afbcf4203249d2cbcb698e46e1f6fb61b479013a84844d6bb1c044e233cab6a") add_versions("0.15.3", "2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e") + add_versions("0.16.2", "75565bcdf12522929a26fb57a2c7f8cc0e175e27a9ecf51616075f3ea960da44") add_configs("ssl", { description = "Requires OpenSSL", default = false, type = "boolean"}) add_configs("zlib", { description = "Requires Zlib", default = false, type = "boolean"}) From ff34b45f10b90b67c3a28d827552d6b5d700cfaa Mon Sep 17 00:00:00 2001 From: SFGrenade <25555417+SFGrenade@users.noreply.github.com> Date: Tue, 13 Aug 2024 04:20:06 +0200 Subject: [PATCH 586/671] try lame on full windows (#4910) * try lame on full windows * add conan-io lame configs --- packages/l/lame/xmake.lua | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/packages/l/lame/xmake.lua b/packages/l/lame/xmake.lua index 525f3ce33..8fb4b3f2f 100644 --- a/packages/l/lame/xmake.lua +++ b/packages/l/lame/xmake.lua @@ -24,10 +24,37 @@ package("lame") import("package.tools.autoconf").install(package, configs) end) - on_install("windows|x86", function (package) + on_install("windows", function (package) + -- slight adjustments according to https://github.com/conan-io/conan-center-index/blob/b39954231875c1350964a658c408c8a840a9eb20/recipes/libmp3lame/all/conanfile.py + -- Honor vc runtime + io.replace("Makefile.MSVC", "CC_OPTS = $(CC_OPTS) /MT", "", {plain = true}) + -- Do not hardcode LTO + io.replace("Makefile.MSVC", " /GL", "", {plain = true}) + io.replace("Makefile.MSVC", " /LTCG", "", {plain = true}) + io.replace("Makefile.MSVC", "ADDL_OBJ = bufferoverflowU.lib", "", {plain = true}) + + -- lame install guide says to `copy configMS.h config.h` + -- then to `nmake -f Makefile.MSVC comp=msvc asm=no` os.cp("configMS.h", "config.h") + -- this was here before, who knows if it's needed io.gsub("Makefile.MSVC", "nasmw", "nasm") - import("package.tools.nmake").build(package, {"-f", "Makefile.MSVC"}) + + -- more stuff from conan-io + local configs = {"-f", "Makefile.MSVC", "comp=msvc"} + if package:is_arch("x86") then + table.insert(configs, "asm=yes") + elseif package:is_arch("x64") then + io.replace("Makefile.MSVC", "MACHINE = /machine:I386", "MACHINE =/machine:X64", {plain = true}) + table.insert(configs, "MSVCVER=Win64") + table.insert(configs, "asm=yes") + elseif package:is_arch("arm64") then + io.replace("Makefile.MSVC", "MACHINE = /machine:I386", "MACHINE =/machine:ARM64", {plain = true}) + table.insert(configs, "MSVCVER=Win64") + else + table.insert(configs, "asm=yes") + end + import("package.tools.nmake").build(package, configs) + os.cp("output/*.lib", package:installdir("lib")) os.cp("output/*.exe", package:installdir("bin")) os.cp("include/*.h", package:installdir("include/lame")) From da7315b7220f9ac3914076542e3a80de719a2daa Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 13 Aug 2024 10:47:32 +0800 Subject: [PATCH 587/671] Update quantlib to 1.35 (#4914) --- packages/q/quantlib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/q/quantlib/xmake.lua b/packages/q/quantlib/xmake.lua index 59cd69119..af29fa4f4 100644 --- a/packages/q/quantlib/xmake.lua +++ b/packages/q/quantlib/xmake.lua @@ -5,6 +5,7 @@ package("quantlib") add_urls("https://github.com/lballabio/QuantLib/releases/download/v$(version)/QuantLib-$(version).tar.gz", "https://github.com/lballabio/QuantLib.git") + add_versions("1.35", "fd83657bbc69d8692065256699b7424d5a606dff03e7136a820b6e9675016c89") add_versions("1.34", "eb87aa8ced76550361771e167eba26aace018074ec370f7af49a01aa56b2fe50") add_versions("1.33", "4810d789261eb36423c7d277266a6ee3b28a3c05af1ee0d45544ca2e0e8312bd") From 52707436c545649ed329d91557efcf56590a2d6d Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 13 Aug 2024 10:47:35 +0800 Subject: [PATCH 588/671] Update aws-c-auth to v0.7.25 (#4913) --- packages/a/aws-c-auth/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-auth/xmake.lua b/packages/a/aws-c-auth/xmake.lua index 2af588439..7dac80488 100644 --- a/packages/a/aws-c-auth/xmake.lua +++ b/packages/a/aws-c-auth/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-auth") add_urls("https://github.com/awslabs/aws-c-auth/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-auth.git") + add_versions("v0.7.25", "8f7993f8fad2992ca19c00123ea16e72c4d13acbeeb6333061034a299274f081") add_versions("v0.7.22", "f249a12a6ac319e929c005fb7efd5534c83d3af3a3a53722626ff60a494054bb") add_versions("v0.7.18", "c705199655066f1f874bc3758683f32e288024196a22f28360d336231e45406f") add_versions("v0.7.17", "8fe380255a71a2d5c9acd4979c135f9842135ce6385010ea562bc0b532bf5b84") From 8b2975fa0fd4753b22ec5c0a65170deab8b2a453 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 13 Aug 2024 10:47:38 +0800 Subject: [PATCH 589/671] Update vk-bootstrap to v1.3.292 (#4912) --- packages/v/vk-bootstrap/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vk-bootstrap/xmake.lua b/packages/v/vk-bootstrap/xmake.lua index 7bee05cd5..3c37a2193 100644 --- a/packages/v/vk-bootstrap/xmake.lua +++ b/packages/v/vk-bootstrap/xmake.lua @@ -6,6 +6,7 @@ package("vk-bootstrap") add_urls("https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/$(version).tar.gz", "https://github.com/charles-lunarg/vk-bootstrap.git") + add_versions("v1.3.292", "0853ab291ab7b19779582ada1d6a245dcd0489c2e346ee1e4275c24d3788077a") add_versions("v1.3.290", "225f61c850f4d2e242121249418db2f54b09cd799922547bdb3f6d9c00738fa8") add_versions("v1.3.289", "101c4b10aaf48f07c5aae955fab12d8a453970c13fa93e8fe5e5b0b58ea1ceac") add_versions("v1.3.285", "c86b12ac2a0a809f7bf2af009a612be188aa4bb3a669d5955b22007989b3e07c") From 953520f9a1dd08d3db2b5b895a8f80d40bc58451 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 20:25:39 +0800 Subject: [PATCH 590/671] usd: update version (#4909) * usd: update version * tbb: fix check * usd: improve xmake.lua * tbb: fix check --- packages/t/tbb/xmake.lua | 5 +++-- packages/u/usd/xmake.lua | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/t/tbb/xmake.lua b/packages/t/tbb/xmake.lua index 2c171f448..749a80aa9 100644 --- a/packages/t/tbb/xmake.lua +++ b/packages/t/tbb/xmake.lua @@ -50,8 +50,9 @@ package("tbb") if on_check then on_check("macosx", function (package) - assert(package:is_arch("arm64") and package:version():ge("2021.0"), - "package(tbb <2021.0) unsupported version on macosx/arm64") + if package:is_arch("arm64") then + assert(package:version():ge("2021.0"), "package(tbb/arm64 <2021.0) unsupported version on macosx") + end end) end diff --git a/packages/u/usd/xmake.lua b/packages/u/usd/xmake.lua index 2123ef46b..d922ee750 100644 --- a/packages/u/usd/xmake.lua +++ b/packages/u/usd/xmake.lua @@ -1,9 +1,14 @@ package("usd") set_homepage("http://www.openusd.org") set_description("Universal Scene Description") + set_license("Apache-2.0") add_urls("https://github.com/PixarAnimationStudios/USD/archive/refs/tags/$(version).tar.gz", "https://github.com/PixarAnimationStudios/USD.git") + + add_versions("v24.08", "6640bb184bf602c6df14fa4a83af6ac5ae1ab8d1d38cf7bb7decfaa9a7ad5d06") + add_versions("v24.05", "0352619895588efc8f9d4aa7004c92be4e4fa70e1ccce77e474ce23941c05828") + add_versions("v24.03", "0724421cff8ae04d0a7108ffa7c104e6ec3f7295418d4d50caaae767e59795ef") add_versions("v23.02", "a8eefff722db0964ce5b11b90bcdc957f3569f1cf1d44c46026ecd229ce7535d") add_versions("v22.11", "f34826475bb9385a9e94e2fe272cc713f517b987cbea15ee6bbc6b21db19aaae") @@ -18,7 +23,7 @@ package("usd") add_defines("NOMINMAX") end - on_install("linux", "macosx", "windows|x64", function (package) + on_install("linux", "macosx|x86_64", "windows|x64", function (package) local configs = { "-DTBB_USE_DEBUG_BUILD=OFF", "-DPXR_BUILD_ALEMBIC_PLUGIN=OFF", @@ -34,7 +39,7 @@ package("usd") "-DPXR_BUILD_USD_TOOLS=OFF", "-DPXR_BUILD_MONOLITHIC=" .. (package:config("monolithic") and "ON" or "OFF") } - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) @@ -45,4 +50,4 @@ package("usd") auto stage = pxr::UsdStage::CreateInMemory(); } ]]}, {configs = {languages = "c++17"}, includes = "pxr/usd/usd/stage.h"})) - end) \ No newline at end of file + end) From 427ff1d662e359fafeff3b1cd4b22c0cb2e0888f Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 22:26:39 +0800 Subject: [PATCH 591/671] pcre2: fix build type & update version (#4173) * pcre2: fix build type & update version * add git url * add check * fix check --- packages/p/pcre/xmake.lua | 3 ++- packages/p/pcre2/xmake.lua | 30 +++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/packages/p/pcre/xmake.lua b/packages/p/pcre/xmake.lua index 59f2cb014..456e26c6a 100644 --- a/packages/p/pcre/xmake.lua +++ b/packages/p/pcre/xmake.lua @@ -1,7 +1,7 @@ package("pcre") - set_homepage("https://www.pcre.org/") set_description("A Perl Compatible Regular Expressions Library") + set_license("BSD-3-Clause") set_urls("https://github.com/xmake-mirror/pcre/releases/download/$(version)/pcre-$(version).tar.bz2") add_versions("8.45", "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8") @@ -22,6 +22,7 @@ package("pcre") on_install("windows", function (package) local configs = {"-DPCRE_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DPCRE_SUPPORT_JIT=" .. (package:config("jit") and "ON" or "OFF")) local bitwidth = package:config("bitwidth") or "8" diff --git a/packages/p/pcre2/xmake.lua b/packages/p/pcre2/xmake.lua index 8081a3c2e..138766f13 100644 --- a/packages/p/pcre2/xmake.lua +++ b/packages/p/pcre2/xmake.lua @@ -1,24 +1,37 @@ package("pcre2") - set_homepage("https://www.pcre.org/") set_description("A Perl Compatible Regular Expressions Library") + set_license("BSD-3-Clause") + + add_urls("https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(version)/pcre2-$(version).tar.gz", + "https://github.com/PhilipHazel/pcre2.git") - set_urls("https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(version)/pcre2-$(version).tar.gz") + add_versions("10.43", "889d16be5abb8d05400b33c25e151638b8d4bac0e2d9c76e9d6923118ae8a34e") add_versions("10.42", "c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f") add_versions("10.40", "ded42661cab30ada2e72ebff9e725e745b4b16ce831993635136f2ef86177724") add_versions("10.39", "0781bd2536ef5279b1943471fdcdbd9961a2845e1d2c9ad849b9bd98ba1a9bd4") - add_deps("cmake") - if not is_plat("iphoneos") then add_configs("jit", {description = "Enable jit.", default = not is_plat("wasm"), type = "boolean"}) end add_configs("bitwidth", {description = "Set the code unit width.", default = "8", values = {"8", "16", "32"}}) + add_deps("cmake") + + if on_check then + on_check("android", function (package) + if package:is_arch("armeabi-v7a") then + local ndk = package:toolchain("ndk") + local ndkver = ndk:config("ndkver") + assert(ndkver and tonumber(ndkver) > 22, "package(pcre2/armeabi-v7a): need ndk version > 22") + end + end) + end + on_load(function (package) local bitwidth = package:config("bitwidth") or "8" local suffix = "" - if package:is_plat("windows") and package:debug() then + if package:is_plat("windows") and package:is_debug() then suffix = "d" end package:add("links", "pcre2-posix" .. suffix) @@ -30,21 +43,24 @@ package("pcre2") end) on_install(function (package) - if package:version():lt("10.21") then + if package:gitref() or package:version():lt("10.21") then io.replace("CMakeLists.txt", [[SET(CMAKE_C_FLAGS -I${PROJECT_SOURCE_DIR}/src)]], [[SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PROJECT_SOURCE_DIR}/src")]], {plain = true}) end io.replace("CMakeLists.txt", "OUTPUT_NAME pcre2%-(%w-)%-static", "OUTPUT_NAME pcre2-%1") + local configs = {"-DPCRE2_BUILD_TESTS=OFF", "-DPCRE2_BUILD_PCRE2GREP=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_STATIC_LIBS=" .. (package:config("shared") and "OFF" or "ON")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DPCRE2_SUPPORT_JIT=" .. (package:config("jit") and "ON" or "OFF")) table.insert(configs, "-DPCRE2_STATIC_PIC=" .. (package:config("pic") and "ON" or "OFF")) + local bitwidth = package:config("bitwidth") or "8" if bitwidth ~= "8" then table.insert(configs, "-DPCRE2_BUILD_PCRE2_8=OFF") table.insert(configs, "-DPCRE2_BUILD_PCRE2_" .. bitwidth .. "=ON") end - if package:debug() then + if package:is_debug() then table.insert(configs, "-DPCRE2_DEBUG=ON") end if package:is_plat("windows") then From 2dd0f7a2f8fb1c0513b7dec131e4f10228a107d8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 23:10:18 +0800 Subject: [PATCH 592/671] jpcre2: add package (#4918) --- packages/j/jpcre2/xmake.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/j/jpcre2/xmake.lua diff --git a/packages/j/jpcre2/xmake.lua b/packages/j/jpcre2/xmake.lua new file mode 100644 index 000000000..038c58e60 --- /dev/null +++ b/packages/j/jpcre2/xmake.lua @@ -0,0 +1,25 @@ +package("jpcre2") + set_kind("library", {headeronly = true}) + set_homepage("https://docs.neurobin.org/jpcre2/latest/") + set_description("C++ wrapper for PCRE2 Library") + set_license("BSD-3-Clause") + + add_urls("https://github.com/jpcre2/jpcre2/archive/867af2d36413cf5f69c2e224f4f96f56f876d889.tar.gz", + "https://github.com/jpcre2/jpcre2.git") + + add_versions("2021.06.15", "8df87579bda9b56ff23eceafcd2a5604938e3e299e0206b88a8f4ee1ba29c0e3") + + add_deps("pcre2") + + on_install(function (package) + os.cp("src/jpcre2.hpp", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + typedef jpcre2::select jp; + void test() { + jp::Regex re; + } + ]]}, {configs = {languages = "c++11"}, includes = "jpcre2.hpp"})) + end) From fac0a354678191dc5bbb46eb349fefcba0c51995 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 23:24:18 +0800 Subject: [PATCH 593/671] libjpeg: add v9f version (#4919) --- packages/l/libjpeg/xmake.lua | 63 +++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/packages/l/libjpeg/xmake.lua b/packages/l/libjpeg/xmake.lua index 2b5d83f68..188b43267 100644 --- a/packages/l/libjpeg/xmake.lua +++ b/packages/l/libjpeg/xmake.lua @@ -1,5 +1,4 @@ package("libjpeg") - set_homepage("http://ijg.org/") set_description("A widely used C library for reading and writing JPEG image files.") @@ -8,6 +7,7 @@ package("libjpeg") add_versions("v9c", "682aee469c3ca857c4c38c37a6edadbfca4b04d42e56613b11590ec6aa4a278d") add_versions("v9d", "2303a6acfb6cc533e0e86e8a9d29f7e6079e118b9de3f96e07a71a11c082fa6a") add_versions("v9e", "4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d") + add_versions("v9f", "04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b") add_configs("headeronly", {description = "Install headerfiles only.", default = false, type = "boolean"}) @@ -17,36 +17,13 @@ package("libjpeg") add_extsources("brew::jpeg/libjpeg") end - on_install(function (package) - io.writefile("xmake.lua", [[ - add_rules("mode.debug", "mode.release") - - target("jpeg") - set_kind("static") - - add_files("jaricom.c", "jcapimin.c", "jcapistd.c", "jcarith.c", "jccoefct.c", "jccolor.c") - add_files("jcdctmgr.c", "jchuff.c", "jcinit.c", "jcmainct.c", "jcmarker.c", "jcmaster.c") - add_files("jcomapi.c", "jcparam.c", "jcprepct.c", "jcsample.c", "jctrans.c", "jdapimin.c") - add_files("jdapistd.c", "jdarith.c", "jdatadst.c", "jdatasrc.c", "jdcoefct.c", "jdcolor.c") - add_files("jddctmgr.c", "jdhuff.c", "jdinput.c", "jdmainct.c", "jdmarker.c", "jdmaster.c") - add_files("jdmerge.c", "jdpostct.c", "jdsample.c", "jdtrans.c", "jerror.c", "jfdctflt.c") - add_files("jfdctfst.c", "jfdctint.c", "jidctflt.c", "jidctfst.c", "jidctint.c", "jquant1.c") - add_files("jquant2.c", "jutils.c", "jmemmgr.c", "jmemansi.c") - - if is_plat("windows") then - add_configfiles("jconfig.vc", {filename = "jconfig.h"}) - else - add_configfiles("jconfig.txt", {filename = "jconfig.h"}) - end - add_includedirs("$(buildir)", {public = true}) - add_headerfiles("jerror.h", "jmorecfg.h", "jpeglib.h", "$(buildir)/jconfig.h") - ]]) - local configs = {} - if package:config("shared") then - configs.kind = "shared" - elseif not package:is_plat("windows", "mingw") and package:config("pic") ~= false then - configs.cxflags = "-fPIC" + on_load(function (package) + if package:config("headeronly") then + package:set("kind", "library", {headeronly = true}) end + end) + + on_install(function (package) if package:config("headeronly") then if package:is_plat("windows") then os.cp("jconfig.vc", "jconfig.h") @@ -55,6 +32,32 @@ package("libjpeg") end os.cp("*.h", package:installdir("include")) else + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + + target("jpeg") + set_kind("$(kind)") + + add_files("jaricom.c", "jcapimin.c", "jcapistd.c", "jcarith.c", "jccoefct.c", "jccolor.c") + add_files("jcdctmgr.c", "jchuff.c", "jcinit.c", "jcmainct.c", "jcmarker.c", "jcmaster.c") + add_files("jcomapi.c", "jcparam.c", "jcprepct.c", "jcsample.c", "jctrans.c", "jdapimin.c") + add_files("jdapistd.c", "jdarith.c", "jdatadst.c", "jdatasrc.c", "jdcoefct.c", "jdcolor.c") + add_files("jddctmgr.c", "jdhuff.c", "jdinput.c", "jdmainct.c", "jdmarker.c", "jdmaster.c") + add_files("jdmerge.c", "jdpostct.c", "jdsample.c", "jdtrans.c", "jerror.c", "jfdctflt.c") + add_files("jfdctfst.c", "jfdctint.c", "jidctflt.c", "jidctfst.c", "jidctint.c", "jquant1.c") + add_files("jquant2.c", "jutils.c", "jmemmgr.c", "jmemansi.c") + + if is_plat("windows") then + add_configfiles("jconfig.vc", {filename = "jconfig.h"}) + else + add_configfiles("jconfig.txt", {filename = "jconfig.h"}) + end + add_includedirs("$(buildir)", {public = true}) + add_headerfiles("jerror.h", "jmorecfg.h", "jpeglib.h", "$(buildir)/jconfig.h") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + ]]) import("package.tools.xmake").install(package, configs) end end) From 986ddcf44f4f18d9d9386ef30a55b41cf4b33e31 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 23:25:12 +0800 Subject: [PATCH 594/671] libspng: add cmake build --- packages/l/libspng/xmake.lua | 56 ++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/packages/l/libspng/xmake.lua b/packages/l/libspng/xmake.lua index 6dba37f73..f5a7ae682 100644 --- a/packages/l/libspng/xmake.lua +++ b/packages/l/libspng/xmake.lua @@ -1,41 +1,59 @@ package("libspng") - set_homepage("https://libspng.org") set_description("Simple, modern libpng alternative") + set_license("BSD-2-Clause") set_urls("https://github.com/randy408/libspng/archive/refs/tags/$(version).tar.gz", "https://github.com/randy408/libspng.git") + add_versions("v0.7.4", "47ec02be6c0a6323044600a9221b049f63e1953faf816903e7383d4dc4234487") add_versions("v0.7.1", "0726a4914ad7155028f3baa94027244d439cd2a2fbe8daf780c2150c4c951d8e") + add_configs("cmake", {description = "Use cmake build system", default = false, type = "boolean"}) + + if is_plat("linux", "bsd") then + add_syslinks("m") + end + add_deps("zlib") on_load(function (package) + if package:config("cmake") then + package:add("deps", "cmake") + end if not package:config("shared") then package:add("defines", "SPNG_STATIC") end end) on_install(function (package) - io.writefile("xmake.lua", [[ - add_rules("mode.debug", "mode.release") - add_requires("zlib") - target("spng") - set_kind("$(kind)") - add_files("spng/*.c") - add_headerfiles("spng/*.h") - add_packages("zlib") - if is_kind("static") then - add_defines("SPNG_STATIC") - end - ]]) - local configs = {} - if package:config("shared") then - configs.kind = "shared" - elseif not package:is_plat("windows", "mingw") and package:config("pic") ~= false then - configs.cxflags = "-fPIC" + if package:config("cmake") then + local configs = {"-DBUILD_EXAMPLES=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + if package:config("shared") then + table.join2(configs, {"-DSPNG_SHARED=ON", "-DSPNG_STATIC=OFF"}) + else + table.join2(configs, {"-DSPNG_SHARED=OFF", "-DSPNG_STATIC=ON"}) + end + import("package.tools.cmake").install(package, configs) + else + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + add_requires("zlib") + target("spng") + set_kind("$(kind)") + add_files("spng/*.c") + add_headerfiles("spng/*.h") + add_packages("zlib") + if is_kind("static") then + add_defines("SPNG_STATIC") + end + if is_plat("linux", "bsd") then + add_syslinks("m") + end + ]]) + import("package.tools.xmake").install(package) end - import("package.tools.xmake").install(package, configs) end) on_test(function (package) From 8e619898ad8cabc6362ae9ab1d83a97b94555cd8 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 13 Aug 2024 23:25:27 +0800 Subject: [PATCH 595/671] libjpeg: remove unused code --- packages/l/libjpeg/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/l/libjpeg/xmake.lua b/packages/l/libjpeg/xmake.lua index 188b43267..f5dbec210 100644 --- a/packages/l/libjpeg/xmake.lua +++ b/packages/l/libjpeg/xmake.lua @@ -58,7 +58,7 @@ package("libjpeg") add_rules("utils.symbols.export_all") end ]]) - import("package.tools.xmake").install(package, configs) + import("package.tools.xmake").install(package) end end) From d74381e5fb69961acd77398caab325358ff9a080 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Aug 2024 10:35:08 +0800 Subject: [PATCH 596/671] Update zziplib to v0.13.78 (#4923) --- packages/z/zziplib/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/z/zziplib/xmake.lua b/packages/z/zziplib/xmake.lua index 46aa8770e..a4f690918 100644 --- a/packages/z/zziplib/xmake.lua +++ b/packages/z/zziplib/xmake.lua @@ -6,6 +6,7 @@ package("zziplib") add_urls("https://github.com/gdraheim/zziplib/archive/refs/tags/$(version).tar.gz", "https://github.com/gdraheim/zziplib.git") + add_versions("v0.13.78", "feaeee7c34f18aa27bd3da643cc6a47d04d2c41753a59369d09102d79b9b0a31") add_versions("v0.13.77", "50e166e6a879c2bd723e60e482a91ec793a7362fa2d9c5fe556fb0e025810477") add_versions("v0.13.76", "08b0e300126329c928a41b6d68e397379fad02469e34a0855d361929968ea4c0") add_versions("v0.13.74", "319093aa98d39453f3ea2486a86d8a2fab2d5632f6633a2665318723a908eecf") From 392de14e4baea8a4ce3ed99872ce89881cc03a3d Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Aug 2024 10:35:10 +0800 Subject: [PATCH 597/671] Update ufbx to v0.14.3 (#4922) --- packages/u/ufbx/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/u/ufbx/xmake.lua b/packages/u/ufbx/xmake.lua index fdace7cf0..556483a0c 100644 --- a/packages/u/ufbx/xmake.lua +++ b/packages/u/ufbx/xmake.lua @@ -6,6 +6,7 @@ package("ufbx") set_urls("https://github.com/ufbx/ufbx/archive/refs/tags/$(version).tar.gz", "https://github.com/ufbx/ufbx.git") + add_versions("v0.14.3", "190bf253d5c7da55b54fa9c16357b0de1ec356ff6a92f5b4e0c6b39d2d3ebff7") add_versions("v0.14.2", "0a50e7328a20a5e8be25a4ae13af1f2dacb51531a94321ef3fe5c57d799fc72e") add_versions("v0.14.0", "7bc48494b236e2ed41000f0008cecc9459956dd25154d91c4af4144c2a26fe6d") add_versions("v0.13.0", "7715ca1e66c005dea6cfe4817be71fa8e31a8e3d36bed18aec5e0df1a953a22c") From e22dceff97593087897f3f61699eb4023a1f51f9 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Aug 2024 10:35:13 +0800 Subject: [PATCH 598/671] Update vc-ltl5 to 5.1.1 (#4920) --- packages/v/vc-ltl5/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/v/vc-ltl5/xmake.lua b/packages/v/vc-ltl5/xmake.lua index d68a10752..c395817ab 100644 --- a/packages/v/vc-ltl5/xmake.lua +++ b/packages/v/vc-ltl5/xmake.lua @@ -4,6 +4,7 @@ package("vc-ltl5") set_license("EPL-2.0") add_urls("https://github.com/Chuyu-Team/VC-LTL5/releases/download/v$(version)/VC-LTL-$(version)-Binary.7z") + add_versions("5.1.1", "71eb81ad7d5270cb2a247d6b1c5c01b8efb8f2c869d2e5222be8aafab2fc07de") add_versions("5.0.6", "e406f829f75d59c34ee1e34cb6e994eb7db0810123ae7196499f26df88bc0a6f") add_versions("5.0.7", "08555aca30b2f77a484534be0799cfed05bfdeb1d1e461d91576264d7123e687") add_versions("5.0.9", "71a3099978ff3dc83fe8e2ebddf104e2f916d13cd10fb01fe02317ebc7fb02d9") From 8822e12a8bd9a85bb34b13bacbe1a0899968c964 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Aug 2024 11:09:33 +0800 Subject: [PATCH 599/671] Update aws-c-http to v0.8.7 (#4924) --- packages/a/aws-c-http/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-http/xmake.lua b/packages/a/aws-c-http/xmake.lua index a47788313..f70a4034e 100644 --- a/packages/a/aws-c-http/xmake.lua +++ b/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.8.7", "173ed7634c87485c2defbd9a96a246a79ec3f3659b28b235ac38e6e92d67392a") add_versions("v0.8.2", "a76ba75e59e1ac169df3ec00c0d1c453db1a4db85ee8acd3282a85ee63d6b31c") add_versions("v0.8.1", "83fb47e2d7956469bb328f16dea96663e96f8f20dc60dc4e9676b82804588530") add_versions("v0.7.12", "0f92f295c96e10aa9c1e66ac73c038ee9d9c61e1be7551e721ee0dab9c89fc6f") From 6b470dffa2e479055d5983511dd6338542b659ea Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Thu, 15 Aug 2024 02:31:21 +0100 Subject: [PATCH 600/671] yaml-cpp: remove limits (#4926) * Update xmake.lua * yaml-cpp: update test * yaml-cpp: exclude mingw * yaml-cpp: make shared if mingw * fix mingw static --------- Co-authored-by: star9029 --- packages/y/yaml-cpp/xmake.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/y/yaml-cpp/xmake.lua b/packages/y/yaml-cpp/xmake.lua index ab7a89815..fccb20154 100644 --- a/packages/y/yaml-cpp/xmake.lua +++ b/packages/y/yaml-cpp/xmake.lua @@ -1,5 +1,4 @@ package("yaml-cpp") - set_homepage("https://github.com/jbeder/yaml-cpp/") set_description("A YAML parser and emitter in C++") set_license("MIT") @@ -13,14 +12,16 @@ package("yaml-cpp") add_versions("0.8.0", "fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16") add_deps("cmake") - on_load("windows", function (package) + + on_load("windows", "mingw", function (package) if not package:config("shared") then package:add("defines", "YAML_CPP_STATIC_DEFINE") end end) - on_install("windows", "linux", "macosx", "mingw", function (package) + on_install(function (package) local configs = {"-DYAML_CPP_BUILD_TESTS=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DYAML_BUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) if package:is_plat("windows") then table.insert(configs, "-DYAML_MSVC_SHARED_RT=" .. (package:config("vs_runtime"):startswith("MT") and "OFF" or "ON")) @@ -30,5 +31,9 @@ package("yaml-cpp") end) on_test(function (package) - assert(package:has_cxxtypes("YAML::Parser", {configs = {languages = "c++11"}, includes = "yaml-cpp/yaml.h"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + YAML::Load(""); + } + ]]}, {configs = {languages = "c++11"}, includes = "yaml-cpp/yaml.h"})) end) From f35ffbc6de80469a74c18531ea35134f26e4b602 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 15 Aug 2024 09:52:10 +0800 Subject: [PATCH 601/671] Update quill to v6.1.2 (#4931) --- packages/q/quill/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/q/quill/xmake.lua b/packages/q/quill/xmake.lua index 962dea4fc..fdb6951f6 100644 --- a/packages/q/quill/xmake.lua +++ b/packages/q/quill/xmake.lua @@ -6,6 +6,7 @@ package("quill") set_urls("https://github.com/odygrd/quill/archive/refs/tags/$(version).tar.gz", "https://github.com/odygrd/quill.git") + add_versions("v6.1.2", "3eea9ec9634ce0ef28a2cc766d5316c1f068feb9340cf54e40e431a9342a9220") add_versions("v6.1.0", "3893ab422c746d93ff47bbcd61dd5e60bee37974b0d81cdab9cf9a4b10c58477") add_versions("v5.1.0", "0b4f34415c4b173f3d0466752fa3d3835e1a58f931bfce5281f817b5f997511f") add_versions("v5.0.0", "c2fd2b090db7d2d7633d4ee5a8316e43b4f5a13d8e339721b8e830fb03c25129") From b11f486dd70093665f236f7806e0b5acf927a8d9 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 15 Aug 2024 09:52:12 +0800 Subject: [PATCH 602/671] Update aws-c-common to v0.9.27 (#4930) --- packages/a/aws-c-common/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-common/xmake.lua b/packages/a/aws-c-common/xmake.lua index aa17a5d07..e26f0fe42 100644 --- a/packages/a/aws-c-common/xmake.lua +++ b/packages/a/aws-c-common/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-common") add_urls("https://github.com/awslabs/aws-c-common/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-common.git") + add_versions("v0.9.27", "0c0eecbd7aa04f85b1bdddf6342789bc8052737c6e9aa2ca35e26caed41d06ba") add_versions("v0.9.25", "443f3268387715e6e2c417a87114a6b42873aeeebc793d3f6f631323e7c48a80") add_versions("v0.9.24", "715a15399fe6dce2971c222ecabea4276e42ba3465a63c175724fc0c80d7a888") add_versions("v0.9.23", "adf838daf6a60aa31268522105b03262d745f529bc981d3ac665424133d6f91b") From 5968ee1f7857b313bcbc83d01c87a739bdc55182 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Thu, 15 Aug 2024 19:40:11 +0800 Subject: [PATCH 603/671] add package dyncall (#4934) * add package dyncall * dyncall: remove plat wasm * update on_test --- packages/d/dyncall/xmake.lua | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/d/dyncall/xmake.lua diff --git a/packages/d/dyncall/xmake.lua b/packages/d/dyncall/xmake.lua new file mode 100644 index 000000000..d61cd4195 --- /dev/null +++ b/packages/d/dyncall/xmake.lua @@ -0,0 +1,21 @@ +package("dyncall") + set_homepage("https://www.dyncall.org") + set_description("dyncall library provides a clean and portable C interface to dynamically issue calls to foreign code using small call kernels written in assembly.") + + add_urls("https://www.dyncall.org/r$(version)/dyncall-$(version).tar.gz") + + add_versions("1.4", "14437dbbef3b6dc92483f6507eaf825ab97964a89eecae8cb347a6bec9c32aae") + + add_configs("shared", {description = "only has static library.", default = false, type = "boolean", readonly = true}) + + add_deps("cmake") + + on_install("!wasm", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cfuncs("dcNewCallVM", {includes = "dyncall.h"})) + end) From 3351bd1150a8a1a3487e3d1ada0fd8b025169a5f Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:40:32 +0100 Subject: [PATCH 604/671] abseil: remove limits (#4935) * abseil: remove limits * abseil: fix indentation of test --- packages/a/abseil/xmake.lua | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/a/abseil/xmake.lua b/packages/a/abseil/xmake.lua index 8ca20172e..dc0a7a8be 100644 --- a/packages/a/abseil/xmake.lua +++ b/packages/a/abseil/xmake.lua @@ -1,11 +1,11 @@ package("abseil") - set_homepage("https://abseil.io") set_description("C++ Common Libraries") set_license("Apache-2.0") add_urls("https://github.com/abseil/abseil-cpp/archive/$(version).tar.gz", "https://github.com/abseil/abseil-cpp.git") + add_versions("20200225.1", "0db0d26f43ba6806a8a3338da3e646bb581f0ca5359b3a201d8fb8e4752fd5f8") add_versions("20210324.1", "441db7c09a0565376ecacf0085b2d4c2bbedde6115d7773551bc116212c2a8d6") add_versions("20210324.2", "59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f") @@ -24,7 +24,9 @@ package("abseil") add_configs("cxx_standard", {description = "Select c++ standard to build.", default = "17", type = "string", values = {"14", "17", "20"}}) - if is_plat("macosx") then + if is_plat("linux") then + add_syslinks("pthread") + elseif is_plat("macosx") then add_frameworks("CoreFoundation") end @@ -34,7 +36,7 @@ package("abseil") end end) - on_install("macosx", "linux", "windows", "mingw", "cross", function (package) + on_install(function (package) if package:version() and package:version():eq("20230802.1") and package:is_plat("mingw") then io.replace(path.join("absl", "synchronization", "internal", "pthread_waiter.h"), "#ifndef _WIN32", "#if !defined(_WIN32) && !defined(__MINGW32__)", {plain = true}) io.replace(path.join("absl", "synchronization", "internal", "win32_waiter.h"), "#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", "#if defined(_WIN32) && !defined(__MINGW32__) && _WIN32_WINNT >= _WIN32_WINNT_VISTA", {plain = true}) @@ -80,11 +82,11 @@ package("abseil") #include #include void test() { - std::vector v = {"foo", "bar", "baz"}; - std::string s = absl::StrJoin(v, "-"); - int result = 0; - auto a = absl::SimpleAtoi("123", &result); - std::cout << "Joined string: " << s << "\\n"; + std::vector v = {"foo", "bar", "baz"}; + std::string s = absl::StrJoin(v, "-"); + int result = 0; + auto a = absl::SimpleAtoi("123", &result); + std::cout << "Joined string: " << s << "\\n"; } ]]}, {configs = {languages = "cxx17"}})) end) From dad98c92a35caebd102aa1b52458926922bd276e Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 15 Aug 2024 20:22:06 +0800 Subject: [PATCH 605/671] libdeflate: remove limit plat (#4936) --- packages/l/libdeflate/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/l/libdeflate/xmake.lua b/packages/l/libdeflate/xmake.lua index 2d403db35..d414802ca 100644 --- a/packages/l/libdeflate/xmake.lua +++ b/packages/l/libdeflate/xmake.lua @@ -34,7 +34,7 @@ package("libdeflate") end end) - on_install("windows", "macosx", "linux", "android", "mingw", "bsd", function (package) + on_install(function (package) local configs = {"-DLIBDEFLATE_BUILD_GZIP=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DLIBDEFLATE_BUILD_STATIC_LIB=" .. (package:config("shared") and "OFF" or "ON")) From 818fa25a45b5645a28cb42553b13dd56984e05be Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 15 Aug 2024 21:17:14 +0800 Subject: [PATCH 606/671] cimgui: make dep luajit private --- packages/c/cimgui/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/c/cimgui/xmake.lua b/packages/c/cimgui/xmake.lua index bd66f7005..845896e13 100644 --- a/packages/c/cimgui/xmake.lua +++ b/packages/c/cimgui/xmake.lua @@ -23,7 +23,7 @@ package("cimgui") add_defines("IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1") - add_deps("luajit") + add_deps("luajit", {private = true}) on_load(function (package) if package:config("sdl2") then From 6f818a25091383a17027c7208d4d46ee66747ceb Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 15 Aug 2024 21:18:38 +0800 Subject: [PATCH 607/671] cpp-httplib: improve test --- packages/c/cpp-httplib/xmake.lua | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/c/cpp-httplib/xmake.lua b/packages/c/cpp-httplib/xmake.lua index 4cb8e264d..c6149dae3 100644 --- a/packages/c/cpp-httplib/xmake.lua +++ b/packages/c/cpp-httplib/xmake.lua @@ -28,6 +28,14 @@ package("cpp-httplib") add_deps("cmake") + if on_check then + on_check("android", function (package) + local ndk = package:toolchain("ndk") + local ndk_sdkver = ndk:config("ndk_sdkver") + assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(httplib): need ndk api level >= 24 for android") + end) + end + on_load(function (package) if package:config("ssl") then package:add("deps", "openssl" .. (package:version():ge("0.15.0") and "3" or "")) @@ -43,15 +51,6 @@ package("cpp-httplib") end end) - if on_check then - on_check("android", function (package) - import("core.tool.toolchain") - local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) - local ndk_sdkver = ndk:config("ndk_sdkver") - assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(httplib): need ndk api level >= 24 for android") - end) - end - on_install(function (package) if package:is_plat("android") then import("core.tool.toolchain") @@ -70,9 +69,8 @@ package("cpp-httplib") on_test(function (package) assert(package:check_cxxsnippets({test = [[ - #include - static void test() { + void test() { httplib::Client cli("http://cpp-httplib-server.yhirose.repl.co"); } - ]]}, {includes = "httplib.h",configs = {languages = "c++11"}})) + ]]}, {configs = {languages = "c++11"}, includes = "httplib.h"})) end) From a7f6161a823a027a767825df7414e5b752725788 Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 15 Aug 2024 21:36:50 +0800 Subject: [PATCH 608/671] openfbx: add package (#4937) * openfbx: add package * limit --- packages/o/openfbx/xmake.lua | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 packages/o/openfbx/xmake.lua diff --git a/packages/o/openfbx/xmake.lua b/packages/o/openfbx/xmake.lua new file mode 100644 index 000000000..3cc3e6f3a --- /dev/null +++ b/packages/o/openfbx/xmake.lua @@ -0,0 +1,38 @@ +package("openfbx") + set_homepage("https://github.com/nem0/OpenFBX") + set_description("Lightweight open source FBX importer") + set_license("MIT") + + add_urls("https://github.com/nem0/OpenFBX/archive/refs/tags/$(version).tar.gz", + "https://github.com/nem0/OpenFBX.git") + + add_versions("v0.9", "d6495e05d469bf2c51b860bb0518db6fb2ccf1df9a542a6b1c0f618202641e94") + + add_deps("cmake") + add_deps("libdeflate") + + if on_check then + on_check("windows", function (package) + local vs_toolset = package:toolchain("msvc"):config("vs_toolset") + if vs_toolset and package:is_arch("arm.*") then + local vs_toolset_ver = import("core.base.semver").new(vs_toolset) + local minor = vs_toolset_ver:minor() + assert(minor and minor >= 30, "package(openfbx) deps(libdeflate/arm) requires vs_toolset >= 14.3") + end + end) + end + + on_install("!wasm", function (package) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + auto s = ofbx::getError(); + } + ]]}, {configs = {languages = "c++17"}, includes = "ofbx.h"})) + end) From cbc3f142988853fe0b9ba15a74238600527939be Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 15 Aug 2024 21:37:17 +0800 Subject: [PATCH 609/671] update sqlite3 to 3.46.1 (#4939) --- packages/s/sqlite3/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sqlite3/xmake.lua b/packages/s/sqlite3/xmake.lua index f085c7ef1..04ab9c668 100644 --- a/packages/s/sqlite3/xmake.lua +++ b/packages/s/sqlite3/xmake.lua @@ -35,6 +35,7 @@ package("sqlite3") add_versions("3.45.0+200", "bc9067442eedf3dd39989b5c5cfbfff37ae66cc9c99274e0c3052dc4d4a8f6ae") add_versions("3.45.0+300", "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531") add_versions("3.46.0+0", "6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d") + add_versions("3.46.0+100", "67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071") add_configs("explain_comments", { description = "Inserts comment text into the output of EXPLAIN.", default = true, type = "boolean"}) add_configs("dbpage_vtab", { description = "Enable the SQLITE_DBPAGE virtual table.", default = true, type = "boolean"}) From 6c8adde56bec498a2b1c305ff1b1986d14ef1f23 Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:50:14 +0100 Subject: [PATCH 610/671] robotstxt: remove limits (#4941) --- packages/r/robotstxt/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/r/robotstxt/xmake.lua b/packages/r/robotstxt/xmake.lua index f3a7edc97..4c7764ba7 100644 --- a/packages/r/robotstxt/xmake.lua +++ b/packages/r/robotstxt/xmake.lua @@ -9,7 +9,7 @@ package("robotstxt") add_deps("abseil") - on_install("macosx", "linux", "windows", function (package) + on_install(function (package) io.writefile("xmake.lua", [[ add_rules("mode.debug", "mode.release") add_requires("abseil") From 9086e3f1021aaf366b54448e4f57e5540ba358bd Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 08:06:01 +0800 Subject: [PATCH 611/671] fix has_tool for fmt (#4942) --- packages/f/fmt/xmake.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/f/fmt/xmake.lua b/packages/f/fmt/xmake.lua index ddf064bb0..29336348c 100644 --- a/packages/f/fmt/xmake.lua +++ b/packages/f/fmt/xmake.lua @@ -52,12 +52,12 @@ package("fmt") package:add("defines", "FMT_EXPORT") end end - if package:has_tool("cxx", "cl") and package:config("unicode") then - package:add("cxxflags", "/utf-8") - end end) on_install(function (package) + if package:has_tool("cxx", "cl") and package:config("unicode") then + package:add("cxxflags", "/utf-8") + end if package:config("header_only") then os.cp("include/fmt", package:installdir("include")) return From 330616d122483262804893f5557d97741accd516 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 09:52:59 +0800 Subject: [PATCH 612/671] fix joltphysics (#4943) --- packages/j/joltphysics/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/j/joltphysics/xmake.lua b/packages/j/joltphysics/xmake.lua index 40d4222a1..4e8622962 100644 --- a/packages/j/joltphysics/xmake.lua +++ b/packages/j/joltphysics/xmake.lua @@ -60,7 +60,7 @@ package("joltphysics") package:add("defines", "JPH_OBJECT_LAYER_BITS=" .. package:config("object_layer_bits")) end if package:is_plat("windows") and not package:config("shared") then - package:add("syslinks", "Advapi32") + package:add("syslinks", "advapi32") end package:add("defines", "JPH_PROFILE_ENABLED") if package:is_plat("windows") then @@ -86,7 +86,7 @@ package("joltphysics") end if package:is_arch("i386", "x86", "x64", "x86_64") then -- add instruction sets (from https://github.com/jrouwe/JoltPhysics/blob/4cd52055e09160affcafa557b39520331bf0d034/Jolt/Jolt.cmake#L602) - if package:has_tool("cxx", "cl") then + if package:is_plat("windows") then if package:config("inst_avx512") then package:add("cxxflags", "/arch:AVX512") elseif package:config("inst_avx2") then From 9fefb978342f70b3e5f8c8cbbbc92b00baac28f9 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 09:53:15 +0800 Subject: [PATCH 613/671] fix catch2 (#4944) --- packages/c/catch2/xmake.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/c/catch2/xmake.lua b/packages/c/catch2/xmake.lua index a843b9756..1ab9f691a 100644 --- a/packages/c/catch2/xmake.lua +++ b/packages/c/catch2/xmake.lua @@ -58,13 +58,6 @@ package("catch2") link = link.."d" end component:add("links", link) - if package:is_plat("windows") then - if package:has_tool("cxx", "cl") then - component:add("ldflags", "-subsystem:console") - elseif package:has_tool("cxx", "clang", "clangxx") then - component:add("ldflags", "-Wl,/subsystem:console") - end - end end) on_component("lib", function (package, component) @@ -76,6 +69,15 @@ package("catch2") end) on_install(function (package) + if package:is_plat("windows") then + local main_component = package:component("main") + if package:has_tool("cxx", "cl") then + main_component:add("ldflags", "-subsystem:console") + elseif package:has_tool("cxx", "clang", "clangxx") then + main_component:add("ldflags", "-Wl,/subsystem:console") + end + end + if package:version():ge("3.0") then local configs = {"-DCATCH_INSTALL_DOCS=OFF", "-DCATCH_BUILD_TESTING=OFF", "-DCATCH_BUILD_EXAMPLES=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) From 393b21c8e41e436e666b13d2d37126274095235c Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Fri, 16 Aug 2024 02:53:36 +0100 Subject: [PATCH 614/671] isocline: remove limits (#4945) --- packages/i/isocline/xmake.lua | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/packages/i/isocline/xmake.lua b/packages/i/isocline/xmake.lua index 5f2fd5a78..84835a624 100644 --- a/packages/i/isocline/xmake.lua +++ b/packages/i/isocline/xmake.lua @@ -4,26 +4,38 @@ package("isocline") set_license("MIT") add_urls("https://github.com/daanx/isocline.git") + add_versions("2022.01.16", "762717b5acc7d8baf64faeb5320ae4b85cf98aac") add_deps("cmake") - on_install("linux", "macosx", "bsd", "mingw", "windows", function (package) + on_install(function (package) + io.replace("src/completers.c", "__finddata64_t", "_finddatai64_t", {plain = true}) + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + if package:is_plat("windows") and package:config("shared") then table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON") end + import("package.tools.cmake").build(package, configs, {buildir = "build"}) + os.cp("include", package:installdir()) - os.trycp("build/*.a", package:installdir("lib")) - os.trycp("build/*.dylib", package:installdir("lib")) - os.trycp("build/*.so", package:installdir("lib")) - os.trycp("build/*.lib", package:installdir("lib")) - os.trycp("build/*.dll", package:installdir("bin")) + + os.trycp("build/**.a", package:installdir("lib")) + os.trycp("build/**.dylib", package:installdir("lib")) + os.trycp("build/**.so", package:installdir("lib")) + os.trycp("build/**.lib", package:installdir("lib")) + os.trycp("build/**.dll", package:installdir("bin")) end) on_test(function (package) - assert(package:has_cfuncs("ic_set_history", {includes = "isocline.h"})) + assert(package:check_cxxsnippets({test = [[ + void test() { + ic_set_history("history.txt", 100); + } + ]]}, {configs = {languages = "c++11"}, includes = "isocline.h"})) end) From aeb8ce01cf1cce3b817e01e42a43c51657a5e96d Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 10:10:53 +0800 Subject: [PATCH 615/671] Update cpp-channel to v0.8.3 (#4948) --- packages/c/cpp-channel/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpp-channel/xmake.lua b/packages/c/cpp-channel/xmake.lua index 41e1ab788..7195d7ece 100644 --- a/packages/c/cpp-channel/xmake.lua +++ b/packages/c/cpp-channel/xmake.lua @@ -7,6 +7,7 @@ package("cpp-channel") add_urls("https://github.com/andreiavrammsd/cpp-channel/archive/refs/tags/$(version).zip", "https://github.com/andreiavrammsd/cpp-channel.git") + add_versions("v0.8.3", "095102dd7be6a2087206fc22ec2e32b4eb687f25f8d57d36355290ffb203e4d7") add_versions("v0.8.2", "36f234c40d59b90356d37b558a8918a86b128030ad5d42d8c6a627cfe81c8624") on_install(function (package) From 135d57658505721ef2eb6d4aab740e80bd1c66a2 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 10:10:56 +0800 Subject: [PATCH 616/671] Update catch2 to v3.7.0 (#4946) --- packages/c/catch2/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/catch2/xmake.lua b/packages/c/catch2/xmake.lua index 1ab9f691a..3e4e00379 100644 --- a/packages/c/catch2/xmake.lua +++ b/packages/c/catch2/xmake.lua @@ -5,6 +5,7 @@ package("catch2") add_urls("https://github.com/catchorg/Catch2/archive/refs/tags/$(version).zip", "https://github.com/catchorg/Catch2.git") + add_versions("v3.7.0", "75b04c94471a70680f10f5d0d985bd1a96b8941d040d6a7bfd43f6c6b1de9daf") add_versions("v3.6.0", "aa0ebf551ffbf098ec1e253b5fee234c30b4ee54a31b1be63cb1a7735d3cf391") add_versions("v3.5.4", "190a236fe0772ac4f5eebfdebfc18f92eeecfd270c55a1e5095ae4f10be2343f") add_versions("v3.5.3", "2de1868288b26a19c2aebfc3fe53a748ec3ec5fc32cc742dfccaf6c685a0dc07") From 027cda2fe8b64ec492093fcc7b8e88c404d1563e Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 16 Aug 2024 10:33:21 +0800 Subject: [PATCH 617/671] Auto-update c4core to 0.2.2 (#4949) * Update c4core to 0.2.2 * Update xmake.lua --------- Co-authored-by: star9029 --- packages/c/c4core/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/c/c4core/xmake.lua b/packages/c/c4core/xmake.lua index 3f3db7046..dd387ca7f 100644 --- a/packages/c/c4core/xmake.lua +++ b/packages/c/c4core/xmake.lua @@ -6,6 +6,7 @@ package("c4core") add_urls("https://github.com/biojppm/c4core/releases/download/v$(version)/c4core-$(version)-src.zip", "https://github.com/biojppm/c4core.git") + add_versions("0.2.2", "5a9508385daa5b2608ed007784d76586af21c5367411efe9ae26d5b4aea03305") add_versions("0.2.1", "81ff1c0d15e24da6d76fdd1b6fdd903fa23d0df7c82e564f993147a4dac88773") add_configs("fast_float", {description = "use fastfloat to parse floats", default = false, type = "boolean"}) @@ -26,7 +27,7 @@ package("c4core") end if package:config("fast_float") or package:config("debugbreak") then - package:add("patches", "0.2.1", "patches/0.2.1/cmake-deps.patch", "92c0c6510cc3b8cbd10b575b5b9d0defa2a19d19f24c1618a73d4f4636da4c9b") + package:add("patches", ">=0.2.1", "patches/0.2.1/cmake-deps.patch", "92c0c6510cc3b8cbd10b575b5b9d0defa2a19d19f24c1618a73d4f4636da4c9b") end end) From cc6dd1089eb7cacf67424e312e106e2d365000c7 Mon Sep 17 00:00:00 2001 From: Frityet Date: Thu, 15 Aug 2024 22:53:56 -0700 Subject: [PATCH 618/671] Update objfw (#4929) * Updated objfw * update objfw * use package:is_plat --- packages/o/objfw/xmake.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/o/objfw/xmake.lua b/packages/o/objfw/xmake.lua index 8348c103a..07e62dc02 100644 --- a/packages/o/objfw/xmake.lua +++ b/packages/o/objfw/xmake.lua @@ -21,6 +21,8 @@ package("objfw") add_versions("1.1.2", "5d9f9a70d583298e780ae11fc75a7ae2beeef904b301e1bc4f4ffa8d7ee31d9f") add_versions("1.1.3", "e66ff27ac93c5747019aaa5c8a72b2e4508938e59b3ce08909e54e566ebb2e41") add_versions("1.1.4", "f6bfdbab22008aae3e4b48d77ced1a04c5153961c6f7e5492891f90ae5131a78") + add_versions("1.1.5", "9d45d2009a0bb9b1a0918918e454b47b8161670df8016b5f3a85eccea91d8988") + add_versions("1.1.6", "c19a97a011e14780fb32cfbdbbd6a699a955b57124e4e079768cb8aad4430e1d") if is_host("linux", "macosx") then @@ -32,7 +34,7 @@ package("objfw") add_frameworks("CoreFoundation") end - add_configs("tls", { description = "Enable TLS support.", default = (is_plat("macosx") and "securetransport" or "openssl"), values = { true, false, "openssl", "gnutls", "securetransport" } }) + add_configs("tls", { description = "Enable TLS support.", default = (is_plat("macosx") and "securetransport" or "openssl"), values = { true, false, "openssl", "gnutls", "securetransport", "mbedtls" } }) add_configs("rpath", { description = "Enable rpath.", default = true, type = "boolean" }) add_configs("runtime", { description = "Use the included runtime, not recommended for macOS!", default = not is_plat("macosx"), type = "boolean" }) add_configs("seluid24", { description = "Use 24 bit instead of 16 bit for selector UIDs.", default = false, type = "boolean" }) @@ -61,7 +63,11 @@ package("objfw") local tls = package:config("tls") if type(tls) == "boolean" then if tls then - package:add("deps", "openssl") + if package:is_plat("macosx") then + package:add("frameworks", "Security") + else + package:add("deps", "openssl") + end end elseif tls then if tls == "openssl" then @@ -70,6 +76,10 @@ package("objfw") package:add("frameworks", "Security") elseif tls == "gnutls" then package:add("deps", "gnutls") + elseif tls == "mbedtls" then + package:add("deps", "mbedtls") + else + raise("Unknown TLS library: %s", tls) end end end) @@ -94,7 +104,8 @@ package("objfw") end end - -- SecureTransport must be handled by system so we don't worry about providing CFLAGS and LDFLAGS + -- SecureTransport must be handled by system so we don't worry about providing CFLAGS and LDFLAGS, + -- but for OpenSSL and GnuTLS we need to provide the paths local ssl = package:dep("openssl") or package:dep("gnutls") local is_gnu = ssl and ssl:name() == "gnutls" if ssl then From 4737c84fb8507a35f6adc6d655464c4f9e622e1f Mon Sep 17 00:00:00 2001 From: Inari0 <42310255+xq114@users.noreply.github.com> Date: Fri, 16 Aug 2024 17:40:56 +0800 Subject: [PATCH 619/671] fix libigl links not found (#4952) --- packages/l/libigl/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/l/libigl/xmake.lua b/packages/l/libigl/xmake.lua index 498d31b19..4546f120a 100644 --- a/packages/l/libigl/xmake.lua +++ b/packages/l/libigl/xmake.lua @@ -26,7 +26,9 @@ package("libigl") add_deps("cmake", "eigen") on_load("macosx", "linux", "windows", "mingw", function (package) - if not package:config("header_only") then + if package:config("header_only") then + package:set("kind", "library", {headeronly = true}) + else raise("Non-header-only version is not supported yet!") end if package:config("cgal") then From 66a62a763e31dd77b192e97cc967402b839a321d Mon Sep 17 00:00:00 2001 From: Chi Huu Huynh <73843190+Chi-EEE@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:29:44 +0100 Subject: [PATCH 620/671] re2: remove limits & add version 2024.07.02 (#4938) * re2: remove limits * re2: directly to lib/cmake/absl * re2: clean up code * re2: move absl_DIR into config table * move absl_DIR define to abseil package * re2: revert change * re2: bsd add pthread * re2: use dep("abseil"):fetch to get absl_DIR --- packages/r/re2/xmake.lua | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/packages/r/re2/xmake.lua b/packages/r/re2/xmake.lua index 127bc6fc4..ea79d51aa 100644 --- a/packages/r/re2/xmake.lua +++ b/packages/r/re2/xmake.lua @@ -1,10 +1,10 @@ package("re2") - set_homepage("https://github.com/google/re2") set_description("RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.") set_license("BSD-3-Clause") add_urls("https://github.com/google/re2/archive/$(version).tar.gz", {version = function (version) return version:gsub("%.", "-") end}) + add_versions("2020.11.01", "8903cc66c9d34c72e2bc91722288ebc7e3ec37787ecfef44d204b2d6281954d7") add_versions("2021.06.01", "26155e050b10b5969e986dab35654247a3b1b295e0532880b5a9c13c0a700ceb") add_versions("2021.08.01", "cd8c950b528f413e02c12970dce62a7b6f37733d7f68807e73a2d9bc9db79bc8") @@ -14,26 +14,44 @@ package("re2") add_versions("2024.03.01", "7b2b3aa8241eac25f674e5b5b2e23d4ac4f0a8891418a2661869f736f03f57f4") add_versions("2024.04.01", "3f6690c3393a613c3a0b566309cf04dc381d61470079b653afc47c67fb898198") add_versions("2024.06.01", "7326c74cddaa90b12090fcfc915fe7b4655723893c960ee3c2c66e85c5504b6c") + add_versions("2024.07.02", "eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b") add_deps("cmake", "abseil") - if is_plat("linux") then + if is_plat("linux", "bsd") then add_syslinks("pthread") end on_load(function (package) local version = package:version() - if version:eq("2024.06.01") and package:is_plat("mingw") then + if version:ge("2024.06.01") and package:is_plat("mingw") then package:add("syslinks", "Dbghelp") end end) - on_install("macosx", "linux", "windows", "mingw", "cross", function (package) - local configs = {"-DRE2_BUILD_TESTING=OFF"} - table.insert(configs, "-DCMAKE_CXX_STANDARD=17") + on_install(function (package) + local configs = { + "-DRE2_BUILD_TESTING=OFF", + "-DCMAKE_CXX_STANDARD=17", + } + + local absl_dir = "" + local abseil = package:dep("abseil"):fetch() + if abseil then + for _, linkdir in ipairs(abseil.linkdirs) do + local dir = path.join(linkdir, "cmake", "absl") + if os.isdir(dir) then + absl_dir = dir + break + end + end + end + table.insert(configs, "-Dabsl_DIR=" .. absl_dir) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - import("package.tools.cmake").install(package, configs) + + import("package.tools.cmake").install(package, configs, {packagedeps = {"abseil"}}) end) on_test(function (package) From b6567b9fdf930537725137602a0113d9562fc918 Mon Sep 17 00:00:00 2001 From: c8ef Date: Fri, 16 Aug 2024 23:23:09 +0800 Subject: [PATCH 621/671] update boost to 1.86.0 (#4954) --- packages/b/boost/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 002b901a2..250f6600b 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -9,6 +9,7 @@ package("boost") return version .. "/boost_" .. (version:gsub("%.", "_")) end}) + add_versions("1.86.0", "2128a4c96862b5c0970c1e34d76b1d57e4a1016b80df85ad39667f30b1deba26") add_versions("1.85.0", "f4a7d3f81b8a0f65067b769ea84135fd7b72896f4f59c7f405086c8c0dc61434") add_versions("1.84.0", "4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95") add_versions("1.83.0", "0c6049764e80aa32754acd7d4f179fd5551d8172a83b71532ae093e7384e98da") From 83d42235b4d6a9316c90395922835068504d7395 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 17 Aug 2024 00:51:41 +0800 Subject: [PATCH 622/671] cpp-httplib: fix cmake find openssl --- packages/c/cpp-httplib/xmake.lua | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/packages/c/cpp-httplib/xmake.lua b/packages/c/cpp-httplib/xmake.lua index c6149dae3..2b046a5d6 100644 --- a/packages/c/cpp-httplib/xmake.lua +++ b/packages/c/cpp-httplib/xmake.lua @@ -4,22 +4,22 @@ package("cpp-httplib") set_description("A C++11 single-file header-only cross platform HTTP/HTTPS library.") set_license("MIT") - set_urls("https://github.com/yhirose/cpp-httplib/archive/v$(version).tar.gz", + set_urls("https://github.com/yhirose/cpp-httplib/archive/refs/tags/$(version).tar.gz", "https://github.com/yhirose/cpp-httplib.git") - add_versions("0.8.5", "b353f3e7c124a08940d9425aeb7206183fa29857a8f720c162f8fd820cc18f0e") - add_versions("0.9.2", "bfef2587a2aa31c85fb361df71c720be97076f8083e4f3881da8572f6a58054f") - add_versions("0.12.1", "0e56c25c63e730ebd42e2beda6e7cb1b950131d8fc00d3158b1443a8d76f41ca") - add_versions("0.12.6", "24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e") - add_versions("0.14.0", "3a92248ef8cf2c32ad07f910b8e3052ff2427022b2adb871cf326fb620d2438e") - add_versions("0.14.1", "2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96") - add_versions("0.14.2", "dbcf5590e8ed35c6745c2ad659a5ebec92f05187d1506eec24449d6db95e5084") - add_versions("0.14.3", "dcf6486d9030937636d8a4f820ca9531808fd7edb283893dddbaa05f99357e63") - add_versions("0.15.0", "b658e625e283e2c81437a485a95f3acf8b1d32c53d8147b1ccecc8f630e1f7bb") - add_versions("0.15.1", "8d6a4a40ee8fd3f553b7e895882e60e674bd910883fc1857587dbbabee3cdb91") - add_versions("0.15.2", "4afbcf4203249d2cbcb698e46e1f6fb61b479013a84844d6bb1c044e233cab6a") - add_versions("0.15.3", "2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e") - add_versions("0.16.2", "75565bcdf12522929a26fb57a2c7f8cc0e175e27a9ecf51616075f3ea960da44") + add_versions("v0.8.5", "b353f3e7c124a08940d9425aeb7206183fa29857a8f720c162f8fd820cc18f0e") + add_versions("v0.9.2", "bfef2587a2aa31c85fb361df71c720be97076f8083e4f3881da8572f6a58054f") + add_versions("v0.12.1", "0e56c25c63e730ebd42e2beda6e7cb1b950131d8fc00d3158b1443a8d76f41ca") + add_versions("v0.12.6", "24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e") + add_versions("v0.14.0", "3a92248ef8cf2c32ad07f910b8e3052ff2427022b2adb871cf326fb620d2438e") + add_versions("v0.14.1", "2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96") + add_versions("v0.14.2", "dbcf5590e8ed35c6745c2ad659a5ebec92f05187d1506eec24449d6db95e5084") + add_versions("v0.14.3", "dcf6486d9030937636d8a4f820ca9531808fd7edb283893dddbaa05f99357e63") + add_versions("v0.15.0", "b658e625e283e2c81437a485a95f3acf8b1d32c53d8147b1ccecc8f630e1f7bb") + add_versions("v0.15.1", "8d6a4a40ee8fd3f553b7e895882e60e674bd910883fc1857587dbbabee3cdb91") + add_versions("v0.15.2", "4afbcf4203249d2cbcb698e46e1f6fb61b479013a84844d6bb1c044e233cab6a") + add_versions("v0.15.3", "2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e") + add_versions("v0.16.2", "75565bcdf12522929a26fb57a2c7f8cc0e175e27a9ecf51616075f3ea960da44") add_configs("ssl", { description = "Requires OpenSSL", default = false, type = "boolean"}) add_configs("zlib", { description = "Requires Zlib", default = false, type = "boolean"}) @@ -59,11 +59,19 @@ package("cpp-httplib") assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(httplib): need ndk api level >= 24 for android") end local configs = {"-DHTTPLIB_COMPILE=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DHTTPLIB_REQUIRE_OPENSSL=" .. (package:config("ssl") and "ON" or "OFF")) table.insert(configs, "-DHTTPLIB_REQUIRE_ZLIB=" .. (package:config("zlib") and "ON" or "OFF")) table.insert(configs, "-DHTTPLIB_REQUIRE_BROTLI=" .. (package:config("brotli") and "ON" or "OFF")) table.insert(configs, "-DHTTPLIB_NO_EXCEPTIONS=" .. (package:config("exceptions") and "OFF" or "ON")) + + if package:config("ssl") then + local openssl = package:dep("openssl" .. (package:version():ge("0.15.0") and "3" or "")) + if not openssl:is_system() then + table.insert(configs, "-DOPENSSL_ROOT_DIR=" .. openssl:installdir()) + end + end import("package.tools.cmake").install(package, configs) end) From b61d7e4736c75beb1f65084760023a9afb435848 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 17 Aug 2024 08:11:46 +0800 Subject: [PATCH 623/671] nlopt: remove limit plat & add v2.8.0 version (#4956) --- packages/n/nlopt/xmake.lua | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/n/nlopt/xmake.lua b/packages/n/nlopt/xmake.lua index b77beaf8e..34a6d1820 100644 --- a/packages/n/nlopt/xmake.lua +++ b/packages/n/nlopt/xmake.lua @@ -1,25 +1,38 @@ package("nlopt") - - set_homepage("https://github.com/stevengj/nlopt/") - set_description("NLopt is a library for nonlinear local and global optimization, for functions with and without gradient information.") + set_homepage("https://github.com/stevengj/nlopt") + set_description("library for nonlinear optimization, wrapping many algorithms for global and local, constrained or unconstrained, optimization") set_license("LGPL-2.1") - add_urls("https://github.com/stevengj/nlopt/archive/$(version).tar.gz", + add_urls("https://github.com/stevengj/nlopt/archive/refs/tags/$(version).tar.gz", "https://github.com/stevengj/nlopt.git") + + add_versions("v2.8.0", "e02a4956a69d323775d79fdaec7ba7a23ed912c7d45e439bc933d991ea3193fd") add_versions("v2.7.0", "b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f") add_versions("v2.7.1", "db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a") + add_configs("octave", {description = "build octave bindings", default = false, type = "boolean", readonly = true}) + add_configs("matlab", {description = "build matlab bindings", default = false, type = "boolean", readonly = true}) + add_configs("guile", {description = "build guile bindings", default = false, type = "boolean", readonly = true}) + add_deps("cmake") + on_load("windows", function (package) if package:config("shared") then package:add("defines", "NLOPT_DLL") end end) - on_install("linux", "windows", "macosx", function (package) - local configs = {"-DNLOPT_PYTHON=OFF", "-DNLOPT_OCTAVE=OFF", "-DNLOPT_MATLAB=OFF", "-DNLOPT_GUILE=OFF", "-DNLOPT_TESTS=OFF"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + on_install(function (package) + local configs = { + "-DNLOPT_TESTS=OFF", + "-DNLOPT_PYTHON=OFF", + "-DNLOPT_SWIG=OFF", + } + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DNLOPT_OCTAVE=" .. (package:config("octave") and "ON" or "OFF")) + table.insert(configs, "-DNLOPT_MATLAB=" .. (package:config("matlab") and "ON" or "OFF")) + table.insert(configs, "-DNLOPT_GUILE=" .. (package:config("guile") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) end) From e1cc464405f855156d3b18ad771c11b7e4546fed Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 09:15:27 +0800 Subject: [PATCH 624/671] Auto-update pagmo to v2.19.0 (#3501) * Update pagmo to v2.19.0 * update tbb version --------- Co-authored-by: star9029 --- packages/p/pagmo/xmake.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/p/pagmo/xmake.lua b/packages/p/pagmo/xmake.lua index 7ef28581a..8409695eb 100644 --- a/packages/p/pagmo/xmake.lua +++ b/packages/p/pagmo/xmake.lua @@ -1,11 +1,12 @@ package("pagmo") - set_homepage("https://esa.github.io/pagmo2/index.html") set_description("pagmo is a C++ scientific library for massively parallel optimization.") set_license("LGPL-3.0") add_urls("https://github.com/esa/pagmo2/archive/refs/tags/$(version).tar.gz", "https://github.com/esa/pagmo2.git") + + add_versions("v2.19.0", "701ada528de7d454201e92a5d88903dd1c22ea64f43861d9694195ddfef82a70") add_versions("v2.18.0", "5ad40bf3aa91857a808d6b632d9e1020341a33f1a4115d7a2b78b78fd063ae31") local configdeps = {eigen = "EIGEN3", nlopt = "NLOPT", --[[ipopt = "IPOPT"]]} @@ -13,9 +14,11 @@ package("pagmo") add_configs(config, {description = "Enable features against " .. config .. ".", default = true, type = "boolean"}) end - add_deps("cmake", "tbb <2021.0") + add_deps("cmake") + add_deps("tbb") add_deps("boost", {configs = {serialization = true}}) - on_load("windows", "macosx", "linux", function (package) + + on_load(function (package) for config, dep in pairs(configdeps) do if package:config(config) then package:add("deps", config) @@ -23,9 +26,9 @@ package("pagmo") end end) - on_install("windows", "macosx", "linux", function (package) + on_install("windows", "macosx", "linux", "mingw@windows", "mingw@msys", function (package) local configs = {"-DCMAKE_INSTALL_LIBDIR=lib", "-DPAGMO_BUILD_TESTS=OFF", "-DBoost_USE_STATIC_LIBS=ON"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DPAGMO_BUILD_STATIC_LIBRARY=" .. (package:config("shared") and "OFF" or "ON")) for config, dep in pairs(configdeps) do table.insert(configs, "-DPAGMO_WITH_" .. dep .. "=" .. (package:config(config) and "ON" or "OFF")) From 03c4e16aa8c1292ad83f31b8e71e1fe4318e8357 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 10:40:21 +0800 Subject: [PATCH 625/671] Update mini to 0.9.16 (#4961) --- packages/m/mini/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/m/mini/xmake.lua b/packages/m/mini/xmake.lua index ea089bdb4..4c333f4e2 100644 --- a/packages/m/mini/xmake.lua +++ b/packages/m/mini/xmake.lua @@ -7,6 +7,7 @@ package("mini") add_urls("https://github.com/metayeti/mINI/archive/refs/tags/$(version).tar.gz", "https://github.com/metayeti/mINI.git") + add_versions("0.9.16", "ce20e12b1e3bcd79d6eaa47bf8d4bb319e843dfa3585e069e73d581bdf0a81ec") add_versions("0.9.15", "241e105ab074827ab8b40582aa7b04c6191f84b244603969965c0874ad4f942c") on_install(function (package) From 6166f2b6570ac2da2f2685a1738e25a67e77300a Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 10:40:24 +0800 Subject: [PATCH 626/671] Update reflect-cpp to v0.14.1 (#4960) --- packages/r/reflect-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 1e9338fb4..1c1001e2d 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -7,6 +7,7 @@ package("reflect-cpp") add_urls("https://github.com/getml/reflect-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/getml/reflect-cpp.git") + add_versions("v0.14.1", "639aec9d33025703a58d32c231ab1ab474c0cc4fb0ff90eadcaffb49271c41cd") add_versions("v0.14.0", "ea92a2460a71184b7d4fa4e9baad9910efad092df78b114459a7d6b0ee558d3c") add_versions("v0.13.0", "a7a31832fe8bbaa7f7299da46dfd4ccc8b99a13242e16a1d93f8669de1fca9c6") add_versions("v0.12.0", "13d448dd5eaee13ecb7ab5cb61cb263c7111ba75230503adc823a888f68e1eaa") From c2f674bc4468d33a1fc510f5a731e653c0ca6c56 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 10:40:27 +0800 Subject: [PATCH 627/671] Update cmark to 0.31.1 (#4958) --- packages/c/cmark/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cmark/xmake.lua b/packages/c/cmark/xmake.lua index ee8a80af8..5510bc1ad 100644 --- a/packages/c/cmark/xmake.lua +++ b/packages/c/cmark/xmake.lua @@ -5,6 +5,7 @@ package("cmark") add_urls("https://github.com/commonmark/cmark/archive/refs/tags/$(version).tar.gz", "https://github.com/commonmark/cmark.git") + add_versions("0.31.1", "3da93db5469c30588cfeb283d9d62edfc6ded9eb0edc10a4f5bbfb7d722ea802") add_versions("0.31.0", "bbcb8f8c03b5af33fcfcf11a74e9499f20a9043200b8552f78a6e8ba76e04d11") add_deps("cmake") From c4f095ff048758384b827e85c80ece58fa9a9fb9 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 11:02:06 +0800 Subject: [PATCH 628/671] Update pagmo to v2.19.1 (#4947) Co-authored-by: star9029 --- packages/p/pagmo/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/p/pagmo/xmake.lua b/packages/p/pagmo/xmake.lua index 8409695eb..d414c851a 100644 --- a/packages/p/pagmo/xmake.lua +++ b/packages/p/pagmo/xmake.lua @@ -6,6 +6,7 @@ package("pagmo") add_urls("https://github.com/esa/pagmo2/archive/refs/tags/$(version).tar.gz", "https://github.com/esa/pagmo2.git") + add_versions("v2.19.1", "ecc180e669fa6bbece959429ac7d92439e89e1fd1c523aa72b11b6c82e414a1d") add_versions("v2.19.0", "701ada528de7d454201e92a5d88903dd1c22ea64f43861d9694195ddfef82a70") add_versions("v2.18.0", "5ad40bf3aa91857a808d6b632d9e1020341a33f1a4115d7a2b78b78fd063ae31") From d9282df21034dba429c4dd20143e6509a219fd57 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 11:07:39 +0800 Subject: [PATCH 629/671] Update yalantinglibs to 0.3.7 (#4957) --- packages/y/yalantinglibs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/y/yalantinglibs/xmake.lua b/packages/y/yalantinglibs/xmake.lua index d33acb31e..2f509809d 100644 --- a/packages/y/yalantinglibs/xmake.lua +++ b/packages/y/yalantinglibs/xmake.lua @@ -7,6 +7,7 @@ package("yalantinglibs") set_urls("https://github.com/alibaba/yalantinglibs/archive/refs/tags/$(version).tar.gz", "https://github.com/alibaba/yalantinglibs.git") + add_versions("0.3.7", "b4258806173f63034aa529913601bc3d90da8a598725c0edf0be1a8c5c6f32b8") add_versions("0.3.6", "92f694ad42537f95535efc648fc5e73e82f840dae4f54524a096050db398214b") add_versions("0.3.4", "dd5edd3f43f23cd4b0614896e6587b61bb38c981dc21c85a54bcc54800d0dfe8") add_versions("0.3.5", "8d382573da01449c4f83fccbbc3bdc08d221651f3fc8b9137eb4fbdb703677c2") From e167e3a9cc6d83706c50908306f7227c1d47f119 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sat, 17 Aug 2024 16:21:09 +0800 Subject: [PATCH 630/671] update fast_float to 6.1.4 & update android CI (#4962) * update fast_float to 6.1.4 & update android CI * format --- .github/workflows/android.yml | 19 +++++++++---------- .github/workflows/android_windows.yml | 15 +++++++-------- packages/f/fast_float/xmake.lua | 5 +++-- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 07831307a..81199ad76 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,27 +12,27 @@ jobs: matrix: os: [ubuntu-latest] arch: [armeabi-v7a, arm64-v8a] - ndk: ["r22", "r26b"] - ndk_sdkver: ["29", "21"] + ndk: ["r22", "r27"] + ndk_sdkver: ["21", "30"] runs-on: ${{ matrix.os }} concurrency: - group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }} - cancel-in-progress: true + group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }} + cancel-in-progress: true steps: - uses: actions/checkout@v1 - uses: xmake-io/github-action-setup-xmake@v1 with: xmake-version: branch@master - actions-cache-folder: '.xmake-cache' - actions-cache-key: 'android' + actions-cache-folder: ".xmake-cache" + actions-cache-key: "android" - name: Prepare run: | - if test ${{ matrix.ndk }} = "r26b"; then - wget -q https://dl.google.com/android/repository/android-ndk-r26b-linux.zip - unzip -q -o ./android-ndk-r26b-linux.zip + if test ${{ matrix.ndk }} = "r27"; then + wget -q https://dl.google.com/android/repository/android-ndk-r27-linux.zip + unzip -q -o ./android-ndk-r27-linux.zip else wget -q https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip unzip -q -o ./android-ndk-r22-linux-x86_64.zip @@ -41,4 +41,3 @@ jobs: - name: Tests run: | xmake l ./scripts/test.lua -D -p android --ndk=`pwd`/android-ndk-${{ matrix.ndk }} --ndk_sdkver=${{ matrix.ndk_sdkver }} -a ${{ matrix.arch }} - diff --git a/.github/workflows/android_windows.yml b/.github/workflows/android_windows.yml index 0d20d5009..21c10b56b 100644 --- a/.github/workflows/android_windows.yml +++ b/.github/workflows/android_windows.yml @@ -12,12 +12,12 @@ jobs: fail-fast: false matrix: arch: [armeabi-v7a, arm64-v8a] - ndk: ["r22", "r26c"] - ndk_sdkver: ["29"] + ndk: ["r22", "r27"] + ndk_sdkver: ["30"] concurrency: - group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-Windows-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }} - cancel-in-progress: true + group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Android-Windows-${{ matrix.arch }}-${{ matrix.ndk }}-${{ matrix.ndk_sdkver }} + cancel-in-progress: true steps: - uses: actions/checkout@v1 - uses: xmake-io/github-action-setup-xmake@v1 @@ -33,9 +33,9 @@ jobs: - name: Prepare run: | - if ("${{ matrix.ndk }}" -eq "r26c") { - curl -fsSL "https://dl.google.com/android/repository/android-ndk-r26c-windows.zip" -o android-ndk-r26c-windows.zip - Expand-Archive ./android-ndk-r26c-windows.zip -DestinationPath ./ndk + if ("${{ matrix.ndk }}" -eq "r27") { + curl -fsSL "https://dl.google.com/android/repository/android-ndk-r27-windows.zip" -o android-ndk-r27-windows.zip + Expand-Archive ./android-ndk-r27-windows.zip -DestinationPath ./ndk } else { curl -fsSL "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" -o android-ndk-r22-windows-x86_64.zip Expand-Archive ./android-ndk-r22-windows-x86_64.zip -DestinationPath ./ndk @@ -55,4 +55,3 @@ jobs: Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path) xmake --version xmake l ./scripts/test.lua -D -p android --ndk=D:/a/xmake-repo/xmake-repo/ndk/android-ndk-${{ matrix.ndk }} --ndk_sdkver=${{ matrix.ndk_sdkver }} -a ${{ matrix.arch }} - diff --git a/packages/f/fast_float/xmake.lua b/packages/f/fast_float/xmake.lua index b5ab84404..acbac9af0 100644 --- a/packages/f/fast_float/xmake.lua +++ b/packages/f/fast_float/xmake.lua @@ -15,6 +15,7 @@ package("fast_float") add_versions("v6.1.0", "a9c8ca8ca7d68c2dbb134434044f9c66cfd4c383d5e85c36b704d30f6be82506") add_versions("v6.1.1", "10159a4a58ba95fe9389c3c97fe7de9a543622aa0dcc12dd9356d755e9a94cb4") add_versions("v6.1.3", "7dd99cc2ff44e07dc2a42bed0c6b8c4a8ee4e3b1c330f77073b6cfdb48724c8e") + add_versions("v6.1.4", "12cb6d250824160ca16bcb9d51f0ca7693d0d10cb444f34f1093bc02acfce704") if is_plat("wasm") then add_patches("v3.4.0", path.join(os.scriptdir(), "patches", "emscripten_fix.patch"), "482705431f67e6f0a375ed7bfe87d6856e7d13f071db6157e1d5659834b0eb50") @@ -29,9 +30,9 @@ package("fast_float") on_test(function (package) assert(package:check_cxxsnippets({test = [[ void test() { - const std::string input = "3.1416 xyz "; + const std::string input = "3.1416 xyz "; double result; - auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result); + auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result); } ]]}, {configs = {languages = "c++14"}, includes = {"fast_float/fast_float.h"}})) end) From 26c48591cb1770170a997d231f9c1c54053aee83 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Aug 2024 19:20:14 +0800 Subject: [PATCH 631/671] Update thorvg to v0.14.6 (#4959) --- packages/t/thorvg/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/thorvg/xmake.lua b/packages/t/thorvg/xmake.lua index 69b6c5a8d..3cabc49c9 100644 --- a/packages/t/thorvg/xmake.lua +++ b/packages/t/thorvg/xmake.lua @@ -6,6 +6,7 @@ package("thorvg") add_urls("https://github.com/thorvg/thorvg/archive/refs/tags/$(version).tar.gz", "https://github.com/thorvg/thorvg.git") + add_versions("v0.14.6", "13d7778968ce10f4f7dd1ea1f66861d4ee8ff22f669566992b4ac00e050496cf") add_versions("v0.14.3", "302e7bb2082a5c4528b6ec9b95d500b2c0f54f4333870a709cc122b5b393dcfe") add_versions("v0.14.2", "04202e8f5e17b427c3b16ae3b3d4be5d3f3cdac96d5c64ed3efd7b6db3ad731f") add_versions("v0.14.1", "9c0346fda8b62a3b13a764dda5784e0465c8cab54fb5342d0240c7fb40e415bd") From 5cb16a2115e408dd2e33084b36e9025f751670f2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 17 Aug 2024 20:47:50 +0800 Subject: [PATCH 632/671] reflect-cpp: remove header only kind (#4965) * reflect-cpp: remove header only kind * limit wasm --- packages/r/reflect-cpp/xmake.lua | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/r/reflect-cpp/xmake.lua b/packages/r/reflect-cpp/xmake.lua index 1c1001e2d..9d36b07ef 100644 --- a/packages/r/reflect-cpp/xmake.lua +++ b/packages/r/reflect-cpp/xmake.lua @@ -1,5 +1,4 @@ package("reflect-cpp") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/getml/reflect-cpp") set_description("A C++20 library for fast serialization, deserialization and validation using reflection. Supports JSON, BSON, CBOR, flexbuffers, msgpack, TOML, XML, YAML / msgpack.org[C++20]") set_license("MIT") @@ -74,18 +73,31 @@ package("reflect-cpp") end local version = package:version() - if version and version:ge("0.11.1") then - package:add("deps", "ctre") - package:add("defines", "REFLECTCPP_NO_BUNDLED_DEPENDENCIES") - else + if version then + if version:lt("0.13.0") then + package:set("kind", "library", {headeronly = true}) + end + + if version:ge("0.11.1") then + package:add("deps", "ctre", {configs = {cmake = true}}) + if version:eq("0.11.1") then + package:add("defines", "REFLECTCPP_NO_BUNDLED_DEPENDENCIES") + end + end + end + + if package:gitref() or version:lt("0.11.1") or version:ge("0.13.0") then package:add("deps", "cmake") end end) - on_install(function (package) + on_install("!wasm", function (package) local version = package:version() - if version and version:lt("0.11.1") then - import("package.tools.cmake").install(package, {"-DREFLECTCPP_USE_BUNDLED_DEPENDENCIES=OFF"}) + if package:gitref() or version:lt("0.11.1") or version:ge("0.13.0") then + local configs = {"-DREFLECTCPP_USE_BUNDLED_DEPENDENCIES=OFF"} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) else os.rm("include/thirdparty") os.cp("include", package:installdir()) From 7d0fe5f3edb1a4025babab734054612ca0ad66b4 Mon Sep 17 00:00:00 2001 From: Inari0 <42310255+xq114@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:58:13 +0800 Subject: [PATCH 633/671] fix embree hash (#4967) --- packages/e/embree/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e/embree/xmake.lua b/packages/e/embree/xmake.lua index e6036fe48..486b17e88 100644 --- a/packages/e/embree/xmake.lua +++ b/packages/e/embree/xmake.lua @@ -12,7 +12,7 @@ package("embree") add_versions("v3.13.4", "e6a8d1d4742f60ae4d936702dd377bc4577a3b034e2909adb2197d0648b1cb35") add_versions("v3.13.5", "b8c22d275d9128741265537c559d0ea73074adbf2f2b66b0a766ca52c52d665b") add_versions("v4.3.0", "baf0a57a45837fc055ba828a139467bce0bc0c6a9a5f2dccb05163d012c12308") - add_versions("v4.3.3", "baf0a57a45837fc055ba828a139467bce0bc0c6a9a5f2dccb05163d012c12308") + add_versions("v4.3.3", "8a3bc3c3e21aa209d9861a28f8ba93b2f82ed0dc93341dddac09f1f03c36ef2d") -- Not recommanded to build embree as a static library. add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"}) From ff42d8f4f4b2ec7663a01ea9f06b6fd1fbffce8b Mon Sep 17 00:00:00 2001 From: star9029 Date: Sat, 17 Aug 2024 22:16:40 +0800 Subject: [PATCH 634/671] Auto-update libvips to v8.15.3 (#4927) * Update libvips to v8.15.3 * enable deps(cgif/nifti/highway) * patch msvc --- .../libvips/patches/8.15.3/msvc-ssize_t.patch | 32 +++++++++++++++++++ packages/l/libvips/xmake.lua | 9 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 packages/l/libvips/patches/8.15.3/msvc-ssize_t.patch diff --git a/packages/l/libvips/patches/8.15.3/msvc-ssize_t.patch b/packages/l/libvips/patches/8.15.3/msvc-ssize_t.patch new file mode 100644 index 000000000..e61bc58af --- /dev/null +++ b/packages/l/libvips/patches/8.15.3/msvc-ssize_t.patch @@ -0,0 +1,32 @@ +diff --git a/libvips/iofuncs/generate.c b/libvips/iofuncs/generate.c +index bb3d1b2d7..8be7ad675 100644 +--- a/libvips/iofuncs/generate.c ++++ b/libvips/iofuncs/generate.c +@@ -92,6 +92,11 @@ + #endif /*HAVE_CONFIG_H*/ + #include + ++#if defined(_MSC_VER) ++#include ++typedef SSIZE_T ssize_t; ++#endif ++ + #include + #include + #include +diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c +index 047516084..c2049c107 100644 +--- a/libvips/iofuncs/util.c ++++ b/libvips/iofuncs/util.c +@@ -37,6 +37,11 @@ + #endif /*HAVE_CONFIG_H*/ + #include + ++#if defined(_MSC_VER) ++#include ++typedef SSIZE_T ssize_t; ++#endif ++ + #include + #include + #include diff --git a/packages/l/libvips/xmake.lua b/packages/l/libvips/xmake.lua index 800e14aca..f3b02bb03 100644 --- a/packages/l/libvips/xmake.lua +++ b/packages/l/libvips/xmake.lua @@ -6,9 +6,12 @@ package("libvips") add_urls("https://github.com/libvips/libvips/archive/refs/tags/$(version).tar.gz", "https://github.com/libvips/libvips.git") + add_versions("v8.15.3", "c23a820443241c35e62f1f1f0a1f6c199b37e07d98e3268a7fa9db43309fd67d") add_versions("v8.15.2", "8c3ece7be367636fd676573a8ff22170c07e95e81fd94f2d1eb9966800522e1f") add_versions("v8.15.1", "5701445a076465a3402a135d13c0660d909beb8efc4f00fbbe82392e243497f2") + add_patches("8.15.3", "patches/8.15.3/msvc-ssize_t.patch", "d056a86735c4e05e164ca6fb27999bd98871e3b4de2fce0b792bf936d67ea658") + add_configs("c++", { description = "Build C++ API", default = true, type = "boolean" }) add_configs("deprecated", { description = "Build deprecated components", default = false, type = "boolean" }) add_configs("dynamic_modules", { description = "Build dynamic modules", default = false, type = "boolean" }) @@ -40,14 +43,14 @@ package("libvips") "libtiff", "libwebp", "zlib", + "cgif", + "nifti", + "highway", } local unsupported_deps = { - "cgif", "exif", - "nifti", "openslide", - "highway", "orc", "pangocairo", "pdfium", From 485366806fc87b5f9c2b235e06f4d801f8937534 Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Sat, 17 Aug 2024 22:21:24 +0800 Subject: [PATCH 635/671] add json_glib repo (#4966) * add json_glib repo * add dep libiconv * add libiconv to meson install --- .../1.9.2/add_brace_to_json_scanner.patch | 22 +++++++++++++++ packages/j/json-glib/xmake.lua | 28 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 packages/j/json-glib/patches/1.9.2/add_brace_to_json_scanner.patch create mode 100644 packages/j/json-glib/xmake.lua diff --git a/packages/j/json-glib/patches/1.9.2/add_brace_to_json_scanner.patch b/packages/j/json-glib/patches/1.9.2/add_brace_to_json_scanner.patch new file mode 100644 index 000000000..94af8601a --- /dev/null +++ b/packages/j/json-glib/patches/1.9.2/add_brace_to_json_scanner.patch @@ -0,0 +1,22 @@ +diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c +index 4ada646..119c3fa 100644 +--- a/json-glib/json-scanner.c ++++ b/json-glib/json-scanner.c +@@ -888,7 +888,7 @@ json_scanner_get_token_ll (JsonScanner *scanner, + gstring = g_string_append_c (gstring, '\f'); + break; + +- case 'u': ++ case 'u':{ + guint fchar = json_scanner_peek_next_char (scanner); + if (is_hex_digit (fchar)) + { +@@ -994,7 +994,7 @@ json_scanner_get_token_ll (JsonScanner *scanner, + gstring = NULL; + } + break; +- ++ } + default: + token = JSON_TOKEN_ERROR; + value.v_error = JSON_ERROR_TYPE_UNESCAPED_CTRL; diff --git a/packages/j/json-glib/xmake.lua b/packages/j/json-glib/xmake.lua new file mode 100644 index 000000000..e2489ffc3 --- /dev/null +++ b/packages/j/json-glib/xmake.lua @@ -0,0 +1,28 @@ +package("json-glib") + + set_homepage("https://gitlab.gnome.org/GNOME/json-glib") + set_description("JSON-GLib implements a full suite of JSON-related tools using GLib and GObject.") + set_license("LGPL-2.1") + + add_urls("https://github.com/GNOME/json-glib/archive/refs/tags/$(version).tar.gz") + add_versions("1.9.2", "277c3b7fc98712e30115ee3a60c3eac8acc34570cb98d3ff78de85ed804e0c80") + + + add_patches("1.9.2", "patches/1.9.2/add_brace_to_json_scanner.patch", "5d77c14d25ad24a911d28d51e9defee9a3c382428dc3e23101f6319fc46b227c") + add_deps("glib", "meson", "ninja") + + add_includedirs("include", "include/json-glib-1.0") + + on_install("linux", function (package) + local configs = {"-Ddocumentation=disabled", "-Dtests=false", "-Dgtk_doc=disabled", "-Dman=false"} + table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static")) + import("package.tools.meson").install(package, configs, {packagedeps = {"libiconv"}}) + end) + + on_test(function (package) + assert(package:check_csnippets({test = [[ + void test() { + JsonParser *parser = json_parser_new (); + } + ]]}, {includes = "json-glib/json-glib.h"})) + end) From 2efbdaa7da4eecbc1fd16abd492d11fb28d44e05 Mon Sep 17 00:00:00 2001 From: Simon Pribylski <66266021+Persson-dev@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:26:11 +0200 Subject: [PATCH 636/671] update godotcpp4 to 4.3 (#4969) --- packages/g/godotcpp4/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/g/godotcpp4/xmake.lua b/packages/g/godotcpp4/xmake.lua index 995e76ce3..3ed04ddbb 100644 --- a/packages/g/godotcpp4/xmake.lua +++ b/packages/g/godotcpp4/xmake.lua @@ -4,6 +4,7 @@ package("godotcpp4") set_license("MIT") set_urls("https://github.com/godotengine/godot-cpp.git") + add_versions("4.3", "fbbf9ec4efd8f1055d00edb8d926eef8ba4c2cce") add_versions("4.2", "d6e5286cc19bbd5b2c626207d3b01a8f145c0f76") add_versions("4.1", "32becf6a13681119ad63b6d7cc4e816c9a0cc86b") add_versions("4.0", "9d1c396c54fc3bdfcc7da4f3abcb52b14f6cce8f") From c07fe14c702c6276188a87940d947d49acf0617f Mon Sep 17 00:00:00 2001 From: Yassine Sen <61026912+01Pollux@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:50:17 +0100 Subject: [PATCH 637/671] Add support for rgb/grb config for FreeImage (#4970) * Add support for rgb/grb config for FreeImage * Add libpng to freeimage --- .../freeimage/patches/3.18.0/pluginbmp.patch | 31 +++++++++++++++++++ packages/f/freeimage/xmake.lua | 17 ++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 packages/f/freeimage/patches/3.18.0/pluginbmp.patch diff --git a/packages/f/freeimage/patches/3.18.0/pluginbmp.patch b/packages/f/freeimage/patches/3.18.0/pluginbmp.patch new file mode 100644 index 000000000..b8d423246 --- /dev/null +++ b/packages/f/freeimage/patches/3.18.0/pluginbmp.patch @@ -0,0 +1,31 @@ +diff --git a/Source/FreeImage/PluginBMP.cpp b/Source/FreeImage/PluginBMP.cpp +index 76149cf..ae1f6fa 100644 +--- a/Source/FreeImage/PluginBMP.cpp ++++ b/Source/FreeImage/PluginBMP.cpp +@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void + + free(buffer); + #ifdef FREEIMAGE_BIGENDIAN +- } else if (bpp == 16) { ++ } else if (dst_bpp == 16) { + int padding = dst_pitch - dst_width * sizeof(WORD); + WORD pad = 0; + WORD pixel; +@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void + } + #endif + #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB +- } else if (bpp == 24) { ++ } else if (dst_bpp == 24) { + int padding = dst_pitch - dst_width * sizeof(FILE_BGR); + DWORD pad = 0; + FILE_BGR bgr; +@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void + } + } + } +- } else if (bpp == 32) { ++ } else if (dst_bpp == 32) { + FILE_BGRA bgra; + for(unsigned y = 0; y < dst_height; y++) { + BYTE *line = FreeImage_GetScanLine(dib, y); diff --git a/packages/f/freeimage/xmake.lua b/packages/f/freeimage/xmake.lua index aa2c4d756..afa221391 100644 --- a/packages/f/freeimage/xmake.lua +++ b/packages/f/freeimage/xmake.lua @@ -10,7 +10,13 @@ package("freeimage") add_patches("3.18.0", path.join(os.scriptdir(), "patches", "3.18.0", "libjxr.patch"), "fddbb9fa736da383f54352dc0ab848d083d9279b66cc6ac53910236144ad75ab") add_patches("3.18.0", path.join(os.scriptdir(), "patches", "3.18.0", "openexr.patch"), "051940ec58fd5ae85b65c67b83fd46eda807c9039f0f5207769ac871350af830") + add_patches("3.18.0", path.join(os.scriptdir(), "patches", "3.18.0", "pluginbmp.patch"), "2029f95478c8ce77f83671fe8e1889c11caa04eef2584abf0cd0a9f6a7047db0") + add_configs("rgb", {description = "Use RGB instead of BGR.", default = false}) + + if is_plat("macosx") then + add_deps("libpng") + end on_load("windows", function (package) if not package:config("shared") then package:add("defines", "FREEIMAGE_LIB") @@ -28,18 +34,25 @@ package("freeimage") local content = io.readfile("Makefile.srcs") sources = content:match("SRCS = (.-)\n"):split(" ") includes = content:match("INCLUDE = (.-)\n"):gsub("%-I", ""):split(" ") + local rgb_type = package:config("rgb") and "FREEIMAGE_COLORORDER=1" or "FREEIMAGE_COLORORDER=0" io.writefile("xmake.lua", format([[ add_rules("mode.debug", "mode.release") includes("check_cincludes.lua") + if is_plat("macosx") then + add_requires("libpng") + end target("freeimage") set_kind("$(kind)") set_languages("c++11") + if is_plat("macosx") then + add_packages("libpng") + end add_files({"%s"}) add_headerfiles("Source/FreeImage.h", "Source/FreeImageIO.h") set_symbols("hidden") add_includedirs({"%s"}) check_cincludes("Z_HAVE_UNISTD_H", "unistd.h") - add_defines("OPJ_STATIC", "NO_LCMS", "LIBRAW_NODLL", "DISABLE_PERF_MEASUREMENT") + add_defines("OPJ_STATIC", "NO_LCMS", "LIBRAW_NODLL", "DISABLE_PERF_MEASUREMENT", "]] .. rgb_type .. [[") if is_plat("windows") then add_files("FreeImage.rc") add_defines("WIN32", "_CRT_SECURE_NO_DEPRECATE") @@ -53,4 +66,4 @@ package("freeimage") on_test(function (package) assert(package:has_cfuncs("FreeImage_Initialise", {includes = "FreeImage.h"})) - end) + end) \ No newline at end of file From f3c42b185c2d7bf90603bf91e8b1aa5a0a4d4a21 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 18 Aug 2024 08:54:44 +0800 Subject: [PATCH 638/671] libevent: remove limit plat (#4971) * libevent: remove limit plat * limit plat --- packages/l/libevent/xmake.lua | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/l/libevent/xmake.lua b/packages/l/libevent/xmake.lua index 9a9c7360e..3d5f95ae5 100644 --- a/packages/l/libevent/xmake.lua +++ b/packages/l/libevent/xmake.lua @@ -1,22 +1,22 @@ package("libevent") - set_homepage("https://libevent.org/") - set_description("libevent – an event notification library") + set_description("Event notification library") set_license("BSD-3-Clause") - add_urls("https://github.com/libevent/libevent/releases/download/release-$(version)-stable/libevent-$(version)-stable.tar.gz") - add_urls("https://github.com/libevent/libevent.git") + add_urls("https://github.com/libevent/libevent/releases/download/release-$(version)-stable/libevent-$(version)-stable.tar.gz", + "https://github.com/libevent/libevent.git") + add_versions("2.1.12", "92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb") add_configs("openssl", {description = "Build with OpenSSL library.", default = false, type = "boolean"}) add_configs("mbedtls", {description = "Build with mbedtls library.", default = false, type = "boolean"}) - add_deps("cmake") - - if is_plat("windows") then + if is_plat("windows", "mingw") then add_syslinks("ws2_32", "advapi32", "iphlpapi") end + add_deps("cmake") + on_load(function (package) if package:config("openssl") then package:add("deps", "openssl3") @@ -26,9 +26,9 @@ package("libevent") end end) - on_install("windows", "linux", "macosx", function (package) + on_install("!android and (!mingw or mingw|!i386)", function (package) io.replace("CMakeLists.txt", "advapi32", "advapi32 crypt32", {plain = true}) - if package:version():eq("2.1.12") then + if package:gitref() or package:version():eq("2.1.12") then io.replace("cmake/LibeventConfig.cmake.in", 'get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../../.." ABSOLUTE)', 'get_filename_component(_INSTALL_PREFIX "${LIBEVENT_CMAKE_DIR}/../.." ABSOLUTE)', @@ -36,7 +36,11 @@ package("libevent") io.replace("cmake/LibeventConfig.cmake.in", "NO_DEFAULT_PATH)", ")", {plain = true}) end - local configs = {"-DEVENT__DISABLE_TESTS=ON", "-DEVENT__DISABLE_REGRESS=ON", "-DEVENT__DISABLE_SAMPLES=ON"} + local configs = { + "-DEVENT__DISABLE_TESTS=ON", + "-DEVENT__DISABLE_REGRESS=ON", + "-DEVENT__DISABLE_SAMPLES=ON", + } table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DEVENT__LIBRARY_TYPE=" .. (package:config("shared") and "SHARED" or "STATIC")) table.insert(configs, "-DEVENT__DISABLE_OPENSSL=" .. (package:config("openssl") and "OFF" or "ON")) From 84cf8f96ce7957b7324625a5248c599cb5be2ba1 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 18 Aug 2024 11:08:21 +0800 Subject: [PATCH 639/671] Update toml11 to v4.2.0 (#4974) --- packages/t/toml11/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/t/toml11/xmake.lua b/packages/t/toml11/xmake.lua index 9ef00a639..9e9ad9a8c 100644 --- a/packages/t/toml11/xmake.lua +++ b/packages/t/toml11/xmake.lua @@ -7,6 +7,7 @@ package("toml11") add_urls("https://github.com/ToruNiina/toml11/archive/refs/tags/$(version).tar.gz", "https://github.com/ToruNiina/toml11.git") + add_versions("v4.2.0", "9287971cd4a1a3992ef37e7b95a3972d1ae56410e7f8e3f300727ab1d6c79c2c") add_versions("v4.1.0", "fb4c02cc708ae28e6fc3496514e3625e4b6738ed4ce40897710ca4d7a29de4f7") add_versions("v4.0.3", "c8cbc7839cb3f235153045ce550e559f55a04554dfcab8743ba8a1e8ef6a54bf") add_versions("v4.0.2", "d1bec1970d562d328065f2667b23f9745a271bf3900ca78e92b71a324b126070") From cf7f6f78b1ba87038dd51cea86a1294727785ed4 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 18 Aug 2024 16:25:44 +0800 Subject: [PATCH 640/671] fix sdl android build (#4976) * fix sdl android build * Update xmake.lua --- packages/l/libsdl/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libsdl/xmake.lua b/packages/l/libsdl/xmake.lua index fff3e6af7..1ccc6fb2b 100644 --- a/packages/l/libsdl/xmake.lua +++ b/packages/l/libsdl/xmake.lua @@ -208,6 +208,7 @@ package("libsdl") end) on_install(function (package) + io.replace("src/sensor/android/SDL_androidsensor.c", "ALooper_pollAll", "ALooper_pollOnce", {plain = true}) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) From 5472630a06a1a26f102b238a1f46c8e451050ea4 Mon Sep 17 00:00:00 2001 From: ilobilo <68286835+ilobilo@users.noreply.github.com> Date: Sun, 18 Aug 2024 13:10:28 +0400 Subject: [PATCH 641/671] centurion: add package (#4953) * centurion: add package * limit wasm --------- Co-authored-by: star9029 --- packages/c/centurion/xmake.lua | 113 +++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 packages/c/centurion/xmake.lua diff --git a/packages/c/centurion/xmake.lua b/packages/c/centurion/xmake.lua new file mode 100644 index 000000000..04fd3f9a9 --- /dev/null +++ b/packages/c/centurion/xmake.lua @@ -0,0 +1,113 @@ +package("centurion") + set_kind("library", { headeronly = true }) + set_homepage("https://github.com/albin-johansson/centurion") + set_description("A modern C++ wrapper library for SDL2 in order to improve type-safety, memory safety and overall ease-of-use.") + set_license("MIT") + + set_urls("https://github.com/albin-johansson/centurion/archive/refs/tags/$(version).tar.gz", + "https://github.com/albin-johansson/centurion.git") + + add_versions("v7.3.0", "ad8b7c27074939fa46380a878e82c2b0365d1c4ad31b4a71bfcd5ce3ac0198e6") + + add_configs("pragma_once", { description = "Use #pragma once in centurion.hpp", default = true, type = "boolean" }) + add_configs("debug_macros", { description = "Include debug-only logging macros, such as CENTURION_LOG_INFO", default = true, type = "boolean" }) + + add_configs("sdl_image", { description = "Enable library components that rely on the SDL_image library", default = true, type = "boolean" }) + add_configs("sdl_mixer", { description = "Enable library components that rely on the SDL_mixer library", default = true, type = "boolean" }) + add_configs("sdl_ttf", { description = "Enable library components that rely on the SDL_ttf library", default = true, type = "boolean" }) + + add_configs("vulkan", { description = "Enable library components related to Vulkan", default = true, type = "boolean" }) + add_configs("opengl", { description = "Enable library components related to OpenGL", default = true, type = "boolean" }) + + if is_plat("wasm") then + add_configs("shared", { description = "Build shared library.", default = false, type = "boolean", readonly = true }) + end + + add_includedirs("include", "include/SDL2") + + on_load(function (package) + if package:config("shared") then + package:add("deps", "libsdl", { configs = { shared = true } }) + else + package:add("deps", "libsdl") + end + + if not package:config("pragma_once") then + package:add("defines", "CENTURION_NO_PRAGMA_ONCE") + end + if not package:config("debug_macros") then + package:add("defines", "CENTURION_NO_DEBUG_LOG_MACROS") + end + + if package:config("sdl_image") then + if package:config("shared") then + package:add("deps", "libsdl_image", { configs = { shared = true } }) + else + package:add("deps", "libsdl_image") + end + else + package:add("defines", "CENTURION_NO_SDL_IMAGE") + end + if package:config("sdl_mixer") then + if package:config("shared") then + package:add("deps", "libsdl_mixer", { configs = { shared = true } }) + else + package:add("deps", "libsdl_mixer") + end + else + package:add("defines", "CENTURION_NO_SDL_MIXER") + end + if package:config("sdl_ttf") then + if package:config("shared") then + package:add("deps", "libsdl_ttf", { configs = { shared = true } }) + else + package:add("deps", "libsdl_ttf") + end + else + package:add("defines", "CENTURION_NO_SDL_TTF") + end + + if not package:config("vulkan") then + package:add("defines", "CENTURION_NO_VULKAN") + end + if not package:config("opengl") then + package:add("defines", "CENTURION_NO_OPENGL") + end + end) + + on_install("!wasm", function (package) + os.cp("src/*", package:installdir("include")) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({ test = [[ + int main() { + const cen::sdl sdl; + cen::window window { "Centurion" }; + cen::renderer renderer = window.make_renderer(); + window.show(); + window.hide(); + } + ]] }, { configs = { languages = "c++17", defines = "SDL_MAIN_HANDLED" }, includes = "centurion.hpp" })) + if package:config("sdl_image") then + assert(package:check_cxxsnippets({ test = [[ + int main() { + const cen::img img; + } + ]] }, { configs = { languages = "c++17", defines = "SDL_MAIN_HANDLED" }, includes = "centurion.hpp" })) + end + if package:config("sdl_mixer") then + assert(package:check_cxxsnippets({ test = [[ + int main() { + const cen::mix mix; + } + ]] }, { configs = { languages = "c++17", defines = "SDL_MAIN_HANDLED" }, includes = "centurion.hpp" })) + end + if package:config("sdl_ttf") then + assert(package:check_cxxsnippets({ test = [[ + int main() { + const cen::ttf ttf; + } + ]] }, { configs = { languages = "c++17", defines = "SDL_MAIN_HANDLED" }, includes = "centurion.hpp" })) + end + end) From 794c980d62a57bb5e7fc301bcec33dc89343ee8a Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 18 Aug 2024 19:05:07 +0800 Subject: [PATCH 642/671] Update ittapi to v3.25.2 (#4975) --- packages/i/ittapi/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/i/ittapi/xmake.lua b/packages/i/ittapi/xmake.lua index 57c0e21c8..183e938aa 100644 --- a/packages/i/ittapi/xmake.lua +++ b/packages/i/ittapi/xmake.lua @@ -6,6 +6,7 @@ package("ittapi") add_urls("https://github.com/intel/ittapi/archive/refs/tags/$(version).tar.gz", "https://github.com/intel/ittapi.git") + add_versions("v3.25.2", "1d76613b29f4b7063dbb2b54e9ef902e36924c5dd016fee1d7b392b3d4ee66c2") add_versions("v3.25.1", "866a5a75a287a7440760146f99bd1093750c3fb5bf572c3bff2d4795628ebc7c") add_versions("v3.24.8", "4e57ece3286f3b902d17b1247710f0f6f9a370cc07d5e67631d3656ffac28d81") add_versions("v3.24.7", "2ff56c5c3f144b92e34af9bee451115f6076c9070ec92d361c3c07de8ff42649") From c55821de99bb768601b9d37efa4d3755291f3e9a Mon Sep 17 00:00:00 2001 From: Inari0 <42310255+xq114@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:28:59 +0800 Subject: [PATCH 643/671] update gmsh (#4977) --- packages/g/gmsh/xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/g/gmsh/xmake.lua b/packages/g/gmsh/xmake.lua index 37c11d9f6..35516562d 100644 --- a/packages/g/gmsh/xmake.lua +++ b/packages/g/gmsh/xmake.lua @@ -7,6 +7,7 @@ package("gmsh") add_urls("http://gmsh.info/src/gmsh-$(version)-source.tgz") add_versions("4.8.4", "760dbdc072eaa3c82d066c5ba3b06eacdd3304eb2a97373fe4ada9509f0b6ace") add_versions("4.11.1", "c5fe1b7cbd403888a814929f2fd0f5d69e27600222a18c786db5b76e8005b365") + add_versions("4.13.1", "77972145f431726026d50596a6a44fb3c1c95c21255218d66955806b86edbe8d") add_configs("openmp", {description = "Enable OpenMP support.", default = not is_plat("windows"), type = "boolean"}) @@ -25,6 +26,8 @@ package("gmsh") on_install("windows", "macosx", "linux", function (package) io.replace("CMakeLists.txt", "add_definitions(-D_USE_MATH_DEFINES)", "add_definitions(-DWIN32)\nadd_definitions(-D_USE_MATH_DEFINES)", {plain = true}) + io.replace("CMakeLists.txt", "if(LINUX_JOYSTICK_H)", "add_definitions(-DLINUX)\nif(LINUX_JOYSTICK_H)", {plain = true}) + io.replace("contrib/metis/GKlib/GKlib.h", "#include ", "#ifdef LINUX\n#include \n#endif\n#include ", {plain = true}) local configs = {"-DENABLE_TESTS=OFF", "-DENABLE_GMP=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DENABLE_BUILD_LIB=" .. (package:config("shared") and "OFF" or "ON")) @@ -32,7 +35,7 @@ package("gmsh") table.insert(configs, "-DENABLE_BUILD_DYNAMIC=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DENABLE_OPENMP=" .. (package:config("openmp") and "ON" or "OFF")) if package:is_plat("windows") then - table.insert(configs, "-DENABLE_MSVC_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF")) + table.insert(configs, "-DENABLE_MSVC_STATIC_RUNTIME=" .. (package:has_runtime("MT", "MTd") and "ON" or "OFF")) end import("package.tools.cmake").install(package, configs) if package:is_plat("windows") and package:config("shared") then From 2fdd344046b86e86ee4f6fa11828c1032962bcfd Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 19 Aug 2024 11:26:27 +0800 Subject: [PATCH 644/671] Update aws-crt-cpp to v0.27.5 (#4984) --- packages/a/aws-crt-cpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-crt-cpp/xmake.lua b/packages/a/aws-crt-cpp/xmake.lua index a37349e97..e8e1e04df 100644 --- a/packages/a/aws-crt-cpp/xmake.lua +++ b/packages/a/aws-crt-cpp/xmake.lua @@ -6,6 +6,7 @@ package("aws-crt-cpp") add_urls("https://github.com/awslabs/aws-crt-cpp/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-crt-cpp.git") + add_versions("v0.27.5", "cc69252ee132f5cc76b1fcf1ebec574e88f7080b05caa8125aab5684b26a37b9") add_versions("v0.27.4", "0554776a4cbbea016075f4a28698ff22818c5b948296171e1f76d0a787576f83") add_versions("v0.27.2", "e17c82d7cc3b5e6e4300bc7e4794306e292b5281d212ead536000a8b5f5f1be4") add_versions("v0.27.0", "e7601c8c5e6391013b6ad164d2dd7b970bf5dbb3693b9cc80c424bd6f42b79c8") From 9cf33bc127852f02cb28914e905aa41e201b14a6 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 19 Aug 2024 21:12:49 +0800 Subject: [PATCH 645/671] Auto-update polyscope to v2.3 (#4973) * Update polyscope to v2.3 * add patch --------- Co-authored-by: Inari0 <42310255+xq114@users.noreply.github.com> --- packages/p/polyscope/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/p/polyscope/xmake.lua b/packages/p/polyscope/xmake.lua index 58b958f73..4d6522681 100644 --- a/packages/p/polyscope/xmake.lua +++ b/packages/p/polyscope/xmake.lua @@ -6,11 +6,12 @@ package("polyscope") add_urls("https://github.com/nmwsharp/polyscope/archive/refs/tags/$(version).tar.gz", "https://github.com/nmwsharp/polyscope.git") + add_versions("v2.3", "2f57d6d206aa69d277858f046f4db08d27f03c10e97d691a0c3fc9e221a0cd60") add_versions("v2.2.1", "1952d20722cb37c5531e88d5b7f5db88c2827c55fd7ada481c2ac425f3bc4d25") add_versions("v2.1.0", "bdad2daab33a44b3b6424cec82b43cecb842b529769fd0df3bf7d8e616cea34c") add_versions("v1.3.0", "c0d3594b1c818c6e7efe2c2589d71f5e254db383d36a92555aa909a2114f12d4") - add_patches("2.2.1", "patches/v2.2.1/deps.patch", "7183fac6dcb6ebc9441c02e4c5f51721ab2a64fe524488611e6085e5b72bb6ae") + add_patches(">=2.2.1", "patches/v2.2.1/deps.patch", "7183fac6dcb6ebc9441c02e4c5f51721ab2a64fe524488611e6085e5b72bb6ae") add_patches("2.1.0", "patches/v2.1.0/deps.patch", "01bc0b31193e65b8cc079d9f232f73fb995b3cfd276840add58a01dfcf477cc8") add_patches("1.3.0", "patches/v1.3.0/deps.patch", "2d183713be791deddcfb48e4546793f584071eb1aa7a045e03c7ceed841470c8") add_patches("1.3.0", "patches/v1.3.0/imgui.patch", "e7865d6de85103098cdc25ab8a0e94dd26fb5f718609f20093b91891cc8f21e1") From 66fb3d2993e8962207d97bb608d4ea4c23794c08 Mon Sep 17 00:00:00 2001 From: c8ef Date: Mon, 19 Aug 2024 23:02:22 +0800 Subject: [PATCH 646/671] update libdwarf to 0.11.0 (#4987) --- packages/l/libdwarf/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/libdwarf/xmake.lua b/packages/l/libdwarf/xmake.lua index 1e6ac7e34..3ebbe00f4 100644 --- a/packages/l/libdwarf/xmake.lua +++ b/packages/l/libdwarf/xmake.lua @@ -4,6 +4,7 @@ package("libdwarf") set_license("LGPL-2.1") add_urls("https://github.com/davea42/libdwarf-code/releases/download/v$(version)/libdwarf-$(version).tar.xz") + add_versions("0.11.0", "846071fb220ac1952f9f15ebbac6c7831ef50d0369b772c07a8a8139a42e07d2") add_versions("0.10.1", "b511a2dc78b98786064889deaa2c1bc48a0c70115c187900dd838474ded1cc19") add_versions("0.10.0", "17b7143c4b3e5949d1578c43e8f1e2abd9f1a47e725e6600fe7ac4833a93bb77") add_versions("0.9.2", "c1cd51467f9cb8459cd27d4071857abc56191cc5d4182d8bdd7744030f88f830") From de79e67fe5279bf3ba06208da0f1b5a4136ab510 Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Mon, 19 Aug 2024 23:02:51 +0800 Subject: [PATCH 647/671] wil: update version to v1.0.240803.1 (#4988) --- packages/w/wil/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/w/wil/xmake.lua b/packages/w/wil/xmake.lua index eafad1ff3..f95cff409 100644 --- a/packages/w/wil/xmake.lua +++ b/packages/w/wil/xmake.lua @@ -7,6 +7,7 @@ package("wil") add_urls("https://github.com/microsoft/wil.git") add_versions("2022.09.16", "5f4caba4e7a9017816e47becdd918fcc872039ba") add_versions("2023.12.16", "572b8728926eb9c8fc55572bb4b84bb92dabd79d") + add_versions("2024.08.03", "f0c6a81c0c9a4b23b6801f40554b8bec425a83b4") on_install("windows", function (package) os.cp("include", package:installdir()) From 708ccfa6ac19fdfc083f128532dcd9a04318964f Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Mon, 19 Aug 2024 23:06:53 +0800 Subject: [PATCH 648/671] add repo libgda (#4979) * add repo libgda * change version to commit and ban the vapi * add iso-code dep * add version 4.16.0 for iso-codes * ignore the deprecated declarations * ignore the deprecated non prototype for clang * change clang options * -Derror=false --- packages/i/iso-codes/xmake.lua | 1 + packages/l/libgda/xmake.lua | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 packages/l/libgda/xmake.lua diff --git a/packages/i/iso-codes/xmake.lua b/packages/i/iso-codes/xmake.lua index 1af3624e1..3e5af962f 100644 --- a/packages/i/iso-codes/xmake.lua +++ b/packages/i/iso-codes/xmake.lua @@ -5,6 +5,7 @@ package("iso-codes") add_urls("https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_$(version).orig.tar.xz") add_versions("4.8.0", "b02b9c8bb81dcfa03e4baa25b266df47710832cbf550081cf43f72dcedfc8768") + add_versions("4.16.0", "d37ff1b2b76e63926e8043b42e0ff806bb4e41e2a57d93c9d4ec99c06b409530") add_deps("gettext", "python 3.x", "pkg-config") diff --git a/packages/l/libgda/xmake.lua b/packages/l/libgda/xmake.lua new file mode 100644 index 000000000..6c00e9a9e --- /dev/null +++ b/packages/l/libgda/xmake.lua @@ -0,0 +1,21 @@ +package("libgda") + + set_homepage("https://github.com/GNOME/libgda/tree/master") + set_description("libgda - an interface to the GDA architecture") + set_license("LGPL-2.0") + + add_urls("https://github.com/GNOME/libgda.git") + add_versions("2024.08.12", "97fec3090dc86d4b69f62f09d87db9dbcc864fa2") + + add_includedirs("include", "include/libgda-6.0", "include/libgda-6.0/libgda") + + add_deps("meson", "ninja", "libxml2", "gettext", "sqlite3", "json-glib", "pcre2", "iso-codes") + on_install("linux", function (package) + local configs = {"-Dui=false", "-Dvapi=false", "-Dwerror=false"} + table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static")) + import("package.tools.meson").install(package, configs, {packagedeps = {"glib"}}) + end) + + on_test(function (package) + assert(package:has_cfuncs("gda_init", {includes = "libgda/libgda.h"})) + end) From 03af09456a0e9b6426f25d89618b027f85344291 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 19 Aug 2024 23:26:22 +0800 Subject: [PATCH 649/671] Update flecs to v4.0.1 (#4985) --- packages/f/flecs/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/f/flecs/xmake.lua b/packages/f/flecs/xmake.lua index 91f01580c..e6d3b4987 100644 --- a/packages/f/flecs/xmake.lua +++ b/packages/f/flecs/xmake.lua @@ -5,6 +5,7 @@ package("flecs") add_urls("https://github.com/SanderMertens/flecs/archive/refs/tags/$(version).tar.gz", "https://github.com/SanderMertens/flecs.git") + add_versions("v4.0.1", "d88928226b3a6e7ebc7c818db50b2fb5828021ed3bcd206c4e2a3b0406472d2b") add_versions("v4.0.0", "6c9826c8602f797acd775269d143763adfb3d3a93031cc81bced2b6d267469d2") add_versions("v3.2.12", "976551dabeecf3ae109648034b8dbc47f39f50226b6d71d76bace1d0b6e2d8ae") add_versions("v3.2.11", "8ebc5f6f3ec7bbba30b0afe9d22f157437925772857ea1c6e4201eb5d31b4fe5") From c6d573dba4f07e4ce64745924d7f9a20ca26036a Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 20 Aug 2024 09:58:43 +0800 Subject: [PATCH 650/671] Update aws-c-event-stream to v0.4.3 (#4991) --- packages/a/aws-c-event-stream/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/a/aws-c-event-stream/xmake.lua b/packages/a/aws-c-event-stream/xmake.lua index 308cbb33b..5ae240c22 100644 --- a/packages/a/aws-c-event-stream/xmake.lua +++ b/packages/a/aws-c-event-stream/xmake.lua @@ -6,6 +6,7 @@ package("aws-c-event-stream") add_urls("https://github.com/awslabs/aws-c-event-stream/archive/refs/tags/$(version).tar.gz", "https://github.com/awslabs/aws-c-event-stream.git") + add_versions("v0.4.3", "d7d82c38bae68d2287ac59972a76b2b6159e7a3d7c9b7edb1357495aa4d0c0de") add_versions("v0.4.2", "c98b8fa05c2ca10aacfce7327b92a84669c2da95ccb8e7d7b3e3285fcec8beee") add_versions("v0.4.1", "f8915fba57c86148f8df4c303ca6f31de6c23375de554ba8d6f9aef2a980e93e") add_versions("v0.3.2", "3134b35a45e9f9d974c2b78ee44fd2ea0aebc04df80236b80692aa63bee2092e") From 0c6e2688e250c179c77b5816fa11842685a95efc Mon Sep 17 00:00:00 2001 From: Bai Miao <68489543+ChrisCatCP@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:09:17 +0800 Subject: [PATCH 651/671] cmake: update version to 3.30.2 (#4989) --- packages/c/cmake/xmake.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/c/cmake/xmake.lua b/packages/c/cmake/xmake.lua index eac5f3f0d..211a9ac81 100644 --- a/packages/c/cmake/xmake.lua +++ b/packages/c/cmake/xmake.lua @@ -22,6 +22,7 @@ package("cmake") add_versions("3.28.3", "d9e2c22fec920a4d1f6b0d0683c035d799475c179c91e41e1a7fbfab610a0305") add_versions("3.29.2", "0d670b59dddd064d24cf8c386abf3590bda2642bb169e11534cf1e3d1ae3a76a") add_versions("3.30.1", "51e12618829b811bba6f033ee8f39f6192da1b6abb20d82a7899d5134e879a4c") + add_versions("3.30.2", "c6fdda745f9ce69bca048e91955c7d043ba905d6388a62e0ff52b681ac17183c") elseif is_host("linux") then if os.arch():find("arm64.*") then add_urls("https://cmake.org/files/v$(version)-aarch64.tar.gz", {version = function (version) @@ -36,6 +37,7 @@ package("cmake") add_versions("3.28.3", "bbf023139f944cefe731d944f2864d8ea3ea0c4f9310b46ac72b3cb4e314b023") add_versions("3.29.2", "ca883c6dc3ce9eebd833804f0f940ecbbff603520cfd169ee58916dbbc23c2b8") add_versions("3.30.1", "ad234996f8750f11d7bd0d17b03f55c434816adf1f1671aab9e8bab21a43286a") + add_versions("3.30.2", "d18f50f01b001303d21f53c6c16ff12ee3aa45df5da1899c2fe95be7426aa026") else add_urls("https://cmake.org/files/v$(version)-x86_64.tar.gz", {version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-linux" or "-Linux") @@ -55,6 +57,7 @@ package("cmake") add_versions("3.28.3", "804d231460ab3c8b556a42d2660af4ac7a0e21c98a7f8ee3318a74b4a9a187a6") add_versions("3.29.2", "0416c70cf88e8f92efcbfe292e181bc09ead7d70e29ab37b697522c01121eab5") add_versions("3.30.1", "ac31f077ef3378641fa25a3cb980d21b2f083982d3149a8f2eb9154f2b53696b") + add_versions("3.30.2", "cdd7fb352605cee3ae53b0e18b5929b642900e33d6b0173e19f6d4f2067ebf16") end elseif is_host("windows") then if os.arch() == "x64" then @@ -76,6 +79,7 @@ package("cmake") add_versions("3.28.3", "cac7916f7e1e73a25de857704c94fd5b72ba9fe2f055356b5602d2f960e50e5b") add_versions("3.29.2", "86b5de51f60a0e9d62be4d8ca76ea467d154083d356fcc9af1409606be341cd8") add_versions("3.30.1", "cf7788ff9d92812da194847d4ec874fc576f34079987d0f20c96cd09e2a16220") + add_versions("3.30.2", "48bf4b3dc2d668c578e0884cac7878e146b036ca6b5ce4f8b5572f861b004c25") elseif os.arch() == "x86" then add_urls("https://cmake.org/files/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. (version:ge("3.20") and "-windows-i386" or "-win32-x86") @@ -95,6 +99,7 @@ package("cmake") add_versions("3.28.3", "411812b6b29ac793faf69bdbd36c612f72659363c5491b9f0a478915db3fc58c") add_versions("3.29.2", "e51b281c9dfd1498834729b33bf49fc668ad1dadbc2eaba7b693d0f7d748450d") add_versions("3.30.1", "f5fb1d93b82e9a5fbd5853d4b17a130605f0b4ed13a655d1371c2d6d55f9261d") + add_versions("3.30.2", "d01f7ea52097dd58aa225884b1ecc543827e9ef99d36dac2898609a0d5e60eb6") elseif os.arch() == "arm64" then add_urls("https://cmake.org/files/v$(version).zip", {excludes = {"*/doc/*"}, version = function (version) return table.concat(table.slice((version):split('%.'), 1, 2), '.') .. "/cmake-" .. version .. "-windows-arm64" @@ -106,6 +111,7 @@ package("cmake") add_versions("3.28.3", "cfe023b7e82812ef802fb1ec619f6cfa2fdcb58ee61165fc315086286fe9cdcc") add_versions("3.29.2", "5b16a0db4966c04582c40131038de49d5b0161fcd950dc9e955753dfab858882") add_versions("3.30.1", "02b433f70aa549449be2d53046d0179590bf3b6290d9fda3fbbb23f96a4f2802") + add_versions("3.30.2", "c0cef52e8f60eb1c3058f8bc0b3803c27d79f066b7d7d94f46a2c689bbd36f22") end else add_urls("https://github.com/Kitware/CMake/releases/download/v$(version)/cmake-$(version).tar.gz") @@ -119,6 +125,7 @@ package("cmake") add_versions("3.28.3", "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1") add_versions("3.29.2", "36db4b6926aab741ba6e4b2ea2d99c9193222132308b4dc824d4123cb730352e") add_versions("3.30.1", "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1") + add_versions("3.30.2", "46074c781eccebc433e98f0bbfa265ca3fd4381f245ca3b140e7711531d60db2") end if is_plat("mingw") and is_subhost("msys") then From 21917cad307ce1b8d3c8431ff82d16d55ee37ebf Mon Sep 17 00:00:00 2001 From: Shiwei Wang <4977975+wsw0108@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:26:47 +0800 Subject: [PATCH 652/671] fix csvparser for xmake 2.9.4 (#4992) it's a header only library --- packages/c/csvparser/xmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/c/csvparser/xmake.lua b/packages/c/csvparser/xmake.lua index f08c4c7d2..ab410ae56 100644 --- a/packages/c/csvparser/xmake.lua +++ b/packages/c/csvparser/xmake.lua @@ -1,5 +1,5 @@ package("csvparser") - + set_kind("library", { headeronly = true }) set_homepage("https://github.com/vincentlaucsb/csv-parser") set_description("A modern C++ library for reading, writing, and analyzing CSV (and similar) files (by vincentlaucsb)") @@ -26,4 +26,4 @@ package("csvparser") } } ]]}, {includes = "csv.hpp", configs = {languages = "cxx17"}})) - end) \ No newline at end of file + end) From 5c0a8a9ee4f77167bb23c252b0593eb5d699fe8a Mon Sep 17 00:00:00 2001 From: apocelipes Date: Tue, 20 Aug 2024 15:43:34 +0800 Subject: [PATCH 653/671] csvparser: add licenses (#4993) --- packages/c/csvparser/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/csvparser/xmake.lua b/packages/c/csvparser/xmake.lua index ab410ae56..22176d697 100644 --- a/packages/c/csvparser/xmake.lua +++ b/packages/c/csvparser/xmake.lua @@ -2,6 +2,7 @@ package("csvparser") set_kind("library", { headeronly = true }) set_homepage("https://github.com/vincentlaucsb/csv-parser") set_description("A modern C++ library for reading, writing, and analyzing CSV (and similar) files (by vincentlaucsb)") + set_license("MIT") add_urls("https://github.com/vincentlaucsb/csv-parser/archive/refs/tags/$(version).zip") add_versions("2.3.0", "17eb8e1a4f2f8cdc6679329e4626de608bb33a830d5614184a21b5d8838bbbb0") From c34c4200773beb2908857e865d2d2bb9c8d874bf Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 20 Aug 2024 22:51:37 +0800 Subject: [PATCH 654/671] boost: fix fetch includedirs --- packages/b/boost/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 250f6600b..d417bf858 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -283,7 +283,7 @@ package("boost") if info then local usingstr = format("\nusing %s : %s : %s %s %s ;", rule, dep:version(), - path.unix(info.includedirs[1]), + path.unix(info.includedirs[1] or info.sysincludedirs[1]), path.unix(info.linkdirs[1]), info.links[1]) file:write(usingstr) From f6341f7d44dbcac8ae806932d272f3a9bcdda6a2 Mon Sep 17 00:00:00 2001 From: star9029 Date: Tue, 20 Aug 2024 22:59:10 +0800 Subject: [PATCH 655/671] mmeter: add package (#4995) * meter: add package * fix dir name * fix includedirs --- packages/m/mmeter/xmake.lua | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/m/mmeter/xmake.lua diff --git a/packages/m/mmeter/xmake.lua b/packages/m/mmeter/xmake.lua new file mode 100644 index 000000000..bd5680337 --- /dev/null +++ b/packages/m/mmeter/xmake.lua @@ -0,0 +1,33 @@ +package("mmeter") + set_homepage("https://github.com/LMauricius/MMeter") + set_description("A simple WIP profiler library for c++. Include the 2 files and you're ready to go.") + set_license("MIT") + + set_urls("https://github.com/LMauricius/MMeter/archive/refs/tags/$(version).tar.gz", + "https://github.com/LMauricius/MMeter.git") + + add_versions("2.0", "7c6186e5e93da09d12c012167bd9247a07345e94e00f57e4f3579188fbd58b5d") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + target("mmeter") + set_kind("$(kind)") + add_files("src/*.cpp") + add_includedirs("include") + add_headerfiles("include/*.h") + set_languages("c++17") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all", {export_classes = true}) + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + void test() { + MMETER_FUNC_PROFILER; + } + ]]}, {configs = {languages = "c++17"}, includes = "MMeter.h"})) + end) From 43d9b6acdd5e33e516521cc04121faf325b5a843 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 21 Aug 2024 07:24:45 +0800 Subject: [PATCH 656/671] ncurses: add 6.5 version (#4998) --- packages/n/ncurses/xmake.lua | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index 9733e792c..09970b05b 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -1,5 +1,4 @@ package("ncurses") - set_homepage("https://invisible-island.net/ncurses/") set_description("A free software emulation of curses.") set_license("MIT") @@ -7,16 +6,19 @@ package("ncurses") add_urls("https://ftpmirror.gnu.org/ncurses/ncurses-$(version).tar.gz", "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$(version).tar.gz", "https://invisible-mirror.net/archives/ncurses/ncurses-$(version).tar.gz") + add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17") add_versions("6.2", "30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d") add_versions("6.3", "97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059") add_versions("6.4", "6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159") + add_versions("6.5", "136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6") add_configs("widec", {description = "Compile with wide-char/UTF-8 code.", default = true, type = "boolean"}) if is_plat("linux") then add_extsources("apt::libncurses-dev") end + on_load(function (package) if package:config("widec") then package:add("links", "ncursesw", "formw", "panelw", "menuw") @@ -25,11 +27,22 @@ package("ncurses") package:add("links", "ncurses", "form", "panel", "menu") package:add("includedirs", "include/ncurses", "include") end + + if not package:config("shared") then + package:add("defines", "NCURSES_STATIC") + end end) on_install("linux", "macosx", "bsd", function (package) - local configs = {"--without-manpages", "--enable-sigwinch", "--with-gpm=no"} - table.insert(configs, "--with-debug=" .. (package:debug() and "yes" or "no")) + local configs = { + "--without-manpages", + "--enable-sigwinch", + "--with-gpm=no", + "--without-tests", + "--without-ada", + } + + table.insert(configs, "--with-debug=" .. (package:is_debug() and "yes" or "no")) if package:config("widec") then table.insert(configs, "--enable-widec") end From ac6c846a9871b3c5e377a8b5332a29afe626f60a Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 21 Aug 2024 07:59:02 +0800 Subject: [PATCH 657/671] boost: fix fetch system library --- packages/b/boost/xmake.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index d417bf858..0b7ebae27 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -281,9 +281,17 @@ package("boost") local dep = package:dep(depname) local info = dep:fetch({external = false}) if info then + local includedirs = table.wrap(info.sysincludedirs or info.includedirs) + if #includedirs == 0 then + includedirs = "" + else + for i, dir in ipairs(includedirs) do + includedirs[i] = path.unix(dir) + end + end local usingstr = format("\nusing %s : %s : %s %s %s ;", rule, dep:version(), - path.unix(info.includedirs[1] or info.sysincludedirs[1]), + table.concat(includedirs, ";"), path.unix(info.linkdirs[1]), info.links[1]) file:write(usingstr) From 9b9642fe7120272115020c065734b1ad6a3f3da9 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 21 Aug 2024 08:04:55 +0800 Subject: [PATCH 658/671] boost: fix table concat --- packages/b/boost/xmake.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 0b7ebae27..80529ea3a 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -282,9 +282,7 @@ package("boost") local info = dep:fetch({external = false}) if info then local includedirs = table.wrap(info.sysincludedirs or info.includedirs) - if #includedirs == 0 then - includedirs = "" - else + if #includedirs != 0 then for i, dir in ipairs(includedirs) do includedirs[i] = path.unix(dir) end From 7c1c391c0918f021c947d7474f53bc54e2e468dd Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 21 Aug 2024 08:35:10 +0800 Subject: [PATCH 659/671] readline: add 8.2 version (#4999) --- packages/r/readline/xmake.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/r/readline/xmake.lua b/packages/r/readline/xmake.lua index cd8bb1368..67bbaf675 100644 --- a/packages/r/readline/xmake.lua +++ b/packages/r/readline/xmake.lua @@ -5,6 +5,8 @@ package("readline") add_urls("https://ftpmirror.gnu.org/readline/readline-$(version).tar.gz", "https://ftp.gnu.org/gnu/readline/readline-$(version).tar.gz") + + add_versions("8.2", "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35") add_versions("8.1", "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02") add_deps("ncurses") @@ -13,7 +15,7 @@ package("readline") local configs = {"--with-curses"} table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no")) table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes")) - if package:debug() then + if package:is_debug() then table.insert(configs, "--enable-debug") end if package:config("pic") ~= false then From a56846b722278bb38205a3131006890ce6fa30ac Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 21 Aug 2024 10:02:03 +0800 Subject: [PATCH 660/671] fix boost (#5000) --- packages/b/boost/xmake.lua | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/b/boost/xmake.lua b/packages/b/boost/xmake.lua index 80529ea3a..14d13bfb3 100644 --- a/packages/b/boost/xmake.lua +++ b/packages/b/boost/xmake.lua @@ -278,22 +278,25 @@ package("boost") end local function config_deppath(file, depname, rule) - local dep = package:dep(depname) - local info = dep:fetch({external = false}) - if info then - local includedirs = table.wrap(info.sysincludedirs or info.includedirs) - if #includedirs != 0 then - for i, dir in ipairs(includedirs) do - includedirs[i] = path.unix(dir) - end - end - local usingstr = format("\nusing %s : %s : %s %s %s ;", - rule, dep:version(), - table.concat(includedirs, ";"), - path.unix(info.linkdirs[1]), - info.links[1]) - file:write(usingstr) + local dep = package:dep(depname) + local info = dep:fetch({external = false}) + if info then + local includedirs = table.wrap(info.sysincludedirs or info.includedirs) + for i, dir in ipairs(includedirs) do + includedirs[i] = path.unix(dir) + end + local linkdirs = table.wrap(info.linkdirs) + for i, dir in ipairs(linkdirs) do + linkdirs[i] = path.unix(dir) end + local links = table.wrap(info.links) + local usingstr = format("\nusing %s : %s : %s %s %s ;", + rule, dep:version(), + table.concat(includedirs, ";"), + table.concat(linkdirs, ";"), + table.concat(links, ";")) + file:write(usingstr) + end end local file = io.open("user-config.jam", "w") if file then @@ -456,7 +459,7 @@ package("boost") map["2"] = 2; } ]]}, {configs = {languages = "c++14"}})) - + if package:config("date_time") then assert(package:check_cxxsnippets({test = [[ #include From b0be614cdd1c0b668f6f94087c1f2a4a58da39e1 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 21 Aug 2024 22:42:25 +0800 Subject: [PATCH 661/671] remove spaces --- packages/c/cosmocc/xmake.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/c/cosmocc/xmake.lua b/packages/c/cosmocc/xmake.lua index a570870d8..8b108be04 100644 --- a/packages/c/cosmocc/xmake.lua +++ b/packages/c/cosmocc/xmake.lua @@ -30,9 +30,6 @@ package("cosmocc") add_versions("3.6.0", "4918c45ac3e0972ff260e2a249e25716881e39fb679d5e714ae216a2ef6c3f7e") add_versions("3.6.1", "5f46bdfa4db8326794306d1a0348efc01e199f53b262bc05aa92b37be09a3f3a") add_versions("3.6.2", "268aa82d9bfd774f76951b250f87b8edcefd5c754b8b409e1639641e8bd8d5bc") - - - on_load("@windows|x64", function (package) package:add("deps", "msys2") From 86a43c0dc65afc555d16df6a02d9e203af0eaf79 Mon Sep 17 00:00:00 2001 From: benny066567 <58126350+hahahahbenny@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:03:08 +0800 Subject: [PATCH 662/671] fix pthread link (#5001) --- packages/j/json-glib/xmake.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/j/json-glib/xmake.lua b/packages/j/json-glib/xmake.lua index e2489ffc3..bb53db51b 100644 --- a/packages/j/json-glib/xmake.lua +++ b/packages/j/json-glib/xmake.lua @@ -7,10 +7,13 @@ package("json-glib") add_urls("https://github.com/GNOME/json-glib/archive/refs/tags/$(version).tar.gz") add_versions("1.9.2", "277c3b7fc98712e30115ee3a60c3eac8acc34570cb98d3ff78de85ed804e0c80") - add_patches("1.9.2", "patches/1.9.2/add_brace_to_json_scanner.patch", "5d77c14d25ad24a911d28d51e9defee9a3c382428dc3e23101f6319fc46b227c") add_deps("glib", "meson", "ninja") + if is_plat("linux") then + add_syslinks("pthread") + end + add_includedirs("include", "include/json-glib-1.0") on_install("linux", function (package) From 31807083997c083ee08089a385d241f720207e4f Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 21 Aug 2024 20:04:18 +0800 Subject: [PATCH 663/671] go: upgrade and add windows-arm64 support (#5004) --- packages/g/go/xmake.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/g/go/xmake.lua b/packages/g/go/xmake.lua index cec62f12b..2916d9a76 100644 --- a/packages/g/go/xmake.lua +++ b/packages/g/go/xmake.lua @@ -9,11 +9,19 @@ package("go") add_versions("1.17.6", "5bf8f87aec7edfc08e6bc845f1c30dba6de32b863f89ae46553ff4bbcc1d4954") add_versions("1.22.2", "8e581cf330f49d3266e936521a2d8263679ef7e2fc2cbbceb85659122d883596") add_versions("1.22.4", "26321c4d945a0035d8a5bc4a1965b0df401ff8ceac66ce2daadabf9030419a98") + add_versions("1.22.6", "6023083a6e4d3199b44c37e9ba7b25d9674da20fd846a35ee5f9589d81c21a6a") + add_versions("1.23.0", "d4be481ef73079ee0ad46081d278923aa3fd78db1b3cf147172592f73e14c1ac") + elseif os.arch() == "arm64" then + set_urls("https://go.dev/dl/go$(version).windows-arm64.zip") + add_versions("1.22.6", "7cf55f357ba8116cd3bff992980e20a704ba451b3dab341cf1787b133d900512") + add_versions("1.23.0", "0be62073ef8f5a2d3b9adcefddf18c417dab0a7975c71488ac2694856e2ff976") else set_urls("https://go.dev/dl/go$(version).windows-386.zip") add_versions("1.17.6", "3809c4e40482ff047200c8b1e22a43a2c9c79b53ef540668d2b00f7228f093aa") add_versions("1.22.2", "651753c06df037020ef4d162c5b273452e9ba976ed17ae39e66ef7ee89d8147e") add_versions("1.22.4", "aca4e2c37278a10f1c70dd0df142f7d66b50334fcee48978d409202d308d6d25") + add_versions("1.22.6", "eb734bacc9aabca1273b61dd392bb84a9bb33783f5e2fff2cd6ab9885bbefbe6") + add_versions("1.23.0", "09448fedec0cdf98ad12397222e0c8bfc835b1d0894c0015ced653534b8d7427") end elseif is_host("linux") then if os.arch() == "x86_64" then @@ -21,16 +29,22 @@ package("go") add_versions("1.17.6", "231654bbf2dab3d86c1619ce799e77b03d96f9b50770297c8f4dff8836fc8ca2") add_versions("1.22.2", "5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17") add_versions("1.22.4", "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d") + add_versions("1.22.6", "999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616") + add_versions("1.23.0", "905a297f19ead44780548933e0ff1a1b86e8327bb459e92f9c0012569f76f5e3") elseif os.arch() == "i386" then set_urls("https://go.dev/dl/go$(version).linux-386.tar.gz") add_versions("1.17.6", "06c50fb0d44bb03dd4ea8795f9448379c5825d2765307b51f66905084c3ba541") add_versions("1.22.2", "586d9eb7fe0489ab297ad80dd06414997df487c5cf536c490ffeaa8d8f1807a7") add_versions("1.22.4", "47a2a8d249a91eb8605c33bceec63aedda0441a43eac47b4721e3975ff916cec") + add_versions("1.22.6", "9e680027b058beab10ce5938607660964b6d2c564bf50bdb01aa090dc5beda98") + add_versions("1.23.0", "0e8a7340c2632e6fb5088d60f95b52be1f8303143e04cd34e9b2314fafc24edd") elseif os.arch() == "arm64" then set_urls("https://go.dev/dl/go$(version).linux-arm64.tar.gz") add_versions("1.17.6", "82c1a033cce9bc1b47073fd6285233133040f0378439f3c4659fe77cc534622a") add_versions("1.22.2", "36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1") add_versions("1.22.4", "a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771") + add_versions("1.22.6", "c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2") + add_versions("1.23.0", "62788056693009bcf7020eedc778cdd1781941c6145eab7688bd087bce0f8659") end elseif is_host("macosx") then if os.arch() == "x86_64" then @@ -38,10 +52,14 @@ package("go") add_versions("1.17.6", "874bc6f95e07697380069a394a21e05576a18d60f4ba178646e1ebed8f8b1f89") add_versions("1.22.2", "33e7f63077b1c5bce4f1ecadd4d990cf229667c40bfb00686990c950911b7ab7") add_versions("1.22.4", "c95967f50aa4ace34af0c236cbdb49a9a3e80ee2ad09d85775cb4462a5c19ed3") + add_versions("1.22.6", "9c3c0124b01b5365f73a1489649f78f971ecf84844ad9ca58fde133096ddb61b") + add_versions("1.23.0", "ffd070acf59f054e8691b838f274d540572db0bd09654af851e4e76ab88403dc") elseif os.arch() == "arm64" then set_urls("https://go.dev/dl/go$(version).darwin-arm64.tar.gz") add_versions("1.22.2", "660298be38648723e783ba0398e90431de1cb288c637880cdb124f39bd977f0d") add_versions("1.22.4", "242b78dc4c8f3d5435d28a0d2cec9b4c1aa999b601fb8aa59fb4e5a1364bf827") + add_versions("1.22.6", "ebac39fd44fc22feed1bb519af431c84c55776e39b30f4fd62930da9c0cfd1e3") + add_versions("1.23.0", "b770812aef17d7b2ea406588e2b97689e9557aac7e646fe76218b216e2c51406") end end From e0241c0f0d66760bea7369a3f82270fb4e20b073 Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 21 Aug 2024 20:46:02 +0800 Subject: [PATCH 664/671] rapidjson: add 2024.08.16 version (#5005) --- packages/r/rapidjson/xmake.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/r/rapidjson/xmake.lua b/packages/r/rapidjson/xmake.lua index dfb7d82be..203735fd5 100644 --- a/packages/r/rapidjson/xmake.lua +++ b/packages/r/rapidjson/xmake.lua @@ -1,12 +1,13 @@ package("rapidjson") - - set_kind("library", { headeronly = true }) + set_kind("library", {headeronly = true}) set_homepage("https://github.com/Tencent/rapidjson") set_description("RapidJSON is a JSON parser and generator for C++.") set_license("MIT") set_urls("https://github.com/Tencent/rapidjson/archive/$(version).zip", "https://github.com/Tencent/rapidjson.git") + + add_versions("2024.08.16", "7c73dd7de7c4f14379b781418c6e947ad464c818") add_versions("2023.12.6", "6089180ecb704cb2b136777798fa1be303618975") add_versions("2022.7.20", "27c3a8dc0e2c9218fe94986d249a12b5ed838f1d") add_versions("v1.1.0", "8e00c38829d6785a2dfb951bb87c6974fa07dfe488aa5b25deec4b8bc0f6a3ab") From 24f2764310de0f360c638bae97e112ede2936f98 Mon Sep 17 00:00:00 2001 From: Inari0 <42310255+xq114@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:25:05 +0800 Subject: [PATCH 665/671] add enoki and fcpw (#5002) * add enoki * add fcpw * fix enoki on mingw * test on more platforms --- packages/e/enoki/xmake.lua | 58 ++++++++++++++++++++++++++++++++++++++ packages/f/fcpw/xmake.lua | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 packages/e/enoki/xmake.lua create mode 100644 packages/f/fcpw/xmake.lua diff --git a/packages/e/enoki/xmake.lua b/packages/e/enoki/xmake.lua new file mode 100644 index 000000000..8d4f7c623 --- /dev/null +++ b/packages/e/enoki/xmake.lua @@ -0,0 +1,58 @@ +package("enoki") + + set_homepage("https://github.com/mitsuba-renderer/enoki") + set_description("Enoki: structured vectorization and differentiation on modern processor architectures") + set_license("BSD-3-Clause") + + add_urls("https://github.com/mitsuba-renderer/enoki.git") + add_versions("2024.04.19", "63a5f4c0a35a8513a39393a9ee92646ce44a386e") + + add_configs("shared", {description = "Build shared library", default = true, type = "boolean", readonly = true}) + add_configs("cuda", {description = "Build Enoki CUDA library", default = false, type = "boolean"}) + add_configs("cudacc", {description = "CUDA compute capability", default = "75", type = "string", values = {"35", "50", "52", "60", "61", "70", "75", "80", "86", "89", "90"}}) + add_configs("autodiff", {description = "Build Enoki automatic differentation library", default = false, type = "boolean"}) + add_configs("python", {description = "Build pybind11 interface to CUDA & automatic differentiation libraries", default = false, type = "boolean"}) + + on_load(function (package) + if package:config("cuda") then + package:add("deps", "cuda") + end + if package:config("python") then + package:add("deps", "python 3.x") + end + if package:config("cuda") or package:config("autodiff") then + package:add("deps", "cmake") + else + package:set("kind", "library", {headeronly = true}) + end + end) + + on_install("windows", "macosx", "linux", "mingw", function (package) + os.cp("include/enoki", package:installdir("include")) + if package:config("cuda") or package:config("autodiff") then + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) + table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + table.insert(configs, "-DENOKI_CUDA=" .. (package:config("cuda") and "ON" or "OFF")) + if package:config("cuda") then + table.insert(configs, "-DENOKI_CUDA_COMPUTE_CAPABILITY=" .. package:config("cudacc")) + end + table.insert(configs, "-DENOKI_AUTODIFF=" .. (package:config("autodiff") and "ON" or "OFF")) + table.insert(configs, "-DENOKI_PYTHON=" .. (package:config("python") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #ifndef _USE_MATH_DEFINES + #define _USE_MATH_DEFINES + #endif + #include + void test() { + enoki::Array idx(1, 2, 3, 4); + using MyFloat = enoki::Array; + MyFloat a = enoki::zero(); + } + ]]}, {configs = {languages = "c++17"}})) + end) diff --git a/packages/f/fcpw/xmake.lua b/packages/f/fcpw/xmake.lua new file mode 100644 index 000000000..65b2bb753 --- /dev/null +++ b/packages/f/fcpw/xmake.lua @@ -0,0 +1,52 @@ +package("fcpw") + set_homepage("https://github.com/rohan-sawhney/fcpw") + set_description("FCPW: Fastest Closest Points in the West") + set_license("MIT") + + add_urls("https://github.com/rohan-sawhney/fcpw.git") + add_versions("v1.0.5", "9a0c41ae44fbcbf32a1740adec7a2a79eded249f") + + add_configs("enoki", {description = "Build enoki backend", default = false, type = "boolean"}) + add_configs("gpu", {description = "Enable GPU support", default = false, type = "boolean"}) + add_configs("python", {description = "Build python binding", default = false, type = "boolean"}) + + add_deps("eigen") + on_load(function (package) + if package:config("enoki") then + package:add("deps", "enoki") + package:add("defines", "FCPW_USE_ENOKI") + -- define FCPW_SIMD_WIDTH by user + end + if package:config("gpu") then + package:add("defines", "FCPW_USE_GPU") + end + if package:config("python") then + package:add("deps", "cmake") + package:add("deps", "python 3.x") + else + package:set("kind", "library", {headeronly = true}) + end + end) + + on_install(function (package) + os.cp("include/fcpw", package:installdir("include")) + if package:config("python") then + local configs = {} + table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) + table.insert(configs, "-DFCPW_USE_ENOKI=" .. (package:config("enoki") and "ON" or "OFF")) + table.insert(configs, "-DFCPW_ENABLE_GPU_SUPPORT=" .. (package:config("gpu") and "ON" or "OFF")) + table.insert(configs, "-DFCPW_BUILD_BINDINGS=" .. (package:config("python") and "ON" or "OFF")) + import("package.tools.cmake").install(package, configs) + end + end) + + on_test(function (package) + assert(package:check_cxxsnippets({test = [[ + #include + void test() { + fcpw::Scene<3> scene; + scene.setObjectCount(1); + scene.build(fcpw::AggregateType::Bvh_SurfaceArea, true); + } + ]]}, {configs = {languages = "c++17"}})) + end) From 2ec9357e07b0caa2a1ba49881d1df2cee6091108 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 22 Aug 2024 12:07:12 +0800 Subject: [PATCH 666/671] Update sqlitecpp to 3.3.2 (#5010) --- packages/s/sqlitecpp/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/sqlitecpp/xmake.lua b/packages/s/sqlitecpp/xmake.lua index 3cd12d26c..856075f6e 100644 --- a/packages/s/sqlitecpp/xmake.lua +++ b/packages/s/sqlitecpp/xmake.lua @@ -6,6 +6,7 @@ package("sqlitecpp") set_urls("https://github.com/SRombauts/SQLiteCpp/archive/refs/tags/$(version).tar.gz", "https://github.com/SRombauts/SQLiteCpp.git") + add_versions("3.3.2", "5aa8eda130d0689bd5ed9b2074714c2dbc610f710483c61ba6cf944cebfe03af") add_versions("3.3.1", "71f990f9fb4b004533b6859ce40729af823b87fe691dd99ca084a7fd40db54b9") add_versions("3.2.1", "70c67d5680c47460f82a7abf8e6b0329bf2fb10795a982a6d8abc06adb42d693") From 1f0a7fee1192dbe6e9ce13011d836f65510691ae Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 22 Aug 2024 12:07:15 +0800 Subject: [PATCH 667/671] Update wfrest to v0.9.7 (#5009) --- packages/w/wfrest/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/w/wfrest/xmake.lua b/packages/w/wfrest/xmake.lua index 5ee88a215..ad1601d1b 100644 --- a/packages/w/wfrest/xmake.lua +++ b/packages/w/wfrest/xmake.lua @@ -6,6 +6,7 @@ package("wfrest") add_urls("https://github.com/wfrest/wfrest/archive/refs/tags/$(version).tar.gz", "https://github.com/wfrest/wfrest.git") + add_versions("v0.9.7", "47eaf6feec20bd5d905a69526c0f3905f07e17b442ffff02391a35ce2ac397bf") add_versions("v0.9.3", "1bd0047484e81e23c7a8ab7ba41634109169c37d80aeb2c480728214db42878e") add_versions("v0.9.4", "1f8811e90e6c89af91db04cab0c37dc86cf4777f4f4713d6003ac0ec1a2471a9") add_versions("v0.9.5", "46e4957a5c00c95c85979bbc41807b4c4f2aacc11c43e123039ce440ebecab84") From 2fed592c89cdca826ee41da281ebe8c48ecd4529 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 22 Aug 2024 12:07:17 +0800 Subject: [PATCH 668/671] Update rocksdb to v9.5.2 (#5008) --- packages/r/rocksdb/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/r/rocksdb/xmake.lua b/packages/r/rocksdb/xmake.lua index 2d7478a27..f586678b1 100644 --- a/packages/r/rocksdb/xmake.lua +++ b/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("v9.5.2", "b20780586d3df4a3c5bcbde341a2c1946b03d18237960bda5bc5e9538f42af40") add_versions("v9.4.0", "1f829976aa24b8ba432e156f52c9e0f0bd89c46dc0cc5a9a628ea70571c1551c") add_versions("v9.3.1", "e63f1be162998c0f49a538a7fe3fcac0e40cad77ee47d5592a65bca50f7c4620") add_versions("v9.2.1", "bb20fd9a07624e0dc1849a8e65833e5421960184f9c469d508b58ed8f40a780f") From 6725edfb7de54bd28c7cdf52ddd4881dd2a66be8 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 22 Aug 2024 12:07:20 +0800 Subject: [PATCH 669/671] Update suitesparse to v7.8.1 (#5007) --- packages/s/suitesparse/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/s/suitesparse/xmake.lua b/packages/s/suitesparse/xmake.lua index 7b6edc0f5..b29792719 100644 --- a/packages/s/suitesparse/xmake.lua +++ b/packages/s/suitesparse/xmake.lua @@ -5,6 +5,7 @@ package("suitesparse") add_urls("https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/$(version).tar.gz", "https://github.com/DrTimothyAldenDavis/SuiteSparse.git") + add_versions("v7.8.1", "b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44") add_versions("v7.7.0", "529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3") add_versions("v7.6.0", "19cbeb9964ebe439413dd66d82ace1f904adc5f25d8a823c1b48c34bd0d29ea5") add_versions("v5.10.1", "acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee") From 659e35cbae67362bd2b332ee3fcc8513d44f99bb Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 22 Aug 2024 20:12:46 +0800 Subject: [PATCH 670/671] Update cpptrace to v0.7.0 (#5012) --- packages/c/cpptrace/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/c/cpptrace/xmake.lua b/packages/c/cpptrace/xmake.lua index c490fe90e..aef19b47e 100644 --- a/packages/c/cpptrace/xmake.lua +++ b/packages/c/cpptrace/xmake.lua @@ -6,6 +6,7 @@ package("cpptrace") add_urls("https://github.com/jeremy-rifkin/cpptrace/archive/refs/tags/$(version).tar.gz", "https://github.com/jeremy-rifkin/cpptrace.git") + add_versions("v0.7.0", "b5c1fbd162f32b8995d9b1fefb1b57fac8b1a0e790f897b81cdafe3625d12001") add_versions("v0.6.3", "665bf76645ec7b9e6d785a934616f0138862c36cdb58b0d1c9dd18dd4c57395a") add_versions("v0.6.2", "02a0540b5b1be0788565f48b065b456d3eab81ae2323a50e75ed36449a0143ed") add_versions("v0.6.1", "4bb478eedbe4b2c0093ef7af4f64795304850e03312e658076b25ef8d6019c75") From 355509f969cffc28b9ce7b77720a1a9ae6f422d4 Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 23 Aug 2024 00:41:58 +0800 Subject: [PATCH 671/671] termcap: add package (#5015) * termcap: add package * patch headers * add missing patch * fix check_cincludes --- .../t/termcap/patches/1.3.1/unistd_h.patch | 15 +++++++++ packages/t/termcap/xmake.lua | 33 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 packages/t/termcap/patches/1.3.1/unistd_h.patch create mode 100644 packages/t/termcap/xmake.lua diff --git a/packages/t/termcap/patches/1.3.1/unistd_h.patch b/packages/t/termcap/patches/1.3.1/unistd_h.patch new file mode 100644 index 000000000..2d3112557 --- /dev/null +++ b/packages/t/termcap/patches/1.3.1/unistd_h.patch @@ -0,0 +1,15 @@ +diff --git a/tparam.c b/tparam.c +index 5a9809a..09ef456 100644 +--- a/tparam.c ++++ b/tparam.c +@@ -40,6 +40,10 @@ char *realloc (); + + #endif /* not emacs */ + ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ + #ifndef NULL + #define NULL (char *) 0 + #endif diff --git a/packages/t/termcap/xmake.lua b/packages/t/termcap/xmake.lua new file mode 100644 index 000000000..d9f7e4d76 --- /dev/null +++ b/packages/t/termcap/xmake.lua @@ -0,0 +1,33 @@ +package("termcap") + set_homepage("https://www.gnu.org/software/termcap") + set_description("Enables programs to use display terminals in a terminal-independent manner") + set_license("GPL-2.0-or-later") + + add_urls("https://ftp.gnu.org/gnu/termcap/termcap-$(version).tar.gz", + "https://github.com/marcv81/termcap.git") + + add_versions("1.3.1", "91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100") + + add_patches("1.3.1", "patches/1.3.1/unistd_h.patch", "9a61b94c22d913ac4f5adf3e5735c07cb5e57eaa057f737bacb754215897cce0") + + on_install(function (package) + io.writefile("xmake.lua", [[ + add_rules("mode.debug", "mode.release") + includes("@builtin/check") + check_cincludes("HAVE_FCNTL_H", "fcntl.h") + check_cincludes("HAVE_UNISTD_H", "unistd.h") + target("termcap") + set_kind("$(kind)") + add_files("*.c") + add_headerfiles("*.h") + add_defines("STDC_HEADERS") + if is_plat("windows") and is_kind("shared") then + add_rules("utils.symbols.export_all") + end + ]]) + import("package.tools.xmake").install(package) + end) + + on_test(function (package) + assert(package:has_cfuncs("tgetent", {includes = "termcap.h"})) + end)