Browse Source

Merge pull request #1118 from xq114/dev

add kuba-zip
ruki 3 years ago
parent
commit
788d1377bb

+ 1 - 0
packages/e/expat/xmake.lua

@@ -5,6 +5,7 @@ package("expat")
     set_license("MIT")
 
     set_urls("https://github.com/libexpat/libexpat/releases/download/R_$(version).tar.bz2", {version = function (version) return version:gsub("%.", "_") .. "/expat-" .. version end})
+    add_versions("2.4.8", "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16")
     add_versions("2.4.7", "e149bdd8b90254c62b3d195da53a09bd531a4d63a963b0d8a5268d48dd2f6a65")
     add_versions("2.4.5", "fbb430f964c7a2db2626452b6769e6a8d5d23593a453ccbc21701b74deabedff")
     add_versions("2.4.1", "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40")

+ 1 - 0
packages/f/freetype/xmake.lua

@@ -6,6 +6,7 @@ package("freetype")
     set_urls("https://downloads.sourceforge.net/project/freetype/freetype2/$(version)/freetype-$(version).tar.gz",
              "https://download.savannah.gnu.org/releases/freetype/freetype-$(version).tar.gz",
              "https://gitlab.freedesktop.org/freetype/freetype.git")
+    add_versions("2.11.1", "f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b")
     add_versions("2.11.0", "a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f")
     add_versions("2.10.4", "5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac")
     add_versions("2.9.1", "ec391504e55498adceb30baceebd147a6e963f636eb617424bcfc47a169898ce")

+ 26 - 0
packages/k/kuba-zip/xmake.lua

@@ -0,0 +1,26 @@
+package("kuba-zip")
+
+    set_homepage("https://github.com/kuba--/zip")
+    set_description("A portable, simple zip library written in C")
+
+    add_urls("https://github.com/kuba--/zip/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/kuba--/zip.git")
+    add_versions("v0.2.2", "f278b1da5e5382c7a1a1db1502cfa1f6df6b1e05e36253d661344d30277f9895")
+
+    add_deps("cmake")
+    on_load("windows", "mingw@windows", function (package)
+        if package:config("shared") then
+            package:add("defines", "ZIP_SHARED")
+        end
+    end)
+
+    on_install("windows", "macosx", "linux", "mingw@windows", function (package)
+        local configs = {"-DCMAKE_DISABLE_TESTING=ON", "-DZIP_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"))
+        import("package.tools.cmake").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("zip_open", {includes = "zip/zip.h"}))
+    end)

+ 4 - 1
packages/v/vcglib/xmake.lua

@@ -1,13 +1,16 @@
 package("vcglib")
 
+    set_kind("library", {headeronly = true})
     set_homepage("http://www.vcglib.net/")
     set_description("The Visualization and Computer Graphics Library (VCG for short) is a open source portable C++ templated library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes.")
     set_license("GPL-3.0")
 
-    add_urls("https://github.com/cnr-isti-vclab/vcglib/archive/refs/tags/$(version).tar.gz")
+    add_urls("https://github.com/cnr-isti-vclab/vcglib/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/cnr-isti-vclab/vcglib.git")
     add_versions("2020.12", "731c57435e39c4b958a1d766cadd9865d9db35e36410708f2da7818e9fa5f786")
     add_versions("2021.07", "384bb4bb86b4114391cbc0fb8990f218473a656d06f2214bcc3725dac193db1c")
     add_versions("2021.10", "a443a4a63c0f6691229c80aa22a15f17ab7d9da2b0b6a5111cf39aee86632d5a")
+    add_versions("2022.02", "724f5ef6ab9b9d21ff2e9e965c2ce909cc024b29f2aa7d39e2974b28ff25bc3f")
 
     add_deps("eigen")
     on_install("windows", "macosx", "linux", function (package)