From eeeeae57e3a7e337ecf334a2dbcbc5c7dc8c292c Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 12 Nov 2024 15:49:49 +0100 Subject: [PATCH] CI FFmpeg SVT-VP9 patch SVT-HEVC and SVT-VP9 patches now interfere (neighbor of SVT-VP9 is not libspeex but libsvthevc now). --- .../scripts/Linux/download_build_ffmpeg.sh | 3 ++ ...lity-for-ffmpeg-to-run-svt-vp9.patch.patch | 43 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 .github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 11f7d805f..c133bc2c8 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -26,6 +26,9 @@ install_svt() { ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 ) # if patch apply fails, try increasing $FFMPEG_GIT_DEPTH git am -3 SVT-HEVC/ffmpeg_plugin/master-*.patch + patch SVT-VP9/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/\ +.github/scripts/Linux/tmp/\ +master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch" git am -3 SVT-VP9/ffmpeg_plugin/master-*.patch } diff --git a/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch b/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch new file mode 100644 index 000000000..dee60f946 --- /dev/null +++ b/.github/scripts/Linux/tmp/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch @@ -0,0 +1,43 @@ +1c1 +< From 38eb54ccd1f624e2ab700c1b10a0e6980df9c0b2 Mon Sep 17 00:00:00 2001 +--- +> From c55eb91b2e5d86efa42387b48216236a3c9ff8eb Mon Sep 17 00:00:00 2001 +20c20 +< index 9f508a2527..a73e1f73c1 100755 +--- +> index e5a4ca42b2..dd5debf274 100755 +31c31 +< @@ -1955,6 +1956,7 @@ EXTERNAL_LIBRARY_LIST=" +--- +> @@ -1956,6 +1957,7 @@ EXTERNAL_LIBRARY_LIST=" +39c39 +< @@ -3587,6 +3589,7 @@ libvpx_vp8_decoder_deps="libvpx" +--- +> @@ -3592,6 +3594,7 @@ libvpx_vp8_decoder_deps="libvpx" +47,48c47 +< @@ -7008,6 +7011,7 @@ enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/ +< enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init +--- +> @@ -7015,6 +7018,7 @@ enabled libspeex && require_pkg_config libspeex speex speex/speex.h spe +50a50 +> enabled libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle +56c56 +< index dd5d0de898..5d2c74e95d 100644 +--- +> index 53a300a7ce..a00fa9f273 100644 +59c59 +< @@ -1160,6 +1160,7 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o +--- +> @@ -1162,6 +1162,7 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o +68c68 +< index c7e5f9910c..acb332fb08 100644 +--- +> index 63ad7ea6ff..5e023215dd 100644 +71c71 +< @@ -798,6 +798,7 @@ extern const FFCodec ff_libuavs3d_decoder; +--- +> @@ -799,6 +799,7 @@ extern const FFCodec ff_libuavs3d_decoder; +787c787 +< 2.46.1 +--- +> 2.47.0