From b1bf6862f23d9cfd49017658120ec960e92309a2 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 12 Sep 2025 11:39:37 +0200 Subject: [PATCH] macOS: brew install ffmpeg https://github.com/matham/ffpyplayer/actions/workflows/pythonapp.yml is failing for thre months. * https://formulae.brew.sh/formula/ffmpeg --- .ci/build-wheels.sh | 2 +- .ci/build_wheels_osx.sh | 2 +- .github/workflows/pythonapp.yml | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.ci/build-wheels.sh b/.ci/build-wheels.sh index e999bc9..094608b 100755 --- a/.ci/build-wheels.sh +++ b/.ci/build-wheels.sh @@ -57,7 +57,7 @@ make install; make distclean; cd ~/ffmpeg_sources; -curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" +curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" tar xzf "lame-$LAME_VERSION.tar.gz" cd "lame-$LAME_VERSION" ./configure --prefix="$BUILD_DIR" --enable-nasm --enable-shared; diff --git a/.ci/build_wheels_osx.sh b/.ci/build_wheels_osx.sh index 83bd15e..fddf813 100644 --- a/.ci/build_wheels_osx.sh +++ b/.ci/build_wheels_osx.sh @@ -127,7 +127,7 @@ if [ "$ARCH" = "x86_64" ]; then arg=("--enable-nasm") fi cd "$SRC_PATH"; -curl -kLO "https://cfhcable.dl.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" +curl -kLO "https://downloads.sourceforge.net/project/lame/lame/$LAME_VERSION/lame-$LAME_VERSION.tar.gz" tar xzf "lame-$LAME_VERSION.tar.gz" cd "lame-$LAME_VERSION" git apply "$base_dir/.ci/libmp3lame-symbols.patch" diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index e9b659b..cdfbc44 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -170,10 +170,10 @@ jobs: needs: linux_wheels steps: - uses: actions/checkout@v4.2.2 - - name: Set up Python 3.x + - name: Set up Python 3.13 uses: actions/setup-python@v5.4.0 with: - python-version: 3.x + python-version: 3.13 # 3.14 fails! - uses: actions/download-artifact@v4.2.1 with: pattern: py_wheel-* @@ -284,13 +284,14 @@ jobs: with: path: ~/${{ env.FFMPEG_BUILD_PATH }}_${{ matrix.arch }} key: ${{ runner.os }}-ffmpeg-${{ matrix.arch }}-${{ env.MACOSX_DEPLOYMENT_TARGET }}-${{ env.MACOSX_DEPLOYMENT_TARGET_ARM }}-${{ hashFiles('.ci/build_wheels_osx.sh') }} - - name: Build FFmpeg - if: steps.cache-ffmpeg.outputs.cache-hit != 'true' - run: bash .ci/build_wheels_osx.sh "${{ matrix.arch }}" + #- name: Build FFmpeg + # if: steps.cache-ffmpeg.outputs.cache-hit != 'true' + # run: bash .ci/build_wheels_osx.sh "${{ matrix.arch }}" + - run: brew install ffmpeg # https://formulae.brew.sh/formula/ffmpeg - name: Install cibuildwheel run: | - python -m pip install cibuildwheel~=2.23.3 + python -m pip install cibuildwheel~=2.23.3 cython setuptools - name: Build wheels run: | export REPAIR_LIBRARY_PATH="$HOME/${{ env.FFMPEG_BUILD_PATH }}_${{ matrix.arch }}/lib"