third_party/weston: update to tag:9.0.0

Our current weston version is 6.0.91 and it's pretty old.
The latest stable version is 9.0.0.

This patch updates weston and does necessary changes to
third_party/weston/BUILD.gn to make it compilable with GN.

Bug: 1149588
Change-Id: I8dba452cab131052ae3f85486e1f841fc6304847
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2632585Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#844595}

DEPS

@@ -1526,7 +1526,7 @@ deps = {
     Var('skia_git') + '/external/github.com/google/wuffs.git' + '@' +  Var('wuffs_revision'),
 
   'src/third_party/weston/src': {
-      'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + 'db905f467169f9f131c5ddc6038296f866d5daeb',
+      'url': Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/weston.git' + '@' + '04d3ae265d8d8f84352c8dac21ec40b2fe07e7d2',
       'condition': 'checkout_linux',
   },
 

third_party/weston/BUILD.gn

@@ -57,6 +57,7 @@ config("weston_config") {
     "-Wno-return-type",
     "-Wno-shift-negative-value",
     "-Wno-string-conversion",
+    "-Wno-non-literal-null-conversion",
   ]
 
   ldflags = [ "-Wl,-rpath=\$ORIGIN" ]
@@ -214,6 +215,7 @@ shared_library("gl_renderer") {
   ]
 
   sources = [
+    "src/libweston/renderer-gl/egl-glue.c",
     "src/libweston/renderer-gl/gl-renderer.c",
     "src/libweston/vertex-clipping.c",
   ]
@@ -256,6 +258,7 @@ shared_library("wayland_backend") {
   deps = [
     ":cairo_shared",
     ":libweston",
+    "//build/config/linux/libdrm",
     "//third_party/wayland:wayland_client",
     "//third_party/wayland-protocols:fullscreen_shell_protocol",
     "//third_party/wayland-protocols:presentation_time_protocol",
@@ -289,6 +292,7 @@ shared_library("headless_backend") {
 
   deps = [
     ":libweston",
+    "//build/config/linux/libdrm",
     "//third_party/wayland-protocols:presentation_time_protocol",
   ]
 
@@ -332,6 +336,7 @@ shared_library("compositor") {
   include_dirs = [ "src/shared" ]
 
   sources = [
+    "src/compositor/executable.c",
     "src/compositor/main.c",
     "src/compositor/text-backend.c",
     "src/compositor/weston-screenshooter.c",
@@ -363,6 +368,7 @@ static_library("toytoolkit") {
     "//third_party/wayland:wayland_client",
     "//third_party/wayland-protocols:pointer_constraints_protocol",
     "//third_party/wayland-protocols:relative_pointer_protocol",
+    "//third_party/wayland-protocols:viewporter_protocol",
     "//third_party/wayland-protocols:xdg_shell_protocol",
   ]
 

third_party/weston/README.chromium

 Name: Weston - reference Wayland compositor
 Short Name: Weston
 URL: https://gitlab.freedesktop.org/wayland/weston
-Version: 6.0.91
-License: MIT "Expat"
+Version: 9.0.0
+License: MIT
 License File: LICENSE
 Security Critical: no
 Source: https://gitlab.freedesktop.org/wayland/weston
@@ -33,4 +33,4 @@ autoninja out/build_dir weston
 
 To update the weston to the version present upstream, change the commit hash
 inside url in the 'src/third_party/weston/src' field with the most recent one in
-DEPS file. Then follow the above steps to compile the updated weston.
\ No newline at end of file
+DEPS file. Then follow the above steps to compile the updated weston.

third_party/weston/config/config.h

@@ -13,14 +13,14 @@
 
 #define BUILD_X11_COMPOSITOR 1
 
+#define EGL_NO_X11 1
+
 #define ENABLE_EGL 1
 
 #define ENABLE_JUNIT_XML 1
 
 #define HAVE_INITGROUPS 1
 
-#define HAVE_LIBDRM_INTEL 1
-
 #define HAVE_LINUX_SYNC_FILE_H 1
 
 #define HAVE_MKOSTEMP 1
@@ -37,18 +37,22 @@
 
 #define MAJOR_IN_SYSMACROS 1
 
+#define MESA_EGL_NO_X11_HEADERS 1
+
 #define PACKAGE_BUGREPORT \
   "https://gitlab.freedesktop.org/wayland/weston/issues/"
 
-#define PACKAGE_STRING "weston 6.0.91"
+#define PACKAGE_STRING "weston 9.0.0"
 
 #define PACKAGE_URL "https://wayland.freedesktop.org"
 
-#define PACKAGE_VERSION "6.0.91"
+#define PACKAGE_VERSION "9.0.0"
+
+#define TEST_GL_RENDERER 1
 
 #define USE_RESIZE_POOL 1
 
-#define VERSION "6.0.91"
+#define VERSION "9.0.0"
 
 #define WESTON_NATIVE_BACKEND "wayland-backend.so"
 

third_party/weston/generate_configs.py

@@ -168,12 +168,23 @@ def GenerateWestonVersion():
     print("Created version.h file from version.h.in\n")
 
 
+def RemoveUndesiredDefines():
+    configfile = os.path.join(BASE_DIR, "config/config.h")
+    # Weston doesn't have a meson option to avoid using memfd_create() method that was
+    # introduced in GLIBC 2.27. That results in weston failing to run on Xenial based bot as
+    # it has GLIBC 2.23, because this config might be generated on a system that has newer
+    # libc libraries that meson checks with has_function() method. Thus, explicitly rewrite
+    # the config to disable usage of that method.
+    RewriteFile(configfile, [("#define HAVE_MEMFD_CREATE .*", "")])
+
+
 def main():
     env = os.environ
     env['CC'] = 'clang'
     GenerateGitConfig('version', env)
     GenerateConfig('config', env)
     ChangeConfigPath()
+    RemoveUndesiredDefines()
     GenerateWestonVersion()
 
 if __name__ == '__main__':

third_party/weston/version/git-version.h

-#define BUILD_ID "96ace9c934e8"
+#define BUILD_ID "fc0cbffa4e29"

third_party/weston/version/libweston/version.h

@@ -26,10 +26,10 @@
 #ifndef WESTON_VERSION_H
 #define WESTON_VERSION_H
 
-#define WESTON_VERSION_MAJOR 6
+#define WESTON_VERSION_MAJOR 9
 #define WESTON_VERSION_MINOR 0
-#define WESTON_VERSION_MICRO 91
-#define WESTON_VERSION "6.0.91"
+#define WESTON_VERSION_MICRO 0
+#define WESTON_VERSION "9.0.0"
 
 /* This macro may not do what you expect.  Weston doesn't guarantee
  * a stable API between 1.X and 1.Y, and thus this macro will return