From d9e7408c0ebb318dbcf1c34ffa7aec94a89a7359 Mon Sep 17 00:00:00 2001 From: Saikari Date: Sun, 5 Jan 2025 23:44:46 +0300 Subject: [PATCH 1/4] revise --- packages/m/miniz/xmake.lua | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/m/miniz/xmake.lua b/packages/m/miniz/xmake.lua index 2b4b1f1db26..880eb4b5df2 100644 --- a/packages/m/miniz/xmake.lua +++ b/packages/m/miniz/xmake.lua @@ -6,24 +6,18 @@ package("miniz") add_urls("https://github.com/richgel999/miniz/archive/refs/tags/$(version).tar.gz", "https://github.com/richgel999/miniz.git") - add_versions("2.1.0", "95f9b23c92219ad2670389a23a4ed5723b7329c82c3d933b7047673ecdfc1fea") - add_versions("2.2.0", "bd1136d0a1554520dcb527a239655777148d90fd2d51cf02c36540afc552e6ec") add_versions("3.0.2", "c4b4c25a4eb81883448ff8924e6dba95c800094a198dc9ce66a292ac2ef8e018") - add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) - on_install(function (package) - io.writefile("miniz_export.h", "#define MINIZ_EXPORT") - io.writefile("xmake.lua", [[ - add_rules("mode.debug", "mode.release") - target("miniz") - set_kind("static") - add_files("miniz.c", "miniz_zip.c", "miniz_tinfl.c", "miniz_tdef.c") - add_headerfiles("miniz.h", "miniz_export.h", "miniz_common.h", "miniz_zip.h", "miniz_tinfl.h", "miniz_tdef.h") - ]]) - import("package.tools.xmake").install(package) + configs = {} + table.insert(configs, "-DBUILD_EXAMPLES=OFF") + table.insert(configs, "-DBUILD_TESTS=OFF") + table.insert(configs, "-DINSTALL_PROJECT=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) end) on_test(function (package) - assert(package:has_cfuncs("mz_compress", {includes = "miniz.h"})) + assert(package:has_cfuncs("mz_compress", {includes = "miniz/miniz.h"})) end) From 4571751e6d9ab0c5145863f0aadf12d767f5e6a0 Mon Sep 17 00:00:00 2001 From: Saikari Date: Sun, 5 Jan 2025 23:58:24 +0300 Subject: [PATCH 2/4] retry for android --- packages/m/miniz/xmake.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/m/miniz/xmake.lua b/packages/m/miniz/xmake.lua index 880eb4b5df2..01eb0a43634 100644 --- a/packages/m/miniz/xmake.lua +++ b/packages/m/miniz/xmake.lua @@ -9,10 +9,7 @@ package("miniz") add_versions("3.0.2", "c4b4c25a4eb81883448ff8924e6dba95c800094a198dc9ce66a292ac2ef8e018") on_install(function (package) - configs = {} - table.insert(configs, "-DBUILD_EXAMPLES=OFF") - table.insert(configs, "-DBUILD_TESTS=OFF") - table.insert(configs, "-DINSTALL_PROJECT=ON") + local configs = {"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW", "-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTS=OFF", "-DINSTALL_PROJECT=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) From 5af9e0af6ee4ccac6f76e3ac09ac61aeaf0e7554 Mon Sep 17 00:00:00 2001 From: Saikari Date: Sun, 5 Jan 2025 23:59:11 +0300 Subject: [PATCH 3/4] fix --- packages/m/miniz/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/m/miniz/xmake.lua b/packages/m/miniz/xmake.lua index 01eb0a43634..60cfa08f167 100644 --- a/packages/m/miniz/xmake.lua +++ b/packages/m/miniz/xmake.lua @@ -9,7 +9,7 @@ package("miniz") add_versions("3.0.2", "c4b4c25a4eb81883448ff8924e6dba95c800094a198dc9ce66a292ac2ef8e018") on_install(function (package) - local configs = {"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW", "-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTS=OFF", "-DINSTALL_PROJECT=ON") + local configs = {"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW", "-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTS=OFF", "-DINSTALL_PROJECT=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) From 1b029d68ad4fb00dbeb179fc19405967fe1cee03 Mon Sep 17 00:00:00 2001 From: Saikari Date: Mon, 6 Jan 2025 01:19:14 +0300 Subject: [PATCH 4/4] fmt --- packages/m/miniz/xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/m/miniz/xmake.lua b/packages/m/miniz/xmake.lua index 60cfa08f167..832e69c50f0 100644 --- a/packages/m/miniz/xmake.lua +++ b/packages/m/miniz/xmake.lua @@ -6,8 +6,11 @@ package("miniz") add_urls("https://github.com/richgel999/miniz/archive/refs/tags/$(version).tar.gz", "https://github.com/richgel999/miniz.git") + add_versions("3.0.2", "c4b4c25a4eb81883448ff8924e6dba95c800094a198dc9ce66a292ac2ef8e018") + add_deps("cmake") + on_install(function (package) local configs = {"-DCMAKE_POLICY_DEFAULT_CMP0057=NEW", "-DBUILD_EXAMPLES=OFF", "-DBUILD_TESTS=OFF", "-DINSTALL_PROJECT=ON"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))