diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 4b6377c0..405217eb 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,5 +1,4 @@ -333cb75f6153f4b8113da88b7c14cfd8b8b7ab5364e8ee2744ee90ff068b644aac -f0437c60aa4d861290d267fde30d457b72bb60d7fd8b0192e1ffa41eaf86c4f800 +825ce1fdc34399276af40721ac226526eea9801faab655ba850ac7ed0b32ba9653 49e95cf848c09df618587bb8286bed3ed9531e24554b9ef275f070201078dba7f5 ee279241e461011e2265086328d9d0a913ab938bb81aa97fa22b8b9b7edf5e33bc 8c0f419eb138061e67dbe2ac73e9c8332649fb90aacb57ac4f00d5de94c0cf23a8 diff --git a/extra/firefox/patches/fix-bundled-ffmpeg-binutils.patch b/extra/firefox/patches/fix-bundled-ffmpeg-binutils.patch deleted file mode 100644 index d96d5d79..00000000 --- a/extra/firefox/patches/fix-bundled-ffmpeg-binutils.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/media/ffvpx/libavcodec/x86/mathops.h b/media/ffvpx/libavcodec/x86/mathops.h -index 6298f5e..ca7e2df 100644 ---- a/media/ffvpx/libavcodec/x86/mathops.h -+++ b/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; - } - diff --git a/extra/firefox/sources b/extra/firefox/sources index 4f3abe45..f6e5482b 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,5 +1,4 @@ -https://ftp.mozilla.org/pub/firefox/releases/117.0.1/source/firefox-117.0.1.source.tar.xz -patches/fix-bundled-ffmpeg-binutils.patch +https://ftp.mozilla.org/pub/firefox/releases/118.0.1/source/firefox-118.0.1.source.tar.xz patches/fix-vaapi.patch patches/musl-sandbox.patch patches/no-atk.patch diff --git a/extra/firefox/version b/extra/firefox/version index 9b663535..952384b9 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -117.0.1 1 +118.0.1 1