Skip to contentSkip to conversation

Minor Gtk+3 and libepoxy upgrades

PATCH In review Jussi Kukkonen 4 participants 22 messages Jun 27, 2017 – Jul 14, 2017

lore
Share & tools
lore

Jussi Kukkonen

author
#0 lore raw

cover Minor Gtk+3 and libepoxy upgrades

Small upgrades and tweak to Gtk upstream version regex

Thanks,
Jussi

The following changes since commit a5bf271c7c4cf5d3bfdf8d1b05eec70ca43726b8:

meta: Add/fix missing Upstream-Status to patches (2017-06-27 10:38:43 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jku/gtk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gtk

Jussi Kukkonen (3):
gtk+3: Update UPSTREAM_CHECK_REGEX
gtk+3: Upgrade 3.22.15 -> 3.22.16
libepoxy: Upgrade 1.4.2 -> 1.4.3

 meta/recipes-gnome/gtk+/gtk+3.inc                                | 6 +++++-
 .../gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch    | 4 ++--
 meta/recipes-gnome/gtk+/{gtk+3_3.22.15.bb => gtk+3_3.22.16.bb}   | 4 ++--
 ...-utils-native_3.22.15.bb => gtk-icon-utils-native_3.22.16.bb} | 9 ++++++---
 .../libepoxy/{libepoxy_1.4.2.bb => libepoxy_1.4.3.bb}            | 9 +++++----
 5 files changed, 20 insertions(+), 12 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.22.15.bb => gtk+3_3.22.16.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.15.bb => gtk-icon-utils-native_3.22.16.bb} (86%)
 rename meta/recipes-graphics/libepoxy/{libepoxy_1.4.2.bb => libepoxy_1.4.3.bb} (70%)
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/3 gtk+3: Update UPSTREAM_CHECK_REGEX

Avoid versions >= 3.90 (development versions for 4.0).

Signed-off-by Jussi Kukkonen <[email protected]>
---
 meta/recipes-gnome/gtk+/gtk+3.inc                        | 6 +++++-
 meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
meta/recipes-gnome/gtk+/gtk+3.inc +5 -1
index 27da844..34845ae 100644
@@ -10,7 +10,11 @@ DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
 
 LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
 
-inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection
+inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection
+
+# versions >= 3.90 are development versions, otherwise like upstream-version-is-even
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
+
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 # This should be in autotools.bbclass, but until something elses uses it putting
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb +4 -1
index d8a0bd0..2d65b96 100644
@@ -20,7 +20,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-inherit pkgconfig native upstream-version-is-even
+inherit pkgconfig native
+
+# versions >= 3.90 are development versions, otherwise like upstream-version-is-even
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
 
 PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 2/3 gtk+3: Upgrade 3.22.15 -> 3.22.16

In reply to Jussi Kukkonen

A fair amount of bug fixes and improvements.

Signed-off-by Jussi Kukkonen <[email protected]>
---
 .../gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch         | 4 ++--
 meta/recipes-gnome/gtk+/{gtk+3_3.22.15.bb => gtk+3_3.22.16.bb}        | 4 ++--
 ...-icon-utils-native_3.22.15.bb => gtk-icon-utils-native_3.22.16.bb} | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+3_3.22.15.bb => gtk+3_3.22.16.bb} (84%)
 rename meta/recipes-gnome/gtk+/{gtk-icon-utils-native_3.22.15.bb => gtk-icon-utils-native_3.22.16.bb} (94%)
meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +2 -2
index e6ee21b..91e3512 100644
@@ -824,8 +824,8 @@ index 649981f..a0e48a6 100644
 +	gdkgears
 +endif
 +
- if USE_X11
- noinst_PROGRAMS += testerrors
+ if USE_WAYLAND
+ noinst_PROGRAMS += testforeign
  endif
 diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
 index 0b3a519..07b096f 100644
meta/recipes-gnome/gtk+/gtk+3_3.22.16.bb renamed from meta/recipes-gnome/gtk+/gtk+3_3.22.15.bb +2 -2
similarity index 84%
rename from meta/recipes-gnome/gtk+/gtk+3_3.22.15.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.22.16.bb
index 35c617c..2ae1d86 100644
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
            file://0003-Add-disable-opengl-configure-option.patch \
            file://0004-configure.ac-Fix-wayland-protocols-path.patch \
           "
