From 9db68075ad14c28c43e15bd586fde357bd4f83b4 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Fri, 26 Jan 2024 20:03:39 -0500 Subject: nm 32.5.2 rc1 --- newmoon/debian/patches/fix-armhf-FTBFS.patch | 20 ++++++++++++++++++++ newmoon/debian/patches/series | 3 +-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 newmoon/debian/patches/fix-armhf-FTBFS.patch (limited to 'newmoon/debian/patches') diff --git a/newmoon/debian/patches/fix-armhf-FTBFS.patch b/newmoon/debian/patches/fix-armhf-FTBFS.patch new file mode 100644 index 0000000..e15be32 --- /dev/null +++ b/newmoon/debian/patches/fix-armhf-FTBFS.patch @@ -0,0 +1,20 @@ +--- 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 85f30b8..e6eb56e 100644 --- a/newmoon/debian/patches/series +++ b/newmoon/debian/patches/series @@ -1,5 +1,4 @@ -# from stevepusser for 29.4.3: -#revert-mach-file.patch +fix-armhf-FTBFS.patch # stackrpms small-icons.patch pm-devuan.patch -- cgit 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 --- ...-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | 76 ++++++++++++++++++++++ newmoon/debian/patches/series | 1 + 2 files changed, 77 insertions(+) create mode 100644 newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch (limited to 'newmoon/debian/patches') 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 From bbf77f60302c4f3532fbb7316ad1d7d130755c9c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Fri, 26 Jan 2024 21:59:15 -0500 Subject: nm: fix patches --- ...-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch | 6 +++-- newmoon/debian/patches/pm-devuan.patch | 26 +++++++++------------- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'newmoon/debian/patches') diff --git a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch index 33fd3d4..2929219 100644 --- a/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch +++ b/newmoon/debian/patches/ffmpeg.git-effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch @@ -11,10 +11,12 @@ Signed-off-by: James Almer 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/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h +--- 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) { diff --git a/newmoon/debian/patches/pm-devuan.patch b/newmoon/debian/patches/pm-devuan.patch index 97d7471..cff8e26 100644 --- a/newmoon/debian/patches/pm-devuan.patch +++ b/newmoon/debian/patches/pm-devuan.patch @@ -1,6 +1,5 @@ -diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul ---- Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul 2020-03-25 09:49:13.000000000 -0400 -+++ Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul 2020-05-05 09:12:48.776096853 -0400 +--- a/palemoon/base/content/aboutDialog.xul ++++ b/palemoon/base/content/aboutDialog.xul @@ -39,9 +39,9 @@ @@ -17,26 +16,24 @@ diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale #ifdef MC_PRIVATE_BUILD This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the . #else -- is released by . -+ This build of newmoon is released by custom. +- is released by Moonchild Productions. ++ This build of newmoon is released by stackrpms. Special thanks to all our supporters and donors for making this browser possible! -diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css ---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css 2020-03-25 09:49:13.000000000 -0400 -+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css 2020-05-05 09:02:38.318463672 -0400 +--- a/palemoon/branding/official/content/aboutDialog.css ++++ b/palemoon/branding/official/content/aboutDialog.css @@ -21,8 +21,6 @@ - } #aboutTextBox { + position: relative; - animation: 3s fadeIn; - animation-fill-mode: forwards; text-shadow: 1px 1px 0px #9ABCD5; color: #101020; } -diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd ---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd 2020-03-25 09:49:13.000000000 -0400 -+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd 2020-05-05 08:28:53.071897555 -0400 +--- a/palemoon/branding/official/locales/en-US/brand.dtd ++++ b/palemoon/branding/official/locales/en-US/brand.dtd @@ -1,4 +1,4 @@ - - @@ -45,9 +42,8 @@ diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/b + + -diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties ---- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties 2020-03-25 09:49:13.000000000 -0400 -+++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties 2020-05-05 08:28:07.923487413 -0400 +--- a/palemoon/branding/official/locales/en-US/brand.properties ++++ b/palemoon/branding/official/locales/en-US/brand.properties @@ -1,5 +1,5 @@ -brandShortName=Pale Moon -brandFullName=Pale Moon -- cgit