[gnome-build-meta/gnome-3-30] sdk: Update to WebKitGTK 2.24.1
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/gnome-3-30] sdk: Update to WebKitGTK 2.24.1
- Date: Thu, 11 Apr 2019 16:06:18 +0000 (UTC)
commit 328a1ea4a88587e25c6b0d1ca3cad182958644b2
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Tue Apr 9 09:51:57 2019 -0500
sdk: Update to WebKitGTK 2.24.1
elements/sdk/WebKitGTK+.bst | 6 +-
files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch | 159 +++++++++++++++++++++
2 files changed, 163 insertions(+), 2 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index 0bfdb160..3d81b6f0 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -1,8 +1,10 @@
kind: cmake
sources:
- kind: tar
- url: webkitgtk_org:webkitgtk-2.24.0.tar.xz
- ref: 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407
+ url: webkitgtk_org:webkitgtk-2.24.1.tar.xz
+ ref: 53cb8eaad2ca4caaae663d68331b83fd27d5bd5f6c5388d6ea3c455e338f396d
+- kind: patch
+ path: files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch
- kind: patch
path: files/webkitgtk/gtk-doc-introspection-cross-compiling.patch
- kind: local
diff --git a/files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch
b/files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch
new file mode 100644
index 00000000..9e019293
--- /dev/null
+++ b/files/webkitgtk/webkitgtk-2-24-1-revert-sse2.patch
@@ -0,0 +1,159 @@
+Index: /trunk/CMakeLists.txt
+===================================================================
+--- /trunk/CMakeLists.txt (revision 244137)
++++ /trunk/CMakeLists.txt (revision 244138)
+@@ -115,14 +115,4 @@
+ endif ()
+
+-#---------------------------
+-# Make sure SSE2 is present.
+-#---------------------------
+-if (WTF_CPU_X86)
+- include(FindSSE2)
+- if (NOT SSE2_SUPPORT_FOUND)
+- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+- endif ()
+-endif ()
+-
+ # -----------------------------------------------------------------------------
+ # Determine the operating system
+Index: /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
+===================================================================
+--- /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (revision 244137)
++++ /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (revision 244138)
+@@ -168,4 +168,9 @@
+ static_assert(sizeof(Probe::State) == PROBE_SIZE, "Probe::State::size's matches ctiMasmProbeTrampoline");
+ static_assert((PROBE_EXECUTOR_OFFSET + PTR_SIZE) <= (PROBE_SIZE + OUT_SIZE), "Must have room after
ProbeContext to stash the probe handler");
++
++#if CPU(X86)
++// SSE2 is a hard requirement on x86.
++static_assert(isSSE2Present(), "SSE2 support is required in JavaScriptCore");
++#endif
+
+ #undef PROBE_OFFSETOF
+@@ -788,4 +793,5 @@
+ {
+ CPUID cpuid = getCPUID(0x1);
++ s_sse2CheckState = (cpuid[3] & (1 << 26)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+ s_sse4_1CheckState = (cpuid[2] & (1 << 19)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+ s_sse4_2CheckState = (cpuid[2] & (1 << 20)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+@@ -804,4 +810,5 @@
+ }
+
++MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse2CheckState =
CPUIDCheckState::NotChecked;
+ MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState =
CPUIDCheckState::NotChecked;
+ MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_2CheckState =
CPUIDCheckState::NotChecked;
+Index: /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
+===================================================================
+--- /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (revision 244137)
++++ /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (revision 244138)
+@@ -4198,4 +4198,33 @@
+ #endif
+
++#if CPU(X86)
++#if OS(MAC_OS_X)
++
++ // All X86 Macs are guaranteed to support at least SSE2,
++ static bool isSSE2Present()
++ {
++ return true;
++ }
++
++#else // OS(MAC_OS_X)
++ static bool isSSE2Present()
++ {
++ if (s_sse2CheckState == CPUIDCheckState::NotChecked)
++ collectCPUFeatures();
++ return s_sse2CheckState == CPUIDCheckState::Set;
++ }
++
++#endif // OS(MAC_OS_X)
++#elif !defined(NDEBUG) // CPU(X86)
++
++ // On x86-64 we should never be checking for SSE2 in a non-debug build,
++ // but non debug add this method to keep the asserts above happy.
++ static bool isSSE2Present()
++ {
++ return true;
++ }
++
++#endif
++
+ using CPUID = std::array<unsigned, 4>;
+ static CPUID getCPUID(unsigned level);
+@@ -4203,4 +4232,5 @@
+ JS_EXPORT_PRIVATE static void collectCPUFeatures();
+
++ JS_EXPORT_PRIVATE static CPUIDCheckState s_sse2CheckState;
+ JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
+ JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_2CheckState;
+Index: unk/Source/cmake/FindSSE2.cmake
+===================================================================
+--- /trunk/Source/cmake/FindSSE2.cmake (revision 244137)
++++ (revision )
+@@ -1,65 +1,0 @@
+-#################################
+-# Check for the presence of SSE2.
+-#
+-# Once done, this will define:
+-# - SSE2_SUPPORT_FOUND - the system supports (at least) SSE2.
+-#
+-# Copyright (c) 2014, Pablo Fernandez Alcantarilla, Jesus Nuevo
+-# Copyright (c) 2019, Igalia S.L.
+-#
+-# Redistribution and use in source and binary forms, with or without modification,
+-# are permitted provided that the following conditions are met:
+-#
+-# * Redistributions of source code must retain the above copyright notice,
+-# this list of conditions and the following disclaimer.
+-#
+-# * Redistributions in binary form must reproduce the above copyright notice,
+-# this list of conditions and the following disclaimer in the documentation
+-# and/or other materials provided with the distribution.
+-#
+-# * Neither the name of the copyright holders nor the names of its contributors
+-# may be used to endorse or promote products derived from this software without
+-# specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+-# SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+-# WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-
+-set(SSE2_SUPPORT_FOUND FALSE)
+-
+-macro(CHECK_FOR_SSE2)
+- include(CheckCXXSourceRuns)
+-
+- check_cxx_source_runs("
+- #include <emmintrin.h>
+- int main ()
+- {
+- __m128d a, b;
+- double vals[2] = {0};
+- a = _mm_loadu_pd (vals);
+- b = _mm_add_pd (a,a);
+- _mm_storeu_pd (vals,b);
+- return(0);
+- }"
+- HAVE_SSE2_EXTENSIONS)
+-
+- if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+- if (HAVE_SSE2_EXTENSIONS)
+- set(SSE2_SUPPORT_FOUND TRUE)
+- endif ()
+- elseif (MSVC AND NOT CMAKE_CL_64)
+- if (HAVE_SSE2_EXTENSIONS)
+- set(SSE2_SUPPORT_FOUND TRUE)
+- message(STATUS "Found SSE2 extensions.")
+- endif (HAVE_SSE2_EXTENSIONS)
+- endif ()
+-
+-endmacro(CHECK_FOR_SSE2)
+-
+-CHECK_FOR_SSE2()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]