Build FFmpeg for Windows / ARM64

.github/workflows/build-ffmpeg.yml

@@ -26,18 +26,25 @@ jobs:
           - os: macos-13
             arch: x86_64
             shell: bash
+          - os: ubuntu-24.04-arm
+            arch: aarch64
+            shell: bash
           - os: ubuntu-24.04
             arch: i686
             shell: bash
           - os: ubuntu-24.04
             arch: x86_64
             shell: bash
+          - os: windows-11-arm
+            arch: ARM64
+            shell: 'msys2 {0}'
+            msys_prefix: mingw-w64-clang-aarch64
+            msys_system: CLANGARM64
           - os: windows-latest
             arch: AMD64
             shell: 'msys2 {0}'
-          - os: ubuntu-24.04-arm
-            arch: aarch64
-            shell: bash
+            msys_prefix: mingw-w64-x86_64
+            msys_system: MINGW64
     defaults:
       run:
         shell: ${{ matrix.shell }}
@@ -55,11 +62,11 @@ jobs:
           brew update
           brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
       - uses: msys2/setup-msys2@v2
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm'
         with:
-          install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm openssl-devel
-          path-type: inherit
-          release: false
+          install: base-devel openssl-devel ${{ matrix.msys_prefix }}-gcc ${{ matrix.msys_prefix }}-gperf ${{ matrix.msys_prefix }}-nasm
+          msystem: ${{ matrix.msys_system }}
+          #path-type: inherit
       - name: Build FFmpeg
         env:
           CIBW_ARCHS: ${{ matrix.arch }}

scripts/build-ffmpeg.py

@@ -336,10 +336,6 @@ def main():
     builder = Builder(dest_dir=dest_dir)
     builder.create_directories()
 
-    # Fix winpthreads breakage until the fix reaches msys2 repos.
-    if plat == "Windows":
-        run(["patch", "-d", "C:/msys64/mingw64", "-i", os.path.join(builder.patch_dir, "winpthreads.patch"), "-p3"])
-
     # install packages
     available_tools = set()
     if plat == "Windows":

scripts/cibuildpkg.py

@@ -32,7 +32,9 @@ def get_platform() -> str:
     elif system == "Darwin":
         return f"macosx_{machine}"
     elif system == "Windows":
-        if struct.calcsize("P") * 8 == 64:
+        if machine == "ARM64":
+            return "win_arm64"
+        elif struct.calcsize("P") * 8 == 64:
             return "win_amd64"
         else:
             return "win32"