From 6468ebc8110135c7342e7548642011eff16cf975 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 2 Aug 2017 11:19:05 +0200 Subject: Updated to 55.0 --- build-big-endian.patch | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'build-big-endian.patch') diff --git a/build-big-endian.patch b/build-big-endian.patch index c2aaea1..e925cfd 100644 --- a/build-big-endian.patch +++ b/build-big-endian.patch @@ -1,6 +1,6 @@ -diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h firefox-53.0.3-changed/gfx/skia/skia/include/core/SkColorPriv.h ---- firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h 2017-01-16 17:16:50.000000000 +0100 -+++ firefox-53.0.3-changed/gfx/skia/skia/include/core/SkColorPriv.h 2017-05-30 12:42:18.032534367 +0200 +diff -up firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h +--- firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2017-07-31 18:20:55.000000000 +0200 ++++ firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h 2017-08-02 10:09:36.350124031 +0200 @@ -31,7 +31,7 @@ * * Here we enforce this constraint. @@ -27,10 +27,10 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkColorPriv.h firefox-53.0.3- #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) #error "can't define PMCOLOR to be RGBA and BGRA" -diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h firefox-53.0.3-changed/gfx/skia/skia/include/core/SkImageInfo.h ---- firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h 2017-02-27 17:10:59.000000000 +0100 -+++ firefox-53.0.3-changed/gfx/skia/skia/include/core/SkImageInfo.h 2017-05-30 12:44:00.250165657 +0200 -@@ -83,7 +83,8 @@ +diff -up firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h +--- firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2017-07-31 18:20:55.000000000 +0200 ++++ firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h 2017-08-02 10:09:36.350124031 +0200 +@@ -83,7 +83,8 @@ enum SkColorType { #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) kN32_SkColorType = kRGBA_8888_SkColorType, #else @@ -40,10 +40,10 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/core/SkImageInfo.h firefox-53.0.3- #endif }; -diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrColor.h ---- firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h 2017-02-27 17:10:59.000000000 +0100 -+++ firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrColor.h 2017-05-31 09:01:50.756536464 +0200 -@@ -74,8 +74,13 @@ +diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h +--- firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian 2017-07-31 18:20:55.000000000 +0200 ++++ firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h 2017-08-02 10:09:36.350124031 +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" */ @@ -58,25 +58,20 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrColor.h firefox-53.0.3-chang #define GrColor_WHITE 0xFFFFFFFF #define GrColor_TRANSPARENT_BLACK 0x0 -diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrTypes.h ---- firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h 2017-02-27 17:10:59.000000000 +0100 -+++ firefox-53.0.3-changed/gfx/skia/skia/include/gpu/GrTypes.h 2017-05-30 17:21:27.782537859 +0200 -@@ -275,9 +275,9 @@ +diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h +--- firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2017-08-02 10:09:36.351124028 +0200 ++++ firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h 2017-08-02 10:13:40.512303982 +0200 +@@ -326,15 +326,13 @@ enum GrPixelConfig { static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; // Aliases for pixel configs that match skia's byte order. -#ifndef SK_CPU_LENDIAN - #error "Skia gpu currently assumes little endian" -#endif -+//#ifndef SK_CPU_LENDIAN -+// #error "Skia gpu currently assumes little endian" -+//#endif #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; - static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig; -@@ -285,7 +285,8 @@ + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; - static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSRGBA_8888_GrPixelConfig; #else - #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." + static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; @@ -84,14 +79,16 @@ diff -ru firefox-53.0.3/gfx/skia/skia/include/gpu/GrTypes.h firefox-53.0.3-chang #endif // Returns true if the pixel config is a GPU-specific compressed format -diff -ru firefox-53.0.3/js/src/jit/none/MacroAssembler-none.h firefox-53.0.3-changed/js/src/jit/none/MacroAssembler-none.h ---- firefox-53.0.3/js/src/jit/none/MacroAssembler-none.h 2017-04-11 06:15:18.000000000 +0200 -+++ firefox-53.0.3-changed/js/src/jit/none/MacroAssembler-none.h 2017-05-30 16:03:20.475810030 +0200 -@@ -196,7 +196,7 @@ - static bool SupportsSimd() { return false; } +diff -up firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian firefox-55.0/js/src/jit/none/MacroAssembler-none.h +--- firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian 2017-08-02 10:09:36.351124028 +0200 ++++ firefox-55.0/js/src/jit/none/MacroAssembler-none.h 2017-08-02 10:14:38.295109906 +0200 +@@ -197,8 +197,8 @@ class MacroAssemblerNone : public Assemb static bool SupportsUnalignedAccesses() { return false; } + static bool HasRoundInstruction(RoundingMode) { return false; } +- - void executableCopy(void*, bool) { MOZ_CRASH(); } ++ + void executableCopy(void*, bool flushICache = true) { MOZ_CRASH(); } void copyJumpRelocationTable(uint8_t*) { MOZ_CRASH(); } void copyDataRelocationTable(uint8_t*) { MOZ_CRASH(); } -- cgit