Procházet zdrojové kódy

update tbb and embree (#472)

* update tbb

* update embree
Hoildkv před 4 roky
rodič
revize
15059b2640
2 změnil soubory, kde provedl 10 přidání a 2 odebrání
  1. 8 2
      packages/e/embree/xmake.lua
  2. 2 0
      packages/t/tbb/xmake.lua

+ 8 - 2
packages/e/embree/xmake.lua

@@ -4,14 +4,20 @@ package("embree")
     set_description("Intel® Embree is a collection of high-performance ray tracing kernels, developed at Intel.")
     set_license("Apache-2.0")
 
-    add_urls("https://github.com/embree/embree/archive/v$(version).tar.gz")
-    add_versions("3.12.1", "0c9e760b06e178197dd29c9a54f08ff7b184b0487b5ba8b8be058e219e23336e")
+    add_urls("https://github.com/embree/embree/archive/$(version).tar.gz",
+             "https://github.com/embree/embree.git")
+    add_versions("v3.12.1", "0c9e760b06e178197dd29c9a54f08ff7b184b0487b5ba8b8be058e219e23336e")
+    add_versions("v3.13.0", "4d86a69508a7e2eb8710d571096ad024b5174834b84454a8020d3a910af46f4f")
+
+    -- Not recommanded to build embree as a static library.
+    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
 
     add_deps("cmake", "tbb")
 
     on_install("macosx", "linux", "windows", function (package)
         local configs = {"-DBUILD_TESTING=OFF", "-DBUILD_DOC=OFF", "-DEMBREE_TUTORIALS=OFF", "-DEMBREE_ISPC_SUPPORT=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DEMBREE_STATIC_LIB=" .. (package:config("shared") and "OFF" or "ON"))
         if package:is_plat("windows") then
             table.insert(configs, "-DUSE_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))
         end

+ 2 - 0
packages/t/tbb/xmake.lua

@@ -8,10 +8,12 @@ package("tbb")
         add_urls("https://github.com/oneapi-src/oneTBB/releases/download/v$(version)-win.zip", {version = function (version) return version .. (version:ge("2021.0") and "/oneapi-tbb-" or "/tbb-") .. version end})
         add_versions("2020.3", "cda37eed5209746a79c88a658f8c1bf3782f58bd9f9f6ba0da3a16624a9bfaa1")
         add_versions("2021.2.0", "9be37b1cb604a5905db0a15b2b893d85579fd0b2f1024859e1f75e96d7331a02")
+        add_versions("2021.3.0", "90e2055cd4be55f79eedd3d50b2010bf05d1739309c4cdd219192d129e931093")
     else
         add_urls("https://github.com/oneapi-src/oneTBB/archive/v$(version).tar.gz")
         add_versions("2020.3", "ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3")
         add_versions("2021.2.0", "cee20b0a71d977416f3e3b4ec643ee4f38cedeb2a9ff015303431dd9d8d79854")
+        add_versions("2021.3.0", "8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e")
 
         add_patches("2021.2.0", path.join(os.scriptdir(), "patches", "2021.2.0", "gcc11.patch"), "181511cf4878460cb48ac0531d3ce8d1c57626d698e9001a0951c728fab176fb")