Skip to contentSkip to conversation

chromium-wayland: always enable CHROMIUM_ENABLE_WAYLAND flag

PATCH New Jacobo Aragunde Pérez 1 participant 3 messages Jan 4, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 chromium-wayland: always enable CHROMIUM_ENABLE_WAYLAND flag

It makes no sense to trigger a build of chromium-wayland and not enable CHROMIUM_ENABLE_WAYLAND, so we are doing it directly in the recipe now.

Now we know the value of the flag beforehand, we are allowed to remove some conditionals. Additionally, we check if Wayland is available before building.

---
 recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb +7 -6
index bbba147..0db8f7d 100644
@@ -1,3 +1,5 @@
+CHROMIUM_ENABLE_WAYLAND = "1"
+
 include chromium-browser.inc
 
 DEPENDS += "wayland libxkbcommon"
@@ -21,15 +23,14 @@ SRC_URI[sha256sum] = "4ca4e2adb340b3fb4d502266ad7d6bda45fa3519906dbf63cce11a63f6
 OZONE_WAYLAND_GIT_BRANCH = "Milestone-SouthSister"
 OZONE_WAYLAND_GIT_SRCREV = "c605505044af3345a276abbd7c29fd53db1dea40"
 
-SRC_URI += "${@base_conditional('CHROMIUM_ENABLE_WAYLAND', '1', 'git://github.com/01org/ozone-wayland.git;destsuffix=${OZONE_WAYLAND_GIT_DESTSUFFIX};branch=${OZONE_WAYLAND_GIT_BRANCH};rev=${OZONE_WAYLAND_GIT_SRCREV} file://chromium-wayland/0006-Remove-GBM-support-from-wayland.gyp.patch', '', d)}"
+SRC_URI += "git://github.com/01org/ozone-wayland.git;destsuffix=${OZONE_WAYLAND_GIT_DESTSUFFIX};branch=${OZONE_WAYLAND_GIT_BRANCH};rev=${OZONE_WAYLAND_GIT_SRCREV} file://chromium-wayland/0006-Remove-GBM-support-from-wayland.gyp.patch"
 
 # Component build is unsupported in ozone-wayland for Chromium 48
 python() {
-    if (d.getVar('CHROMIUM_ENABLE_WAYLAND', True) == '1'):
-        if bb.utils.contains('PACKAGECONFIG', 'component-build', True, False, d):
-            bb.fatal("Chromium 48 Wayland version cannot be built in component-mode")
-    else:
-        raise bb.parse.SkipPackage("CHROMIUM_ENABLE_WAYLAND isn't enabled")
+    if not bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d):
+        raise bb.parse.SkipPackage("Wayland is not available")
+    if bb.utils.contains('PACKAGECONFIG', 'component-build', True, False, d):
+        bb.fatal("Chromium 48 Wayland version cannot be built in component-mode")
 }
 
 CHROMIUM_WAYLAND_GYP_DEFINES = "use_ash=1 use_aura=1 chromeos=0 use_ozone=1 use_xkbcommon=1"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 chromium: disable CHROMIUM_ENABLE_WAYLAND in the x11 recipe

The chromium x11 recipe may crash when run with CHROMIUM_ENABLE_WAYLAND enabled, because it misses some steps that are performed in the chromium-wayland recipe. Doing this change, we eliminate one possible failure point.

Also adds a check for x11 in DISTRO_FEATURES.

---
 recipes-browser/chromium/chromium_52.0.2743.76.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
recipes-browser/chromium/chromium_52.0.2743.76.bb +8 -0
index 14b519c..a3270e9 100644
@@ -1,3 +1,5 @@
+CHROMIUM_ENABLE_WAYLAND = "0"
+
 include chromium-browser.inc
 
 DEPENDS += "xextproto gtk+ libxi libxss"
@@ -16,3 +18,9 @@ SRC_URI += "\
 LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
 SRC_URI[md5sum] = "0fee71466e1f2dc39ed4549d04b58ee2"
 SRC_URI[sha256sum] = "c54cdc11c3324152f3d5be98dcb4eae2bda0fc9dac7dd5f9010150458d68c18c"
+
+# X11 must be available for this flavor of Chromium
+python() {
+    if not bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d):
+        raise bb.parse.SkipPackage("X11 is not available")
+}
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/3 chromium: remove conditional detection of CHROMIUM_ENABLE_WAYLAND

In reply to Jacobo Aragunde Pérez

It can be a source of problems, because you must have chosen the correct recipe to build the wayland or x11 version of chromium.

---
 recipes-browser/chromium/chromium-browser.inc | 6 ------
 1 file changed, 6 deletions(-)
recipes-browser/chromium/chromium-browser.inc +0 -6
index 4fb47fd..8c73207 100644
@@ -102,12 +102,6 @@ PACKAGECONFIG[kiosk-mode] = ""
 PACKAGECONFIG[proprietary-codecs] = ""
 
 
-# Conditionally add ozone-wayland and its patches to the Chromium sources
-# You can override this by setting CHROMIUM_ENABLE_WAYLAND=1 or CHROMIUM_ENABLE_WAYLAND=0 in local.conf
-CHROMIUM_ENABLE_WAYLAND ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', \
-                     bb.utils.contains('DISTRO_FEATURES', 'wayland', '1', \
-                     '0', d),d)}"
-
 # ozone-wayland will be cloned into a directory with this name
 OZONE_WAYLAND_GIT_DESTSUFFIX ?= "ozone-wayland-git"
 # Use glob to filter out the patches that shall be applied against ozone-wayland.
Signature · 1 line
2.7.4