summarylogtreecommitdiffstats
path: root/0003-Bug-1504834-Rough-progress-patch.patch
diff options
context:
space:
mode:
authorBjörn Bidar2023-03-23 23:23:11 +0200
committerBjörn Bidar2023-03-23 23:43:53 +0200
commita4ae66b6b28607dd7bec51cae73300552ec8fafd (patch)
tree1e9b32b65ea282f4a3e7693dc165d6c9db6a33cf /0003-Bug-1504834-Rough-progress-patch.patch
parent61abbb0481681a0894d4c1b98f685dcada8ab2e8 (diff)
downloadaur-a4ae66b6b28607dd7bec51cae73300552ec8fafd.tar.gz
Update to 111.0-1
- New upstream release - Use tarball instead of hg sources - Restructure patching process - All patches are checked into git and then applied on top of the existing Mozilla sources. Doing so allows rebasing of patches to be done by a simple git rebase, all patches cherry-picked from upstream are then automatically excluded upon updating. - Rebase patch-set based on OpenSUSE patches, updates to the package will be faster this way. - The sources can be found here: https://github.com/Thaodan/gecko-dev The branches are split of from the mozilla 'release' branch that is set to the latest release version into release/$major.$minor.x and then the thaodan/release/$major.$minor.x branch is rebased upon that. - Remove other obsolete patches - Drop obsolete kde.js, it was removed in the OpenSUSE patches long ago, is redundant and doesn't function anymore. boo#1151186 https://bugzilla.opensuse.org/show_bug.cgi?id=1151186 Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
Diffstat (limited to '0003-Bug-1504834-Rough-progress-patch.patch')
-rw-r--r--0003-Bug-1504834-Rough-progress-patch.patch92
1 files changed, 92 insertions, 0 deletions
diff --git a/0003-Bug-1504834-Rough-progress-patch.patch b/0003-Bug-1504834-Rough-progress-patch.patch
new file mode 100644
index 000000000000..11f374d059fe
--- /dev/null
+++ b/0003-Bug-1504834-Rough-progress-patch.patch
@@ -0,0 +1,92 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Thu, 29 Nov 2018 14:50:37 -0600
+Subject: [PATCH] Bug 1504834 - Rough progress patch
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
+---
+ gfx/2d/DrawTargetSkia.cpp | 3 +--
+ gfx/2d/Types.h | 7 -------
+ gfx/skia/skia/third_party/skcms/skcms.cc | 18 ++++++++++++++----
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
+index 04ee0c652db516bc03af19cf5e1b1e28e5a5f85e..e138a4e290af1293cc355b32c636a6073bf9d1dc 100644
+--- a/gfx/2d/DrawTargetSkia.cpp
++++ b/gfx/2d/DrawTargetSkia.cpp
+@@ -152,8 +152,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& aSize, const Rect* aBounds,
+ return surfaceBounds.Intersect(bounds);
+ }
+
+-static const int kARGBAlphaOffset =
+- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
++static const int kARGBAlphaOffset = 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
+
+ static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
+ const int32_t aStride, SurfaceFormat aFormat) {
+diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
+index fc3a910daa3c4c9ee2dc70375cbbb6dfb80b84ef..2c16a9a01ca2791a610cb498d0539772c817a9a5 100644
+--- a/gfx/2d/Types.h
++++ b/gfx/2d/Types.h
+@@ -92,15 +92,8 @@ enum class SurfaceFormat : int8_t {
+ // The following values are endian-independent synonyms. The _UINT32 suffix
+ // indicates that the name reflects the layout when viewed as a uint32_t
+ // value.
+-#if MOZ_LITTLE_ENDIAN()
+ A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
+ X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
+-#elif MOZ_BIG_ENDIAN()
+- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
+- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
+-#else
+-# error "bad endianness"
+-#endif
+
+ // The following values are OS and endian-independent synonyms.
+ //
+diff --git a/gfx/skia/skia/third_party/skcms/skcms.cc b/gfx/skia/skia/third_party/skcms/skcms.cc
+index 6b4d87b15df9353f5d596f88749507c9b4efef78..7c0559d2679038e8cb79aed993f9656d978e8f6b 100644
+--- a/gfx/skia/skia/third_party/skcms/skcms.cc
++++ b/gfx/skia/skia/third_party/skcms/skcms.cc
+@@ -30,6 +30,8 @@
+ #include <avx512fintrin.h>
+ #include <avx512dqintrin.h>
+ #endif
++#else
++ #define SKCMS_PORTABLE
+ #endif
+
+ // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
+@@ -280,20 +282,28 @@ enum {
+ static uint16_t read_big_u16(const uint8_t* ptr) {
+ uint16_t be;
+ memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+- return _byteswap_ushort(be);
++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++ return be;
+ #else
++ #if defined(_MSC_VER)
++ return _byteswap_ushort(be);
++ #else
+ return __builtin_bswap16(be);
++ #endif
+ #endif
+ }
+
+ static uint32_t read_big_u32(const uint8_t* ptr) {
+ uint32_t be;
+ memcpy(&be, ptr, sizeof(be));
+-#if defined(_MSC_VER)
+- return _byteswap_ulong(be);
++#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
++ return be;
+ #else
++ #if defined(_MSC_VER)
++ return _byteswap_ulong(be);
++ #else
+ return __builtin_bswap32(be);
++ #endif
+ #endif
+ }
+