<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/764b583901be7cc879d2d6f2dbd89ee003454b2c">https://github.com/macports/macports-ports/commit/764b583901be7cc879d2d6f2dbd89ee003454b2c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 764b583901be7cc879d2d6f2dbd89ee003454b2c
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Fri Feb 21 22:45:32 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg*: add patch for svt-av1 v3
</span>---
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(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30bec95f477..53a4b91a1ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ set my_name ffmpeg
</span> conflicts ffmpeg
version 7.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> epoch 2
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +127,10 @@ patchfiles-append patch-libavcodec-librsvgdec.diff
</span> # so the FFMpeg team does not seem to care to include this functionality
patchfiles-append patch-add-pixeldensity.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# SVT-AV1 v3 has API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # 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} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..057719fea6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->eos_flag = EOS_NOT_REACHED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (svt_ret != EB_ErrorNone) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 249c834508b..762a51bc49a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ conflicts ffmpeg-devel
</span>
# Please increase the revision of mpv whenever ffmpeg's version is updated.
version 4.4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> epoch 1
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,6 +121,10 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # so the FFMpeg team does not seem to care to include this functionality
patchfiles-append patch-add-pixeldensity.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# SVT-AV1 v3 has API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg/files/patch-svt-av1-v3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..057719fea6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/files/patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->eos_flag = EOS_NOT_REACHED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (svt_ret != EB_ErrorNone) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg4/Portfile b/multimedia/ffmpeg4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a91fd3eeaa6..e5221fea8c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ set my_name ffmpeg
</span>
# Please increase the revision of mpv whenever ffmpeg's version is updated.
version 4.4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
license LGPL-2.1+
categories multimedia
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,6 +119,10 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # so the FFMpeg team does not seem to care to include this functionality
patchfiles-append patch-add-pixeldensity.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# SVT-AV1 v3 has API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..057719fea6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg4/files/patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->eos_flag = EOS_NOT_REACHED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (svt_ret != EB_ErrorNone) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/Portfile b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15982cfc163..7cc75f22f86 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ name ffmpeg6
</span> set my_name ffmpeg
version 6.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> epoch 0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,10 @@ patchfiles-append patch-libavcodec-librsvgdec.diff
</span> # Remove once upstream has included these in the next release
patchfiles-append patch-issue-10695.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# SVT-AV1 v3 has API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..057719fea6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg6/files/patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->eos_flag = EOS_NOT_REACHED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (svt_ret != EB_ErrorNone) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/Portfile b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9797110e78..b5ff0fa5024 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ name ffmpeg7
</span> set my_name ffmpeg
version 7.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
license LGPL-2.1+
categories multimedia
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,6 +129,10 @@ platform darwin {
</span> # https://trac.macports.org/ticket/69678
# patchfiles-append patch-fix-vulkan.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# SVT-AV1 v3 has API changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/988e930c1083ce518ead1d364e3a486e9209bf73
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff b/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..057719fea6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/files/patch-svt-av1-v3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c.orig 2024-07-29 08:54:52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c 2025-02-21 22:34:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->eos_flag = EOS_NOT_REACHED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (svt_ret != EB_ErrorNone) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>