Jelajahi Sumber

improve ffmpeg (#1838)

* improve ffmpeg

* Update xmake.lua
ruki 2 tahun lalu
induk
melakukan
45ce8c5c7f
1 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 3 3
      packages/f/ffmpeg/xmake.lua

+ 3 - 3
packages/f/ffmpeg/xmake.lua

@@ -81,7 +81,7 @@ package("ffmpeg")
         end)
     end
 
-    on_load("linux", "macos", "android", function (package)
+    on_load("linux", "macosx", "android", function (package)
         local configdeps = {zlib    = "zlib",
                             bzlib   = "bzip2",
                             lzma    = "xz",
@@ -94,7 +94,7 @@ package("ffmpeg")
             end
         end
         -- https://www.ffmpeg.org/platform.html#toc-Advanced-linking-configuration
-        if package:config("pic") ~= false then
+        if package:config("pic") ~= false and not package:is_plat("macosx") then
             package:add("shflags", "-Wl,-Bsymbolic")
             package:add("ldflags", "-Wl,-Bsymbolic")
         end
@@ -116,7 +116,7 @@ package("ffmpeg")
         if package:config("gpl") then
             table.insert(configs, "--enable-gpl")
         end
-        if is_plat("macosx") and macos.version():ge("10.8") then
+        if package:is_plat("macosx") and macos.version():ge("10.8") then
             table.insert(configs, "--enable-videotoolbox")
         end
         for name, enabled in pairs(package:configs()) do