Skip to content

Commit 88b6f44

Browse files
committed
Exclude libmvec
1 parent 81661a4 commit 88b6f44

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.github/workflows/build-ffmpeg.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- os: macos-14
2424
arch: arm64
2525
shell: bash
26-
- os: macos-13
26+
- os: macos-15-intel
2727
arch: x86_64
2828
shell: bash
2929
- os: ubuntu-24.04-arm
@@ -49,10 +49,10 @@ jobs:
4949
with:
5050
python-version: "3.13"
5151
- name: Set deployment target
52-
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
53-
run: echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV
52+
if: runner.os == 'macOS'
53+
run: echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV
5454
- name: Install packages for macOS
55-
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
55+
if: runner.os == 'macOS'
5656
run: |
5757
brew update
5858
brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
@@ -68,7 +68,7 @@ jobs:
6868
CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor --community
6969
CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor --community
7070
CIBW_BUILD: cp311-*
71-
CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel}
71+
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}
7272
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel}
7373
CIBW_TEST_COMMAND: python -c "import dummy"
7474
run: |

scripts/build-ffmpeg.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,20 @@ def calculate_sha256(filename: str) -> str:
204204
source_dir="source",
205205
when=When.community_only,
206206
),
207-
Package(
208-
name="srt",
209-
source_url="https://github.com/Haivision/srt/archive/refs/tags/v1.5.4.tar.gz",
210-
sha256="d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd",
211-
build_system="cmake",
212-
build_arguments=(
213-
[r"-DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL"]
214-
if plat == "Windows"
215-
else ["-DENABLE_ENCRYPTION=OFF"]
216-
if plat == "Darwin"
217-
else [""]
218-
),
219-
when=When.community_only,
220-
),
207+
# Package(
208+
# name="srt",
209+
# source_url="https://github.com/Haivision/srt/archive/refs/tags/v1.5.4.tar.gz",
210+
# sha256="d0a8b600fe1b4eaaf6277530e3cfc8f15b8ce4035f16af4a5eb5d4b123640cdd",
211+
# build_system="cmake",
212+
# build_arguments=(
213+
# [r"-DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL"]
214+
# if plat == "Windows"
215+
# else ["-DENABLE_ENCRYPTION=OFF"]
216+
# if plat == "Darwin"
217+
# else [""]
218+
# ),
219+
# when=When.community_only,
220+
# ),
221221
]
222222

223223
alsa_package = Package(
@@ -373,7 +373,7 @@ def main():
373373
"--enable-libopus",
374374
"--enable-libspeex",
375375
"--enable-libsvtav1",
376-
"--enable-libsrt" if community else "--disable-libsrt",
376+
# "--enable-libsrt" if community else "--disable-libsrt",
377377
"--enable-libtwolame",
378378
"--enable-libvorbis",
379379
"--enable-libvpx",

0 commit comments

Comments
 (0)