From 764b583901be7cc879d2d6f2dbd89ee003454b2c Mon Sep 17 00:00:00 2001 From: i0ntempest Date: Fri, 21 Feb 2025 22:45:32 +1100 Subject: [PATCH] ffmpeg*: add patch for svt-av1 v3 --- multimedia/ffmpeg-devel/Portfile | 6 +++++- multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff | 11 +++++++++++ multimedia/ffmpeg/Portfile | 6 +++++- multimedia/ffmpeg/files/patch-svt-av1-v3.diff | 11 +++++++++++ multimedia/ffmpeg4/Portfile | 6 +++++- multimedia/ffmpeg4/files/patch-svt-av1-v3.diff | 11 +++++++++++ multimedia/ffmpeg6/Portfile | 6 +++++- multimedia/ffmpeg6/files/patch-svt-av1-v3.diff | 11 +++++++++++ multimedia/ffmpeg7/Portfile | 6 +++++- multimedia/ffmpeg7/files/patch-svt-av1-v3.diff | 11 +++++++++++ 10 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff create mode 100644 multimedia/ffmpeg/files/patch-svt-av1-v3.diff create mode 100644 multimedia/ffmpeg4/files/patch-svt-av1-v3.diff create mode 100644 multimedia/ffmpeg6/files/patch-svt-av1-v3.diff create mode 100644 multimedia/ffmpeg7/files/patch-svt-av1-v3.diff diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile index 30bec95f4771f..53a4b91a1ff45 100644 --- a/multimedia/ffmpeg-devel/Portfile +++ b/multimedia/ffmpeg-devel/Portfile @@ -18,7 +18,7 @@ set my_name ffmpeg conflicts ffmpeg version 7.1 -revision 3 +revision 4 epoch 2 license LGPL-2.1+ @@ -127,6 +127,10 @@ patchfiles-append patch-libavcodec-librsvgdec.diff # so the FFMpeg team does not seem to care to include this functionality patchfiles-append patch-add-pixeldensity.diff +# SVT-AV1 v3 has API changes +# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73 +patchfiles-append patch-svt-av1-v3.diff + # Typedef AVMediaType to NSString* on older systems # Patch submitted to upstream, remove once upstream has included it if {${os.platform} eq "darwin" && ${os.major} < 17} { diff --git a/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff new file mode 100644 index 0000000000000..057719fea6ae6 --- /dev/null +++ b/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff @@ -0,0 +1,11 @@ +--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52 ++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45 +@@ -262,7 +262,7 @@ + + svt_enc->eos_flag = EOS_NOT_REACHED; + +- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); + if (svt_ret != EB_ErrorNone) { + return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); + } diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile index 249c834508bca..762a51bc49af0 100644 --- a/multimedia/ffmpeg/Portfile +++ b/multimedia/ffmpeg/Portfile @@ -19,7 +19,7 @@ conflicts ffmpeg-devel # Please increase the revision of mpv whenever ffmpeg's version is updated. version 4.4.5 -revision 4 +revision 5 epoch 1 license LGPL-2.1+ @@ -121,6 +121,10 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff # so the FFMpeg team does not seem to care to include this functionality patchfiles-append patch-add-pixeldensity.diff +# SVT-AV1 v3 has API changes +# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73 +patchfiles-append patch-svt-av1-v3.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/multimedia/ffmpeg/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg/files/patch-svt-av1-v3.diff new file mode 100644 index 0000000000000..057719fea6ae6 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-svt-av1-v3.diff @@ -0,0 +1,11 @@ +--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52 ++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45 +@@ -262,7 +262,7 @@ + + svt_enc->eos_flag = EOS_NOT_REACHED; + +- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); + if (svt_ret != EB_ErrorNone) { + return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); + } diff --git a/multimedia/ffmpeg4/Portfile b/multimedia/ffmpeg4/Portfile index a91fd3eeaa613..e5221fea8c672 100644 --- a/multimedia/ffmpeg4/Portfile +++ b/multimedia/ffmpeg4/Portfile @@ -18,7 +18,7 @@ set my_name ffmpeg # Please increase the revision of mpv whenever ffmpeg's version is updated. version 4.4.5 -revision 1 +revision 2 license LGPL-2.1+ categories multimedia @@ -119,6 +119,10 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff # so the FFMpeg team does not seem to care to include this functionality patchfiles-append patch-add-pixeldensity.diff +# SVT-AV1 v3 has API changes +# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73 +patchfiles-append patch-svt-av1-v3.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff new file mode 100644 index 0000000000000..057719fea6ae6 --- /dev/null +++ b/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff @@ -0,0 +1,11 @@ +--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52 ++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45 +@@ -262,7 +262,7 @@ + + svt_enc->eos_flag = EOS_NOT_REACHED; + +- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); + if (svt_ret != EB_ErrorNone) { + return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); + } diff --git a/multimedia/ffmpeg6/Portfile b/multimedia/ffmpeg6/Portfile index 15982cfc163c0..7cc75f22f86e7 100644 --- a/multimedia/ffmpeg6/Portfile +++ b/multimedia/ffmpeg6/Portfile @@ -17,7 +17,7 @@ name ffmpeg6 set my_name ffmpeg version 6.1.2 -revision 2 +revision 3 epoch 0 license LGPL-2.1+ @@ -114,6 +114,10 @@ patchfiles-append patch-libavcodec-librsvgdec.diff # Remove once upstream has included these in the next release patchfiles-append patch-issue-10695.diff +# SVT-AV1 v3 has API changes +# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73 +patchfiles-append patch-svt-av1-v3.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff new file mode 100644 index 0000000000000..057719fea6ae6 --- /dev/null +++ b/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff @@ -0,0 +1,11 @@ +--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52 ++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45 +@@ -262,7 +262,7 @@ + + svt_enc->eos_flag = EOS_NOT_REACHED; + +- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); + if (svt_ret != EB_ErrorNone) { + return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); + } diff --git a/multimedia/ffmpeg7/Portfile b/multimedia/ffmpeg7/Portfile index b9797110e78b7..b5ff0fa5024fd 100644 --- a/multimedia/ffmpeg7/Portfile +++ b/multimedia/ffmpeg7/Portfile @@ -12,7 +12,7 @@ name ffmpeg7 set my_name ffmpeg version 7.1 -revision 3 +revision 4 license LGPL-2.1+ categories multimedia @@ -129,6 +129,10 @@ platform darwin { # https://trac.macports.org/ticket/69678 # patchfiles-append patch-fix-vulkan.diff +# SVT-AV1 v3 has API changes +# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73 +patchfiles-append patch-svt-av1-v3.diff + # enable auto configure of asm optimizations # requires Xcode 3.1 or better on Leopard minimum_xcodeversions {9 3.1} diff --git a/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff new file mode 100644 index 0000000000000..057719fea6ae6 --- /dev/null +++ b/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff @@ -0,0 +1,11 @@ +--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52 ++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45 +@@ -262,7 +262,7 @@ + + svt_enc->eos_flag = EOS_NOT_REACHED; + +- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params); ++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params); + if (svt_ret != EB_ErrorNone) { + return svt_print_error(avctx, svt_ret, "Error initializing encoder handle"); + }