update disable-neon-in-qcms.patch
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 9 Dec 2021 20:26:24 +0000 (20:26 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 9 Dec 2021 20:26:24 +0000 (20:26 +0000)
debian/patches/disable-neon-in-qcms.patch

index 1f9888dd33539dad3ae804fda7fdadbc6982bcc0..933022227b2cb050923609a28efa29f6b708728d 100644 (file)
@@ -6,9 +6,11 @@ Subject: Disable neon in qcms.
 
 ---
 
---- firefox-esr-78.3.0esr.orig/gfx/qcms/qcmsint.h
-+++ firefox-esr-78.3.0esr/gfx/qcms/qcmsint.h
-@@ -344,18 +344,18 @@ void qcms_transform_data_bgra_out_lut_al
+diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h
+index b08fc9490b..3f5ad40145 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);
  
@@ -39,67 +41,3 @@ Subject: Disable neon in qcms.
  
  extern bool qcms_supports_iccv4;
  extern bool qcms_supports_neon;
---- firefox-esr-78.3.0esr.orig/gfx/qcms/transform.cpp
-+++ firefox-esr-78.3.0esr/gfx/qcms/transform.cpp
-@@ -1240,7 +1240,7 @@ qcms_transform* qcms_transform_create(
- #endif
-                   } else
- #endif
--#if defined(__arm__) || defined(__aarch64__)
-+#if 0 // defined(__arm__) || defined(__aarch64__)
-                     if (qcms_supports_neon) {
-                           if (in_type == QCMS_DATA_RGB_8) {
-                                   transform->transform_fn = qcms_transform_data_rgb_out_lut_neon;
---- firefox-esr-78.3.0esr.orig/gfx/tests/gtest/TestQcms.cpp
-+++ firefox-esr-78.3.0esr/gfx/tests/gtest/TestQcms.cpp
-@@ -493,11 +493,11 @@ void GfxQcms_ProfilePairBase::TransformP
-     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_avx));
-   }
- #endif
--#ifdef MOZILLA_MAY_SUPPORT_NEON
--  if (mozilla::supports_neon()) {
--    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
--  }
--#endif
-+//#ifdef MOZILLA_MAY_SUPPORT_NEON
-+//  if (mozilla::supports_neon()) {
-+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
-+//  }
-+//#endif
-   // Verify RGBA transforms.
-   ASSERT_TRUE(SetBuffers(QCMS_DATA_RGBA_8));
-@@ -518,11 +518,11 @@ void GfxQcms_ProfilePairBase::TransformP
-     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_avx));
-   }
- #endif
--#ifdef MOZILLA_MAY_SUPPORT_NEON
--  if (mozilla::supports_neon()) {
--    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
--  }
--#endif
-+//#ifdef MOZILLA_MAY_SUPPORT_NEON
-+//  if (mozilla::supports_neon()) {
-+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
-+//  }
-+//#endif
-   // Verify BGRA transforms.
-   ASSERT_TRUE(SetBuffers(QCMS_DATA_BGRA_8));
-@@ -543,11 +543,11 @@ void GfxQcms_ProfilePairBase::TransformP
-     EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_avx));
-   }
- #endif
--#ifdef MOZILLA_MAY_SUPPORT_NEON
--  if (mozilla::supports_neon()) {
--    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
--  }
--#endif
-+//#ifdef MOZILLA_MAY_SUPPORT_NEON
-+//  if (mozilla::supports_neon()) {
-+//    EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
-+//  }
-+//#endif
- }
- class GfxQcms_sRGB_To_sRGB : public GfxQcms_ProfilePairBase {