Przeglądaj źródła

dav1d: add 1.4.3 version (#4676)

* dav1d: support windows arm64

* fix xmake.lua

* fix tools

* fix bsd syslinks
star9029 1 rok temu
rodzic
commit
7d1fe84677
1 zmienionych plików z 23 dodań i 10 usunięć
  1. 23 10
      packages/d/dav1d/xmake.lua

+ 23 - 10
packages/d/dav1d/xmake.lua

@@ -1,30 +1,43 @@
 package("dav1d")
-
     set_homepage("https://www.videolan.org/projects/dav1d.html")
     set_description("dav1d is a new AV1 cross-platform decoder, open-source, and focused on speed, size and correctness.")
     set_license("BSD-2-Clause")
 
-    add_urls("https://downloads.videolan.org/pub/videolan/dav1d/$(version)/dav1d-$(version).tar.xz")
-    add_versions("0.9.0", "cfae88e8067c9b2e5b96d95a7a00155c353376fe9b992a96b4336e0eab19f9f6")
+    add_urls("https://downloads.videolan.org/pub/videolan/dav1d/$(version)/dav1d-$(version).tar.xz",
+             "https://code.videolan.org/videolan/dav1d.git")
+
+    add_versions("1.4.3", "42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19")
     add_versions("1.1.0", "fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1")
+    add_versions("0.9.0", "cfae88e8067c9b2e5b96d95a7a00155c353376fe9b992a96b4336e0eab19f9f6")
+
+    add_configs("tools", {description = "Build tools", default = false, type = "boolean"})
 
     add_deps("nasm", "meson", "ninja")
-    if is_plat("linux") then
+    if is_plat("linux", "bsd") then
         add_syslinks("pthread", "dl")
     end
 
-    on_install("windows", "macosx", "linux|x86_64", function (package)
+    on_install("!android and !wasm", function (package)
+        import("package.tools.meson")
+
         local configs = {"-Denable_tests=false"}
         table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
-        if package:is_plat("windows") and package:is_cross() then
-            table.insert(configs, "-Denable_asm=false") -- arm asm requires bash and gas-preprocessor
+        table.insert(configs, "-Denable_tools=" .. (package:config("tools") and "true" or "false"))
+        if package:config("tools") then
+            package:addenv("PATH", "bin")
+        end
+
+        local opt = {}
+        opt.envs = meson.buildenvs(package)
+        -- add gas-preprocessor to PATH
+        if package:is_plat("windows") and package:is_arch("arm.*") then
+            opt.envs.PATH = path.join(os.programdir(), "scripts") .. path.envsep() .. opt.envs.PATH
         end
-        import("package.tools.meson").install(package, configs)
-        package:addenv("PATH", "bin")
+        meson.install(package, configs, opt)
     end)
 
     on_test(function (package)
-        if not package:is_cross() then
+        if package:config("tools") and (not package:is_cross()) then
             os.vrun("dav1d -v")
         end
         assert(package:has_cfuncs("dav1d_default_settings", {includes = "dav1d/dav1d.h"}))