[oe] [meta-browser][PATCH] chromium-ozone-wayland: Stop depending on the system's wayland-scanner binary

Ulrich Ölmann u.oelmann at pengutronix.de
Thu Jun 27 13:38:59 UTC 2019


This commit re-applies the changes of the commit given below to the current
chromium-ozone-wayland recipe as they got lost in the meantime.

| commit cd88d7be61bc39726b8ecf7ddc19e6942bcf8cb4
| Author: Raphael Kubo da Costa <raphael.kubo.da.costa at intel.com>
| Date:   Thu May 2 12:08:54 2019 +0200
|
|     chromium-ozone-wayland: Stop depending on the system's wayland-scanner
|     binary
|
|     So far, we were using Chromium's default GN path for the system
|     wayland-scanner binary, "/usr/bin/wayland-scanner", which may not be present
|     at all and which should never be used anyway. Instead, we now point to the
|     version built by the wayland-native recipe.
|
|     Doing so of course requires depending on wayland-native in the first place,
|     and that requires adding back REQUIRED_DISTRO_FEATURES and a DEPENDS block
|     that got removed with no explanation when the recipe was updated to
|     M72 (commit 97876fab, "chromium: Update to 72.0.3626.81").
|
|     Fixes #241
|
|     Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa at intel.com>

Fixes: 1f363e25cb7d ("chromium: Update to 74.0.3729.131")
Signed-off-by: Ulrich Ölmann <u.oelmann at pengutronix.de>
---
 .../chromium/chromium-ozone-wayland_75.0.3770.100.bb   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/recipes-browser/chromium/chromium-ozone-wayland_75.0.3770.100.bb b/recipes-browser/chromium/chromium-ozone-wayland_75.0.3770.100.bb
index 22afa52aec20..1e4ed2958d2d 100644
--- a/recipes-browser/chromium/chromium-ozone-wayland_75.0.3770.100.bb
+++ b/recipes-browser/chromium/chromium-ozone-wayland_75.0.3770.100.bb
@@ -31,6 +31,15 @@ SRC_URI += " \
         file://0001-ozone-wayland-Fix-method-prototype-match.patch \
 "
 
+REQUIRED_DISTRO_FEATURES = "wayland"
+
+DEPENDS += "\
+        libxkbcommon \
+        virtual/egl \
+        wayland \
+        wayland-native \
+"
+
 # Chromium can use v4l2 device for hardware accelerated video decoding. Make sure that
 # /dev/video-dec exists.
 PACKAGECONFIG[use-linux-v4l2] = "use_v4l2_codec=true use_v4lplugin=true use_linux_v4l2_only=true"
@@ -42,6 +51,7 @@ GN_ARGS += "\
         ozone_platform_headless=true \
         ozone_platform_wayland=true \
         ozone_platform_x11=false \
+        system_wayland_scanner_path="${STAGING_BINDIR_NATIVE}/wayland-scanner" \
         use_xkbcommon=true \
         use_system_libwayland=true \
         use_system_minigbm=true \
-- 
2.20.1



More information about the Openembedded-devel mailing list