Build our wheels against FFmpeg 6.0

PyAV-Org · Nov 2, 2023 · c318c03 · c318c03
1 parent af760ec
commit c318c03
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -142,6 +142,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {os: windows-latest, python: 3.8, ffmpeg: "6.0"}
           - {os: windows-latest, python: 3.8, ffmpeg: "5.1"}
           - {os: windows-latest, python: 3.8, ffmpeg: "5.0"}
 
@@ -161,7 +162,9 @@ jobs:
           pillow \
           python=${{ matrix.config.python }} \
           setuptools
-        if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
+        if [[ "${{ matrix.config.ffmpeg }}" == "6.0" ]]; then
+          curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/6.0.0-1/ffmpeg-win_amd64.tar.gz
+        elif [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
           curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.3-1/ffmpeg-win_amd64.tar.gz
         elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
           curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz
@@ -194,7 +197,7 @@ jobs:
       - name: Build source package
         run: |
           pip install cython
-          python scripts/fetch-vendor.py /tmp/vendor
+          python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.0.json /tmp/vendor
           PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig python setup.py sdist
       - name: Upload source package
         uses: actions/upload-artifact@v3
@@ -237,8 +240,8 @@ jobs:
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BEFORE_ALL_LINUX: yum install -y alsa-lib libxcb
-          CIBW_BEFORE_BUILD: pip install cython && python scripts/fetch-vendor.py /tmp/vendor
-          CIBW_BEFORE_BUILD_WINDOWS: pip install cython && python scripts\fetch-vendor.py C:\cibw\vendor
+          CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.0.json /tmp/vendor
+          CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-6.0.json C:\cibw\vendor
           CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig
           CIBW_ENVIRONMENT_MACOS: PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig LDFLAGS=-headerpad_max_install_names
           CIBW_ENVIRONMENT_WINDOWS: INCLUDE=C:\\cibw\\vendor\\include LIB=C:\\cibw\\vendor\\lib PYAV_SKIP_TESTS=unicode_filename

diff --git a/scripts/ffmpeg-5.0.json b/scripts/ffmpeg-5.0.json
@@ -0,0 +1,3 @@
+{
+    "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-{platform}.tar.gz"]
+}
diff --git a/scripts/fetch-vendor.json → scripts/ffmpeg-5.1.json b/scripts/fetch-vendor.json → scripts/ffmpeg-5.1.json
diff --git a/scripts/ffmpeg-6.0.json b/scripts/ffmpeg-6.0.json
@@ -0,0 +1,3 @@
+{
+    "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/6.0.0-1/ffmpeg-{platform}.tar.gz"]
+}