sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (61d1f364ea64b5bc1dc7fb0a152be5c06d222dc3)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (61d1f364ea64b5bc1dc7fb0a152be5c06d222dc3)
- Date: Fri, 7 Mar 2025 16:34:53 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
openprinting/pdfio/DETAILS | 2
openprinting/pdfio/HISTORY | 3
rust-crates/sccache/DETAILS | 4
rust-crates/sccache/HISTORY | 3
video/ffmpeg7/DETAILS | 2
video/ffmpeg7/HISTORY | 4
video/ffmpeg7/patches/ffmpeg-7.1-texinfo_fix-1.patch | 280
-------------------
7 files changed, 14 insertions(+), 284 deletions(-)
New commits:
commit 61d1f364ea64b5bc1dc7fb0a152be5c06d222dc3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
ffmpeg7: => 7.1.1
commit 363969f864c050fd3a64d7231d09b85e49c94379
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
sccache: => 0.9.1
commit 5f7f013a2862d11b48a8d0ad32b50331c3d517ae
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pdfio: => 1.5.0
diff --git a/openprinting/pdfio/DETAILS b/openprinting/pdfio/DETAILS
index 98505f2..f7857a5 100755
--- a/openprinting/pdfio/DETAILS
+++ b/openprinting/pdfio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pdfio
- VERSION=1.4.1
+ VERSION=1.5.0
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$SPELL-$VERSION
diff --git a/openprinting/pdfio/HISTORY b/openprinting/pdfio/HISTORY
index b3d7b82..eb4c8c1 100644
--- a/openprinting/pdfio/HISTORY
+++ b/openprinting/pdfio/HISTORY
@@ -1,3 +1,6 @@
+2025-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.0
+
2025-01-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.1
diff --git a/rust-crates/sccache/DETAILS b/rust-crates/sccache/DETAILS
index 4893e24..9c90d6c 100755
--- a/rust-crates/sccache/DETAILS
+++ b/rust-crates/sccache/DETAILS
@@ -1,9 +1,9 @@
SPELL=sccache
- VERSION=0.8.1
+ VERSION=0.9.1
+
SOURCE_HASH=sha256:150967a59f148f780acc167c9e35961a196953bd804d513ab013344d73deb436
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/mozilla/${SPELL}/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha256:30b951b49246d5ca7d614e5712215cb5f39509d6f899641f511fb19036b5c4e5
LICENSE[0]=APACHE
STAGED_INSTALL=off
WEB_SITE=https://github.com/mozilla/sccache
diff --git a/rust-crates/sccache/HISTORY b/rust-crates/sccache/HISTORY
index 20a442e..23d9fd8 100644
--- a/rust-crates/sccache/HISTORY
+++ b/rust-crates/sccache/HISTORY
@@ -1,3 +1,6 @@
+2025-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.1
+
2024-06-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.1
diff --git a/video/ffmpeg7/DETAILS b/video/ffmpeg7/DETAILS
index ea07864..abf7d3a 100755
--- a/video/ffmpeg7/DETAILS
+++ b/video/ffmpeg7/DETAILS
@@ -1,6 +1,6 @@
SPELL=ffmpeg7
SPELLX=ffmpeg
- VERSION=7.1
+ VERSION=7.1.1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/video/ffmpeg7/HISTORY b/video/ffmpeg7/HISTORY
index 60100c5..b2b8ffe 100644
--- a/video/ffmpeg7/HISTORY
+++ b/video/ffmpeg7/HISTORY
@@ -1,3 +1,7 @@
+2025-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.1.1
+ * ffmpeg-7.1-texinfo_fix-1.patch: deleted
+
2024-09-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.1
* PRE_BUILD patches/*: from blfs
diff --git a/video/ffmpeg7/patches/ffmpeg-7.1-texinfo_fix-1.patch
b/video/ffmpeg7/patches/ffmpeg-7.1-texinfo_fix-1.patch
deleted file mode 100644
index 21bcfb3..0000000
--- a/video/ffmpeg7/patches/ffmpeg-7.1-texinfo_fix-1.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date: 2025-01-02
-Initial Package Version: 7.1
-Origin: Upstream Mailing List
(https://ffmpeg.org/pipermail/ffmpeg-devel/2024-November/335575.html)
-Upstream Status: Submitted
-Description: Fixes building ffmpeg-7.1 with texinfo-7.2. The
issue
- is due to API changes in the Texinfo::Convert::HTML
- perl submodule, where the gdt method was removed.
The
- patch uses the cdt method instead, and portability
- guards are put into place for users who are using
- older versions of Texinfo. Thanks goes to Marty Jack
- for bringing it to our attention in the LFS ticket.
-
-diff -Naurp ffmpeg-7.1.orig/doc/t2h.pm ffmpeg-7.1/doc/t2h.pm
---- ffmpeg-7.1.orig/doc/t2h.pm 2025-01-02 14:52:50.960834600 -0600
-+++ ffmpeg-7.1/doc/t2h.pm 2025-01-02 14:53:01.048047754 -0600
-@@ -54,12 +54,24 @@ sub get_formatting_function($$) {
- }
-
- # determine texinfo version
--my $program_version_num =
version->declare(ff_get_conf('PACKAGE_VERSION'))->numify;
-+my $package_version = ff_get_conf('PACKAGE_VERSION');
-+$package_version =~ s/\+dev$//;
-+my $program_version_num = version->declare($package_version)->numify;
- my $program_version_6_8 = $program_version_num >= 6.008000;
-
- # no navigation elements
- ff_set_from_init_file('HEADERS', 0);
-
-+my %sectioning_commands = %Texinfo::Common::sectioning_commands;
-+if (scalar(keys(%sectioning_commands)) == 0) {
-+ %sectioning_commands = %Texinfo::Commands::sectioning_heading_commands;
-+}
-+
-+my %root_commands = %Texinfo::Common::root_commands;
-+if (scalar(keys(%root_commands)) == 0) {
-+ %root_commands = %Texinfo::Commands::root_commands;
-+}
-+
- sub ffmpeg_heading_command($$$$$)
- {
- my $self = shift;
-@@ -77,6 +89,9 @@ sub ffmpeg_heading_command($$$$$)
- return $result;
- }
-
-+ # no need to set it as the $element_id is output unconditionally
-+ my $heading_id;
-+
- my $element_id = $self->command_id($command);
- $result .= "<a name=\"$element_id\"></a>\n"
- if (defined($element_id) and $element_id ne '');
-@@ -84,24 +99,40 @@ sub ffmpeg_heading_command($$$$$)
- print STDERR "Process $command "
- .Texinfo::Structuring::_print_root_command_texi($command)."\n"
- if ($self->get_conf('DEBUG'));
-- my $element;
-- if ($Texinfo::Common::root_commands{$command->{'cmdname'}}
-- and $command->{'parent'}
-- and $command->{'parent'}->{'type'}
-- and $command->{'parent'}->{'type'} eq 'element') {
-- $element = $command->{'parent'};
-+ my $output_unit;
-+ if ($root_commands{$command->{'cmdname'}}) {
-+ if ($command->{'associated_unit'}) {
-+ $output_unit = $command->{'associated_unit'};
-+ } elsif ($command->{'structure'}
-+ and $command->{'structure'}->{'associated_unit'}) {
-+ $output_unit = $command->{'structure'}->{'associated_unit'};
-+ } elsif ($command->{'parent'}
-+ and $command->{'parent'}->{'type'}
-+ and $command->{'parent'}->{'type'} eq 'element') {
-+ $output_unit = $command->{'parent'};
-+ }
- }
-- if ($element) {
-+
-+ if ($output_unit) {
- $result .= &{get_formatting_function($self,
'format_element_header')}($self, $cmdname,
-- $command, $element);
-+ $command,
$output_unit);
- }
-
- my $heading_level;
- # node is used as heading if there is nothing else.
- if ($cmdname eq 'node') {
-- if (!$element or (!$element->{'extra'}->{'section'}
-- and $element->{'extra'}->{'node'}
-- and $element->{'extra'}->{'node'} eq $command
-+ if (!$output_unit or
-+ (((!$output_unit->{'extra'}->{'section'}
-+ and $output_unit->{'extra'}->{'node'}
-+ and $output_unit->{'extra'}->{'node'} eq $command)
-+ or
-+ ((($output_unit->{'extra'}->{'unit_command'}
-+ and $output_unit->{'extra'}->{'unit_command'} eq $command)
-+ or
-+ ($output_unit->{'unit_command'}
-+ and $output_unit->{'unit_command'} eq $command))
-+ and $command->{'extra'}
-+ and not $command->{'extra'}->{'associated_section'}))
- # bogus node may not have been normalized
- and defined($command->{'extra'}->{'normalized'}))) {
- if ($command->{'extra'}->{'normalized'} eq 'Top') {
-@@ -111,7 +142,15 @@ sub ffmpeg_heading_command($$$$$)
- }
- }
- } else {
-- $heading_level = $command->{'level'};
-+ if (defined($command->{'extra'})
-+ and defined($command->{'extra'}->{'section_level'})) {
-+ $heading_level = $command->{'extra'}->{'section_level'};
-+ } elsif ($command->{'structure'}
-+ and defined($command->{'structure'}->{'section_level'})) {
-+ $heading_level = $command->{'structure'}->{'section_level'};
-+ } else {
-+ $heading_level = $command->{'level'};
-+ }
- }
-
- my $heading = $self->command_text($command);
-@@ -119,8 +158,8 @@ sub ffmpeg_heading_command($$$$$)
- # if there is an error in the node.
- if (defined($heading) and $heading ne '' and defined($heading_level)) {
-
-- if ($Texinfo::Common::root_commands{$cmdname}
-- and $Texinfo::Common::sectioning_commands{$cmdname}) {
-+ if ($root_commands{$cmdname}
-+ and $sectioning_commands{$cmdname}) {
- my $content_href = $self->command_contents_href($command,
'contents',
-
$self->{'current_filename'});
- if ($content_href) {
-@@ -140,7 +179,13 @@ sub ffmpeg_heading_command($$$$$)
- }
- }
-
-- if ($self->in_preformatted()) {
-+ my $in_preformatted;
-+ if ($program_version_num >= 7.001090) {
-+ $in_preformatted = $self->in_preformatted_context();
-+ } else {
-+ $in_preformatted = $self->in_preformatted();
-+ }
-+ if ($in_preformatted) {
- $result .= $heading."\n";
- } else {
- # if the level was changed, set the command name right
-@@ -149,21 +194,25 @@ sub ffmpeg_heading_command($$$$$)
- $cmdname
- =
$Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
- }
-- # format_heading_text expects an array of headings for texinfo
>= 7.0
- if ($program_version_num >= 7.000000) {
-- $heading = [$heading];
-- }
-- $result .=
&{get_formatting_function($self,'format_heading_text')}(
-+ $result .=
&{get_formatting_function($self,'format_heading_text')}($self,
-+ $cmdname, [$cmdname], $heading,
-+ $heading_level
+$self->get_conf('CHAPTER_HEADER_LEVEL') -1,
-+ $heading_id, $command);
-+
-+ } else {
-+ $result .=
&{get_formatting_function($self,'format_heading_text')}(
- $self, $cmdname, $heading,
- $heading_level +
- $self->get_conf('CHAPTER_HEADER_LEVEL') - 1,
$command);
-+ }
- }
- }
- $result .= $content if (defined($content));
- return $result;
- }
-
--foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') {
-+foreach my $command (keys(%sectioning_commands), 'node') {
- texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
- }
-
-@@ -188,28 +237,56 @@ sub ffmpeg_begin_file($$$)
- my $filename = shift;
- my $element = shift;
-
-- my $command;
-- if ($element and $self->get_conf('SPLIT')) {
-- $command = $self->element_command($element);
-+ my ($element_command, $node_command, $command_for_title);
-+ if ($element) {
-+ if ($element->{'unit_command'}) {
-+ $element_command = $element->{'unit_command'};
-+ } elsif ($self->can('tree_unit_element_command')) {
-+ $element_command = $self->tree_unit_element_command($element);
-+ } elsif ($self->can('tree_unit_element_command')) {
-+ $element_command = $self->element_command($element);
-+ }
-+
-+ $node_command = $element_command;
-+ if ($element_command and $element_command->{'cmdname'}
-+ and $element_command->{'cmdname'} ne 'node'
-+ and $element_command->{'extra'}
-+ and $element_command->{'extra'}->{'associated_node'}) {
-+ $node_command = $element_command->{'extra'}->{'associated_node'};
-+ }
-+
-+ $command_for_title = $element_command if ($self->get_conf('SPLIT'));
- }
-
-- my ($title, $description, $encoding, $date, $css_lines,
-- $doctype, $bodytext, $copying_comment, $after_body_open,
-- $extra_head, $program_and_version, $program_homepage,
-+ my ($title, $description, $keywords, $encoding, $date, $css_lines,
$doctype,
-+ $root_html_element_attributes, $body_attributes, $copying_comment,
-+ $after_body_open, $extra_head, $program_and_version,
$program_homepage,
- $program, $generator);
-- if ($program_version_num >= 7.000000) {
-- ($title, $description, $encoding, $date, $css_lines,
-- $doctype, $bodytext, $copying_comment, $after_body_open,
-+ if ($program_version_num >= 7.001090) {
-+ ($title, $description, $keywords, $encoding, $date, $css_lines,
$doctype,
-+ $root_html_element_attributes, $body_attributes, $copying_comment,
-+ $after_body_open, $extra_head, $program_and_version,
$program_homepage,
-+ $program, $generator) =
$self->_file_header_information($command_for_title,
-+
$filename);
-+ } elsif ($program_version_num >= 7.000000) {
-+ ($title, $description, $encoding, $date, $css_lines, $doctype,
-+ $root_html_element_attributes, $copying_comment, $after_body_open,
- $extra_head, $program_and_version, $program_homepage,
-- $program, $generator) = $self->_file_header_information($command);
-+ $program, $generator) =
$self->_file_header_information($command_for_title,
-+ $filename);
- } else {
- ($title, $description, $encoding, $date, $css_lines,
-- $doctype, $bodytext, $copying_comment, $after_body_open,
-- $extra_head, $program_and_version, $program_homepage,
-- $program, $generator) = $self->_file_header_informations($command);
-+ $doctype, $root_html_element_attributes, $copying_comment,
-+ $after_body_open, $extra_head, $program_and_version,
$program_homepage,
-+ $program, $generator) =
$self->_file_header_informations($command_for_title);
- }
-
-- my $links = $self->_get_links ($filename, $element);
-+ my $links;
-+ if ($program_version_num >= 7.000000) {
-+ $links = $self->_get_links($filename, $element, $node_command);
-+ } else {
-+ $links = $self->_get_links ($filename, $element);
-+ }
-
- my $head1 = $ENV{"FFMPEG_HEADER1"} || <<EOT;
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
-@@ -252,13 +329,25 @@ sub ffmpeg_program_string($)
- if (defined($self->get_conf('PROGRAM'))
- and $self->get_conf('PROGRAM') ne ''
- and defined($self->get_conf('PACKAGE_URL'))) {
-- return $self->convert_tree(
-+ if ($program_version_num >= 7.001090) {
-+ return $self->convert_tree(
-+ $self->cdt('This document was generated using
@uref{{program_homepage}, @emph{{program}}}.',
-+ { 'program_homepage' => {'text' => $self->get_conf('PACKAGE_URL')},
-+ 'program' => {'text' => $self->get_conf('PROGRAM') }}));
-+ } else {
-+ return $self->convert_tree(
- $self->gdt('This document was generated using
@uref{{program_homepage}, @emph{{program}}}.',
-- { 'program_homepage' => $self->get_conf('PACKAGE_URL'),
-- 'program' => $self->get_conf('PROGRAM') }));
-+ { 'program_homepage' => {'text' => $self->get_conf('PACKAGE_URL')},
-+ 'program' => {'text' => $self->get_conf('PROGRAM') }}));
-+ }
- } else {
-- return $self->convert_tree(
-- $self->gdt('This document was generated automatically.'));
-+ if ($program_version_num >= 7.001090) {
-+ return $self->convert_tree(
-+ $self->cdt('This document was generated automatically.'));
-+ } else {
-+ return $self->convert_tree(
-+ $self->gdt('This document was generated automatically.'));
-+ }
- }
- }
- if ($program_version_6_8) {
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (61d1f364ea64b5bc1dc7fb0a152be5c06d222dc3), Treeve Jelbert, 03/07/2025
Archive powered by MHonArc 2.6.24.