[packages/handbrake] add binutils 2.41 patch for embedded ffmpeg
atler
atler at pld-linux.org
Sun Oct 1 10:22:08 CEST 2023
commit fe2d86dea68ff96b923df7e3d9572c8287747f10
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Oct 1 09:07:38 2023 +0200
add binutils 2.41 patch for embedded ffmpeg
binutils2.41.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
handbrake.spec | 3 +++
2 files changed, 79 insertions(+)
---
diff --git a/handbrake.spec b/handbrake.spec
index 0c637f4..ccdad81 100644
--- a/handbrake.spec
+++ b/handbrake.spec
@@ -12,6 +12,7 @@ Source0: https://github.com/HandBrake/HandBrake/releases/download/%{version}/Han
# recreate an updated Source1 tarball for it too!
Source1: HandBrake-%{version}-contrib-tarballs.tar
# Source1-md5: 11691c785ee60b58651c5405eeeb5f22
+Patch0: binutils2.41.patch
URL: https://handbrake.fr/
BuildRequires: autoconf
BuildRequires: automake
@@ -92,6 +93,8 @@ This is the CLI tool version of HandBrake.
%prep
%setup -q -n HandBrake-%{version} -a1
+cp -p %{PATCH0} contrib/ffmpeg/A77-%{basename:%{PATCH0}}
+
%build
export CFLAGS="%{rpmcflags}"
export CXXFLAGS="%{rpmcxxflags}"
diff --git a/binutils2.41.patch b/binutils2.41.patch
new file mode 100644
index 0000000..52a9310
--- /dev/null
+++ b/binutils2.41.patch
@@ -0,0 +1,76 @@
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+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 <jamrial at gmail.com>
+---
+ 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.25.1
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/handbrake.git/commitdiff/f9391539ba85228ff92c098ff8ebdcc9760440aa
More information about the pld-cvs-commit
mailing list