From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 21 Dec 2021 17:19:44 +0000 (+0000)
Subject: Apply raspbian patches
X-Git-Tag: archive/raspbian/91.4.0esr-1+rpi1~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a25486a28cdd1bc16e6152f15d1f85f4a33f7bb6;p=firefox-esr.git

Apply raspbian patches
---

diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure
index 3b755e27db9..abce09fde69 100644
--- a/build/moz.configure/arm.configure
+++ b/build/moz.configure/arm.configure
@@ -261,11 +261,11 @@ set_define("HAVE_ARM_NEON", have_arm_neon)
 # This matches media/webrtc/trunk/webrtc/build/common.gypi.
 @depends(arm_target.arm_arch, when=have_arm_neon)
 def build_arm_neon(arm_arch):
-    return arm_arch >= 7
+    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/rust.configure b/build/moz.configure/rust.configure
index eb7bbf760de..62ad7b13949 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -236,8 +236,13 @@ def rust_compiler(rustc_info, cargo_info):
 
 
 @depends(rustc, when=rust_compiler)
+@imports("sys")
+@imports(_from="__builtin__", _import='repr')
 @imports(_from="__builtin__", _import="ValueError")
 def rust_supported_targets(rustc):
+    #HACK: if there are multiple matches the algorithm uses the last one
+    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
+    out.append("arm-unknown-linux-gnueabihf")
     out = check_cmd_output(rustc, "--print", "target-list").splitlines()
     data = {}
     for t in out:
diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h
index b08fc9490b1..3f5ad40145c 100644
--- a/gfx/qcms/qcmsint.h
+++ b/gfx/qcms/qcmsint.h
@@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform,
                                               unsigned char *dest,
                                               size_t length);
 
-void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
-                                          const unsigned char *src,
-                                          unsigned char *dest,
-                                          size_t length);
-void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
-                                           const unsigned char *src,
-                                           unsigned char *dest,
-                                           size_t length);
-void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
-                                           const unsigned char *src,
-                                           unsigned char *dest,
-                                           size_t length);
+//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
+//                                          const unsigned char *src,
+//                                          unsigned char *dest,
+//                                          size_t length);
+//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
+//                                           const unsigned char *src,
+//                                           unsigned char *dest,
+//                                           size_t length);
+//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
+//                                           const unsigned char *src,
+//                                           unsigned char *dest,
+//                                           size_t length);
 
 extern bool qcms_supports_iccv4;
 extern bool qcms_supports_neon;