[packages/ffmpeg/DEVEL-7.0] - updated to 7.0.3, not ready for current xeve
qboosh
qboosh at pld-linux.org
Tue Oct 13 06:29:05 CEST 2026
commit 530a20921e9b590f0d4b37466479713ac064fb0e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Oct 13 06:29:33 2026 +0200
- updated to 7.0.3, not ready for current xeve
binutils-2.43.patch | 58 ----------
ffmpeg.spec | 58 +++++-----
libv4l2-1.30.patch | 8 +-
texinfo-7.2.patch | 297 ----------------------------------------------------
4 files changed, 32 insertions(+), 389 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 580a192..0883c0e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -133,7 +133,7 @@
Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
-Version: 7.0.2
+Version: 7.0.3
Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# GPL: frei0r libcdio libdavs2 rubberband vidstab x264 x265 xavs xavs2 xvid
@@ -142,14 +142,12 @@ Release: 1
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: https://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: e22725fc3738e314d71a7fb32f2336db
+# Source0-md5: fd48a094415174af114c7fcdbd9e0e5a
Patch0: %{name}-omx-libnames.patch
Patch1: %{name}-atadenoise.patch
Patch2: opencv4.patch
Patch3: v4l2-request-hwdec.patch
-Patch6: texinfo-7.2.patch
Patch7: libv4l2-1.30.patch
-Patch8: binutils-2.43.patch
URL: https://ffmpeg.org/
%{?with_avisynth:BuildRequires: AviSynthPlus-devel >= 3.7.3}
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.11}
@@ -290,7 +288,9 @@ BuildRequires: twolame-devel >= 0.3.10
%{?with_avs:BuildRequires: xavs-devel}
%{?with_avs2:BuildRequires: xavs2-devel >= 1.3}
%{?with_xevc:BuildRequires: xevd-devel >= 0.4.1}
+%{?with_xevc:BuildRequires: xevd-devel < 0.5}
%{?with_xevc:BuildRequires: xeve-devel >= 0.4.3}
+%{?with_xevc:BuildRequires: xeve-devel < 0.5}
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXv-devel
@@ -587,9 +587,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
%if %{with v4l2_request}
%patch -P3 -p1
%endif
-%patch -P6 -p1
%patch -P7 -p1
-%patch -P8 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > ffmpeg-avconfig
@@ -875,35 +873,35 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.61
-%attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.61
-%attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.10
-%attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.61
-%attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.59
-%attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.58
-%attr(755,root,root) %{_libdir}/libswresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswresample.so.5
-%attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.8
+%{_libdir}/libavcodec.so.*.*.*
+%ghost %{_libdir}/libavcodec.so.61
+%{_libdir}/libavdevice.so.*.*.*
+%ghost %{_libdir}/libavdevice.so.61
+%{_libdir}/libavfilter.so.*.*.*
+%ghost %{_libdir}/libavfilter.so.10
+%{_libdir}/libavformat.so.*.*.*
+%ghost %{_libdir}/libavformat.so.61
+%{_libdir}/libavutil.so.*.*.*
+%ghost %{_libdir}/libavutil.so.59
+%{_libdir}/libpostproc.so.*.*.*
+%ghost %{_libdir}/libpostproc.so.58
+%{_libdir}/libswresample.so.*.*.*
+%ghost %{_libdir}/libswresample.so.5
+%{_libdir}/libswscale.so.*.*.*
+%ghost %{_libdir}/libswscale.so.8
%files devel
%defattr(644,root,root,755)
%doc doc/optimization.txt
%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
-%attr(755,root,root) %{_libdir}/libavcodec.so
-%attr(755,root,root) %{_libdir}/libavdevice.so
-%attr(755,root,root) %{_libdir}/libavfilter.so
-%attr(755,root,root) %{_libdir}/libavformat.so
-%attr(755,root,root) %{_libdir}/libavutil.so
-%attr(755,root,root) %{_libdir}/libpostproc.so
-%attr(755,root,root) %{_libdir}/libswresample.so
-%attr(755,root,root) %{_libdir}/libswscale.so
+%{_libdir}/libavcodec.so
+%{_libdir}/libavdevice.so
+%{_libdir}/libavfilter.so
+%{_libdir}/libavformat.so
+%{_libdir}/libavutil.so
+%{_libdir}/libpostproc.so
+%{_libdir}/libswresample.so
+%{_libdir}/libswscale.so
%{_includedir}/ffmpeg
%{_includedir}/libavcodec
%{_includedir}/libavdevice
diff --git a/binutils-2.43.patch b/binutils-2.43.patch
deleted file mode 100644
index 750f350..0000000
--- a/binutils-2.43.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton at arm.com>
-Date: Fri, 9 Aug 2024 11:32:00 +0100
-Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
- binutils 2.43
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-binutils 2.43 has stricter validation for labels[1] and results in errors
-when building ffmpeg for armv5:
-
-src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
-
-Remove the leading zero in the "01" label to resolve this error.
-
-[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
-
-Signed-off-by: Ross Burton <ross.burton at arm.com>
-Signed-off-by: Martin Storsjö <martin at martin.st>
----
- libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
-index 4f9aa485fd..d31568611c 100644
---- a/libavcodec/arm/mlpdsp_armv5te.S
-+++ b/libavcodec/arm/mlpdsp_armv5te.S
-@@ -229,7 +229,7 @@ A .endif
- .endif
-
- // Begin loop
--01:
-+1:
- .if TOTAL_TAPS == 0
- // Things simplify a lot in this case
- // In fact this could be pipelined further if it's worth it...
-@@ -241,7 +241,7 @@ A .endif
- str ST0, [PST, #-4]!
- str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
- str ST0, [PSAMP], #4 * MAX_CHANNELS
-- bne 01b
-+ bne 1b
- .else
- .if \fir_taps & 1
- .set LOAD_REG, 1
-@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
- str ST3, [PST, #-4]!
- str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
- str ST3, [PSAMP], #4 * MAX_CHANNELS
-- bne 01b
-+ bne 1b
- .endif
- b 99f
-
---
-2.30.2
-
diff --git a/libv4l2-1.30.patch b/libv4l2-1.30.patch
index 16b3e65..8463f75 100644
--- a/libv4l2-1.30.patch
+++ b/libv4l2-1.30.patch
@@ -24,7 +24,7 @@ diff --git a/configure b/configure
index de1b88150f..534b443f7d 100755
--- a/configure
+++ b/configure
-@@ -2533,6 +2533,7 @@ HAVE_LIST="
+@@ -2508,6 +2508,7 @@ HAVE_LIST="
$TOOLCHAIN_FEATURES
$TYPES_LIST
gzip
@@ -32,15 +32,15 @@ index de1b88150f..534b443f7d 100755
libdrm_getfb2
makeinfo
makeinfo_html
-@@ -2545,7 +2546,6 @@ HAVE_LIST="
- opencl_vaapi_intel_media
+@@ -2520,7 +2521,6 @@ HAVE_LIST="
+ opencl_videotoolbox
perl
pod2man
- posix_ioctl
texi2html
xmllint
zlib_gzip
-@@ -7275,7 +7275,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
+@@ -7157,7 +7157,7 @@ xmllint --version > /dev/null 2>&1 && e
check_headers linux/fb.h
check_headers linux/videodev2.h
test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
diff --git a/texinfo-7.2.patch b/texinfo-7.2.patch
deleted file mode 100644
index 52d4aa2..0000000
--- a/texinfo-7.2.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Date: Fri, 1 Nov 2024 15:57:07 +0100
-From: Patrice Dumas <pertususatfree.fr>
-Subject: [FFmpeg-devel] [PATCH] doc/t2h: Support texinfo 7.1 and 7.2 pretest
-
-Here is a proposed patch for portability of doc/t2h.pm for GNU Texinfo
-7.1 and 7.1.90 (7.2 pretest). I tested against 7.1 and 7.1.90 (7.2
-pretest). There is a difference in the headings compared to the website
-version, maybe related to FA_ICONS not being set the same, but the
-result seems correct.
-
-I also renamed $element to $output_unit in ffmpeg_heading_command as in
-new equivalent makeinfo/texi2any code the $element variable is the
-$command variable in ffmpeg_heading_command, which is very confusing. I
-left as is the $command variable to have a patch easier to read, but it
-could make sense to rename $command as $element later on.
-
-The patch could also have effects with Texinfo 7.0, since some of the
-changes are for that version, but that probably never show up because it
-is for situations that may not exist in ffmpeg manuals (for example
- at node without sectioning command), or because the code is robust to some
-missing information (case of $heading_level in ffmpeg_heading_command
-that was not set, as far as I can tell).
-
----
- doc/t2h.pm | 169 ++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 129 insertions(+), 40 deletions(-)
-
-diff --git a/doc/t2h.pm b/doc/t2h.pm
-index b7485e1f1e..1359960f27 100644
---- a/doc/t2h.pm
-+++ b/doc/t2h.pm
-@@ -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) {
---
-2.45.2
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/530a20921e9b590f0d4b37466479713ac064fb0e
More information about the pld-cvs-commit
mailing list