diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml index bfa9dd5c36f..93f11d1ad6b 100644 --- a/.github/actions/deploy-windows/action.yml +++ b/.github/actions/deploy-windows/action.yml @@ -55,37 +55,42 @@ runs: if not "%CI_DEPLOY_NEED_GCC%"=="" ( echo Installing an older less buggy version of GCC - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gdb-11.2-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-ada-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-objc-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.38-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gdb-11.2-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-ada-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-objc-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-11.3.0-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.38-2-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst - bash -c "pacman -Rc --noconfirm mingw-w64-i686-libgccjit mingw-w64-x86_64-libgccjit mingw-w64-i686-gdb-multiarch mingw-w64-x86_64-gdb-multiarch" + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gdb-12.1-6-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gdb-multiarch-12.1-6-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-ada-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-objc-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libgfortran-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-binutils-2.39-3-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-headers-1.3.275.0-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-loader-1.3.275.0-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gdb-12.1-6-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gdb-multiarch-12.1-6-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-ada-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-objc-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-9-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.39-3-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-headers-1.3.275.0-1-any.pkg.tar.zst + curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-loader-1.3.275.0-1-any.pkg.tar.zst bash -c "pacman -U --noconfirm *.pkg.tar.zst" ) else ( bash -c "pacman -Rc --noconfirm mingw-w64-i686-headers-git mingw-w64-x86_64-headers-git mingw-w64-i686-zlib mingw-w64-x86_64-zlib" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8607c9b42b9..85970242346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ + * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481)) * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472)) * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475)) * Upgrade presets for PyTorch 2.2.1 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)) diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh old mode 100755 new mode 100644 index 839b668c537..0b22be442bb --- a/ffmpeg/cppbuild.sh +++ b/ffmpeg/cppbuild.sh @@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then fi DISABLE="--disable-iconv --disable-opencl --disable-sdl2 --disable-bzlib --disable-lzma --disable-linux-perf --disable-xlib" -ENABLE="--enable-shared --enable-version3 --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libvpx --enable-libfreetype --enable-libopus --enable-libxml2 --enable-libsrt --enable-libwebp --enable-libaom --enable-libsvtav1" +ENABLE="--enable-shared --enable-version3 --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libvpx --enable-libfreetype --enable-libopus --enable-libxml2 --enable-libsrt --enable-libwebp --enable-libaom --enable-libsvtav1 --enable-libzimg" ENABLE_VULKAN="--enable-vulkan --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --enable-hwaccel=av1_vulkan" if [[ "$EXTENSION" == *gpl ]]; then @@ -47,6 +47,7 @@ LIBSRT_VERSION=1.5.3 WEBP_VERSION=1.3.2 AOMAV1_VERSION=3.8.0 SVTAV1_VERSION=1.8.0 +ZIMG_VERSION=3.0.5 FFMPEG_VERSION=6.1.1 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz @@ -69,6 +70,7 @@ download https://github.com/FFmpeg/nv-codec-headers/archive/n$NVCODEC_VERSION.ta download https://github.com/webmproject/libwebp/archive/refs/tags/v$WEBP_VERSION.tar.gz libwebp-$WEBP_VERSION.tar.gz download https://storage.googleapis.com/aom-releases/libaom-$AOMAV1_VERSION.tar.gz aom-$AOMAV1_VERSION.tar.gz download https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$SVTAV1_VERSION/SVT-AV1-v$SVTAV1_VERSION.tar.gz SVT-AV1-$SVTAV1_VERSION.tar.gz +download https://github.com/sekrit-twc/zimg/archive/refs/tags/release-$ZIMG_VERSION.tar.gz zimg-release-$ZIMG_VERSION.tar.gz download http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 ffmpeg-$FFMPEG_VERSION.tar.bz2 mkdir -p $PLATFORM$EXTENSION @@ -95,6 +97,7 @@ tar --totals -xzf ../$XML2.tar.gz tar --totals -xzf ../libwebp-$WEBP_VERSION.tar.gz tar --totals -xzf ../aom-$AOMAV1_VERSION.tar.gz tar --totals -xzf ../SVT-AV1-$SVTAV1_VERSION.tar.gz +tar --totals -xzf ../zimg-release-$ZIMG_VERSION.tar.gz tar --totals -xjf ../ffmpeg-$FFMPEG_VERSION.tar.bz2 if [[ "${ACLOCAL_PATH:-}" == C:\\msys64\\* ]]; then @@ -132,10 +135,20 @@ case $PLATFORM in export STRIP="$ANDROID_PREFIX-strip" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB ./configure --prefix=$INSTALL_PATH --static --uname=arm-linux make -j $MAKEJ V=0 make install @@ -278,10 +291,20 @@ EOF export STRIP="$ANDROID_PREFIX-strip" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB ./configure --prefix=$INSTALL_PATH --static --uname=aarch64-linux make -j $MAKEJ V=0 make install @@ -423,10 +446,20 @@ EOF export STRIP="$ANDROID_PREFIX-strip" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=i686-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB ./configure --prefix=$INSTALL_PATH --static --uname=i686-linux make -j $MAKEJ V=0 make install @@ -565,10 +598,20 @@ EOF export STRIP="$ANDROID_PREFIX-strip" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=x86_64-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB ./configure --prefix=$INSTALL_PATH --static --uname=x86_64-linux make -j $MAKEJ V=0 make install @@ -702,10 +745,20 @@ EOF export AS="nasm" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --host=i686-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="gcc -m32 -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -841,10 +894,20 @@ EOF export AS="nasm" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --host=x86_64-linux + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -993,12 +1056,22 @@ EOF echo "Detected non arm arch so cross compiling"; fi + echo "" + echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux-gnueabihf + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="arm-linux-gnueabihf-gcc -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -1193,10 +1266,20 @@ EOF HOST_ARCH="$(uname -m)" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux-gnu + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="aarch64-linux-gnu-gcc -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -1330,10 +1413,24 @@ EOF MACHINE_TYPE=$( uname -m ) echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then + CC="gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH + else + CC="powerpc64le-linux-gnu-gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --host=powerpc64le-linux-gnu + fi + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then CC="gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --static else @@ -1545,10 +1642,20 @@ EOF export CPPFLAGS="$CFLAGS" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --host=aarch64-apple-darwin + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="clang -arch arm64 -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -1670,10 +1777,20 @@ EOF export AS="nasm" echo "" echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH + make -j $MAKEJ V=0 + make install + echo "" + echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB CC="clang -fPIC" ./configure --prefix=$INSTALL_PATH --static make -j $MAKEJ V=0 make install @@ -1791,12 +1908,22 @@ EOF ;; windows-x86) + echo "" + echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB make -j $MAKEJ install -fwin32/Makefile.gcc BINARY_PATH=$INSTALL_PATH/bin/ INCLUDE_PATH=$INSTALL_PATH/include/ LIBRARY_PATH=$INSTALL_PATH/lib/ echo "" echo "--------------------" @@ -1922,12 +2049,22 @@ EOF ;; windows-x86_64) + echo "" + echo "--------------------" + echo "Building zimg" + echo "--------------------" + echo "" + cd zimg-release-$ZIMG_VERSION + autoreconf -iv + ./configure --prefix=$INSTALL_PATH + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" echo "--------------------" echo "" - cd $ZLIB + cd ../$ZLIB make -j $MAKEJ install -fwin32/Makefile.gcc BINARY_PATH=$INSTALL_PATH/bin/ INCLUDE_PATH=$INSTALL_PATH/include/ LIBRARY_PATH=$INSTALL_PATH/lib/ echo "" echo "--------------------" diff --git a/ffmpeg/ffmpeg.patch b/ffmpeg/ffmpeg.patch index 07b591c8295..6a2f5ae710b 100644 --- a/ffmpeg/ffmpeg.patch +++ b/ffmpeg/ffmpeg.patch @@ -1,7 +1,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure --- ffmpeg-6.1/configure 2023-11-11 09:25:17.000000000 +0900 +++ ffmpeg-6.1-patch/configure 2023-11-11 19:18:26.388930944 +0900 -@@ -6673,7 +6673,7 @@ +@@ -6675,7 +6675,7 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; } enabled ladspa && require_headers "ladspa.h dlfcn.h" enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext @@ -10,7 +10,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new || { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } || die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; } -@@ -6699,7 +6699,7 @@ +@@ -6701,7 +6701,7 @@ flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lfl enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled fontconfig && enable libfontconfig enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit @@ -19,7 +19,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -@@ -6729,15 +6729,7 @@ +@@ -6731,15 +6731,7 @@ if enabled libmfx && enabled libvpl; then # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. elif enabled libmfx; then @@ -36,7 +36,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure warn "libmfx is deprecated. Please run configure with --enable-libvpl to use libvpl instead." elif enabled libvpl; then # Consider pkg-config only. The name of libmfx is still passed to check_pkg_config function for --enable-libvpl option -@@ -6764,21 +6756,14 @@ +@@ -6766,21 +6758,14 @@ enabled libopencv && { check_headers opencv2/core/core_c.h && { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } @@ -60,7 +60,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection -@@ -6794,9 +6779,9 @@ +@@ -6796,9 +6781,9 @@ enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbcli enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init @@ -73,7 +73,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg -@@ -6815,19 +6800,15 @@ +@@ -6817,19 +6802,15 @@ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h enabled libvpx && { enabled libvpx_vp8_decoder && { @@ -93,7 +93,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs" } if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then -@@ -6836,14 +6817,14 @@ +@@ -6838,24 +6819,24 @@ enabled libvpx && { } enabled libwebp && { @@ -112,7 +112,10 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get -@@ -6853,7 +6834,7 @@ + enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore +-enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version ++enabled libzimg && require libzimg zimg.h zimg_get_api_version -lzimg -lstdc++ + enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; } @@ -121,7 +124,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init || check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init || check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto || -@@ -6892,15 +6873,13 @@ +@@ -6894,15 +6875,13 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } && enable omx enabled omx && require_headers OMX_Core.h