ruki vor 5 Jahren
Ursprung
Commit
0686ea00ea
2 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 2 2
      packages/f/ffmpeg/xmake.lua
  2. 3 3
      scripts/packages.lua

+ 2 - 2
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")

+ 3 - 3
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 = {}