-SRC_URI[md5sum] = "9a1177854c4c5609293e017c53bc8950"
-SRC_URI[sha256sum] = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb"
+SRC_URI[md5sum] = "71820863d5479e2c4a5b78f3164d5f15"
+SRC_URI[sha256sum] = "3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c"
 
 S = "${WORKDIR}/gtk+-${PV}"
meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.16.bb renamed from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb +2 -2
similarity index 94%
rename from meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.15.bb
rename to meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.16.bb
index 2d65b96..adfb928 100644
@@ -10,8 +10,8 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
           file://Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch"
-SRC_URI[md5sum] = "9a1177854c4c5609293e017c53bc8950"
-SRC_URI[sha256sum] = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb"
+SRC_URI[md5sum] = "71820863d5479e2c4a5b78f3164d5f15"
+SRC_URI[sha256sum] = "3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
Signature · 1 line
2.1.4
author
#3 lore raw

PATCH 3/3 libepoxy: Upgrade 1.4.2 -> 1.4.3

In reply to Jussi Kukkonen

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 <[email protected]>
---
 .../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%)
meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +5 -4
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
@@ -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] = "bea6fdec3d10939954495da898d872ee836b75c35699074cbf02a64fcb80d5b3"
+SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed"
+SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6"
 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"
Signature · 1 line
2.1.4
#4 lore raw

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

Quoted 46 lines · Jussi Kukkonen

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 <[email protected]>
---
 .../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%)

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -0
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
@@ -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"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -2
-SRC_URI[md5sum] = "632fcfd7ae9d21f5a634326d753a89c4"
-SRC_URI[sha256sum] = "bea6fdec3d10939954495da898d87

2ee836b75c35699074cbf02a64fcb80d5b3"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +2 -0
+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"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +3 -3
-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"
--
Quoted 2 lines

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'

ERROR: gtk+3-3.22.16-r0 do_prepare_recipe_sysroot: Function failed:
extend_recipe_sysroot
ERROR: Logfile of failure stored in: /home/gizero/work/smartliving/ distro/repo-master/build-poky/tmp/work/cortexa7hf-neon- vfpv4-poky-linux-gnueabi/gtk+3/3.22.16-r0/temp/log.do_ prepare_recipe_sysroot.31798
ERROR: Task (/home/gizero/work/smartliving/distro/repo- master/build-poky/conf/../../layers/poky/meta/recipes- gnome/gtk+/gtk+3_3.22.16.bb:do_prepare_recipe_sysroot) failed with exit code '1'

During bisection the failing task changed from do_prepare_recipe_sysroot to do_compile with the log below. I have no idea if these things do relate themselves, but if not, I was not able to figure it out while bisecting.

| In file included from /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/epoxy/egl.h:46:0,
| from ../../../gtk+-3.22.16/gdk/
wayland/gdkglcontext-wayland.h:32,
| from ../../../gtk+-3.22.16/gdk/
wayland/gdkglcontext-wayland.c:24:
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:179:43: error:
expected expression before 'EGLContext'

|                                          : EGL_NO_CONTEXT,
|                                            ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:200:47: error:
expected expression before 'EGLContext'
|                                              : EGL_NO_CONTEXT,
|                                                ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function

