[oe] [meta-browser][PATCH 1/3] Set CHROMIUM_ENABLE_WAYLAND flag in chromium-wayland recipe

[Jacobo Aragunde Pérez]

On 17/11/16 19:09, Khem Raj wrote:
> 
> 
> On 11/17/16 9:34 AM, Jacobo Aragunde Pérez wrote:
>> 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.
>>
>> We are allowed to remove some conditionals, now we know the value of
>> the flag beforehand.
>>
>> Signed-off-by: Jacobo Aragunde Pérez <jaragunde at igalia.com>
>> ---
>>  recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb | 11 +++++------
>>  1 file changed, 5 insertions(+), 6 deletions(-)
>>
>> 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 bbba147..f66e77c 100644
>> --- a/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
>> +++ b/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bb
>> @@ -1,3 +1,5 @@
>> +CHROMIUM_ENABLE_WAYLAND = "1"
>> +
>>  include chromium-browser.inc
>>  
>>  DEPENDS += "wayland libxkbcommon"
>> @@ -21,15 +23,12 @@ 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 bb.utils.contains('PACKAGECONFIG', 'component-build', True, False, d):
>> +        bb.fatal("Chromium 48 Wayland version cannot be built in component-mode")
>>  }
>>  
> 
> 
> you still need to skip parsing this recipe if user has not enabled wayland
> 

Will do, thanks for the tip.

> 
>>  CHROMIUM_WAYLAND_GYP_DEFINES = "use_ash=1 use_aura=1 chromeos=0 use_ozone=1 use_xkbcommon=1"
>>
> 

Best,
-- 
Jacobo Aragunde
Software Engineer at Igalia