fix some packages (#314)

packages/b/box2d/xmake.lua

@@ -28,5 +28,5 @@ package("box2d")
             void test(int argc, char** argv) {
                 b2World world(b2Vec2(0.0f, -10.0f));
             }
-        ]]}, {configss = {languages = "c++11"}, includes = "box2d/box2d.h"}))
+        ]]}, {configs = {languages = "c++11"}, includes = "box2d/box2d.h"}))
     end)

packages/b/brynet/xmake.lua

@@ -20,5 +20,5 @@ package("brynet")
             void test(int argc, char** argv) {
                 auto service = brynet::net::TcpService::Create();
             }
-        ]]}, {configss = {languages = "c++17"}, includes = "brynet/net/TcpService.hpp"}))
+        ]]}, {configs = {languages = "c++17"}, includes = "brynet/net/TcpService.hpp"}))
     end)

packages/c/cgal/xmake.lua

@@ -10,12 +10,13 @@ package("cgal")
     add_configs("header_only", {description = "Use header only version.", default = true, type = "boolean"})
 
     add_deps("cmake")
-    add_deps("boost")
+    add_deps("boost", "eigen")
     if is_plat("macosx", "linux") then
         add_deps("gmp", "mpfr")
     end
 
     on_load("windows", function (package)
+        package:add("defines", "CGAL_NO_GMP")
         if not package:config("header_only") then
             raise("Non-header-only version is not supported yet!")
         end
@@ -35,7 +36,7 @@ package("cgal")
     end)
 
     on_test(function (package)
-        package:check_cxxsnippets({test = [[
+        assert(package:check_cxxsnippets({test = [[
             #include <vector>
             void test() {
                 using K = CGAL::Epick_d<CGAL::Dynamic_dimension_tag>;
@@ -43,5 +44,5 @@ package("cgal")
                 DT::Point p;
                 std::vector<DT::Point> points;
             }
-        ]]}, {config = {languages = "c++14"}, includes = {"CGAL/Epick_d.h", "CGAL/Delaunay_triangulation.h"}})
+        ]]}, {configs = {languages = "c++14"}, includes = {"CGAL/Epick_d.h", "CGAL/Delaunay_triangulation.h"}}))
     end)

packages/i/icu4c/xmake.lua

@@ -6,6 +6,7 @@ package("icu4c")
     add_urls("https://github.com/unicode-org/icu/releases/download/release-$(version)-src.tgz", {version = function (version)
             return (version:gsub("%.", "-")) .. "/icu4c-" .. (version:gsub("%.", "_"))
         end})
+    add_versions("68.2", "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625")
     add_versions("68.1", "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d")
     add_versions("64.2", "627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c")
 

packages/m/mpfr/xmake.lua

@@ -9,7 +9,8 @@ package("mpfr")
 
     add_deps("gmp")
     on_install("macosx", "linux", function (package)
-        local configs = {"--disable-dependency-tracking", "--with-pic"}
+        local configs = {"--disable-dependency-tracking"}
+        table.insert(configs, "--with-gmp=" .. package:dep("gmp"):installdir())
         if package:config("shared") then
             table.insert(configs, "--enable-shared=yes")
             table.insert(configs, "--enable-static=no")
@@ -17,6 +18,9 @@ package("mpfr")
             table.insert(configs, "--enable-static=yes")
             table.insert(configs, "--enable-shared=no")
         end
+        if package:config("pic") then
+            table.insert(configs, "--with-pic")
+        end
         import("package.tools.autoconf").install(package, configs)
     end)
 

packages/o/opencv/xmake.lua

@@ -10,12 +10,14 @@ package("opencv")
     add_versions("3.4.9", "b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a")
 
     add_deps("cmake", "python 3.x", {kind = "binary"})
+    add_deps("zlib")
 
     if is_plat("macosx") then
         add_frameworks("Foundation", "CoreFoundation", "CoreGraphics", "AppKit", "OpenCL")
     elseif is_plat("linux") then
-        add_deps("zlib")
         add_syslinks("pthread", "dl")
+    elseif is_plat("windows") then
+        add_syslinks("gdi32", "user32", "advapi32", "comdlg32")
     end
 
     add_resources("4.5.1", "opencv_contrib", "https://github.com/opencv/opencv_contrib/archive/4.5.1.tar.gz", "12c3b1ddd0b8c1a7da5b743590a288df0934e5cef243e036ca290c2e45e425f5")