'gdk_x11_gl_context_dispose':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:510:54: error:
expected expression before 'EGLSurface'
| eglMakeCurrent(display_wayland->egl_display, EGL_NO_SURFACE,
EGL_NO_SURFACE,
| ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:510:70: error:
expected expression before 'EGLSurface'
| eglMakeCurrent(display_wayland->egl_display, EGL_NO_SURFACE,
EGL_NO_SURFACE,
| ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:511:24: error:
expected expression before 'EGLContext'

|                         EGL_NO_CONTEXT);
|                         ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function

'gdk_wayland_display_make_gl_context_current':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:534:52: error:
expected expression before 'EGLSurface'
| eglMakeCurrent(display_wayland->egl_display, EGL_NO_SURFACE,
EGL_NO_SURFACE,
| ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:534:68: error:
expected expression before 'EGLSurface'
| eglMakeCurrent(display_wayland->egl_display, EGL_NO_SURFACE,
EGL_NO_SURFACE,
| ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:535:22: error:
expected expression before 'EGLContext'

|                       EGL_NO_CONTEXT);
|                       ^
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:547:16: error:
expected expression before 'EGLSurface'
|   egl_surface = EGL_NO_SURFACE;
|                 ^
| Makefile:692: recipe for target 'gdkglcontext-wayland.lo' failed
| make[5]: *** [gdkglcontext-wayland.lo] Error 1
| make[5]: *** Waiting for unfinished jobs....
| make[5]: Leaving directory '/home/gizero/work/smartliving/distro/repo-

master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky- linux-gnueabi/gtk+3/3.22.16-r0/build/gdk/wayland'

author
#5 lore raw

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

Quoted 87 lines · Andrea Galbusera
Quoted 46 lines · Jussi Kukkonen

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 <[email protected]>
---
 .../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%)

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -0
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
@@ -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"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -2
-SRC_URI[md5sum] = "632fcfd7ae9d21f5a634326d753a89c4"
-SRC_URI[sha256sum] = "bea6fdec3d10939954495da898d87

2ee836b75c35699074cbf02a64fcb80d5b3"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +2 -0
+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"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +3 -3
-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"
--
Quoted 2 lines

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:
Quoted 12 lines

*** 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

author
#6 lore raw

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

Quoted 9 lines · Jussi Kukkonen

Exception: FileExistsError: [Errno 17] File exists:

Quoted 6 lines

'/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.2 2.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h'

Quoted 8 lines

/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).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what mesa-gl in oe-core does).

Make sure you have oe-core commit f0762f5bad3 (poky: 773d10873).

Jussi

author
#7 lore raw

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

Quoted 14 lines · Jussi Kukkonen
Quoted 13 lines · Jussi Kukkonen

Exception: FileExistsError: [Errno 17] File exists:

Quoted 6 lines

'/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.2 2.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?

Quoted 10 lines
Quoted 4 lines

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).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what mesa-gl in oe-core does).

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether egl is enabled or not -- so they've started installing it in any case from 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

I don't know what the correct fix is yet, just wanted to correct my original wrong info.

#8 lore raw

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

Quoted 27 lines · Jussi Kukkonen
Quoted 15 lines · Jussi Kukkonen
Quoted 13 lines · Jussi Kukkonen

Exception: FileExistsError: [Errno 17] File exists:

Quoted 6 lines

'/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.2 2.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?

Quoted 10 lines
Quoted 4 lines

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).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what mesa-gl in oe-core does).

Quoted 9 lines

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether egl is enabled or not -- so they've started installing it in any case from 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

I don't know what the correct fix is yet, just wanted to correct my original wrong info.

Ok, got it.... That was also my initial interpretation of mentioned commit message which states:

mesa: Upgrade to 17.1.4 release

This includes following upstream bug fixes:

Bug 77240 - khrplatform.h not installed if EGL is disabled

#9 lore raw

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

In reply to Jussi Kukkonen
Quoted 24 lines · Jussi Kukkonen
Quoted 13 lines · Jussi Kukkonen
Quoted 11 lines · Jussi Kukkonen
Quoted 5 lines

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?

Quoted 9 lines
Quoted 3 lines

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).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what mesa-gl in oe-core does).

Quoted 9 lines

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether egl is enabled or not -- so they've started installing it in any case from 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

I don't know what the correct fix is yet, just wanted to correct my original wrong info.

Post an update to sync this header for userland package.

Quoted 7 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#10 lore raw

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

Il 11 lug 2017 8:00 PM, "Khem Raj" <[email protected]> ha scritto:

Quoted 3 lines · Jussi Kukkonen
Quoted 2 lines · Jussi Kukkonen

On 11 July 2017 at 10:42, Jussi Kukkonen <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

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'

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

-> '/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'

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

/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

Quoted 9 lines
Quoted 9 lines
Quoted 5 lines

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).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is

what

Quoted 5 lines
Quoted 2 lines

mesa-gl in oe-core does).

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed

whether

Quoted 5 lines

egl is enabled or not -- so they've started installing it in any case from 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

I don't know what the correct fix is yet, just wanted to correct my

original

Quoted 2 lines

wrong info.

Post an update to sync this header for userland package.

Will this help solving the gtk+3 issue of mesa-gl and userland now both providing the same header and causing recipe-sysroot construction to fail?

Quoted 7 lines

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#11 lore raw

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

Quoted 47 lines · Andrea Galbusera

Il 11 lug 2017 8:00 PM, "Khem Raj" <[email protected]> ha scritto:

