From 77ff8518ec9febbea6e3500f3e3a9c81e274a0eb Mon Sep 17 00:00:00 2001 From: FREEWING-JP Date: Sat, 21 Oct 2023 17:17:00 +0900 Subject: [PATCH] Add specify FFmpeg version function --- extra/FFmpeg_versions.txt | 66 +++++++++++++++++++++++++++ extra/README.md | 23 ++++++++-- extra/build.sh | 32 ++++++++++--- extra/copy_ffmpeg_exe.sh | 25 ++++++---- extra/make.sh | 40 +++++++++++++++- extra/wsl_patch_2023_05_for_n4_4_x.sh | 2 +- extra/wsl_patch_2023_10_for_n4_4_x.sh | 2 + extra/wsl_patch_2023_10_for_n5_x_x.sh | 23 ++++++++++ 8 files changed, 191 insertions(+), 22 deletions(-) create mode 100644 extra/FFmpeg_versions.txt create mode 100644 extra/wsl_patch_2023_10_for_n5_x_x.sh diff --git a/extra/FFmpeg_versions.txt b/extra/FFmpeg_versions.txt new file mode 100644 index 00000000..977eb401 --- /dev/null +++ b/extra/FFmpeg_versions.txt @@ -0,0 +1,66 @@ +2023/10/21 +================================================================================ +ffmpeg version n4.4.4-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers +built with gcc 10.2.0 (GCC) +configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --disable-libdav1d --enable-nonfree --enable-libfdk-aac --enable-decklink +libavutil 56. 70.100 / 56. 70.100 +libavcodec 58.134.100 / 58.134.100 +libavformat 58. 76.100 / 58. 76.100 +libavdevice 58. 13.100 / 58. 13.100 +libavfilter 7.110.100 / 7.110.100 +libswscale 5. 9.100 / 5. 9.100 +libswresample 3. 9.100 / 3. 9.100 +libpostproc 55. 9.100 / 55. 9.100 + +================================================================================ +ffmpeg version n5.0.3-ffmpeg-windows-build-helpers Copyright (c) 2000-2022 the FFmpeg developers +built with gcc 10.2.0 (GCC) +configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink +libavutil 57. 17.100 / 57. 17.100 +libavcodec 59. 18.100 / 59. 18.100 +libavformat 59. 16.100 / 59. 16.100 +libavdevice 59. 4.100 / 59. 4.100 +libavfilter 8. 24.100 / 8. 24.100 +libswscale 6. 4.100 / 6. 4.100 +libswresample 4. 3.100 / 4. 3.100 +libpostproc 56. 3.100 / 56. 3.100 + +================================================================================ +ffmpeg version n5.1.3-2-g77a43962e3-ffmpeg-windows-build-helpers Copyright (c) 2000-2022 the FFmpeg developers +built with gcc 10.2.0 (GCC) +configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink +libavutil 57. 28.100 / 57. 28.100 +libavcodec 59. 37.100 / 59. 37.100 +libavformat 59. 27.100 / 59. 27.100 +libavdevice 59. 7.100 / 59. 7.100 +libavfilter 8. 44.100 / 8. 44.100 +libswscale 6. 7.100 / 6. 7.100 +libswresample 4. 7.100 / 4. 7.100 +libpostproc 56. 6.100 / 56. 6.100 + +================================================================================ +ffmpeg version n6.0-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers +built with gcc 10.2.0 (GCC) +configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink +libavutil 58. 2.100 / 58. 2.100 +libavcodec 60. 3.100 / 60. 3.100 +libavformat 60. 3.100 / 60. 3.100 +libavdevice 60. 1.100 / 60. 1.100 +libavfilter 9. 3.100 / 9. 3.100 +libswscale 7. 1.100 / 7. 1.100 +libswresample 4. 10.100 / 4. 10.100 +libpostproc 57. 1.100 / 57. 1.100 + +================================================================================ +ffmpeg version N-112494-g393d1ee541-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers +built with gcc 10.2.0 (GCC) +configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-libaribcaption --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink +libavutil 58. 27.100 / 58. 27.100 +libavcodec 60. 30.102 / 60. 30.102 +libavformat 60. 15.100 / 60. 15.100 +libavdevice 60. 2.101 / 60. 2.101 +libavfilter 9. 11.100 / 9. 11.100 +libswscale 7. 4.100 / 7. 4.100 +libswresample 4. 11.100 / 4. 11.100 +libpostproc 57. 2.100 / 57. 2.100 + diff --git a/extra/README.md b/extra/README.md index 815efe51..004f9642 100644 --- a/extra/README.md +++ b/extra/README.md @@ -1,9 +1,7 @@ # ffmpeg windows cross compile helper extra script -* 2023/10/15 FFmpeg 4.4.4 - * This is Patch for Windows WSL Ubuntu -* FFmpeg 4.4.4 for Windows 64-bit with FDK-AAC(--disable-nonfree=n, --build-ffmpeg-static=y) +* FFmpeg for Windows 64-bit with FDK-AAC(--disable-nonfree=n, --build-ffmpeg-static=y) * disable Tesseract OCR function * Environment @@ -34,6 +32,20 @@ cd ffmpeg-windows-build-helpers # Windows 10 WLS Ubuntu ./extra/make.sh +# Default Build FFmpeg 4.4.4 +# If you need other versions. Type as follows +./extra/make.sh n5.0.3 +./extra/make.sh n5.1.3 +./extra/make.sh n6.0 +./extra/make.sh master + +# You can build each FFmpeg verisons following +# The build time from the 2nd time onwards is about 10 minutes +./extra/make.sh +./extra/make.sh n5.0.3 +./extra/make.sh n5.1.3 +./extra/make.sh n6.0 +./extra/make.sh master * FFmpeg is Win64 (64-bit only). Edit ./extra/build.sh if you want the 32-bit version . @@ -51,7 +63,7 @@ Take about 1 to few hours depending on machine specs # for more details visit following URL http://www.neko.ne.jp/~freewing/software/windows_compile_ffmpeg_enable_fdk_aac/ -# 2023/10/15 FFmpeg 4.4.4 ffmpeg.exe -version +# 2023/10/21 FFmpeg 4.4.4 ffmpeg.exe -version ``` ffmpeg.exe -version ffmpeg version n4.4.4-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers @@ -67,3 +79,6 @@ libswresample 3. 9.100 / 3. 9.100 libpostproc 55. 9.100 / 55. 9.100 ``` +# For other versions +please see FFmpeg_versions.txt + diff --git a/extra/build.sh b/extra/build.sh index 5eece669..869ce636 100755 --- a/extra/build.sh +++ b/extra/build.sh @@ -3,16 +3,34 @@ # Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't # set -x -echo "Windows WSL patch" -bash ./extra/wsl_patch_2023_05_for_n4_4_x.sh -bash ./extra/wsl_patch_2023_10_for_n4_4_x.sh +FFMPEG_VER="n4.4.4" +if [ -n "$1" ]; then + FFMPEG_VER="$1" +fi -FFMPEG_VER=4.4.4 +echo "FFmpeg $FFMPEG_VER for Windows" + +if [ ! "$FFMPEG_VER" = "master" ]; then + + if [ ! "${FFMPEG_VER:0:4}" = "n6.1" ]; then + echo "Windows WSL patch require: n4.x, n5.x, n6.0" + bash ./extra/wsl_patch_2023_05_for_n4_4_x.sh + fi + + if [ "${FFMPEG_VER:0:3}" = "n5." ]; then + if [ ! "${FFMPEG_VER:0:4}" = "n5.0" ]; then + echo "Windows WSL patch require: n5.1, n5.2" + bash ./extra/wsl_patch_2023_10_for_n5_x_x.sh + fi + fi + + echo "Windows WSL patch require: n4.x, n5.x, n6.x" + bash ./extra/wsl_patch_2023_10_for_n4_4_x.sh +fi -echo "FFmpeg "$FFMPEG_VER" for Windows" echo "Default: --build-ffmpeg-static=y --build-intel-qsv=y --build-amd-amf=y" -echo "Add Args: --disable-nonfree=n --ffmpeg-git-checkout-version=n"$FFMPEG_VER +echo "Add Args: --disable-nonfree=n --ffmpeg-git-checkout-version=$FFMPEG_VER" # --compiler-flavors=multi,win32,win64 -time ./cross_compile_ffmpeg.sh --disable-nonfree=n --ffmpeg-git-checkout-version=n"$FFMPEG_VER" --compiler-flavors=win64 +time ./cross_compile_ffmpeg.sh --disable-nonfree=n --compiler-flavors=win64 --ffmpeg-git-checkout-version=$FFMPEG_VER diff --git a/extra/copy_ffmpeg_exe.sh b/extra/copy_ffmpeg_exe.sh index 5a4c3a16..dcc04e6a 100755 --- a/extra/copy_ffmpeg_exe.sh +++ b/extra/copy_ffmpeg_exe.sh @@ -3,17 +3,26 @@ # Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't # set -x -echo "Copy FFmpeg execute files to Windows C:\ffmpeg_tmp directory" +FFMPEG_VER="n4.4.4" +if [ -n "$1" ]; then + FFMPEG_VER="$1" +fi -ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_n4.4.4/ff*.exe +WIN_FFMPEG_DIR=/mnt/c/ffmpeg_tmp_$FFMPEG_VER + +echo "FFmpeg $FFMPEG_VER for Windows" + +echo "Copy FFmpeg execute files to Windows C:\ffmpeg_tmp_$FFMPEG_VER directory" + +ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe ls -l ./sandbox/win64/x264/x*.exe ls -l ./sandbox/win64/x265/8bit/x*.exe -mkdir /mnt/c/ffmpeg_tmp/ -cp ./sandbox/win64/ffmpeg_git_with_fdk_aac_n4.4.4/ff*.exe /mnt/c/ffmpeg_tmp/ -cp ./sandbox/win64/x264/x*.exe /mnt/c/ffmpeg_tmp/ -cp ./sandbox/win64/x265/8bit/x*.exe /mnt/c/ffmpeg_tmp/ -rm /mnt/c/ffmpeg_tmp/ff*_g.exe +mkdir ${WIN_FFMPEG_DIR}/ +cp ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe ${WIN_FFMPEG_DIR}/ +cp ./sandbox/win64/x264/x*.exe ${WIN_FFMPEG_DIR}/ +cp ./sandbox/win64/x265/8bit/x*.exe ${WIN_FFMPEG_DIR}/ +rm ${WIN_FFMPEG_DIR}/ff*_g.exe -ls -l /mnt/c/ffmpeg_tmp/ +ls -l ${WIN_FFMPEG_DIR}/ diff --git a/extra/make.sh b/extra/make.sh index cfb959de..9dee959d 100755 --- a/extra/make.sh +++ b/extra/make.sh @@ -3,6 +3,17 @@ # Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't # set -x +FFMPEG_VER="n4.4.4" +# n4.4.4 +# n5.0.3 +# n5.1.3 +# n6.0 +# master + +if [ -n "$1" ]; then + FFMPEG_VER="$1" +fi + WIN_VER="" WIN_CMD_EXE=/mnt/c/Windows/System32/cmd.exe if [ -e $WIN_CMD_EXE ]; then @@ -24,7 +35,13 @@ if [ -z "$WIN_VER" ]; then exit 1 fi -echo "FFmpeg for Windows $WIN_VER" +if [ -e cross_compile_ffmpeg.sh_org ]; then + cp cross_compile_ffmpeg.sh_org cross_compile_ffmpeg.sh +else + cp cross_compile_ffmpeg.sh cross_compile_ffmpeg.sh_org +fi + +echo "FFmpeg $FFMPEG_VER for Windows $WIN_VER" echo "Make file for WSL Ubuntu" # WSL Debian @@ -48,6 +65,25 @@ if [ "$WIN_VER" = "10" ]; then fi echo $'\a' -bash ./extra/build.sh +bash ./extra/build.sh $FFMPEG_VER echo $'\a' +echo "." +echo "." +echo "." + +ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe 2> /dev/null +if [ $? -eq 0 ]; then + echo "========" + echo "Build Success" + echo "========" + echo "Type" + echo " './extra/copy_ffmpeg_exe.sh $FFMPEG_VER'" + echo "to Copy FFmpeg.exe to Windows C:\\ffmpeg_tmp_$FFMPEG_VER Directory" + echo "========" +else + echo "========" + echo "Build Failed" + echo "========" +fi + diff --git a/extra/wsl_patch_2023_05_for_n4_4_x.sh b/extra/wsl_patch_2023_05_for_n4_4_x.sh index dd7c69f5..17fb2dcb 100755 --- a/extra/wsl_patch_2023_05_for_n4_4_x.sh +++ b/extra/wsl_patch_2023_05_for_n4_4_x.sh @@ -13,5 +13,5 @@ echo "2023/05/05 no member named 'compressed_ten_bit_format'" # https://github.com/FFmpeg/FFmpeg/commit/031f1561cd286596cdb374da32f8aa816ce3b135 # avcodec/libsvtav1: remove compressed_ten_bit_format and simplify allo… # patch git cherry-pick 031f156 -sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 031f156/g" cross_compile_ffmpeg.sh +sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 031f156/g" cross_compile_ffmpeg.sh diff --git a/extra/wsl_patch_2023_10_for_n4_4_x.sh b/extra/wsl_patch_2023_10_for_n4_4_x.sh index f2081318..ca9089b3 100755 --- a/extra/wsl_patch_2023_10_for_n4_4_x.sh +++ b/extra/wsl_patch_2023_10_for_n4_4_x.sh @@ -9,6 +9,8 @@ echo "2023/10/15 Disable libaribcaption --enable-libaribcaption" # Because FFmpeg 4.4.x doesn't have this option # #693 --enable-libaribcaption #694 # https://github.com/rdp/ffmpeg-windows-build-helpers/pull/694 +# lavc/libaribcaption.c: add ARIB caption decoder using libaribcaption +# https://github.com/FFmpeg/FFmpeg/commit/b6138633cdf2ecae22c4c02029e91245c430c4fe # config_options+=" --enable-libaribcaption" # libaribcatption (MIT licensed) sed -i -e "s/--enable-libaribcaption//g" cross_compile_ffmpeg.sh sed -i -e "s/ build_libaribcaption/ # build_libaribcaption/g" cross_compile_ffmpeg.sh diff --git a/extra/wsl_patch_2023_10_for_n5_x_x.sh b/extra/wsl_patch_2023_10_for_n5_x_x.sh new file mode 100644 index 00000000..e5079bff --- /dev/null +++ b/extra/wsl_patch_2023_10_for_n5_x_x.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# ffmpeg windows cross compile helper extra script, see github repo README +# Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't +# set -x + +echo "This is Patch for WSL Ubuntu 2023/10/20" + +echo "2023/05/05 no member named 'vbv_bufsize'" +# https://github.com/FFmpeg/FFmpeg/commit/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee +# avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms +# patch git cherry-pick 1c6fd7d +# https://bugs.launchpad.net/ubuntu/+source/ffmpeg/+bug/2024487 +# ffmpeg 5.1.3u1 fails to compile with svt-av1 1.5.0 +# libavcodec/libsvtav1.c: In function 'config_enc_params': +# libavcodec/libsvtav1.c:182:10: error: 'EbSvtAv1EncConfiguration' has no member named 'vbv_bufsize' +# 182 | param->vbv_bufsize = avctx->rc_buffer_size; +# | ^~ +# libavcodec/libsvtav1.c:299:34: error: 'EbSvtAv1EncConfiguration' has no member named 'vbv_bufsize' +# 299 | avctx->rc_buffer_size = param->vbv_bufsize; +# | ^~ +# make: *** [ffbuild/common.mak:81: libavcodec/libsvtav1.o] Error 1 +sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 1c6fd7d/g" cross_compile_ffmpeg.sh +