From 074d96d8ecdece95d8e39f8b17d31f440266eeff Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Fri, 26 Jan 2024 20:33:17 -0500 Subject: add ffmpeg patch from videolan.org --- newmoon/debian/control | 1 - ...-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | 76 ++++++++++++++++++++++ newmoon/debian/patches/series | 1 + 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch diff --git a/newmoon/debian/control b/newmoon/debian/control index 647a0fc..cb9cd4f 100644 --- a/newmoon/debian/control +++ b/newmoon/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 12), libasound2-dev, libdbus-glib-1-dev (>= 0.60), libfontconfig1-dev, - libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.18), libpulse-dev, libx11-xcb-dev, diff --git a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch new file mode 100644 index 0000000..33fd3d4 --- /dev/null +++ b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch @@ -0,0 +1,76 @@ +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/newmoon/debian/patches/series b/newmoon/debian/patches/series index e6eb56e..4cd1aab 100644 --- a/newmoon/debian/patches/series +++ b/newmoon/debian/patches/series @@ -3,3 +3,4 @@ fix-armhf-FTBFS.patch small-icons.patch pm-devuan.patch pm-to-nm.patch +ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch -- cgit