Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -12,22 +12,6 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
|
||||
|
||||
config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT
|
||||
bool
|
||||
# ARM needs NEON for JIT.
|
||||
default y if BR2_ARM_CPU_HAS_NEON
|
||||
# AArch64 is supported upstream but not well tested on big-endian mode.
|
||||
default y if BR2_aarch64
|
||||
# i386 & x86_64 don't have any special requirements.
|
||||
default y if BR2_i386
|
||||
default y if BR2_x86_64
|
||||
# JIT is known not to work on MIPS64.
|
||||
# Plain MIPS32 (pre R2) is not well tested and likely broken, and R6
|
||||
# is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258
|
||||
# The MIPS support is completely untested in big-endian mode.
|
||||
default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2
|
||||
default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5
|
||||
|
||||
comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
|
||||
depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
|
||||
@@ -56,6 +40,7 @@ config BR2_PACKAGE_WEBKITGTK
|
||||
select BR2_PACKAGE_LIBTASN1
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_LIBXSLT
|
||||
select BR2_PACKAGE_OPENJPEG
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_WEBP
|
||||
select BR2_PACKAGE_WEBP_DEMUX
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.22.5.tar.xz.sums
|
||||
md5 96a731522b800f38e70f85c22f8de477 webkitgtk-2.22.5.tar.xz
|
||||
sha1 809b067a1672a81a4ce31363a0872c668cc72953 webkitgtk-2.22.5.tar.xz
|
||||
sha256 99d3863f418a7c3a3e37e5062950dbf2d91fb106ec1633459b0ef6f2d5f6cb13 webkitgtk-2.22.5.tar.xz
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.24.2.tar.xz.sums
|
||||
md5 83012998e1b9f71abb37d8baf6f9c7e6 webkitgtk-2.24.2.tar.xz
|
||||
sha1 632a65d93beb996bebdf7592ef9591f3993dea91 webkitgtk-2.24.2.tar.xz
|
||||
sha256 019cb1f0d05bf6148b72c7a85734bcd006388a1c14132843ef9a1b2cb7b4321c webkitgtk-2.24.2.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WEBKITGTK_VERSION = 2.22.5
|
||||
WEBKITGTK_SITE = http://www.webkitgtk.org/releases
|
||||
WEBKITGTK_VERSION = 2.24.2
|
||||
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
|
||||
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
|
||||
WEBKITGTK_INSTALL_STAGING = YES
|
||||
WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
|
||||
WEBKITGTK_LICENSE_FILES = \
|
||||
Source/WebCore/LICENSE-APPLE \
|
||||
Source/WebCore/LICENSE-LGPL-2.1
|
||||
WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
|
||||
WEBKITGTK_DEPENDENCIES = host-ruby host-python host-gperf \
|
||||
enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
|
||||
libtasn1 libxml2 libxslt sqlite webp woff2
|
||||
libtasn1 libxml2 libxslt openjpeg sqlite webp woff2
|
||||
WEBKITGTK_CONF_OPTS = \
|
||||
-DENABLE_API_TESTS=OFF \
|
||||
-DENABLE_GEOLOCATION=OFF \
|
||||
@@ -25,27 +25,18 @@ WEBKITGTK_CONF_OPTS = \
|
||||
-DPORT=GTK \
|
||||
-DUSE_LIBNOTIFY=OFF \
|
||||
-DUSE_LIBHYPHEN=OFF \
|
||||
-DUSE_OPENJPEG=ON \
|
||||
-DUSE_WOFF2=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS_JIT),y)
|
||||
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON
|
||||
else
|
||||
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y)
|
||||
WEBKITGTK_CONF_OPTS += \
|
||||
-DENABLE_VIDEO=ON \
|
||||
-DENABLE_WEB_AUDIO=ON
|
||||
WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good
|
||||
else
|
||||
# ENABLE_MEDIA_STREAM has to be explicitly disabled because there is a missing
|
||||
# feature dependency in the WebKitGTK+ CMake files. This can be removed once
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=174940 makes it into a release.
|
||||
WEBKITGTK_CONF_OPTS += \
|
||||
-DENABLE_VIDEO=OFF \
|
||||
-DENABLE_WEB_AUDIO=OFF \
|
||||
-DENABLE_MEDIA_STREAM=OFF
|
||||
-DENABLE_WEB_AUDIO=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y)
|
||||
|
||||
Reference in New Issue
Block a user