mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
@@ -1,36 +0,0 @@
|
||||
From a672bbd75f257dd65844ad53dd21fb37345999b5 Mon Sep 17 00:00:00 2001
|
||||
From: "aperez@igalia.com"
|
||||
<aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
|
||||
Date: Mon, 20 May 2019 21:20:02 +0000
|
||||
Subject: [PATCH] Build failure after r243644 in GTK
|
||||
Linux 64-bit stable builds https://bugs.webkit.org/show_bug.cgi?id=196440
|
||||
|
||||
Patch by Pablo Saavedra <psaavedra@igalia.com> on 2019-04-01
|
||||
Reviewed by Philippe Normand.
|
||||
|
||||
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
|
||||
(WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
|
||||
|
||||
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
|
||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
index 608aee2e1b3..c614050972a 100644
|
||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
|
||||
@@ -1000,11 +1000,13 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
|
||||
break;
|
||||
}
|
||||
|
||||
+#if USE(GSTREAMER_GL)
|
||||
// When the imxvpudecoder is used, the texture sampling of the
|
||||
// directviv-uploaded texture returns an RGB value, so there's no need to
|
||||
// convert it.
|
||||
if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
|
||||
m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -9,7 +9,7 @@ https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewe
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
|
||||
Source/WTF/wtf/Platform.h | 2 +-
|
||||
Source/WTF/wtf/PlatformHave.h | 2 +-
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
|
||||
@@ -63,8 +63,8 @@ index bf0bdc7a51a..78d2ec81838 100644
|
||||
#if CPU(X86)
|
||||
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
index e2a3388993f..95fe7c593cf 100644
|
||||
--- a/Source/WTF/wtf/Platform.h
|
||||
+++ b/Source/WTF/wtf/Platform.h
|
||||
--- a/Source/WTF/wtf/PlatformHave.h
|
||||
+++ b/Source/WTF/wtf/PlatformHave.h
|
||||
@@ -683,7 +683,7 @@
|
||||
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
|
||||
#endif
|
||||
|
||||
@@ -12,12 +12,13 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
|
||||
comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 6, host gcc >= 4.8"
|
||||
comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
|
||||
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || !BR2_HOST_GCC_AT_LEAST_4_8
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \
|
||||
|| !BR2_HOST_GCC_AT_LEAST_4_9
|
||||
|
||||
comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend"
|
||||
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
@@ -29,10 +30,10 @@ config BR2_PACKAGE_WPEWEBKIT
|
||||
bool "wpewebkit"
|
||||
depends on !BR2_STATIC_LIBS # wayland
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu
|
||||
depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
|
||||
depends on BR2_USE_WCHAR # icu, libsoup
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy
|
||||
@@ -64,6 +65,21 @@ config BR2_PACKAGE_WPEWEBKIT
|
||||
|
||||
if BR2_PACKAGE_WPEWEBKIT
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT_SANDBOX
|
||||
bool "sandboxing support"
|
||||
depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # libseccomp
|
||||
select BR2_PACKAGE_BUBBLEWRAP # runtime
|
||||
select BR2_PACKAGE_XDG_DBUS_PROXY # runtime
|
||||
select BR2_PACKAGE_LIBSECCOMP
|
||||
help
|
||||
Enable sandboxing of the processes used for network operation,
|
||||
disk asccess, and Web content rendering.
|
||||
|
||||
comment "sandboxing supports needs a toolchain w/ headers >= 3.12"
|
||||
depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA
|
||||
bool "multimedia support"
|
||||
select BR2_PACKAGE_GSTREAMER1
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# From https://wpewebkit.org/releases/wpewebkit-2.24.2.tar.xz.sums
|
||||
md5 3604a2167827c8354f6dcbab98305d7b wpewebkit-2.24.2.tar.xz
|
||||
sha1 1248d7723d0e6aec52cafc27a92c5c335c1abdd4 wpewebkit-2.24.2.tar.xz
|
||||
sha256 cf251a467b3bcae50f97e22f4baccca49fcbbd54162dc5b71c0b1ebf655fd95f wpewebkit-2.24.2.tar.xz
|
||||
# From https://wpewebkit.org/releases/wpewebkit-2.30.1.tar.xz.sums
|
||||
md5 251228a6e2917eff90a3eb6e9a7e920d wpewebkit-2.30.1.tar.xz
|
||||
sha1 7f5bdc79d4694ab5644b7fed9bd7311c2cbc988f wpewebkit-2.30.1.tar.xz
|
||||
sha256 78c0135d935b980fc64fbddf1fbaf441920edda4eeb4c16857ee8dc985650c25 wpewebkit-2.30.1.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WPEWEBKIT_VERSION = 2.24.2
|
||||
WPEWEBKIT_VERSION = 2.30.1
|
||||
WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
|
||||
WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
|
||||
WPEWEBKIT_INSTALL_STAGING = YES
|
||||
@@ -18,8 +18,20 @@ WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \
|
||||
|
||||
WPEWEBKIT_CONF_OPTS = \
|
||||
-DPORT=WPE \
|
||||
-DENABLE_ACCESSIBILITY=OFF \
|
||||
-DENABLE_API_TESTS=OFF \
|
||||
-DENABLE_MINIBROWSER=OFF
|
||||
-DENABLE_MINIBROWSER=OFF \
|
||||
-DSILENCE_CROSS_COMPILATION_NOTICES=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y)
|
||||
WPEWEBKIT_CONF_OPTS += \
|
||||
-DENABLE_BUBBLEWRAP_SANDBOX=ON \
|
||||
-DBWRAP_EXECUTABLE=/usr/bin/bwrap \
|
||||
-DDBUS_PROXY_EXECUTABLE=/usr/bin/xdg-dbus-proxy
|
||||
WPEWEBKIT_DEPENDENCIES += libseccomp
|
||||
else
|
||||
WPEWEBKIT_CONF_OPTS += -DENABLE_BUBBLEWRAP_SANDBOX=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)
|
||||
WPEWEBKIT_CONF_OPTS += \
|
||||
@@ -51,4 +63,13 @@ else
|
||||
WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
|
||||
endif
|
||||
|
||||
# JIT is not supported for MIPS r6, but the WebKit build system does not
|
||||
# have a check for these processors. Disable JIT forcibly here and use
|
||||
# the CLoop interpreter instead.
|
||||
#
|
||||
# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258
|
||||
ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
|
||||
WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user