Browse Source

add qhull (#356)

* add qhull

* update openjpeg

* support pic
Hoildkv 4 năm trước cách đây
mục cha
commit
04c58c8b96
3 tập tin đã thay đổi với 27 bổ sung2 xóa
  1. 2 2
      packages/l/libtiff/xmake.lua
  2. 1 0
      packages/o/openjpeg/xmake.lua
  3. 24 0
      packages/q/qhull/xmake.lua

+ 2 - 2
packages/l/libtiff/xmake.lua

@@ -8,11 +8,11 @@ package("libtiff")
     add_versions("v4.1.0", "fddd8838e7e57ba20a93b17706c3f9fe68c8711a6321f04b9ce9a9c24196ac74")
     add_versions("v4.2.0", "f87463ac8984b43e8dd84a04c14816f5f217796d9f1f459756239c499857e75a")
 
-    add_deps("zlib", "libjpeg")
+    add_deps("zlib")
     add_deps("cmake")
 
     on_install("windows", "mingw", "macosx", "linux", "bsd", function (package)
-        local configs = {"-Dzstd=OFF", "-Dlzma=OFF", "-Dwebp=OFF", "-Djpeg12=OFF", "-Djbig=OFF", "-Dpixarlog=OFF"}
+        local configs = {"-Dzstd=OFF", "-Dlzma=OFF", "-Dwebp=OFF", "-Djpeg=OFF", "-Djbig=OFF", "-Dpixarlog=OFF"}
         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")

+ 1 - 0
packages/o/openjpeg/xmake.lua

@@ -7,6 +7,7 @@ package("openjpeg")
     add_urls("https://github.com/uclouvain/openjpeg/archive/v$(version).tar.gz",
              "https://github.com/uclouvain/openjpeg.git")
     add_versions("2.3.1", "63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9")
+    add_versions("2.4.0", "8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d")
 
     add_deps("cmake")
     add_deps("lcms", "libtiff", "libpng")

+ 24 - 0
packages/q/qhull/xmake.lua

@@ -0,0 +1,24 @@
+package("qhull")
+
+    set_homepage("http://www.qhull.org/")
+    set_description("Qhull computes the convex hull, Delaunay triangulation, Voronoi diagram, halfspace intersection about a point, furthest-site Delaunay triangulation, and furthest-site Voronoi diagram.")
+
+    add_urls("https://github.com/qhull/qhull/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/qhull/qhull.git")
+    add_versions("2020.2", "59356b229b768e6e2b09a701448bfa222c37b797a84f87f864f97462d8dbc7c5")
+
+    add_deps("cmake")
+    on_install("windows", "macosx", "linux", "mingw", 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"))
+        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")
+        end
+        import("package.tools.cmake").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("qh_addpoint", {includes = "libqhull/libqhull.h"}))
+    end)