From a72f2094ac7c81c496b17288c11d9a817a1e900d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 10 Nov 2023 18:46:44 +0000 Subject: Fri Nov 10 18:46:44 UTC 2023 a/bash-5.2.021-x86_64-1.txz: Upgraded. ap/rdfind-1.6.0-x86_64-1.txz: Added. ap/sudo-1.9.15p2-x86_64-1.txz: Upgraded. l/ffmpeg-5.1.4-x86_64-1.txz: Upgraded. n/dhcpcd-10.0.5-x86_64-1.txz: Upgraded. n/whois-5.5.20-x86_64-1.txz: Upgraded. Added the .gn TLD server. Removed 6 new gTLDs which are no longer active. xfce/xfce4-whiskermenu-plugin-2.8.1-x86_64-1.txz: Upgraded. --- .../effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | 77 ------ source/l/ffmpeg/ffmpeg.SlackBuild | 8 +- source/l/ffmpeg/texinfo.patch | 283 --------------------- 3 files changed, 1 insertion(+), 367 deletions(-) delete mode 100644 source/l/ffmpeg/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch delete mode 100644 source/l/ffmpeg/texinfo.patch (limited to 'source/l') diff --git a/source/l/ffmpeg/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch b/source/l/ffmpeg/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch deleted file mode 100644 index 984c2a820..000000000 --- a/source/l/ffmpeg/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch +++ /dev/null @@ -1,77 +0,0 @@ -From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Signed-off-by: James Almer ---- - libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5ed19..ca7e2dffc1 100644 ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - --- -2.30.2 - - diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index 5eb122cb2..2874f9082 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -175,9 +175,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Fix texinfo-7.1 regression: -zcat $CWD/texinfo.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -188,9 +185,6 @@ find -L . \ # Restore missing function needed by Chromium and qt-webengine: zcat $CWD/add-av_stream_get_first_dts-for-chromium.patch.gz | patch -p1 --verbose || exit 1 -# Upstream patch to build with binutils-2.41: -zcat $CWD/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch.gz | patch -p1 --verbose || exit 1 - # Build against recent Vulkan: zcat $CWD/ffmpeg.vulkan.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/l/ffmpeg/texinfo.patch b/source/l/ffmpeg/texinfo.patch deleted file mode 100644 index 2de58c150..000000000 --- a/source/l/ffmpeg/texinfo.patch +++ /dev/null @@ -1,283 +0,0 @@ ---- ffmpeg-6.0/doc/t2h.pm 2022-11-04 22:16:28.000000000 +0200 -+++ t2h.pm.BAK 2023-10-26 00:47:01.128352085 +0300 -@@ -19,9 +19,11 @@ - # You should have received a copy of the GNU General Public - # License along with FFmpeg; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+use lib '/usr/share/texinfo/Texinfo/Convert'; -+use Texinfo::Convert::Converter; - - # no navigation elements --set_from_init_file('HEADERS', 0); -+texinfo_set_from_init_file('HEADERS', 0); - - sub ffmpeg_heading_command($$$$$) - { -@@ -60,66 +62,68 @@ - } - - 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 -- # bogus node may not have been normalized -- and defined($command->{'extra'}->{'normalized'}))) { -- if ($command->{'extra'}->{'normalized'} eq 'Top') { -- $heading_level = 0; -- } else { -- $heading_level = 3; -- } -- } -+ -+if ($cmdname eq 'node') { -+ if (!$element or ( -+ $element->{'extra'}->{'section'} and -+ $element->{'extra'}->{'node'} and -+ $element->{'extra'}->{'node'} eq $command and -+ defined($command->{'extra'}->{'normalized'}) -+ )) { -+ $heading_level = 0; # Set heading level to 0 - } else { -- $heading_level = $command->{'level'}; -+ $heading_level = 3; - } -+} else { -+ $heading_level = $command->{'level'}; -+} - -- my $heading = $self->command_text($command); -- # $heading not defined may happen if the command is a @node, for example -- # 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}) { -- my $content_href = $self->command_contents_href($command, 'contents', -- $self->{'current_filename'}); -- if ($content_href) { -- my $this_href = $content_href =~ s/^\#toc-/\#/r; -- $heading .= ''. -- ' '. -- ''. -- ''; -- } -+my $heading = $self->command_text($command); -+ -+if (defined($heading) and $heading ne '' and defined($heading_level)) { -+ if ($Texinfo::Common::root_commands{$cmdname} -+ and $Texinfo::Common::sectioning_commands{$cmdname}) { -+ my $content_href = $self->command_contents_href($command, 'contents', $self->{'current_filename'}); -+ if ($content_href) { -+ my $this_href = $content_href =~ s/^\#toc-/\#/r; -+ $heading .= ''. -+ ' ' . -+ ''. -+ ''; - } -+ } - -- if ($self->in_preformatted()) { -- $result .= $heading."\n"; -- } else { -- # if the level was changed, set the command name right -- if ($cmdname ne 'node' -- and $heading_level ne $Texinfo::Common::command_structuring_level{$cmdname}) { -- $cmdname -- = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level]; -- } -- $result .= &{$self->{'format_heading_text'}}( -- $self, $cmdname, $heading, -- $heading_level + -- $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command); -+ if ($self->in_preformatted()) { -+ $result .= $heading."\n"; -+ } else { -+ if ($cmdname ne 'node' -+ and $heading_level ne $Texinfo::Common::command_structuring_level{$cmdname}) { -+ $cmdname -+ = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level]; - } -+ if ($cmdname ne 'node') { -+ # Only add class if the command is not "node" -+ $result .= &{$self->formatting_function('format_heading_text')}( -+ $self, $cmdname, $heading, -+ $heading_level + -+ $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command); -+} else { -+ # Handle "Top" differently, without adding class -+ $result .= $heading . "\n"; -+} - } -- $result .= $content if (defined($content)); -- return $result; -+} -+$result .= $content if (defined($content)); -+ -+return $result; - } - - foreach my $command (keys(%Texinfo::Common::sectioning_commands), 'node') { -@@ -127,22 +131,22 @@ - } - - # determine if texinfo is at least version 6.8 --my $program_version_num = version->declare(get_conf('PACKAGE_VERSION'))->numify; -+my $program_version_num = version->declare(texinfo_get_conf('PACKAGE_VERSION'))->numify; - my $program_version_6_8 = $program_version_num >= 6.008000; - - # print the TOC where @contents is used - if ($program_version_6_8) { -- set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline'); -+ texinfo_set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline'); - } else { -- set_from_init_file('INLINE_CONTENTS', 1); -+ texinfo_set_from_init_file('INLINE_CONTENTS', 1); - } - - # make chapters

