<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/bda0629599e0a51904a1781acdeba7c98100325c">https://github.com/macports/macports-ports/commit/bda0629599e0a51904a1781acdeba7c98100325c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bda0629599e ffmpeg/ffmpeg-devel: patch for compressed_ten_bit_format build error Fixes: https://trac.macports.org/ticket/67327
</span>bda0629599e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bda0629599e0a51904a1781acdeba7c98100325c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue May 9 17:21:31 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg/ffmpeg-devel: patch for compressed_ten_bit_format build error
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67327
</span>---
multimedia/ffmpeg-devel/Portfile | 8 +++++
.../patch-libavcodec-libsvtav1-ten_bit_format.diff | 40 ++++++++++++++++++++++
multimedia/ffmpeg/Portfile | 8 +++++
.../patch-libavcodec-libsvtav1-ten_bit_format.diff | 40 ++++++++++++++++++++++
4 files changed, 96 insertions(+)
<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 ef890c29d31..797265eabd5 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;'>@@ -115,6 +115,14 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # Fixed via upstream commit: e5163b1d34381a3319214a902ef1df923dd2eeba
patchfiles-append patch-libsdl2-version.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for upstream issue:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libavcodec/libsvtav1.c:124:53: error: no member named 'compressed_ten_bit_format' in 'struct EbSvtAv1EncConfiguration'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ~~~~~~ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/67327
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.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-devel/files/patch-libavcodec-libsvtav1-ten_bit_format.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-libsvtav1-ten_bit_format.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..891ca8aca90
</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-libavcodec-libsvtav1-ten_bit_format.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Thu, 20 Oct 2022 22:55:27 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compressed_ten_bit_format has been deprecated upstream and has no effect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and can be removed. Plus, technically it was never used in the first place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since it would require the app (ffmpeg) to set it and do additional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# processing of the input frames.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int pack_mode_10bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const size_t luma_size_8bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- config->source_width * config->source_height * (1 << pack_mode_10bit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const size_t luma_size_10bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const size_t luma_size = config->source_width * config->source_height *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (config->encoder_bit_depth > 8 ? 2 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EbSvtIOFormat *in_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_enc->raw_size = luma_size * 3 / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // allocate buffer for in and out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</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 d2cdcd13851..7cd4413e938 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;'>@@ -115,6 +115,14 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # Fixed via upstream commit: e5163b1d34381a3319214a902ef1df923dd2eeba
patchfiles-append patch-libsdl2-version.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for upstream issue:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libavcodec/libsvtav1.c:124:53: error: no member named 'compressed_ten_bit_format' in 'struct EbSvtAv1EncConfiguration'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ~~~~~~ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/67327
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.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-libavcodec-libsvtav1-ten_bit_format.diff b/multimedia/ffmpeg/files/patch-libavcodec-libsvtav1-ten_bit_format.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..891ca8aca90
</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-libavcodec-libsvtav1-ten_bit_format.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Thu, 20 Oct 2022 22:55:27 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compressed_ten_bit_format has been deprecated upstream and has no effect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and can be removed. Plus, technically it was never used in the first place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since it would require the app (ffmpeg) to set it and do additional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# processing of the input frames.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const int pack_mode_10bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const size_t luma_size_8bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- config->source_width * config->source_height * (1 << pack_mode_10bit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const size_t luma_size_10bit =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const size_t luma_size = config->source_width * config->source_height *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (config->encoder_bit_depth > 8 ? 2 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EbSvtIOFormat *in_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ svt_enc->raw_size = luma_size * 3 / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // allocate buffer for in and out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>