mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,36 @@
|
||||
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
|
||||
|
||||
79
package/wpewebkit/0001-Fix-build-with-musl.patch
Normal file
79
package/wpewebkit/0001-Fix-build-with-musl.patch
Normal file
@@ -0,0 +1,79 @@
|
||||
From cc3c27a7e997ef157ed469127f185a7bb6eb1feb Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 27 May 2019 23:51:32 +0200
|
||||
Subject: [PATCH] Fix build with musl
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
[Retrieved (and slightly updated) from:
|
||||
https://github.com/WebPlatformForEmbedded/meta-wpe/blob/master/recipes-wpe/wpewebkit/wpewebkit/0001-Fix-build-with-musl.patch]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Source/JavaScriptCore/runtime/MachineContext.h | 10 +++++-----
|
||||
Source/WTF/wtf/Platform.h | 2 +-
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h
|
||||
index bf0bdc7a51a..78d2ec81838 100644
|
||||
--- a/Source/JavaScriptCore/runtime/MachineContext.h
|
||||
+++ b/Source/JavaScriptCore/runtime/MachineContext.h
|
||||
@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext)
|
||||
#error Unknown Architecture
|
||||
#endif
|
||||
|
||||
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
||||
+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
|
||||
|
||||
#if CPU(X86)
|
||||
return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
|
||||
@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext)
|
||||
#error Unknown Architecture
|
||||
#endif
|
||||
|
||||
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
||||
+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
|
||||
|
||||
// The following sequence depends on glibc's sys/ucontext.h.
|
||||
#if CPU(X86)
|
||||
@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext)
|
||||
#error Unknown Architecture
|
||||
#endif
|
||||
|
||||
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
||||
+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
|
||||
|
||||
// The following sequence depends on glibc's sys/ucontext.h.
|
||||
#if CPU(X86)
|
||||
@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
|
||||
#error Unknown Architecture
|
||||
#endif
|
||||
|
||||
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
||||
+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
|
||||
|
||||
// The following sequence depends on glibc's sys/ucontext.h.
|
||||
#if CPU(X86)
|
||||
@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
|
||||
#error Unknown Architecture
|
||||
#endif
|
||||
|
||||
-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
|
||||
+#elif OS(FUCHSIA) || OS(LINUX) || defined(__BIONIC__)
|
||||
|
||||
// The following sequence depends on glibc's sys/ucontext.h.
|
||||
#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
|
||||
@@ -683,7 +683,7 @@
|
||||
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
|
||||
#endif
|
||||
|
||||
-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
|
||||
+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
|
||||
#define HAVE_MACHINE_CONTEXT 1
|
||||
#endif
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
111
package/wpewebkit/Config.in
Normal file
111
package/wpewebkit/Config.in
Normal file
@@ -0,0 +1,111 @@
|
||||
config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
bool
|
||||
# ARM needs BLX, so v5t+, BE completely untested so disabled
|
||||
default y if BR2_arm && !BR2_ARM_CPU_ARMV4
|
||||
default y if BR2_aarch64 || BR2_aarch64_be
|
||||
default y if BR2_i386 || BR2_x86_64
|
||||
# Disabled on MIPS big endian due to sigbus
|
||||
default y if BR2_mipsel || BR2_mips64el
|
||||
# Disabled on PowerPC pending runtime testing
|
||||
# Disabled on SuperH because of segfault
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
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"
|
||||
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
|
||||
|
||||
comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend"
|
||||
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \
|
||||
|| !BR2_PACKAGE_HAS_LIBEGL_WAYLAND
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT
|
||||
bool "wpewebkit"
|
||||
depends on !BR2_STATIC_LIBS # wayland
|
||||
depends on !BR2_BINFMT_FLAT # 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_USE_WCHAR # icu, libsoup
|
||||
depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy
|
||||
depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo
|
||||
depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_CAIRO
|
||||
select BR2_PACKAGE_CAIRO_PNG
|
||||
select BR2_PACKAGE_HARFBUZZ
|
||||
select BR2_PACKAGE_ICU
|
||||
select BR2_PACKAGE_JPEG
|
||||
select BR2_PACKAGE_LIBEPOXY
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_LIBSOUP
|
||||
select BR2_PACKAGE_LIBTASN1
|
||||
select BR2_PACKAGE_LIBXSLT
|
||||
select BR2_PACKAGE_OPENJPEG
|
||||
select BR2_PACKAGE_WAYLAND
|
||||
select BR2_PACKAGE_WAYLAND_PROTOCOLS
|
||||
select BR2_PACKAGE_WEBP
|
||||
select BR2_PACKAGE_WEBP_DEMUX
|
||||
select BR2_PACKAGE_WPEBACKEND_FDO
|
||||
help
|
||||
WPE (Web Platform for Embedded) port of the WebKit engine,
|
||||
to allow embedders to create simple and performant systems
|
||||
based on Web platform technologies.
|
||||
|
||||
https://wpewebkit.org/
|
||||
|
||||
if BR2_PACKAGE_WPEWEBKIT
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA
|
||||
bool "multimedia support"
|
||||
select BR2_PACKAGE_GSTREAMER1
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP
|
||||
select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
|
||||
select BR2_PACKAGE_GST1_LIBAV
|
||||
help
|
||||
This option pulls in all of the required dependencies
|
||||
to enable multimedia (video/audio) support.
|
||||
|
||||
if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL
|
||||
bool "use gstreamer-gl"
|
||||
default y
|
||||
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL
|
||||
help
|
||||
Use the GStreamer GL elements for handling video content.
|
||||
This is recommended as it improves performance of video
|
||||
playback. In some target configurations incorrect rendering
|
||||
might be produced, and disabling this option may help.
|
||||
|
||||
endif
|
||||
|
||||
config BR2_PACKAGE_WPEWEBKIT_WEBDRIVER
|
||||
bool "WebDriver support"
|
||||
help
|
||||
Enable support for WebDriver. This will build and install the
|
||||
WebKitWebDriver program in the target.
|
||||
|
||||
endif
|
||||
8
package/wpewebkit/wpewebkit.hash
Normal file
8
package/wpewebkit/wpewebkit.hash
Normal file
@@ -0,0 +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
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1
|
||||
54
package/wpewebkit/wpewebkit.mk
Normal file
54
package/wpewebkit/wpewebkit.mk
Normal file
@@ -0,0 +1,54 @@
|
||||
################################################################################
|
||||
#
|
||||
# wpewebkit
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WPEWEBKIT_VERSION = 2.24.2
|
||||
WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
|
||||
WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
|
||||
WPEWEBKIT_INSTALL_STAGING = YES
|
||||
WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause
|
||||
WPEWEBKIT_LICENSE_FILES = \
|
||||
Source/WebCore/LICENSE-APPLE \
|
||||
Source/WebCore/LICENSE-LGPL-2.1
|
||||
WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \
|
||||
harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \
|
||||
libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo
|
||||
|
||||
WPEWEBKIT_CONF_OPTS = \
|
||||
-DPORT=WPE \
|
||||
-DENABLE_API_TESTS=OFF \
|
||||
-DENABLE_MINIBROWSER=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)
|
||||
WPEWEBKIT_CONF_OPTS += \
|
||||
-DENABLE_VIDEO=ON \
|
||||
-DENABLE_WEB_AUDIO=ON
|
||||
WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
|
||||
else
|
||||
WPEWEBKIT_CONF_OPTS += \
|
||||
-DENABLE_VIDEO=OFF \
|
||||
-DENABLE_WEB_AUDIO=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y)
|
||||
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON
|
||||
else
|
||||
WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y)
|
||||
WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON
|
||||
else
|
||||
WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WOFF2),y)
|
||||
WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON
|
||||
WPEWEBKIT_DEPENDENCIES += woff2
|
||||
else
|
||||
WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user