--set_from_init_file('CHAPTER_HEADER_LEVEL', 2); -+texinfo_set_from_init_file('CHAPTER_HEADER_LEVEL', 2); - - # Do not add
--set_from_init_file('DEFAULT_RULE', ''); --set_from_init_file('BIG_RULE', ''); -+texinfo_set_from_init_file('DEFAULT_RULE', ''); -+texinfo_set_from_init_file('BIG_RULE', ''); - - # Customized file beginning - sub ffmpeg_begin_file($$$) -@@ -156,10 +160,10 @@ - $command = $self->element_command($element); - } - -- my ($title, $description, $encoding, $date, $css_lines, -+my ($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); -+ $program, $generator) = $self->_file_header_information($command); - - my $links = $self->_get_links ($filename, $element); - -@@ -201,13 +205,13 @@ - sub ffmpeg_program_string($) - { - my $self = shift; -- if (defined($self->get_conf('PROGRAM')) -- and $self->get_conf('PROGRAM') ne '' -- and defined($self->get_conf('PACKAGE_URL'))) { -+ if (defined($self->texinfo_get_conf('PROGRAM')) -+ and $self->texinfo_get_conf('PROGRAM') ne '' -+ and defined($self->texinfo_get_conf('PACKAGE_URL'))) { - 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' => $self->texinfo_get_conf('PACKAGE_URL'), -+ 'program' => $self->texinfo_get_conf('PROGRAM') })); - } else { - return $self->convert_tree( - $self->gdt('This document was generated automatically.')); -@@ -223,7 +227,7 @@ - sub ffmpeg_end_file($) - { - my $self = shift; -- my $program_string = &{$self->{'format_program_string'}}($self); -+ my $program_string = "This document was generated using TexinfoConverter."; - my $program_text = < - $program_string -@@ -244,7 +248,7 @@ - - # Dummy title command - # Ignore title. Title is handled through ffmpeg_begin_file(). --set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1); -+texinfo_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1); - sub ffmpeg_title($$$$) - { - return ''; -@@ -253,6 +257,8 @@ - texinfo_register_command_formatting('titlefont', - \&ffmpeg_title); - -+use lib '/usr/share/texinfo/Texinfo/Convert'; -+ - # Customized float command. Part of code borrowed from GNU Texinfo. - sub ffmpeg_float($$$$$) - { -@@ -262,8 +268,9 @@ - my $args = shift; - my $content = shift; - -- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self, -+my ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self, - $command); -+ - my $caption_text = ''; - my $prepended_text; - my $prepended_save = ''; -@@ -335,24 +342,31 @@ - $caption->{'args'}->[0], 'float caption'); - } - if ($prepended_text.$caption_text ne '') { -- $prepended_text = $self->_attribute_class('div','float-caption'). '>' -- . $prepended_text; -+ $prepended_text = '
' . $prepended_text; - $caption_text .= '
'; -+ - } -- my $html_class = ''; -- if ($prepended_save =~ /NOTE/) { -- $html_class = 'info'; -- $prepended_text = ''; -- $caption_text = ''; -- } elsif ($prepended_save =~ /IMPORTANT/) { -- $html_class = 'warning'; -- $prepended_text = ''; -- $caption_text = ''; -- } -- return $self->_attribute_class('div', $html_class). '>' . "\n" . -- $prepended_text . $caption_text . $content . ''; --} -+ my $html_class = []; - -+if ($prepended_save =~ /NOTE/) { -+ $html_class = ['info']; -+ $prepended_text = ''; -+ $caption_text = ''; -+} elsif ($prepended_save =~ /IMPORTANT/) { -+ $html_class = ['warning']; -+ $prepended_text = ''; -+ $caption_text = ''; -+} elsif ($prepended_save =~ /Top/) { -+ $html_class = [grep { $_ ne 'Top' } @$html_class]; # Remove "Top" class -+ $prepended_text = ''; -+ $caption_text = ''; -+} -+ -+# Set the class attribute directly in the HTML -+return $self->html_attribute_class('div', $html_class) . '>' . "\n" . -+ $prepended_text . $caption_text . $content . ''; -+ -+} - texinfo_register_command_formatting('float', - \&ffmpeg_float); - -- cgit v1.2.3-65-gdbad