Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
CIBW_ARCHS: ${{ matrix.msys_system == 'CLANGARM64' && 'ARM64' || (matrix.msys_prefix && 'AMD64' || matrix.arch) }}
CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor
CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor
CIBW_BUILD: cp311-*
CIBW_BUILD: cp312-*
CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair --exclude libmvec.so.1 --exclude libmvec-2.so --exclude libmvec.so --exclude libmvec -w {dest_dir} {wheel}
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel}
CIBW_TEST_COMMAND: python -c "import dummy"
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
CIBW_ARCHS: ${{ matrix.arch }}
CIBW_BEFORE_ALL_LINUX: ./scripts/install-static-clang.sh
CIBW_BEFORE_BUILD_LINUX: python scripts/build-ffmpeg.py /tmp/vendor
CIBW_BUILD: cp311-${{ matrix.build }}${{ matrix.arch }}
CIBW_BUILD: cp312-${{ matrix.build }}${{ matrix.arch }}
CIBW_ENVIRONMENT_LINUX: >
CC="/opt/clang/bin/clang"
CXX="/opt/clang/bin/clang++"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Currently FFmpeg 9.0.2 is built with the following packages enabled for all plat
- [bwlame](https://github.com/basswood-io/bwlame) 4.1.0
- opus 1.6.1
- dav1d 1.5.4
- libsvtav1 4.2.0
- libsvtav1 4.3.0
- vpx 1.17.0
- webp 1.6.0
- libvmaf 3.2.1
Expand Down
11 changes: 6 additions & 5 deletions scripts/cibuildpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,19 @@ def _build_x265(self, package: Package) -> None:
# builds in dummy directory
dummy_install_path = os.path.join(package_path, "dummy_install_path")

# For 10/12 bits version, only x86_64 has assembly instructions available
# For 10/12 bits version, only x86_64 and AArch64 have assembly
# instructions available.
flags_high_bits = []

disable_sve = platform.system() == "Linux" and platform.machine() == "aarch64"
if platform.machine() not in {"x86_64", "amd64"}:
if platform.machine().lower() not in {"x86_64", "amd64", "arm64", "aarch64"}:
flags_high_bits.append("-DENABLE_ASSEMBLY=0")
flags_high_bits.append("-DENABLE_ALTIVEC=0")

if disable_sve:
flags_high_bits.append("-DENABLE_SVE2=OFF")
if disable_sve:
flags_high_bits.append("-DENABLE_SVE2=OFF")

# x265 greps /proc/cpuinfo for NEON, which reports the aarch64 host's
# x265 greps /proc/cpuinfo for NEON, which reports the AArch64 host's
# flags ("asimd") inside the 32-bit ARM container. Its NEON .S files are
# assembled regardless, so tell it NEON is there or they get -mfpu=vfp.
arm32_flags = (
Expand Down
4 changes: 2 additions & 2 deletions scripts/pkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def __lt__(self, other):
),
Package(
name="libsvtav1",
source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v4.2.0/SVT-AV1-v4.2.0.tar.bz2",
sha256="512f2ea5649e3e76c2dddcc25c2556fb67a9582baaab207c9c96161c94659dad",
source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v4.3.0/SVT-AV1-v4.3.0.tar.bz2",
sha256="9223ce06e6172ad41357ed23b3b00f036e03794b86b0e20ea9ccb3f648b8955d",
build_system="cmake",
build_arguments=["-DBUILD_APPS=OFF", "-DBUILD_DEC=OFF", "-DBUILD_ENC=ON", "-DENABLE_NASM=ON"],
),
Expand Down
Loading