Build wheels with ffmpeg 7

PyAV-Org · Aug 4, 2024 · f5ec8ca · f5ec8ca
1 parent a351a97
commit f5ec8ca
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -34,12 +34,12 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-latest, python: "3.9", ffmpeg: "6.1", extras: true}
-          # TODO: - {os: ubuntu-latest, python: "3.9", ffmpeg: "7.0"}
+          - {os: ubuntu-latest, python: "3.9", ffmpeg: "6.1.1", extras: true}
+          - {os: ubuntu-latest, python: "3.9", ffmpeg: "7.0.2"}
           - {os: ubuntu-latest, python: "3.9", ffmpeg: "6.0"}
-          - {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1"}
-          - {os: macos-12,  python: "3.9", ffmpeg: "7.0"}
-          - {os: macos-12,  python: "3.9", ffmpeg: "6.1"}
+          - {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1.1"}
+          - {os: macos-12,  python: "3.9", ffmpeg: "7.0.2"}
+          - {os: macos-12,  python: "3.9", ffmpeg: "6.1.1"}
 
     env:
       PYAV_PYTHON: python${{ matrix.config.python }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,12 +11,10 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      - name: Compile Time
-        run: python scripts/comptime.py 6.1
       - name: Build source package
         run: |
           pip install cython
-          python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
+          python scripts/fetch-vendor.py --config-file scripts/ffmpeg-7.0.json /tmp/vendor
           PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig python setup.py sdist
       - name: Upload source package
         uses: actions/upload-artifact@v4
@@ -55,21 +53,17 @@ jobs:
         run: |
           brew update
           brew install pkg-config
-      - name: Anon1
+      - name: Set Minimum MacOS Target
         if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
         run: |
           echo "MACOSX_DEPLOYMENT_TARGET=10.13" >> $GITHUB_ENV
-          python scripts/comptime.py 7
-      - name: Anon2
-        if: matrix.os != 'macos-13' && matrix.os != 'macos-14'
-        run: python scripts/comptime.py 6.1
       - name: Build wheels
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BEFORE_ALL_LINUX: yum install -y alsa-lib libxcb
-          CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
+          CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-7.0.json /tmp/vendor
           CIBW_BEFORE_BUILD_MACOS: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-7.0.json /tmp/vendor
-          CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-6.1.json C:\cibw\vendor
+          CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-7.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/activate.sh b/scripts/activate.sh
@@ -17,7 +17,7 @@ if [[ ! "$PYAV_LIBRARY" ]]; then
             return 1
         fi
     else
-        PYAV_LIBRARY=ffmpeg-7.0.1
+        PYAV_LIBRARY=ffmpeg-7.0.2
         echo "No \$PYAV_LIBRARY set; defaulting to $PYAV_LIBRARY"
     fi
 fi

diff --git a/scripts/build-deps b/scripts/build-deps
@@ -33,8 +33,6 @@ cd $PYAV_LIBRARY
 echo ./configure
 ./configure \
     --disable-doc \
-    --disable-mmx \
-    --disable-optimizations \
     --disable-static \
     --disable-stripping \
     --enable-debug=3 \
@@ -43,6 +41,9 @@ echo ./configure
     --enable-libx264 \
     --enable-libxml2 \
     --enable-shared \
+    --enable-sse \
+    --enable-avx \
+    --enable-avx2 \
     --prefix="$PYAV_LIBRARY_PREFIX" \
     || exit 2
 echo