Skip to content

Commit 6bf4c2a

Browse files
committed
Enable parallel building for Windows
1 parent 20ba460 commit 6bf4c2a

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.github/workflows/build-ffmpeg.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,18 @@ jobs:
8787
path: output/
8888

8989
cross-build:
90-
runs-on: ${{ matrix.os }}
90+
runs-on: ubuntu-24.04
9191
strategy:
9292
fail-fast: false
9393
matrix:
94-
os: [ "ubuntu-24.04" ]
9594
build: [ "manylinux_", "musllinux_" ]
9695
# arch: [ "loongarch64", "ppc64le", "riscv64", "s390x" ]
9796
arch: [ "ppc64le" ]
9897
steps:
9998
- uses: actions/checkout@v6
10099
- uses: actions/setup-python@v6
101100
with:
102-
python-version: "3.13"
101+
python-version: "3.14"
103102
- uses: docker/setup-qemu-action@v3
104103
- name: Build FFmpeg
105104
env:

scripts/build-ffmpeg.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@ def calculate_sha256(filename: str) -> str:
154154
name="opencore-amr",
155155
source_url="https://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-0.1.6.tar.gz",
156156
sha256="483eb4061088e2b34b358e47540b5d495a96cd468e361050fae615b1809dc4a1",
157-
# parallel build hangs on Windows
158-
build_parallel=plat != "Windows",
157+
build_arguments=["--disable-dependency-tracking"],
159158
when=When.community_only,
160159
),
161160
Package(
@@ -164,7 +163,7 @@ def calculate_sha256(filename: str) -> str:
164163
sha256="6eeb82934e69fd51e043bd8c5b0d152839638d1ce7aa4eea65a3fedcf83ff224",
165164
# assembly contains textrels which are not supported by musl
166165
build_arguments=(
167-
"--disable-lsmash --disable-swscale --disable-ffms --enable-strip" + (" --disable-asm" if is_musllinux else "")
166+
"--disable-cli --disable-lsmash --disable-swscale --disable-ffms --enable-strip" + (" --disable-asm" if is_musllinux else "")
168167
).split(" "),
169168
),
170169
Package(
@@ -216,8 +215,6 @@ def calculate_sha256(filename: str) -> str:
216215
name="ffmpeg",
217216
source_url="https://ffmpeg.org/releases/ffmpeg-8.0.1.tar.xz",
218217
sha256="05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41",
219-
build_arguments=[],
220-
build_parallel=plat != "Windows",
221218
)
222219

223220

0 commit comments

Comments
 (0)