From 88b6f44135e2f87691914778f6c51c6c0c07eb89 Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Sun, 28 Sep 2025 11:44:16 -0400 Subject: [PATCH] Exclude libmvec --- .github/workflows/build-ffmpeg.yml | 10 +++++----- scripts/build-ffmpeg.py | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index eed678c1..be6dd601 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -23,7 +23,7 @@ jobs: - os: macos-14 arch: arm64 shell: bash - - os: macos-13 + - os: macos-15-intel arch: x86_64 shell: bash - os: ubuntu-24.04-arm @@ -49,10 +49,10 @@ jobs: with: python-version: "3.13" - name: Set deployment target - if: matrix.os == 'macos-13' || matrix.os == 'macos-14' - run: echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV + if: runner.os == 'macOS' + run: echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV - name: Install packages for macOS - if: matrix.os == 'macos-13' || matrix.os == 'macos-14' + if: runner.os == 'macOS' run: | brew update brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound @@ -68,7 +68,7 @@ jobs: CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor --community CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor --community CIBW_BUILD: cp311-* - CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel} + 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" run: | diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 6941eb32..ef98c326 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -204,20 +204,20 @@ def calculate_sha256(filename: str) -> str: source_dir="source", when=When.community_only, ), - Package( - name="srt", - source_url="https://github.com/Haivision/srt/archive/refs/tags/v1.5.4.tar.gz", - sha256="d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd", - build_system="cmake", - build_arguments=( - [r"-DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL"] - if plat == "Windows" - else ["-DENABLE_ENCRYPTION=OFF"] - if plat == "Darwin" - else [""] - ), - when=When.community_only, - ), + # Package( + # name="srt", + # source_url="https://github.com/Haivision/srt/archive/refs/tags/v1.5.4.tar.gz", + # sha256="d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd", + # build_system="cmake", + # build_arguments=( + # [r"-DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL"] + # if plat == "Windows" + # else ["-DENABLE_ENCRYPTION=OFF"] + # if plat == "Darwin" + # else [""] + # ), + # when=When.community_only, + # ), ] alsa_package = Package( @@ -373,7 +373,7 @@ def main(): "--enable-libopus", "--enable-libspeex", "--enable-libsvtav1", - "--enable-libsrt" if community else "--disable-libsrt", + # "--enable-libsrt" if community else "--disable-libsrt", "--enable-libtwolame", "--enable-libvorbis", "--enable-libvpx",