[meta-browser][PATCH] chromium-wayland: add wayland to REQUIRED_DISTRO_FEATURES

[meta-browser][PATCH] chromium-wayland: add wayland to REQUIRED_DISTRO_FEATURES

[Martin Jansa]

* otherwise chromium-wayland recipe might build with CHROMIUM_ENABLE_WAYLAND 0 and then
  autodetect couple of x11 libraries
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on atk, but it isn't a build dependency, missing atk in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gdk-pixbuf, but it isn't a build dependency, missing gdk-pixbuf in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gtk+, but it isn't a build dependency, missing gtk+ in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcursor, but it isn't a build dependency, missing libxcursor in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]

* reported a while ago in:
  http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109131.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
index f7ad2ce..bad3d71 100644
--- a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
+++ b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
@@ -2,6 +2,9 @@ include chromium-browser.inc
 
 DEPENDS += "wayland libxkbcommon"
 
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "wayland"
+
 SRC_URI += "\
         file://chromium-wayland/add_missing_stat_h_include.patch \
         file://0003-Remove-hard-coded-values-for-CC-and-CXX.patch \
-- 
2.10.1

Re: [meta-browser][PATCH] chromium-wayland: add wayland to REQUIRED_DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2661 bytes --]

On Thu, Oct 13, 2016 at 04:24:32PM +0200, Martin Jansa wrote:
> * otherwise chromium-wayland recipe might build with CHROMIUM_ENABLE_WAYLAND 0 and then
>   autodetect couple of x11 libraries
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on atk, but it isn't a build dependency, missing atk in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gdk-pixbuf, but it isn't a build dependency, missing gdk-pixbuf in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gtk+, but it isn't a build dependency, missing gtk+ in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcursor, but it isn't a build dependency, missing libxcursor in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]
> 
> * reported a while ago in:
>   http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109131.html
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> index f7ad2ce..bad3d71 100644
> --- a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> +++ b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> @@ -2,6 +2,9 @@ include chromium-browser.inc
>  
>  DEPENDS += "wayland libxkbcommon"
>  
> +inherit distro_features_check
> +REQUIRED_DISTRO_FEATURES = "wayland"

This isn't enough, because when x11 is also in DISTRO_FEATURES it will
disable wayland support (so we should skip this recipe).

# $CHROMIUM_ENABLE_WAYLAND
#   set
#   /OE/build/oe-core/meta-browser/recipes-browser/chromium/chromium-browser.inc:109
#     [_defaultval] "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0',
#     bb.utils.contains('DISTRO_FEATURES', 'wayland', '1',
#     '0', d),d)}"
CHROMIUM_ENABLE_WAYLAND="0"

> +
>  SRC_URI += "\
>          file://chromium-wayland/add_missing_stat_h_include.patch \
>          file://0003-Remove-hard-coded-values-for-CC-and-CXX.patch \
> -- 
> 2.10.1
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

[meta-browser][PATCHv2] chromium-wayland: skip when CHROMIUM_ENABLE_WAYLAND isn't enabled

[Martin Jansa]

* otherwise chromium-wayland recipe might build with CHROMIUM_ENABLE_WAYLAND 0 and then
  autodetect couple of x11 libraries
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on atk, but it isn't a build dependency, missing atk in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gdk-pixbuf, but it isn't a build dependency, missing gdk-pixbuf in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gtk+, but it isn't a build dependency, missing gtk+ in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcursor, but it isn't a build dependency, missing libxcursor in DEPENDS or PACKAGECONFIG? [build-deps]
  chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]

* reported a while ago in:
  http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109131.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
index f7ad2ce..bbba147 100644
--- a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
+++ b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
@@ -28,6 +28,8 @@ 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")
 }
 
 CHROMIUM_WAYLAND_GYP_DEFINES = "use_ash=1 use_aura=1 chromeos=0 use_ozone=1 use_xkbcommon=1"
-- 
2.10.1

Re: [meta-browser][PATCHv2] chromium-wayland: skip when CHROMIUM_ENABLE_WAYLAND isn't enabled

[Khem Raj]

On Thu, Oct 13, 2016 at 8:41 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> * otherwise chromium-wayland recipe might build with CHROMIUM_ENABLE_WAYLAND 0 and then
>   autodetect couple of x11 libraries
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on atk, but it isn't a build dependency, missing atk in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gdk-pixbuf, but it isn't a build dependency, missing gdk-pixbuf in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on gtk+, but it isn't a build dependency, missing gtk+ in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcomposite, but it isn't a build dependency, missing libxcomposite in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxcursor, but it isn't a build dependency, missing libxcursor in DEPENDS or PACKAGECONFIG? [build-deps]
>   chromium-wayland-48.0.2548.0: chromium-wayland rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]
>
> * reported a while ago in:
>   http://lists.openembedded.org/pipermail/openembedded-devel/2016-September/109131.html
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> index f7ad2ce..bbba147 100644
> --- a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> +++ b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
> @@ -28,6 +28,8 @@ 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")

This is ok.