Quoted 36 lines · Jussi Kukkonen
Quoted 22 lines · Jussi Kukkonen
Quoted 9 lines · Jussi Kukkonen
Quoted 7 lines

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'

Quoted 8 lines

/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).

Quoted 5 lines

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what
mesa-gl in oe-core does).

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether
egl is enabled or not -- so they've started installing it in any case from 17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

Quoted 4 lines

I don't know what the correct fix is yet, just wanted to correct my original
wrong info.

Quoted 5 lines

Post an update to sync this header for userland package.

Will this help solving the gtk+3 issue of mesa-gl and userland now both providing the same header and causing recipe-sysroot construction to fail?

No it certainly would not. But we can then decide who provides it, in a easy way.

#12 lore raw

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

Quoted 60 lines · Khem Raj
Quoted 7 lines · Andrea Galbusera

Il 11 lug 2017 8:00 PM, "Khem Raj" <[email protected]> ha scritto:

Quoted 1 line · Jussi Kukkonen

On 11 July 2017 at 11:27, Jussi Kukkonen <[email protected]>

Quoted 7 lines · wrote:
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines · Jussi Kukkonen
Quoted 4 lines

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'

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

->

'/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'

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

/usr/include/KHR/khrplatform.h is the egl platform header file,

provided

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

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

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 2 lines

libepoxy change (it does not use or ship the actual header file).

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what
mesa-gl in oe-core does).

Quoted 4 lines
Quoted 4 lines

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether
egl is enabled or not -- so they've started installing it in any case

from

Quoted 11 lines
Quoted 7 lines

17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts with userland.

I don't know what the correct fix is yet, just wanted to correct my original
wrong info.

Post an update to sync this header for userland package.

Quoted 7 lines
Quoted 2 lines

Will this help solving the gtk+3 issue of mesa-gl and userland now both providing the same header and causing recipe-sysroot construction to

fail?

No it certainly would not. But we can then decide who provides it, in a easy way.

I may be in the need to craft something locally to unbreak building with current master... Could you please shed some light on how this should be done then? Is this a matter of completely removing either mesa-gl or userland from gtk+3 deps or a more selective change to avoid the clash in recipe-sysroot?

#13 lore raw

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

Quoted 71 lines · Andrea Galbusera
Quoted 62 lines · Khem Raj
Quoted 59 lines · Andrea Galbusera

Il 11 lug 2017 8:00 PM, "Khem Raj" <[email protected]> ha scritto:

Quoted 45 lines · Jussi Kukkonen
Quoted 26 lines · Jussi Kukkonen
Quoted 17 lines · Jussi Kukkonen
Quoted 9 lines

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?

Quoted 4 lines

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).

Quoted 7 lines

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa
accidentally shipped khrplatform.h even when egl was disabled (which is
what
mesa-gl in oe-core does).

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether
egl is enabled or not -- so they've started installing it in any case from
17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts
with userland.

Quoted 4 lines

I don't know what the correct fix is yet, just wanted to correct my original
wrong info.

Post an update to sync this header for userland package.

Quoted 6 lines
Quoted 3 lines

Will this help solving the gtk+3 issue of mesa-gl and userland now both providing the same header and causing recipe-sysroot construction to fail?

No it certainly would not. But we can then decide who provides it, in a easy way.

Quoted 5 lines

I may be in the need to craft something locally to unbreak building with current master... Could you please shed some light on how this should be done then? Is this a matter of completely removing either mesa-gl or userland from gtk+3 deps or a more selective change to avoid the clash in recipe-sysroot?

Firstly, determine where this file belongs to. If it is part of egl/gles then it should go to userland, otherwise it should be provided by mesa when using userland for graphics

#14 lore raw

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

Quoted 85 lines · Khem Raj
Quoted 13 lines · Andrea Galbusera
Quoted 12 lines · Khem Raj
Quoted 9 lines · Andrea Galbusera

Il 11 lug 2017 8:00 PM, "Khem Raj" <[email protected]> ha scritto:

Quoted 3 lines · Jussi Kukkonen
Quoted 1 line · Jussi Kukkonen
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines · Jussi Kukkonen
Quoted 5 lines

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'

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

->

'/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'

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

/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

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 26 lines
Quoted 5 lines
Quoted 3 lines

the
libepoxy change (it does not use or ship the actual header file).

