update cef (#502)

* update cef

* fix cef

packages/c/cef/port/xmake.lua

@@ -1,5 +1,5 @@
 add_rules("mode.release", "mode.debug")
-target("cef")
+target("cef_dll_wrapper")
     set_kind("static")
     add_files("libcef_dll/**.cc|ctocpp/test/**.cc|cpptoc/test/**.cc")
     add_includedirs(".")

packages/c/cef/xmake.lua

@@ -4,47 +4,47 @@ package("cef")
     set_description("Chromium Embedded Framework (CEF). A simple framework for embedding Chromium-based browsers in other applications.")
     set_license("BSD-3-Clause")
 
+    local buildver = {
+        ["88.2.1"]  = "88.2.1+g0b18d0b+chromium-88.0.4324.146",
+        ["88.2.9"]  = "88.2.9+g5c8711a+chromium-88.0.4324.182",
+        ["90.5.3"]  = "90.5.3+gaf0e862+chromium-90.0.4430.72",
+        ["91.1.22"] = "91.1.22+gc67b5dd+chromium-91.0.4472.124"
+    }
+  
     if is_plat("windows") then
+        add_urls("https://cef-builds.spotifycdn.com/cef_binary_$(version).tar.bz2", {version = function (version)
+            return format("%s_windows%s", buildver[tostring(version)], (is_arch("x64") and "64" or "32"))
+        end})
         if is_arch("x64") then
+            add_versions("91.1.22", "a01dd3f996061a8d0ddc1a2ab211340f9b3bb890eef3606329579b43101607dc")
             add_versions("90.5.3", "d92abe3e3d3aa2aa7bf25669fe7cb59a0232ee9eb14ad4f1ea60334f9485d0ef")
             add_versions("88.2.9", "86c01e38e7b7d59fed8a1e1ab2c3bfbcc1db42e21f8a6e6feb4061b2af7b1b7d")
             add_versions("88.2.1", "8ed01da6327258536c61ada46e14157149ce727e7729ec35a30b91b3ad3cf555")
         else
+            add_versions("91.1.22", "9f9ab6787f2d35024238aceab5d1eccf49e19e8bfe2519ca96610fe2bbe82ad1")
             add_versions("90.5.3", "8e49009a543273319ae51d58e1b78a1695f3864c5773cdfdf7f5994810d0874d")
             add_versions("88.2.9", "90c15421d6d7b970ca839b746d8e85c09f449ae37d87d07f42dd45dfe16df455")
             add_versions("88.2.1", "f608e4028478d4c87541c679f5cfe42bda0d459a80ee26acfe93f634c25e96ab")
         end
+        add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MT", type = "string", readonly = true})
     end
 
-    set_urls("https://cef-builds.spotifycdn.com/cef_binary_$(version).tar.bz2", {version = function (version)
-        if version:eq("88.2.1") then
-            return "88.2.1+g0b18d0b+chromium-88.0.4324.146_windows" .. (is_arch("x64") and "64" or "32")
-        elseif version:eq("88.2.9") then
-            return "88.2.9+g5c8711a+chromium-88.0.4324.182_windows" .. (is_arch("x64") and "64" or "32")
-        elseif version:eq("90.5.3") then
-            return "90.5.3+gaf0e862+chromium-90.0.4430.72_windows" .. (is_arch("x64") and "64" or "32")
-        end
-        return ""
-    end})
-
-    add_includedirs(".", "include")
-
+    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true})
+    
     if is_plat("windows") then
-        add_syslinks("user32", "advapi32")
+        add_syslinks("user32", "advapi32", "shlwapi", "comctl32", "rpcrt4")
     end
+    add_includedirs(".", "include")
 
     on_install("windows", function (package)
-        assert(package:config("vs_runtime") == "MT" and not package:config("shared"), "only support static library with MT")
-        package:addenv("PATH", "bin")
         local distrib_type = package:debug() and "Debug" or "Release"
         os.cp(path.join(distrib_type, "*.lib"), package:installdir("lib"))
         os.cp(path.join(distrib_type, "*.dll"), package:installdir("bin"))
-        os.cp(path.join(distrib_type, "swiftshader", "*.dll"), package:installdir("bin/swiftshader"))
+        os.cp(path.join(distrib_type, "swiftshader", "*.dll"), package:installdir("bin", "swiftshader"))
         os.cp(path.join(distrib_type, "*.bin"), package:installdir("bin"))
         os.cp("Resources/*", package:installdir("bin"))
-        local configs = {}
         os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua")
-        import("package.tools.xmake").install(package, configs)
+        import("package.tools.xmake").install(package)
     end)
 
     on_test(function (package)

packages/f/flann/xmake.lua

@@ -47,21 +47,17 @@ package("flann")
             end
             target("flann")
                 set_kind("$(kind)")
+                add_rules("utils.install.cmake_importfiles")
                 add_files("flann/flann.cpp")
                 add_includedirs(".")
                 add_includedirs("flann")
                 add_packages("lz4")
                 add_headerfiles("(flann/config.h)", "(flann/defines.h)", "(flann/flann.h)")
                 add_headerfiles("(flann/flann.hpp)", "(flann/general.h)", "(flann/algorithms/*.h)", "(flann/io/*.h)", "(flann/nn/*.h)", "(flann/util/*.h)")
-            target("flann_cpp") -- for cmake finding only
-                set_kind("$(kind)")
-                add_files("flann/flann_cpp.cpp")
-                add_includedirs(".")
-                add_includedirs("flann")
-                add_packages("lz4")
             target("flann_cuda")
                 set_enabled(%s)
                 set_kind("$(kind)")
+                add_rules("utils.install.cmake_importfiles")
                 add_files("flann/algorithms/*.cu")
                 add_defines("FLANN_USE_CUDA")
                 add_includedirs(".")