diff options
| -rw-r--r-- | newmoon/debian/changelog | 2 | ||||
| -rw-r--r-- | newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | 78 | ||||
| -rw-r--r-- | newmoon/debian/patches/fix-armhf-FTBFS.patch | 20 | ||||
| -rw-r--r-- | newmoon/debian/patches/series | 2 |
4 files changed, 2 insertions, 100 deletions
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog index cb52d58..875e2e4 100644 --- a/newmoon/debian/changelog +++ b/newmoon/debian/changelog @@ -1,5 +1,7 @@ newmoon (33.0.0-1+stackrpms) obs; urgency=medium + * remove obsolete ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch + * remove obsolete fix-armhf-FTBFS.patch * Upstream updates * Implemented a restricted version of the asynchronous clipboard API (navigator.clipboard). This API is restricted to writing only for diff --git a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch deleted file mode 100644 index 2929219..0000000 --- a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch +++ /dev/null @@ -1,78 +0,0 @@ -From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@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@gmail.com> ---- - libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -Source: https://git.videolan.org/?p=ffmpeg.git;a=patch;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb - -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5ed19..ca7e2dffc1 100644 ---- a/platform/media/ffvpx/libavcodec/x86/mathops.h -+++ b/platform/media/ffvpx/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/fix-armhf-FTBFS.patch b/newmoon/debian/patches/fix-armhf-FTBFS.patch deleted file mode 100644 index e15be32..0000000 --- a/newmoon/debian/patches/fix-armhf-FTBFS.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- palemoon-32.4.1.orig/platform/js/src/jit/arm/MacroAssembler-arm.cpp -+++ palemoon-32.4.1/platform/js/src/jit/arm/MacroAssembler-arm.cpp -@@ -3013,7 +3013,7 @@ MacroAssemblerARMCompat::testInt32(Condi - return cond; - } - --+Assembler::Condition -+Assembler::Condition - MacroAssemblerARMCompat::testBigInt(Condition cond,const BaseIndex& src) - { - MOZ_ASSERT(cond == Equal || cond == NotEqual); -@@ -3766,7 +3766,7 @@ MacroAssemblerARMCompat::testStringTruth - return truthy ? Assembler::NotEqual : Assembler::Equal; - } - --+Assembler::Condition -+Assembler::Condition - MacroAssemblerARMCompat::testBigIntTruthy(bool truthy, const ValueOperand& value) - { - Register bi = value.payloadReg(); diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series index 4cd1aab..e5e15c5 100644 --- a/newmoon/debian/patches/series +++ b/newmoon/debian/patches/series @@ -1,6 +1,4 @@ -fix-armhf-FTBFS.patch # stackrpms small-icons.patch pm-devuan.patch pm-to-nm.patch -ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch |