From: Peter Michael Green Date: Thu, 9 Nov 2023 23:23:06 +0000 (+0000) Subject: update quilt patches. X-Git-Tag: archive/raspbian/115.3.0esr-1+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=704b1fadce337f3a1a671429f2503054af7d4e81;p=firefox-esr.git update quilt patches. --- diff --git a/debian/patches/disable-more-armv7neon-stuff.patch b/debian/patches/disable-more-armv7neon-stuff.patch index 06e5b72ba38..7bd9bd2934d 100644 --- a/debian/patches/disable-more-armv7neon-stuff.patch +++ b/debian/patches/disable-more-armv7neon-stuff.patch @@ -1,11 +1,7 @@ From: Peter Michael Green Date: Sat, 27 Aug 2022 08:00:25 +0000 -X-Dgit-Generated: 102.2.0esr-1+rpi1 987d60ce9ec74082bc02f5eb0e346ebe9bbd7e83 Subject: Disable more armv7/neon stuff. - ---- - diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build index c643fbaf406..e715f1a94fc 100644 --- a/gfx/ycbcr/moz.build @@ -186,10 +182,10 @@ index 672d48bf24d..9caf5295726 100644 '../../third_party/aom/aom/aom.h', '../../third_party/aom/aom/aom_codec.h', diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild -index e9d687a1c79..f8ddd6675d0 100644 +index 31b1c021e96..55f84b7e863 100644 --- a/media/libvpx/sources.mozbuild +++ b/media/libvpx/sources.mozbuild -@@ -536,249 +536,6 @@ files = { +@@ -539,252 +539,6 @@ files = { 'libvpx/vpx_scale/vpx_scale_rtcd.c', 'libvpx/vpx_util/vpx_thread.c', 'libvpx/vpx_util/vpx_write_yuv_frame.c', @@ -322,6 +318,8 @@ index e9d687a1c79..f8ddd6675d0 100644 - 'libvpx/vp9/decoder/vp9_detokenize.c', - 'libvpx/vp9/decoder/vp9_dsubexp.c', - 'libvpx/vp9/decoder/vp9_job_queue.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c', @@ -355,6 +353,7 @@ index e9d687a1c79..f8ddd6675d0 100644 - 'libvpx/vp9/encoder/vp9_subexp.c', - 'libvpx/vp9/encoder/vp9_svc_layercontext.c', - 'libvpx/vp9/encoder/vp9_tokenize.c', +- 'libvpx/vp9/encoder/vp9_tpl_model.c', - 'libvpx/vp9/encoder/vp9_treewriter.c', - 'libvpx/vp9/vp9_cx_iface.c', - 'libvpx/vp9/vp9_dx_iface.c', @@ -367,9 +366,9 @@ index e9d687a1c79..f8ddd6675d0 100644 - 'libvpx/vpx_dsp/arm/avg_pred_neon.c', - 'libvpx/vpx_dsp/arm/fdct16x16_neon.c', - 'libvpx/vpx_dsp/arm/fdct32x32_neon.c', -- 'libvpx/vpx_dsp/arm/fdct_neon.c', +- 'libvpx/vpx_dsp/arm/fdct4x4_neon.c', +- 'libvpx/vpx_dsp/arm/fdct8x8_neon.c', - 'libvpx/vpx_dsp/arm/fdct_partial_neon.c', -- 'libvpx/vpx_dsp/arm/fwd_txfm_neon.c', - 'libvpx/vpx_dsp/arm/hadamard_neon.c', - 'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c', - 'libvpx/vpx_dsp/arm/idct16x16_add_neon.c', diff --git a/debian/patches/try-harder-to-disable-neon.patch b/debian/patches/try-harder-to-disable-neon.patch index 414ed273694..b61c51eefb9 100644 --- a/debian/patches/try-harder-to-disable-neon.patch +++ b/debian/patches/try-harder-to-disable-neon.patch @@ -1,21 +1,15 @@ From: Peter Michael Green Date: Thu, 7 Nov 2019 11:23:19 +0000 -X-Dgit-Generated: 68.2.0esr-1+rpi1 a8a34a748cbe157a1fb6bfdb2c127ff6ec8416e9 Subject: Try harder to disable neon. ---- - ---- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure -+++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure -@@ -229,8 +229,8 @@ def build_arm_neon(arm_arch): - return arm_arch >= 700 - - --set_config("BUILD_ARM_NEON", build_arm_neon) --set_define("BUILD_ARM_NEON", build_arm_neon) -+#set_config("BUILD_ARM_NEON", build_arm_neon) -+#set_define("BUILD_ARM_NEON", build_arm_neon) - - - set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) +diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure +index 5d26f4d7323..e0862669c53 100644 +--- a/build/moz.configure/arm.configure ++++ b/build/moz.configure/arm.configure +@@ -271,3 +271,2 @@ +-set_config("BUILD_ARM_NEON", True, when=build_arm_neon) +-set_define("BUILD_ARM_NEON", True, when=build_arm_neon) +- ++#set_config("BUILD_ARM_NEON", True, when=build_arm_neon) ++#set_define("BUILD_ARM_NEON", True, when=build_arm_neon) diff --git a/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch b/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch index 055074f0731..519ec2733e9 100644 --- a/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch +++ b/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch @@ -1,19 +1,17 @@ From: Peter Michael Green Date: Tue, 21 Dec 2021 17:35:22 +0000 -X-Dgit-Generated: 91.4.0esr-1+rpi1 f2f0506a7eb9cf10f4fe44779c3d669707eb61e3 -Subject: Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting definitions error. +Subject: Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting definitions error - ---- - ---- firefox-esr-91.4.0esr.orig/modules/fdlibm/src/math_private.h -+++ firefox-esr-91.4.0esr/modules/fdlibm/src/math_private.h +diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h +index 632d2c4c619..b7fecb02e58 100644 +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h @@ -35,7 +35,7 @@ typedef long double __double_t; #else typedef double __double_t; #endif -typedef __double_t double_t; +#define double_t __double_t + typedef float __float_t; /* - * The original fdlibm code used statements like: