From 4ef92cb61517c522d40d42327a35dc1e42e7ba96 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Sat, 23 Mar 2019 17:44:06 -0400 Subject: [PATCH 1/2] Build GLFW from source for Linux shell Instead of requiring a system-level GLFW, build it from source and statically link it into the Linux shell. --- build/install-build-deps-linux-desktop.sh | 2 +- shell/platform/glfw/BUILD.gn | 2 +- shell/platform/linux/config/BUILD.gn | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build/install-build-deps-linux-desktop.sh b/build/install-build-deps-linux-desktop.sh index e3c47a69a3375..47d9746b4d3d3 100755 --- a/build/install-build-deps-linux-desktop.sh +++ b/build/install-build-deps-linux-desktop.sh @@ -8,4 +8,4 @@ set -e -sudo apt-get -y install libglfw3-dev libepoxy-dev libgtk-3-dev libx11-dev +sudo apt-get -y install libepoxy-dev libgtk-3-dev libx11-dev diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn index 5fa29fc02c717..1ea27af7c83d0 100644 --- a/shell/platform/glfw/BUILD.gn +++ b/shell/platform/glfw/BUILD.gn @@ -52,6 +52,7 @@ source_set("flutter_glfw") { "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper", "$flutter_root/shell/platform/embedder:embedder", "$flutter_root/shell/platform/glfw/client_wrapper:client_wrapper_glfw", + "//build/secondary/third_party/glfw", "//third_party/rapidjson", ] @@ -60,7 +61,6 @@ source_set("flutter_glfw") { configs += [ "$flutter_root/shell/platform/linux/config:epoxy", - "$flutter_root/shell/platform/linux/config:glfw3", "$flutter_root/shell/platform/linux/config:gtk3", "$flutter_root/shell/platform/linux/config:x11", ] diff --git a/shell/platform/linux/config/BUILD.gn b/shell/platform/linux/config/BUILD.gn index 81043013717b1..a373ed0253c61 100644 --- a/shell/platform/linux/config/BUILD.gn +++ b/shell/platform/linux/config/BUILD.gn @@ -8,10 +8,6 @@ pkg_config("epoxy") { packages = [ "epoxy" ] } -pkg_config("glfw3") { - packages = [ "glfw3" ] -} - pkg_config("gtk3") { packages = [ "gtk+-3.0" ] } From 031318ca2bc1046d5da7ca6703b9c1dfac093218 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 27 Mar 2019 19:43:17 -0400 Subject: [PATCH 2/2] Roll buildroot for GLFW build changes --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index ac42e3fa0a2fa..8fa0aeff133ba 100644 --- a/DEPS +++ b/DEPS @@ -121,7 +121,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ee817fb84542865e253bcce1866bc13e4065ca4d', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ad098fcdb1b41fcf57c22e46e898d0dc04d3a178', # Fuchsia compatibility #