Quoted 7 lines

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa
accidentally shipped khrplatform.h even when egl was disabled (which is
what
mesa-gl in oe-core does).

Sorry, I've not had enough coffee. It was the other way round:
khrplatform.h is the platform header that mesa now thinks is needed whether
egl is enabled or not -- so they've started installing it in any case from
17.1.4 which means mesa-gl now provides khrplatform.h and thus conflicts
with userland.

I don't know what the correct fix is yet, just wanted to correct my original
wrong info.

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

Post an update to sync this header for userland package.

Will this help solving the gtk+3 issue of mesa-gl and userland now

both

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

providing the same header and causing recipe-sysroot construction to fail?

No it certainly would not. But we can then decide who provides it, in a easy way.

Quoted 5 lines

I may be in the need to craft something locally to unbreak building with current master... Could you please shed some light on how this should be done then? Is this a matter of completely removing either mesa-gl or userland from gtk+3 deps or a more selective change to avoid the clash in recipe-sysroot?

Quoted 4 lines

Firstly, determine where this file belongs to. If it is part of egl/gles then it should go to userland, otherwise it should be provided by mesa when using userland for graphics

If I understand correctly your point, you mean it is about having the two upstream agreeing on where the header belongs to and fixing either one or the other to stop providing it. In the meanwhile, from an oe perspective, having such a patch in place for any of the two or even removing the file in an appropriate do_install_append should do the job, right?

author
#15 lore raw

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

In reply to Khem Raj
Quoted 8 lines · Khem Raj
Quoted 5 lines · Andrea Galbusera

I may be in the need to craft something locally to unbreak building with current master... Could you please shed some light on how this should be done then? Is this a matter of completely removing either mesa-gl or userland from gtk+3 deps or a more selective change to avoid the clash in recipe-sysroot?

Quoted 4 lines

Firstly, determine where this file belongs to. If it is part of egl/gles then it should go to userland, otherwise it should be provided by mesa when using userland for graphics

It's a "generic" Khronos platform header (so not part of EGL or GLES[1-3] but needed by all), in a perfect world we could use any version of it ... unfortunately "Adopters may modify this file to suit their platform" and of course that's what Userland has done.

I think I'll just send a patch to mesa-gl recipe to not install the header. If someone wants to solve this properly with the upstreams, be my guest.

Jussi

#16 lore raw

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

Quoted 4 lines · Jussi Kukkonen

I think I'll just send a patch to mesa-gl recipe to not install the header. If someone wants to solve this properly with the upstreams, be my guest.

Sounds like the best fix considering the alternatives, to be honest.

Ross

#17 lore raw

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

In reply to Jussi Kukkonen
Quoted 19 lines · Jussi Kukkonen
Quoted 9 lines · Jussi Kukkonen

Exception: FileExistsError: [Errno 17] File exists:

Quoted 6 lines

'/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.2 2.16-r0/recipe-sysroot/usr/include/KHR/khrplatform.h'

Quoted 8 lines

/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).

Quoted 6 lines

Actually this was maybe fixed by Otavios upgrade to mesa 17.1.4 -- mesa accidentally shipped khrplatform.h even when egl was disabled (which is what mesa-gl in oe-core does).

Make sure you have oe-core commit f0762f5bad3 (poky: 773d10873).

Yes I have it, and the cleansstate mentioned above makes me think it got used as expected. Indeed the commit you mention is part of the bunch of commits after pulling which I got my builds broken... I'm confused! Any idea how to figure out which recipe get considered first in gtk+3's do_prepare_recipe_sysroot and effectively deliver khrplatform.h to the recipe-sysroot?

#18 lore raw

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

In reply to Jussi Kukkonen
Quoted 104 lines · Jussi Kukkonen
Quoted 89 lines · Andrea Galbusera

On Tue, Jun 27, 2017 at 3:16 PM, Jussi Kukkonen <[email protected]

Quoted 48 lines

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 <[email protected]>
---
 .../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%)

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -0
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
@@ -6,15 +6,16 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d4

01e07bd9ee8b6b58cf464b"

SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${
BP}.tar.xz"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +0 -2
-SRC_URI[md5sum] = "632fcfd7ae9d21f5a634326d753a89c4"
-SRC_URI[sha256sum] = "bea6fdec3d10939954495da898d87

