Second arches build fixes

1 files changed, 32 insertions, 59 deletions

diff --git a/build-big-endian.patch b/build-big-endian.patch
index 932da57..111bd6a 100644
--- a/build-big-endian.patch
+++ b/build-big-endian.patch
@@ -1,67 +1,22 @@
-diff -up firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h
---- firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h	2017-09-29 17:25:04.651876330 +0200
-@@ -31,7 +31,7 @@
-  *
-  *  Here we enforce this constraint.
-  */
--
-+/*
- #ifdef SK_CPU_BENDIAN
-     #define SK_RGBA_R32_SHIFT   24
-     #define SK_RGBA_G32_SHIFT   16
-@@ -43,6 +43,7 @@
-     #define SK_BGRA_R32_SHIFT   8
-     #define SK_BGRA_A32_SHIFT   0
- #else
-+*/
-     #define SK_RGBA_R32_SHIFT   0
-     #define SK_RGBA_G32_SHIFT   8
-     #define SK_RGBA_B32_SHIFT   16
-@@ -52,7 +53,7 @@
-     #define SK_BGRA_G32_SHIFT   8
-     #define SK_BGRA_R32_SHIFT   16
-     #define SK_BGRA_A32_SHIFT   24
--#endif
-+/*#endif*/
- 
- #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
-     #error "can't define PMCOLOR to be RGBA and BGRA"
-diff -up firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h
---- firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h	2017-09-29 17:25:04.651876330 +0200
-@@ -83,7 +83,8 @@ enum SkColorType {
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2018-04-25 10:28:21.367480569 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h	2018-04-25 10:34:58.240051062 +0200
+@@ -83,8 +83,8 @@ enum SkColorType {
+     kN32_SkColorType = kBGRA_8888_SkColorType,
  #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
      kN32_SkColorType = kRGBA_8888_SkColorType,
- #else
--    #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
-+    //#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
+-#else
+-    #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
++#else    
 +    kN32_SkColorType = kBGRA_8888_SkColorType
  #endif
  };
  
-diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h
---- firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h	2017-09-29 17:25:04.652876327 +0200
-@@ -74,8 +74,13 @@ static inline GrColor GrColorPackA4(unsi
-  *  Since premultiplied means that alpha >= color, we construct a color with
-  *  each component==255 and alpha == 0 to be "illegal"
-  */
--#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
-+//Just for big endian platforms, little has: (~(0xFF << GrColor_SHIFT_A))
-+#ifdef SK_CPU_BENDIAN
-+#define GrColor_ILLEGAL     0xFFFFFF00
-+#else
-+#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A)) 
- 
-+#endif
- #define GrColor_WHITE 0xFFFFFFFF
- #define GrColor_TRANSPARENT_BLACK 0x0
- 
-diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h
---- firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h	2017-09-29 17:25:04.652876327 +0200
-@@ -326,15 +326,13 @@ enum GrPixelConfig {
+diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
+--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2018-04-25 10:28:21.367480569 +0200
++++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h	2018-04-25 10:31:41.692759011 +0200
+@@ -344,15 +344,13 @@ enum GrPixelConfig {
  static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
  
  // Aliases for pixel configs that match skia's byte order.
@@ -78,4 +33,22 @@ diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-56.
 +    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
  #endif
  
- // Returns true if the pixel config is a GPU-specific compressed format
+ /**
+diff -up firefox-60.0/gfx/skia/skia/include/private/GrColor.h.big-endian firefox-60.0/gfx/skia/skia/include/private/GrColor.h
+--- firefox-60.0/gfx/skia/skia/include/private/GrColor.h.big-endian	2018-04-16 22:05:28.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/private/GrColor.h	2018-04-25 10:28:21.367480569 +0200
+@@ -74,8 +74,13 @@ static inline GrColor GrColorPackA4(unsi
+  *  Since premultiplied means that alpha >= color, we construct a color with
+  *  each component==255 and alpha == 0 to be "illegal"
+  */
+-#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
++//Just for big endian platforms, little has: (~(0xFF << GrColor_SHIFT_A))
++#ifdef SK_CPU_BENDIAN
++#define GrColor_ILLEGAL     0xFFFFFF00
++#else
++#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A)) 
+ 
++#endif
+ #define GrColor_WHITE 0xFFFFFFFF
+ #define GrColor_TRANSPARENT_BLACK 0x0
+