mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 00:20:38 -09:00
package/flutter-engine: bump version to 3.24.0
Add `"download_fuchsia_deps": False` to the dot-gclient file as this is for linux, not fuchsia, so the dependencies are not necessary. Also, change various paths in flutter-engine.mk to ensure that the package builds correctly. Remove patch 0005-skip-configuration-dependency-if-unit-tests-are-disa.patch which is upstream. Tested with tests.package.test_flutter.TestFlutter.test_run Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
7f7a5f0374
commit
dbd1dce67d
@@ -1,32 +0,0 @@
|
||||
From 2252a85e59669b5826019f60a98b7a69939dacfd Mon Sep 17 00:00:00 2001
|
||||
From: Greg Spencer <gspencer@google.com>
|
||||
Date: Mon, 4 Mar 2024 12:30:41 -0800
|
||||
Subject: [PATCH] Skip configuration dependency if unit tests are disabled.
|
||||
|
||||
Commit 88baf62f made gtk+-3.0 an unconditional requirement, see:
|
||||
|
||||
Issue: https://github.com/flutter/flutter/issues/144421
|
||||
Upstream: Merged. https://github.com/flutter/engine/pull/51179
|
||||
|
||||
Signed-off-by: Greg Spencer <gspencer@google.com>
|
||||
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
|
||||
---
|
||||
flutter/testing/BUILD.gn | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/flutter/testing/BUILD.gn b/flutter/testing/BUILD.gn
|
||||
index 9eac29452..a7d094695 100644
|
||||
--- a/flutter/testing/BUILD.gn
|
||||
+++ b/flutter/testing/BUILD.gn
|
||||
@@ -51,7 +51,7 @@ source_set("testing") {
|
||||
|
||||
sources = [ "run_all_unittests.cc" ]
|
||||
|
||||
- if (is_linux) {
|
||||
+ if (enable_unittests && is_linux) {
|
||||
# So that we can call gtk_init in main().
|
||||
configs += [ "//flutter/shell/platform/linux/config:gtk" ]
|
||||
}
|
||||
--
|
||||
2.44.0
|
||||
|
||||
@@ -8,6 +8,7 @@ solutions = [{
|
||||
"custom_vars": {
|
||||
"download_android_deps": False,
|
||||
"download_windows_deps": False,
|
||||
"download_linux_deps": False
|
||||
"download_linux_deps": False,
|
||||
"download_fuchsia_deps": False
|
||||
},
|
||||
}]
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#
|
||||
# There is no hash provided, as the gn binary (used for configuration) relies
|
||||
# on the .git directories. As such, a reproducible tarball is not possible.
|
||||
FLUTTER_ENGINE_VERSION = 3.19.5
|
||||
FLUTTER_ENGINE_VERSION = 3.24.0
|
||||
|
||||
# There is nothing for Buildroot to download. This is handled by gclient.
|
||||
FLUTTER_ENGINE_SITE =
|
||||
@@ -67,7 +67,7 @@ FLUTTER_ENGINE_INSTALL_FILES = libflutter_engine.so
|
||||
|
||||
# Flutter engine includes a bundled patched clang that must be used for
|
||||
# compiling or else there are linking errors.
|
||||
FLUTTER_ENGINE_CLANG_PATH = $(@D)/buildtools/linux-x64/clang
|
||||
FLUTTER_ENGINE_CLANG_PATH = $(@D)/flutter/buildtools/linux-x64/clang
|
||||
|
||||
FLUTTER_ENGINE_CONF_OPTS = \
|
||||
--clang \
|
||||
@@ -126,7 +126,7 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
FLUTTER_ENGINE_DEPENDENCIES += libgles
|
||||
FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-opengles
|
||||
FLUTTER_ENGINE_CONF_OPTS += --enable-impeller-3d
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLFW),y)
|
||||
@@ -153,7 +153,7 @@ FLUTTER_ENGINE_DEPENDENCIES += libxcb
|
||||
else
|
||||
define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP
|
||||
$(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \
|
||||
$(@D)/build_overrides/vulkan_headers.gni
|
||||
$(@D)/flutter/build_overrides/vulkan_headers.gni
|
||||
|
||||
$(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \
|
||||
$(@D)/build/config/BUILDCONFIG.gn
|
||||
@@ -166,7 +166,7 @@ FLUTTER_ENGINE_DEPENDENCIES += wayland
|
||||
else
|
||||
define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP
|
||||
$(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \
|
||||
$(@D)/build_overrides/vulkan_headers.gni
|
||||
$(@D)/flutter/build_overrides/vulkan_headers.gni
|
||||
|
||||
$(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \
|
||||
$(@D)/build/config/BUILDCONFIG.gn
|
||||
|
||||
Reference in New Issue
Block a user