Browse Source

usd: update version (#4909)

* usd: update version

* tbb: fix check

* usd: improve xmake.lua

* tbb: fix check
star9029 1 year ago
parent
commit
953520f9a1
2 changed files with 11 additions and 5 deletions
  1. 3 2
      packages/t/tbb/xmake.lua
  2. 8 3
      packages/u/usd/xmake.lua

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

@@ -50,8 +50,9 @@ package("tbb")
 
     if on_check then
         on_check("macosx", function (package)
-            assert(package:is_arch("arm64") and package:version():ge("2021.0"),
-                "package(tbb <2021.0) unsupported version on macosx/arm64")
+            if package:is_arch("arm64") then
+                assert(package:version():ge("2021.0"), "package(tbb/arm64 <2021.0) unsupported version on macosx")
+            end
         end)
     end
 

+ 8 - 3
packages/u/usd/xmake.lua

@@ -1,9 +1,14 @@
 package("usd")
     set_homepage("http://www.openusd.org")
     set_description("Universal Scene Description")
+    set_license("Apache-2.0")
 
     add_urls("https://github.com/PixarAnimationStudios/USD/archive/refs/tags/$(version).tar.gz",
              "https://github.com/PixarAnimationStudios/USD.git")
+
+    add_versions("v24.08", "6640bb184bf602c6df14fa4a83af6ac5ae1ab8d1d38cf7bb7decfaa9a7ad5d06")
+    add_versions("v24.05", "0352619895588efc8f9d4aa7004c92be4e4fa70e1ccce77e474ce23941c05828")
+    add_versions("v24.03", "0724421cff8ae04d0a7108ffa7c104e6ec3f7295418d4d50caaae767e59795ef")
     add_versions("v23.02", "a8eefff722db0964ce5b11b90bcdc957f3569f1cf1d44c46026ecd229ce7535d")
     add_versions("v22.11", "f34826475bb9385a9e94e2fe272cc713f517b987cbea15ee6bbc6b21db19aaae")
 
@@ -18,7 +23,7 @@ package("usd")
         add_defines("NOMINMAX")
     end
 
-    on_install("linux", "macosx", "windows|x64", function (package)
+    on_install("linux", "macosx|x86_64", "windows|x64", function (package)
         local configs = {
             "-DTBB_USE_DEBUG_BUILD=OFF",
             "-DPXR_BUILD_ALEMBIC_PLUGIN=OFF",
@@ -34,7 +39,7 @@ package("usd")
             "-DPXR_BUILD_USD_TOOLS=OFF",
             "-DPXR_BUILD_MONOLITHIC=" .. (package:config("monolithic") and "ON" or "OFF")
         }
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_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)
@@ -45,4 +50,4 @@ package("usd")
                 auto stage = pxr::UsdStage::CreateInMemory();
             }
         ]]}, {configs = {languages = "c++17"}, includes = "pxr/usd/usd/stage.h"}))
-    end)
+    end)