Skip to content

Commit 9acd7d2

Browse files
committed
Don't need gperf
1 parent 8eb27bb commit 9acd7d2

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

.github/workflows/build-ffmpeg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- uses: msys2/setup-msys2@v2
6565
if: matrix.os == 'windows-latest'
6666
with:
67-
install: base-devel openssl-devel ${{ matrix.msys_prefix }}-gcc ${{ matrix.msys_prefix }}-gperf ${{ matrix.msys_prefix }}-nasm
67+
install: base-devel openssl-devel ${{ matrix.msys_prefix }}-gcc ${{ matrix.msys_prefix }}-nasm
6868
msystem: ${{ matrix.msys_system }}
6969
path-type: inherit
7070
- name: Build FFmpeg

scripts/build-ffmpeg.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -328,27 +328,18 @@ def main():
328328
# install packages
329329
available_tools = set()
330330
if plat == "Windows":
331-
available_tools.update(["gperf", "nasm"])
331+
available_tools.update(["nasm"])
332332

333333
# print tool locations
334334
print("PATH", os.environ["PATH"])
335-
for tool in ["gcc", "g++", "curl", "gperf", "ld", "nasm", "pkg-config"]:
335+
for tool in ["gcc", "g++", "curl", "ld", "nasm", "pkg-config"]:
336336
run(["where", tool])
337337

338338
with log_group("install python packages"):
339339
run(["pip", "install", "cmake==3.31.10", "meson", "ninja"])
340340

341341
# build tools
342342
build_tools = []
343-
if "gperf" not in available_tools:
344-
build_tools.append(
345-
Package(
346-
name="gperf",
347-
source_url="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz",
348-
sha256="588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2",
349-
)
350-
)
351-
352343
if "nasm" not in available_tools and platform.machine() not in {"arm64", "aarch64"}:
353344
build_tools.append(
354345
Package(

0 commit comments

Comments
 (0)