From f4a6dc97453c3fb0d12f2f75ef5a39910a32d6e3 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Wed, 27 Mar 2019 20:22:50 -0400 Subject: [PATCH] Build GLFW from source for Linux shell (#8327) Instead of requiring a system-level GLFW, build it from source and statically link it into the Linux shell. --- DEPS | 2 +- build/install-build-deps-linux-desktop.sh | 2 +- shell/platform/glfw/BUILD.gn | 2 +- shell/platform/linux/config/BUILD.gn | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) 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 # diff --git a/build/install-build-deps-linux-desktop.sh b/build/install-build-deps-linux-desktop.sh index 6048470aa43de..ef24ad5d95cf5 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 libgtk-3-dev libx11-dev +sudo apt-get -y install libgtk-3-dev libx11-dev diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn index 00b1aec1bccd9..478d2e80e3255 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", ] @@ -59,7 +60,6 @@ source_set("flutter_glfw") { libs = [ "GL" ] configs += [ - "$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 8eeeaf687b258..f501bac61096e 100644 --- a/shell/platform/linux/config/BUILD.gn +++ b/shell/platform/linux/config/BUILD.gn @@ -4,10 +4,6 @@ import("//build/config/linux/pkg_config.gni") -pkg_config("glfw3") { - packages = [ "glfw3" ] -} - pkg_config("gtk3") { packages = [ "gtk+-3.0" ] }