Skip to content

Commit 4e482c1

Browse files
committed
Build FFmpeg for Windows / ARM64
1 parent 34eae0b commit 4e482c1

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.github/workflows/build-ffmpeg.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,25 @@ jobs:
2626
- os: macos-13
2727
arch: x86_64
2828
shell: bash
29+
- os: ubuntu-24.04-arm
30+
arch: aarch64
31+
shell: bash
2932
- os: ubuntu-24.04
3033
arch: i686
3134
shell: bash
3235
- os: ubuntu-24.04
3336
arch: x86_64
3437
shell: bash
38+
- os: windows-11-arm
39+
arch: ARM64
40+
shell: 'msys2 {0}'
41+
msys_prefix: mingw-w64-clang-aarch64
42+
msys_system: CLANGARM64
3543
- os: windows-latest
3644
arch: AMD64
3745
shell: 'msys2 {0}'
38-
- os: ubuntu-24.04-arm
39-
arch: aarch64
40-
shell: bash
46+
msys_prefix: mingw-w64-x86_64
47+
msys_system: MINGW64
4148
defaults:
4249
run:
4350
shell: ${{ matrix.shell }}
@@ -55,10 +62,11 @@ jobs:
5562
brew update
5663
brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
5764
- uses: msys2/setup-msys2@v2
58-
if: matrix.os == 'windows-latest'
65+
if: matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm'
5966
with:
60-
install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm openssl-devel
67+
install: base-devel openssl-devel ${{ matrix.msys_prefix }}-cc ${{ matrix.msys_prefix }}-gperf ${{ matrix.msys_prefix }}-nasm
6168
path-type: inherit
69+
msystem: ${{ matrix.msys_system }}
6270
release: false
6371
- name: Build FFmpeg
6472
env:

scripts/cibuildpkg.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def get_platform() -> str:
3232
elif system == "Darwin":
3333
return f"macosx_{machine}"
3434
elif system == "Windows":
35-
if struct.calcsize("P") * 8 == 64:
35+
if machine == "ARM64":
36+
return "win_arm64"
37+
elif struct.calcsize("P") * 8 == 64:
3638
return "win_amd64"
3739
else:
3840
return "win32"

0 commit comments

Comments
 (0)