improve ffmpeg

5 years ago · 0686ea00ea
parent fb8b899763
commit 0686ea00ea
2 changed files with 5 additions and 5 deletions
--- a/packages/f/ffmpeg/xmake.lua
+++ b/packages/f/ffmpeg/xmake.lua
@ -76,7 +76,7 @@ package("ffmpeg")
                cpu = "armv8-a"
                triple = "aarch64-linux-android"
                cross_prefix = path.join(bin, "aarch64-linux-android-")
-            elseif package:is_arch("armv7-a") then
+            elseif package:arch():startswith("arm") then
                arch = "arm"
                cpu = "armv7-a"
                triple = "armv7a-linux-androideabi"
@ -92,7 +92,7 @@ package("ffmpeg")
                table.insert(cflags, "-mfpu=neon")
                table.insert(cflags, "-mfloat-abi=soft")
            else
-                table.insert(cflags, "-mfpu=vfpv3-d16")
+                table.insert(cflags, "-mfpu=neon")
                table.insert(cflags, "-mfloat-abi=soft")
            end
            table.insert(configs, "--enable-neon")
--- a/scripts/packages.lua
+++ b/scripts/packages.lua
@ -22,9 +22,9 @@ function _is_supported(instance, plat, arch, opt)
        -- `@linux|x86_64`
        -- `@macosx,linux`
        -- `android@macosx,linux`
-        -- `android|armv7-a@macosx,linux`
-        -- `android|armv7-a@macosx,linux|x86_64`
-        -- `android|armv7-a@linux|x86_64`
+        -- `android|armeabi-v7a@macosx,linux`
+        -- `android|armeabi-v7a@macosx,linux|x86_64`
+        -- `android|armeabi-v7a@linux|x86_64`
        --
        for _pattern, _script in pairs(script) do
            local hosts = {}