<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/afca66901e6c061aaa4bb2012334440a70184f42">https://github.com/macports/macports-ports/commit/afca66901e6c061aaa4bb2012334440a70184f42</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 afca66901e6 ffmpeg{,-devel}: fix build with texinfo >= 7
</span>afca66901e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit afca66901e6c061aaa4bb2012334440a70184f42
</span>Author: Max Rees <maxcrees@me.com>
AuthorDate: Fri Nov 24 23:46:43 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg{,-devel}: fix build with texinfo >= 7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68747
</span>---
multimedia/ffmpeg-devel/Portfile | 6 +
multimedia/ffmpeg-devel/files/patch-texinfo-7.diff | 207 +++++++++++++++++++++
multimedia/ffmpeg/Portfile | 6 +
multimedia/ffmpeg/files/patch-texinfo-7.diff | 207 +++++++++++++++++++++
4 files changed, 426 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 1f0db9ee37c..fc17aad99e8 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;'>@@ -119,6 +119,12 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135
patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for building docs with texinfo >= 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/68747
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.ffmpeg.org/ticket/10636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: f01fdedb69e4accb1d1555106d8f682ff1f1ddc7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-texinfo-7.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-texinfo-7.diff b/multimedia/ffmpeg-devel/files/patch-texinfo-7.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8b8652ca2dd
</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-texinfo-7.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,207 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from the below upstream commit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 8 Nov 2023 07:55:18 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/1] doc/html: support texinfo 7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Resolves trac ticket #10636 (http://trac.ffmpeg.org/ticket/10636).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Texinfo 7.0, released in November 2022, changed the names of various
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+functions. Compiling docs with Texinfo 7.0 resulted in warnings and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+improperly formatted documentation. More old names appear to have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+been removed in Texinfo 7.1, released October 2023, which causes docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilation to fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This commit addresses the issue by adding logic to switch between the old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and new function names depending on the Texinfo version. Texinfo 6.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+produces identical documentation before and after the patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1938238.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.gentoo.org/916104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/t2h.pm | 106 ++++++++++++++++++++++++++++++++++++++++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 85 insertions(+), 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc/t2h.pm b/doc/t2h.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d07d974286..b7485e1f1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/t2h.pm 2023-04-12 14:01:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/t2h.pm 2023-11-21 13:32:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,8 +20,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License along with FFmpeg; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Texinfo 7.0 changed the syntax of various functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Provide a shim for older versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub ff_set_from_init_file($$) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $key = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $value = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exists &{'texinfo_set_from_init_file'}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ texinfo_set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub ff_get_conf($) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $key = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exists &{'texinfo_get_conf'}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ texinfo_get_conf($key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_conf($key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub get_formatting_function($$) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $obj = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $func = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $sub = $obj->can('formatting_function');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($sub) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $obj->formatting_function($func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $obj->{$func};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# determine texinfo version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $program_version_num = version->declare(ff_get_conf('PACKAGE_VERSION'))->numify;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $program_version_6_8 = $program_version_num >= 6.008000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no navigation elements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +92,7 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $element = $command->{'parent'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($element) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $result .= &{$self->{'format_element_header'}}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $command, $element);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +149,11 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $cmdname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $result .= &{$self->{'format_heading_text'}}(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # format_heading_text expects an array of headings for texinfo >= 7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $heading = [$heading];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $result .= &{get_formatting_function($self,'format_heading_text')}(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $self, $cmdname, $heading,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $heading_level +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,14 +168,14 @@ foreach my $command (keys(%Texinfo::Common::sectioning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # print the TOC where @contents is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make chapters <h2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not add <hr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Customized file beginning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +192,18 @@ sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator) = $self->_file_header_information($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $links = $self->_get_links ($filename, $element);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +259,7 @@ sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $self = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $program_string = &{$self->{'format_program_string'}}($self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $program_string = &{get_formatting_function($self,'format_program_string')}($self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $program_text = <<EOT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <p style="font-size: small;">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $program_string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,7 +276,7 @@ texinfo_register_formatting_function('end_file', \&ffm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dummy title command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ignore title. Title is handled through ffmpeg_begin_file().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_title($$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,8 +294,14 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $args = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $content = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my ($caption, $prepended);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $caption_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $prepended_save = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,8 +373,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption->{'args'}->[0], 'float caption');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($prepended_text.$caption_text ne '') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text = $self->html_attribute_class('div',['float-caption']). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption_text .= '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $html_class = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,8 +392,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $prepended_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $self->html_attribute_class('div', [$html_class]). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ texinfo_register_command_formatting('float',
</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 4582698a071..0de8bcc2e2e 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;'>@@ -119,6 +119,12 @@ patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span> # Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135
patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch for building docs with texinfo >= 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/68747
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.ffmpeg.org/ticket/10636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed via upstream commit: f01fdedb69e4accb1d1555106d8f682ff1f1ddc7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-texinfo-7.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-texinfo-7.diff b/multimedia/ffmpeg/files/patch-texinfo-7.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8b8652ca2dd
</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-texinfo-7.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,207 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from the below upstream commit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 8 Nov 2023 07:55:18 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/1] doc/html: support texinfo 7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Resolves trac ticket #10636 (http://trac.ffmpeg.org/ticket/10636).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Texinfo 7.0, released in November 2022, changed the names of various
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+functions. Compiling docs with Texinfo 7.0 resulted in warnings and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+improperly formatted documentation. More old names appear to have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+been removed in Texinfo 7.1, released October 2023, which causes docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilation to fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This commit addresses the issue by adding logic to switch between the old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and new function names depending on the Texinfo version. Texinfo 6.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+produces identical documentation before and after the patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1938238.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.gentoo.org/916104
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc/t2h.pm | 106 ++++++++++++++++++++++++++++++++++++++++++-----------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 85 insertions(+), 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc/t2h.pm b/doc/t2h.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d07d974286..b7485e1f1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/t2h.pm 2023-04-12 14:01:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/t2h.pm 2023-11-21 13:32:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,8 +20,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License along with FFmpeg; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Texinfo 7.0 changed the syntax of various functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Provide a shim for older versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub ff_set_from_init_file($$) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $key = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $value = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exists &{'texinfo_set_from_init_file'}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ texinfo_set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub ff_get_conf($) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $key = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (exists &{'texinfo_get_conf'}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ texinfo_get_conf($key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_conf($key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sub get_formatting_function($$) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $obj = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $func = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $sub = $obj->can('formatting_function');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($sub) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $obj->formatting_function($func);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $obj->{$func};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# determine texinfo version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $program_version_num = version->declare(ff_get_conf('PACKAGE_VERSION'))->numify;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++my $program_version_6_8 = $program_version_num >= 6.008000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no navigation elements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +92,7 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $element = $command->{'parent'};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($element) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $result .= &{$self->{'format_element_header'}}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $command, $element);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +149,11 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $cmdname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $result .= &{$self->{'format_heading_text'}}(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # format_heading_text expects an array of headings for texinfo >= 7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $heading = [$heading];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $result .= &{get_formatting_function($self,'format_heading_text')}(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $self, $cmdname, $heading,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $heading_level +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,14 +168,14 @@ foreach my $command (keys(%Texinfo::Common::sectioning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # print the TOC where @contents is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make chapters <h2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not add <hr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Customized file beginning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +192,18 @@ sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator) = $self->_file_header_information($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $links = $self->_get_links ($filename, $element);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +259,7 @@ sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $self = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my $program_string = &{$self->{'format_program_string'}}($self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my $program_string = &{get_formatting_function($self,'format_program_string')}($self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $program_text = <<EOT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <p style="font-size: small;">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $program_string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,7 +276,7 @@ texinfo_register_formatting_function('end_file', \&ffm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dummy title command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ignore title. Title is handled through ffmpeg_begin_file().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ff_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub ffmpeg_title($$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,8 +294,14 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $args = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $content = shift;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ my ($caption, $prepended);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $caption_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $prepended_save = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,8 +373,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption->{'args'}->[0], 'float caption');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($prepended_text.$caption_text ne '') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text = $self->html_attribute_class('div',['float-caption']). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption_text .= '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my $html_class = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,8 +392,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $prepended_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $caption_text = '';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $self->html_attribute_class('div', [$html_class]). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ texinfo_register_command_formatting('float',
</span></pre><pre style='margin:0'>
</pre>