Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
805944c3be | ||
|
|
705ab9cfa8 | ||
|
|
6a8a9af815 | ||
|
|
accfa5debd | ||
|
|
e100ee7a17 | ||
|
|
1bc1233c2c | ||
|
|
111066fcff | ||
|
|
e9cd5eaa76 | ||
|
|
f454be3fd1 | ||
|
|
acc325cd20 |
3 changed files with 89 additions and 6 deletions
82
skia-s390x.patch
Normal file
82
skia-s390x.patch
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
diff --git a/Source/ThirdParty/skia/include/core/SkTypes.h b/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
index 79644da049ff..fc0646e21772 100644
|
||||
--- a/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
+++ b/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
@@ -33,6 +33,8 @@
|
||||
# undef SK_DIRECT3D
|
||||
#endif
|
||||
|
||||
+#if !defined(SK_R32_SHIFT) || !defined(SK_G32_SHIFT) || !defined(SK_B32_SHIFT) || !defined(SK_A32_SHIFT)
|
||||
+
|
||||
// If SK_R32_SHIFT is set, we'll use that to choose RGBA or BGRA.
|
||||
// If not, we'll default to RGBA everywhere except BGRA on Windows.
|
||||
#if defined(SK_R32_SHIFT)
|
||||
@@ -52,6 +54,8 @@
|
||||
#define SK_G32_SHIFT 8
|
||||
#define SK_A32_SHIFT 24
|
||||
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* SK_PMCOLOR_BYTE_ORDER can be used to query the byte order of SkPMColor at compile time.
|
||||
*/
|
||||
diff --git a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
index c321fb77c0ae..a0a01cccd58a 100644
|
||||
--- a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
+++ b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "include/core/SkTypes.h"
|
||||
#include "include/private/SkEncodedInfo.h"
|
||||
#include "modules/skcms/skcms.h"
|
||||
+#include "src/core/SkEndian.h"
|
||||
#include "src/codec/SkColorPalette.h"
|
||||
#include "src/core/SkColorData.h"
|
||||
|
||||
diff --git a/Source/ThirdParty/skia/src/core/Sk4px.h b/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
index d5d481e7e300..c7ef0bcd0ed0 100644
|
||||
--- a/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
+++ b/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
@@ -27,7 +27,9 @@ public:
|
||||
|
||||
// RGBA rgba XYZW xyzw -> AAAA aaaa WWWW wwww
|
||||
Sk4px alphas() const {
|
||||
+#ifdef SK_CPU_LENDIAN
|
||||
static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
|
||||
+#endif
|
||||
return Sk4px(skvx::shuffle<3,3,3,3, 7,7,7,7, 11,11,11,11, 15,15,15,15>(fV));
|
||||
}
|
||||
Sk4px inv() const { return Sk4px(skvx::byte16(255) - fV); }
|
||||
diff --git a/Source/ThirdParty/skia/src/core/SkColorPriv.h b/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
index 45471c25529e..319fec78069b 100644
|
||||
--- a/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
+++ b/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
@@ -64,6 +64,20 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
|
||||
* Here we enforce this constraint.
|
||||
*/
|
||||
|
||||
+#ifdef SK_CPU_BENDIAN
|
||||
+
|
||||
+#define SK_RGBA_R32_SHIFT 24
|
||||
+#define SK_RGBA_G32_SHIFT 16
|
||||
+#define SK_RGBA_B32_SHIFT 8
|
||||
+#define SK_RGBA_A32_SHIFT 0
|
||||
+
|
||||
+#define SK_BGRA_B32_SHIFT 24
|
||||
+#define SK_BGRA_G32_SHIFT 16
|
||||
+#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
|
||||
@@ -74,6 +88,8 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
|
||||
#define SK_BGRA_R32_SHIFT 16
|
||||
#define SK_BGRA_A32_SHIFT 24
|
||||
|
||||
+#endif
|
||||
+
|
||||
#if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA)
|
||||
#error "Configure PMCOLOR by setting SK_R32_SHIFT."
|
||||
#endif
|
||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (webkitgtk-2.52.3.tar.xz.asc) = cb7f6dc0e2d65c763988e9a18c48ee6810d60a8d2351912bdd33358dcd2d46b994ba34f85c6f8315a34d5b5cb78bd2f0dcb78d076af58e657d1817fdd56f005d
|
||||
SHA512 (webkitgtk-2.52.3.tar.xz) = 8007688e4eb5b465a6f50e05e89858f970f7bbaed45844b8f97175de1fb24e41e6d88f4f6b6299d5ae2ad4e19483da371ac16257d787626da29de7551fbd2a3c
|
||||
SHA512 (webkitgtk-2.53.91.tar.xz) = 0bb5ec4c75cf0dcd4ccc46b7cf8595722d447385b75ed6ec79333b56203f681077fa355600210edb4fe6344e4af2943c7fb5b1bff6e35a7ec1ea456d891a1951
|
||||
SHA512 (webkitgtk-2.53.91.tar.xz.asc) = 72f6f01f8f3e12228ee70202b9b9bda589c80a791086cde6d6af5f2f916b44877b984267c6a5970f4fe41ff7dac21bccfa7323f19d71f6fd3e4a87abb18be58c
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
%endif
|
||||
|
||||
Name: webkitgtk
|
||||
Version: 2.52.3
|
||||
Version: 2.53.91
|
||||
Release: %autorelease
|
||||
Summary: GTK web content engine library
|
||||
|
||||
|
|
@ -36,7 +36,6 @@ Summary: GTK web content engine library
|
|||
# Source/ThirdParty/ANGLE/include/CL/cl_d3d10.h is Apache-2.0
|
||||
# Source/ThirdParty/ANGLE/include/GLES/gl.h is MIT-Khronos (not on list see https://github.com/spdx/license-list-XML/issues/2017)
|
||||
# Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp is GPL-3.0-or-later WITH Bison-exception-2.2
|
||||
# Source/ThirdParty/ANGLE/tools/flex-bison/third_party/m4sugar/m4sugar.m4 is GPL-3.0-or-later WITH Autoconf-exception-3.0
|
||||
# Source/ThirdParty/pdfjs/web/images/annotation-paperclip.svg is MPL-2.0i
|
||||
# Source/ThirdParty/pdfjs/web/standard_fonts/LICENSE_LIBERATION is OFL-1.1
|
||||
# Source/ThirdParty/xdgmime/ is AFL-2.0 OR GPL-2.0-or-later
|
||||
|
|
@ -45,10 +44,9 @@ Summary: GTK web content engine library
|
|||
# Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp is LGPL-2.1-or-later
|
||||
# Source/WTF/LICENSE-libc++.txt is NCSA OR MIT
|
||||
# Source/WTF/LICENSE-LLVM.txt is Apache-2.0 WITH LLVM-exception
|
||||
# Source/WTF/icu/LICENSE is ICU
|
||||
# Source/WTF/wtf/Markable.h is BSL-1.0
|
||||
# The license tag and above comment is up to date as of WebKitGTK 2.42.2.
|
||||
License: LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND GPL-3.0-or-later WITH Autoconf-exception-3.0 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 OR GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND ICU AND BSL-1.0
|
||||
License: LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 OR GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND BSL-1.0
|
||||
URL: https://www.webkitgtk.org/
|
||||
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
||||
|
|
@ -57,6 +55,9 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
|||
# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
||||
Source2: webkitgtk-keys.gpg
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=312677
|
||||
Patch: skia-s390x.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bubblewrap
|
||||
BuildRequires: clang
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue