[OE-core] [PATCH 3/3] libepoxy: Upgrade 1.4.2 -> 1.4.3

[Jussi Kukkonen]

On 10 July 2017 at 17:47, Andrea Galbusera <gizero at gmail.com> wrote:

> On Tue, Jun 27, 2017 at 3:16 PM, Jussi Kukkonen <jussi.kukkonen at intel.com>
> wrote:
>
>> Imports the current EGL API registry from Khronos.
>>
>> Makes EGL support optional: this is reflected in the recipe but
>> egl is enabled by default as before.
>>
>> Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
>> ---
>>  .../libepoxy/{libepoxy_1.4.2.bb => libepoxy_1.4.3.bb}            | 9
>> +++++----
>>  1 file changed, 5 insertions(+), 4 deletions(-)
>>  rename meta/recipes-graphics/libepoxy/{libepoxy_1.4.2.bb =>
>> libepoxy_1.4.3.bb} (70%)
>>
>> diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb
>> b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
>> similarity index 70%
>> rename from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb
>> rename to meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
>> index e69e828..c8b398f 100644
>> --- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb
>> +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb
>> @@ -6,15 +6,16 @@ LICENSE = "MIT"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
>>
>>  SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${
>> BP}.tar.xz"
>> -SRC_URI[md5sum] = "632fcfd7ae9d21f5a634326d753a89c4"
>> -SRC_URI[sha256sum] = "bea6fdec3d10939954495da898d87
>> 2ee836b75c35699074cbf02a64fcb80d5b3"
>> +SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed"
>> +SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8
>> bc7fb2fda074478e329b063c1f872b826f6"
>>  UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
>>
>>  inherit autotools pkgconfig distro_features_check
>>
>>  REQUIRED_DISTRO_FEATURES = "opengl"
>>
>> -DEPENDS = "util-macros virtual/egl"
>> +DEPENDS = "util-macros"
>>
>> +PACKAGECONFIG[egl] = "--enable-egl, --disable-egl, virtual/egl"
>>  PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11"
>> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
>> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
>> --
>> 2.1.4
>>
>
> Beside the issue with recent patch to mesa, also this one seems to have
> caused nasty effects on raspberrypi builds... I got to it after bisecting
> poky from 854c8c2 that failed with:
>
> ERROR: gtk+3-3.22.16-r0 do_prepare_recipe_sysroot: Error executing a
> python function in exec_python_func() autogenerated:
>
> The stack trace of python calls that resulted in this exception/failure
> was:
> File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
>      0001:
>  *** 0002:extend_recipe_sysroot(d)
>      0003:
> File: '/home/gizero/work/smartliving/distro/repo-master/build-
> poky/conf/../../layers/poky/meta/classes/staging.bbclass', lineno: 510,
> function: extend_recipe_sysroot
>      0506:                    dest = newmanifest[l]
>      0507:                    if l.endswith("/"):
>      0508:                        staging_copydir(l, targetdir, dest,
> seendirs)
>      0509:                        continue
>  *** 0510:                    staging_copyfile(l, targetdir, dest,
> postinsts, seendirs)
>      0511:
>      0512:    for f in fixme:
>      0513:        if f == '':
>      0514:            staging_processfixme(fixme[f], recipesysroot,
> recipesysroot, recipesysrootnative, d)
> File: '/home/gizero/work/smartliving/distro/repo-master/build-
> poky/conf/../../layers/poky/meta/classes/staging.bbclass', lineno: 151,
> function: staging_copyfile
>      0147:        os.symlink(linkto, dest)
>      0148:        #bb.warn(c)
>      0149:    else:
>      0150:        try:
>  *** 0151:            os.link(c, dest)
>      0152:        except OSError as err:
>      0153:            if err.errno == errno.EXDEV:
>      0154:                bb.utils.copyfile(c, dest)
>      0155:            else:
> Exception: FileExistsError: [Errno 17] File exists:
> '/home/gizero/work/smartliving/distro/repo-master/build-
> poky/tmp/sysroots-components/raspberrypi3/userland/usr/include/KHR/khrplatform.h'
> -> '/home/gizero/work/smartliving/distro/repo-master/build-
> poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+
> 3/3.22.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h'
>

/usr/include/KHR/khrplatform.h is the egl platform header file, provided by
both mesa and RPI userland. Does mesa end up in your gtk+3 recipe-sysroot
somehow?

For clarity: this could be a bug but it is unlikely to be related to the
libepoxy change (it does not use or ship the actual header file).

 - Jussi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170711/470257f6/attachment-0002.html>