2ee836b75c35699074cbf02a64fcb80d5b3"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +2 -0
+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"

meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb renamed from meta/recipes-graphics/libepoxy/libepoxy_1.4.2.bb +3 -2
-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)}
Quoted 4 lines

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:
Quoted 12 lines

*** 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'

Quoted 4 lines

/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?

Indeed, both mesa-gl and userland are listed in tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/gtk+3/3.22.16-r0/recipe-sysroot/sysroot-providers. Are these two conflicting? Something I can do to help nailing it down? I
managed to call cleansstate for all recipes in userland, gtk+3 and mesa but
I end up with the same recipe-sysroot...

Quoted 4 lines

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).

author
#19 lore raw

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

In reply to Andrea Galbusera
Quoted 4 lines · Andrea Galbusera

During bisection the failing task changed from do_prepare_recipe_sysroot to do_compile with the log below. I have no idea if these things do relate themselves, but if not, I was not able to figure it out while bisecting.

Quoted 15 lines

| In file included from /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/epoxy/egl.h:46:0,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.h:32,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.c:24:
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:179:43: error:
expected expression before 'EGLContext'
| : EGL_NO_CONTEXT,
| ^

Your bisect seems valid: gtk+3 uses a define that comes from epoxy and was changed in the update. The new define uses a EGL_CAST() macro that was added to eglplatform.h at the same time. mesa has updated their eglplatform.h so it all seems to work, but userland does not seem to have this macro?

There's probably more to the story (since the error is not about implicit EGL_CAST() as one would expect). My first suggestion would be that userland eglplatform.h is updated to match current Khronos registry or at least to include the EGL_CAST definition.

#20 lore raw

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

Quoted 28 lines · Jussi Kukkonen
Quoted 4 lines · Andrea Galbusera

During bisection the failing task changed from do_prepare_recipe_sysroot to do_compile with the log below. I have no idea if these things do relate themselves, but if not, I was not able to figure it out while bisecting.

Quoted 15 lines

| In file included from /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/incl ude/epoxy/egl.h:46:0,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.h:32,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.c:24:
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:179:43:
error: expected expression before 'EGLContext'
| : EGL_NO_CONTEXT,
| ^

Your bisect seems valid: gtk+3 uses a define that comes from epoxy and was changed in the update. The new define uses a EGL_CAST() macro that was added to eglplatform.h at the same time. mesa has updated their eglplatform.h so it all seems to work, but userland does not seem to have this macro?

Quoted 5 lines

There's probably more to the story (since the error is not about implicit EGL_CAST() as one would expect). My first suggestion would be that userland eglplatform.h is updated to match current Khronos registry or at least to include the EGL_CAST definition.

I looked at the userland upstream repo and they don't seem to have updates on their eglplatform.h since 2015...

#21 lore raw

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

In reply to Jussi Kukkonen
Quoted 28 lines · Jussi Kukkonen
Quoted 4 lines · Andrea Galbusera

During bisection the failing task changed from do_prepare_recipe_sysroot to do_compile with the log below. I have no idea if these things do relate themselves, but if not, I was not able to figure it out while bisecting.

Quoted 15 lines

| In file included from /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/incl ude/epoxy/egl.h:46:0,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.h:32,
| from ../../../gtk+-3.22.16/gdk/wayl
and/gdkglcontext-wayland.c:24:
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c: In function 'gdk_wayland_gl_context_realize':
| ../../../gtk+-3.22.16/gdk/wayland/gdkglcontext-wayland.c:179:43:
error: expected expression before 'EGLContext'
| : EGL_NO_CONTEXT,
| ^

Your bisect seems valid: gtk+3 uses a define that comes from epoxy and was changed in the update. The new define uses a EGL_CAST() macro that was added to eglplatform.h at the same time. mesa has updated their eglplatform.h so it all seems to work, but userland does not seem to have this macro?

Quoted 6 lines

There's probably more to the story (since the error is not about implicit EGL_CAST() as one would expect). My first suggestion would be that userland eglplatform.h is updated to match current Khronos registry or at least to include the EGL_CAST definition.

Can anyone of you guys with deep understanding in this matter help with [1]. I posted a pull request on RPi userland upstream backporting changes to eglplatform.h from mesa that seems relevant to fix builds for libepoxy and gtk+3 but maintainers arguments needs more knowledge than I have...

[1] https://github.com/raspberrypi/userland/pull/407