From 37467edcafecd2a68fc0c97dc95eab912854deeb Mon Sep 17 00:00:00 2001 From: EZ4Stephen Date: Sun, 26 Apr 2026 23:59:27 +0400 Subject: [PATCH 1/2] Add zix 0.8.0 to xrepo Added 2 licenses, not sure if it needs change. (per https://gitlab.com/drobilla/zix/-/tree/main/LICENSES?ref_type=heads ) Adds zix-0 to include paths Adds ZIX_STATIC define Disabled benchmarks fully. Unsure if it should be optional, but if it should be optional, glib would need to be added as a dependency when building with benchmarks enabled. Available options at https://gitlab.com/drobilla/zix/-/blob/main/meson_options.txt?ref_type=heads -Note html and singlehtml are within docs folder, so disabling docs disables those as well, removing need for adding `-Dhtml=disabled` or `-Dsinglehtml=disabled`. --- packages/z/zix/xmake.lua | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/z/zix/xmake.lua diff --git a/packages/z/zix/xmake.lua b/packages/z/zix/xmake.lua new file mode 100644 index 00000000000..ea4525078bd --- /dev/null +++ b/packages/z/zix/xmake.lua @@ -0,0 +1,29 @@ +package("zix") + set_description("A lightweight C99 portability and data structure library") + set_license("0BSD", "ISC") + + add_urls("https://gitlab.com/drobilla/zix/-/archive/v$(version)/zix-v$(version).tar.gz", + "https://gitlab.com/drobilla/zix.git") + + add_versions("0.8.0", "51d70d63e970214db84e32d55377d84090c02145f5768265ab140d117f2b8e24") + + add_deps("meson", "ninja") + + on_install(function (package) + local configs = { + "-Dbenchmarks=disabled", + "-Ddocs=disabled", + "-Dtests=disabled", + "-Dtests_cpp=disabled", + } + import("package.tools.meson").install(package, configs) + package:add("includedirs", path.join("include", "zix-0")) + if not package:config("shared") then + package:add("defines", "ZIX_STATIC") + end + + end) + + on_test(function (package) + assert(package:has_cfuncs("zix_strerror", {includes = "zix/status.h"})) + end) \ No newline at end of file From 88c8f82436901fcdcd1bcbf5b25666e1362189a0 Mon Sep 17 00:00:00 2001 From: EZ4Stephen Date: Mon, 27 Apr 2026 10:00:34 +0400 Subject: [PATCH 2/2] Fixes to zix's xmake.lua file Removed the tabs. Set ISC only as license. Put the setting of include path and the static define in an on_load block. --- packages/z/zix/xmake.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/z/zix/xmake.lua b/packages/z/zix/xmake.lua index ea4525078bd..4babea82e61 100644 --- a/packages/z/zix/xmake.lua +++ b/packages/z/zix/xmake.lua @@ -1,6 +1,6 @@ package("zix") set_description("A lightweight C99 portability and data structure library") - set_license("0BSD", "ISC") + set_license("ISC") add_urls("https://gitlab.com/drobilla/zix/-/archive/v$(version)/zix-v$(version).tar.gz", "https://gitlab.com/drobilla/zix.git") @@ -9,21 +9,23 @@ package("zix") add_deps("meson", "ninja") + on_load(function (package) + package:add("includedirs", "include/zix-0") + if not package:config("shared") then + package:add("defines", "ZIX_STATIC") + end + end) + on_install(function (package) local configs = { "-Dbenchmarks=disabled", "-Ddocs=disabled", "-Dtests=disabled", - "-Dtests_cpp=disabled", + "-Dtests_cpp=disabled", } - import("package.tools.meson").install(package, configs) - package:add("includedirs", path.join("include", "zix-0")) - if not package:config("shared") then - package:add("defines", "ZIX_STATIC") - end - + import("package.tools.meson").install(package, configs) end) on_test(function (package) assert(package:has_cfuncs("zix_strerror", {includes = "zix/status.h"})) - end) \ No newline at end of file + end)