diff --git a/scripts/activate.sh b/scripts/activate.sh index a58a64b94..8df33716c 100755 --- a/scripts/activate.sh +++ b/scripts/activate.sh @@ -21,7 +21,7 @@ if [[ ! "$PYAV_LIBRARY" ]]; then return 1 fi else - PYAV_LIBRARY=ffmpeg-8.0.1 + PYAV_LIBRARY=ffmpeg-8.1 echo "No \$PYAV_LIBRARY set; defaulting to $PYAV_LIBRARY" fi fi @@ -38,7 +38,6 @@ fi # Hack for PyPy on GitHub Actions. # This is because PYAV_PYTHON is constructed from "python${{ matrix.config.python }}" # resulting in "pythonpypy3", which won't work. -# It would be nice to clean this up, but I want it to work ASAP. if [[ "$PYAV_PYTHON" == *pypy* ]]; then PYAV_PYTHON=python fi diff --git a/scripts/build b/scripts/build index e3bd7a073..dff74a880 100755 --- a/scripts/build +++ b/scripts/build @@ -17,9 +17,5 @@ echo PKG_CONFIG_PATH: $PKG_CONFIG_PATH echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH echo -which ffmpeg || exit 2 -ffmpeg -version || exit 3 -echo - $PYAV_PIP install -U --pre cython setuptools 2> /dev/null "$PYAV_PYTHON" setup.py config build_ext --inplace || exit 1 diff --git a/scripts/build-deps b/scripts/build-deps index 5b9a299c3..d89b1e406 100755 --- a/scripts/build-deps +++ b/scripts/build-deps @@ -55,15 +55,19 @@ cd $PYAV_LIBRARY echo ./configure ./configure \ --disable-doc \ - --disable-static \ + --disable-programs \ --disable-stripping \ + --disable-static \ + --enable-shared \ + --enable-gpl \ + --enable-version3 \ --disable-libxml2 \ + --disable-xlib \ --disable-openssl \ --enable-debug=3 \ - --enable-gpl \ - --enable-version3 \ --enable-libx264 \ - --enable-shared \ + --disable-bsfs \ + --enable-bsf=chomp,h264_mp4toannexb,setts \ --enable-sse \ --enable-avx \ --enable-avx2 \