diff --git a/ffmpeg-shared-build-cywin32.sh b/ffmpeg-shared-build-cywin32.sh index a8a75c8..5db7a40 100755 --- a/ffmpeg-shared-build-cywin32.sh +++ b/ffmpeg-shared-build-cywin32.sh @@ -17,8 +17,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/cygwin32-shared" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # COMPILER VARIABLES C_COMPILER="gcc" @@ -34,21 +34,23 @@ lib_x265_name="x265_3.5.tar.gz@x265_3.5" lib_xvid="https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.gz" lib_xvid_name="xvidcore-1.3.7.tar.gz@xvidcore" -lib_aom_msys="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-aom-3.2.0-1-any.pkg.tar.zst" -lib_aom_msys_name="mingw-w64-i686-aom-3.2.0-1-any.pkg.tar.zst@mingw32" +lib_aom_msys="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-aom-3.8.0-1-any.pkg.tar.zst" +lib_aom_msys_name="mingw-w64-i686-aom-3.8.0-1-any.pkg.tar.zst@mingw32" #https://packages.msys2.org/package/mingw-w64-i686-aom # Dependencies for aom -dep_one="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-11.2.0-5-any.pkg.tar.zst" -dep_one_name="mingw-w64-i686-gcc-libs-11.2.0-5-any.pkg.tar.zst" -dep_two="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-9.0.0.6357.eac8c38c1-1-any.pkg.tar.zst" -dep_two_name="mingw-w64-i686-libwinpthread-git-9.0.0.6357.eac8c38c1-1-any.pkg.tar.zst" -dep_three="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.2.1-2-any.pkg.tar.zst" -dep_three_name="mingw-w64-i686-gmp-6.2.1-2-any.pkg.tar.zst" -dep_four="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" -dep_four_name="mingw-w64-i686-mpc-1.2.1-1-any.pkg.tar.zst" -dep_five="https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" -dep_five_name="mingw-w64-i686-mpfr-4.1.0.p13-1-any.pkg.tar.zst" +dep_one="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-13.2.0-3-any.pkg.tar.zst" +dep_one_name="mingw-w64-i686-gcc-libs-13.2.0-3-any.pkg.tar.zst" +dep_two="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-11.0.0.r442.ga27e7b27e-1-any.pkg.tar.zst" +dep_two_name="mingw-w64-i686-libwinpthread-git-11.0.0.r442.ga27e7b27e-1-any.pkg.tar.zst" +dep_three="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.3.0-2-any.pkg.tar.zst" +dep_three_name="mingw-w64-i686-gmp-6.3.0-2-any.pkg.tar.zst" +dep_four="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.3.1-2-any.pkg.tar.zst" +dep_four_name="mingw-w64-i686-mpc-1.3.1-2-any.pkg.tar.zst" +dep_five="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.2.0-1-any.pkg.tar.zst" +dep_five_name="mingw-w64-i686-mpfr-4.2.0-1-any.pkg.tar.zst" +dep_six="https://repo.msys2.org/mingw/mingw32/mingw-w64-i686-zimg-3.0.5-2-any.pkg.tar.zst" +dep_six_name="mingw-w64-i686-zimg-3.0.5-2-any.pkg.tar.zst" # Check root permission mkdir -p /etc/root &> /dev/null @@ -227,11 +229,13 @@ else wget -c ${dep_three} wget -c ${dep_four} wget -c ${dep_five} + wget -c ${dep_six} tar --use-compress-program=unzstd -xvf ${dep_one_name} tar --use-compress-program=unzstd -xvf ${dep_two_name} tar --use-compress-program=unzstd -xvf ${dep_three_name} tar --use-compress-program=unzstd -xvf ${dep_four_name} tar --use-compress-program=unzstd -xvf ${dep_five_name} + tar --use-compress-program=unzstd -xvf ${dep_six_name} cd ${name_folder} cp -rfv bin/* /usr/bin/ cd .. @@ -251,7 +255,7 @@ wget -c ${ffmpeg_package} tar jxvf ${name_package} cd ${name_folder} chmod +x configure -./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libaom +./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libaom --enable-libzimg build_error=$? if [ ${build_error} -eq 0 ] ; then echo "" @@ -265,7 +269,7 @@ else echo " - aom" echo "" sleep 5 - ./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --disable-libaom + ./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --disable-libaom --enable-libzimg fi make rm -rf ${dir_build}/* diff --git a/ffmpeg-shared-build-cywin64.sh b/ffmpeg-shared-build-cywin64.sh index 9c0533b..231f401 100755 --- a/ffmpeg-shared-build-cywin64.sh +++ b/ffmpeg-shared-build-cywin64.sh @@ -17,8 +17,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/cygwin64-shared" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # COMPILER VARIABLES C_COMPILER="gcc" @@ -34,8 +34,8 @@ lib_x265_name="x265_3.5.tar.gz@x265_3.5" lib_xvid="https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.gz" lib_xvid_name="xvidcore-1.3.7.tar.gz@xvidcore" -lib_aom_msys="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-aom-3.6.0-1-any.pkg.tar.zst" -lib_aom_msys_name="mingw-w64-x86_64-aom-3.6.0-1-any.pkg.tar.zst@mingw64" +lib_aom_msys="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-aom-3.8.0-1-any.pkg.tar.zst" +lib_aom_msys_name="mingw-w64-x86_64-aom-3.8.0-1-any.pkg.tar.zst@mingw64" #https://packages.msys2.org/package/mingw-w64-i686-aom lib_svtav1_msys="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-svt-av1-1.4.1-1-any.pkg.tar.zst" @@ -52,6 +52,8 @@ dep_four="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any. dep_four_name="mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" dep_five="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst" dep_five_name="mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst" +dep_six="https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-zimg-3.0.5-2-any.pkg.tar.zst" +dep_six_name="mingw-w64-x86_64-zimg-3.0.5-2-any.pkg.tar.zst" # Check root permission mkdir -p /etc/root &> /dev/null @@ -230,11 +232,13 @@ else wget -c ${dep_three} wget -c ${dep_four} wget -c ${dep_five} + wget -c ${dep_six} tar --use-compress-program=unzstd -xvf ${dep_one_name} tar --use-compress-program=unzstd -xvf ${dep_two_name} tar --use-compress-program=unzstd -xvf ${dep_three_name} tar --use-compress-program=unzstd -xvf ${dep_four_name} tar --use-compress-program=unzstd -xvf ${dep_five_name} + tar --use-compress-program=unzstd -xvf ${dep_six_name} cd ${name_folder} cp -rfv bin/* /usr/bin/ cd .. @@ -275,7 +279,7 @@ wget -c ${ffmpeg_package} tar jxvf ${name_package} cd ${name_folder} chmod +x configure -./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libsvtav1 --enable-libaom +./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libsvtav1 --enable-libaom --enable-libzimg build_error=$? if [ ${build_error} -eq 0 ] ; then echo "" @@ -289,7 +293,7 @@ else echo " - aom" echo "" sleep 5 - ./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libsvtav1 --disable-libaom + ./configure --prefix=${dir_build} --enable-gpl --enable-nonfree --disable-ffplay --disable-w32threads --enable-openssl --enable-libass --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libmp3lame --enable-libopenjpeg --enable-libopus --enable-libsoxr --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libxml2 --enable-libxvid --enable-libspeex --enable-libx264 --enable-libx265 --enable-static --enable-version3 --enable-doc --disable-indev=dshow --disable-indev=gdigrab --enable-libsvtav1 --disable-libaom --enable-libzimg fi make rm -rf ${dir_build}/* diff --git a/ffmpeg-static-build-linux32-native.sh b/ffmpeg-static-build-linux32-native.sh index 8c221f2..d9fc558 100755 --- a/ffmpeg-static-build-linux32-native.sh +++ b/ffmpeg-static-build-linux32-native.sh @@ -12,8 +12,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/linux32" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # Build parameters ffmpeg_parameters="--prefix=${dir_build}/usr --enable-gpl --enable-nonfree --enable-version3 \ @@ -24,7 +24,7 @@ ffmpeg_parameters="--prefix=${dir_build}/usr --enable-gpl --enable-nonfree --ena --enable-libsoxr --enable-libspeex --enable-libvorbis --enable-libopus --enable-libtheora \ --enable-libvidstab --enable-libvo-amrwbenc --enable-libvpx --enable-libwebp --enable-libx264 \ --enable-libx265 --enable-libxml2 --enable-libdav1d --enable-libxvid --enable-libzvbi \ ---enable-libwebp" +--enable-libwebp --enable-libzimg" # Check root permission mkdir -p /etc/root &> /dev/null @@ -52,7 +52,7 @@ libaom-dev libfribidi-dev libass-dev libvmatch-dev libfreetype-dev libmp3lame-de libopencore-amrnb-dev libopencore-amrwb-dev libjpeg-dev librubberband-dev libsoxr-dev \ libspeex-dev libvorbis-dev libopus-dev libtheora-dev libvidstab-dev libvo-amrwbenc-dev \ libvpx-dev libwebp-dev libx264-dev libx265-dev libxml2-dev libdav1d-dev libxvidcore-dev \ -libzvbi-dev nasm libogg-dev libwebp-dev zlib1g-dev +libzvbi-dev nasm libogg-dev libwebp-dev zlib1g-dev libzimg-dev # Download FFmpeg echo "* Building FFmpeg using system libraries" diff --git a/ffmpeg-static-build-linux32.sh b/ffmpeg-static-build-linux32.sh index e585461..5e9fc20 100755 --- a/ffmpeg-static-build-linux32.sh +++ b/ffmpeg-static-build-linux32.sh @@ -24,8 +24,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/linux32" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # Build parameters ffmpeg_pre_parameters="PKG_CONFIG_PATH=\"${dir_build_libs}/lib/pkgconfig\"" @@ -36,7 +36,7 @@ ffmpeg_parameters="--prefix=\"${dir_build}/usr\" --extra-cflags=\"-I${dir_build_ --enable-libaom --enable-libfribidi --enable-libass --enable-libfreetype --enable-libmp3lame --disable-shared \ --enable-libopenjpeg --enable-libsoxr --enable-libspeex --enable-libvorbis --enable-libopus --enable-libtheora \ --enable-libvidstab --enable-libvo-amrwbenc --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 \ ---enable-libdav1d --enable-libxvid --enable-libfdk-aac" +--enable-libdav1d --enable-libxvid --enable-libfdk-aac --enable-libzimg" # COMPILER VARIABLES C_COMPILER="gcc" diff --git a/ffmpeg-static-build-linux64-native.sh b/ffmpeg-static-build-linux64-native.sh index a0bfda4..30e0f94 100755 --- a/ffmpeg-static-build-linux64-native.sh +++ b/ffmpeg-static-build-linux64-native.sh @@ -12,8 +12,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/linux64" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # Build parameters ffmpeg_parameters="--prefix=${dir_build}/usr --enable-gpl --enable-nonfree --enable-version3 \ @@ -24,7 +24,7 @@ ffmpeg_parameters="--prefix=${dir_build}/usr --enable-gpl --enable-nonfree --ena --enable-libsoxr --enable-libspeex --enable-libvorbis --enable-libopus --enable-libtheora \ --enable-libvidstab --enable-libvo-amrwbenc --enable-libvpx --enable-libwebp --enable-libx264 \ --enable-libx265 --enable-libxml2 --enable-libdav1d --enable-libxvid --enable-libzvbi \ ---enable-libwebp" +--enable-libwebp --enable-libzimg" # Check root permission mkdir -p /etc/root &> /dev/null @@ -52,7 +52,7 @@ libaom-dev libfribidi-dev libass-dev libvmatch-dev libfreetype-dev libmp3lame-de libopencore-amrnb-dev libopencore-amrwb-dev libjpeg-dev librubberband-dev libsoxr-dev \ libspeex-dev libvorbis-dev libopus-dev libtheora-dev libvidstab-dev libvo-amrwbenc-dev \ libvpx-dev libwebp-dev libx264-dev libx265-dev libxml2-dev libdav1d-dev libxvidcore-dev \ -libzvbi-dev nasm libogg-dev libwebp-dev zlib1g-dev +libzvbi-dev nasm libogg-dev libwebp-dev zlib1g-dev libzimg-dev # Download FFmpeg echo "* Building FFmpeg using system libraries" diff --git a/ffmpeg-static-build-linux64.sh b/ffmpeg-static-build-linux64.sh index 5a96c23..06a693d 100755 --- a/ffmpeg-static-build-linux64.sh +++ b/ffmpeg-static-build-linux64.sh @@ -24,8 +24,8 @@ dir_build_libs="/opt/ffmpeg-builds/lib/linux64" dir_build_packages="/opt/ffmpeg-builds/packages" # FFmpeg version -ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2" -ffmpeg_package_name="ffmpeg-6.0.tar.bz2@ffmpeg-6.0" +ffmpeg_package="https://ffmpeg.org/releases/ffmpeg-6.1.tar.bz2" +ffmpeg_package_name="ffmpeg-6.1.tar.bz2@ffmpeg-6.1" # Build parameters ffmpeg_pre_parameters="PKG_CONFIG_PATH=\"${dir_build_libs}/lib/pkgconfig\"" @@ -36,7 +36,7 @@ ffmpeg_parameters="--prefix=\"${dir_build}/usr\" --extra-cflags=\"-I${dir_build_ --enable-libaom --enable-libfribidi --enable-libass --enable-libfreetype --enable-libmp3lame --disable-shared \ --enable-libopenjpeg --enable-libsoxr --enable-libspeex --enable-libvorbis --enable-libopus --enable-libtheora \ --enable-libvidstab --enable-libvo-amrwbenc --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 \ ---enable-libdav1d --enable-libxvid --enable-libfdk-aac" +--enable-libdav1d --enable-libxvid --enable-libfdk-aac --enable-libzimg" # COMPILER VARIABLES C_COMPILER="gcc"