<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Jun 27, 2017 at 3:16 PM, Jussi Kukkonen <span dir="ltr"><<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Imports the current EGL API registry from Khronos.<br>
<br>
Makes EGL support optional: this is reflected in the recipe but<br>
egl is enabled by default as before.<br>
<br>
Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
---<br>
.../libepoxy/{<a href="http://libepoxy_1.4.2.bb" rel="noreferrer" target="_blank">libepoxy_1.4.2.<wbr>bb</a> => <a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a>} | 9 +++++----<br>
1 file changed, 5 insertions(+), 4 deletions(-)<br>
rename meta/recipes-graphics/libepoxy<wbr>/{<a href="http://libepoxy_1.4.2.bb" rel="noreferrer" target="_blank">libepoxy_1.4.2.bb</a> => <a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a>} (70%)<br>
<br>
diff --git a/meta/recipes-graphics/libepo<wbr>xy/<a href="http://libepoxy_1.4.2.bb" rel="noreferrer" target="_blank">libepoxy_1.4.2.bb</a> b/meta/recipes-graphics/libepo<wbr>xy/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a><br>
similarity index 70%<br>
rename from meta/recipes-graphics/libepoxy<wbr>/<a href="http://libepoxy_1.4.2.bb" rel="noreferrer" target="_blank">libepoxy_1.4.2.bb</a><br>
rename to meta/recipes-graphics/libepoxy<wbr>/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a><br>
index e69e828..c8b398f 100644<br>
--- a/meta/recipes-graphics/libepo<wbr>xy/<a href="http://libepoxy_1.4.2.bb" rel="noreferrer" target="_blank">libepoxy_1.4.2.bb</a><br>
+++ b/meta/recipes-graphics/libepo<wbr>xy/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a><br>
@@ -6,15 +6,16 @@ LICENSE = "MIT"<br>
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d4<wbr>01e07bd9ee8b6b58cf464b"<br>
<br>
SRC_URI = "<a href="https://github.com/anholt/$%7BBPN%7D/releases/download/$%7BPV%7D/$%7BBP%7D.tar.xz" rel="noreferrer" target="_blank">https://github.com/anholt/${B<wbr>PN}/releases/download/${PV}/${<wbr>BP}.tar.xz</a>"<br>
-SRC_URI[md5sum] = "632fcfd7ae9d21f5a634326d753a8<wbr>9c4"<br>
-SRC_URI[sha256sum] = "bea6fdec3d10939954495da898d87<wbr>2ee836b75c35699074cbf02a64fcb8<wbr>0d5b3"<br>
+SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9<wbr>bed"<br>
+SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8<wbr>bc7fb2fda074478e329b063c1f872b<wbr>826f6"<br>
UPSTREAM_CHECK_URI = "<a href="https://github.com/anholt/libepoxy/releases" rel="noreferrer" target="_blank">https://github.com/anholt/lib<wbr>epoxy/releases</a>"<br>
<br>
inherit autotools pkgconfig distro_features_check<br>
<br>
REQUIRED_DISTRO_FEATURES = "opengl"<br>
<br>
-DEPENDS = "util-macros virtual/egl"<br>
+DEPENDS = "util-macros"<br>
<br>
+PACKAGECONFIG[egl] = "--enable-egl, --disable-egl, virtual/egl"<br>
PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11"<br>
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FE<wbr>ATURES', 'x11', d)}"<br>
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FE<wbr>ATURES', 'x11', d)} egl"<br>
<span class="m_827202577286063731gmail-HOEnZb"><font color="#888888">--<br>
2.1.4</font></span><br></blockquote></div><br></div><div class="gmail_extra">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:<br><br>ERROR: gtk+3-3.22.16-r0 do_prepare_recipe_sysroot: Error executing a python function in exec_python_func() autogenerated:<br><br>The stack trace of python calls that resulted in this exception/failure was:<br>File: 'exec_python_func() autogenerated', lineno: 2, function: <module><br> 0001:<br> *** 0002:extend_recipe_sysroot(d)<br> 0003:<br>File: '/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/conf/../../<wbr>layers/poky/meta/classes/<wbr>staging.bbclass', lineno: 510, function: extend_recipe_sysroot<br> 0506: dest = newmanifest[l]<br> 0507: if l.endswith("/"):<br> 0508: staging_copydir(l, targetdir, dest, seendirs)<br> 0509: continue<br> *** 0510: staging_copyfile(l, targetdir, dest, postinsts, seendirs)<br> 0511:<br> 0512: for f in fixme:<br> 0513: if f == '':<br> 0514: staging_processfixme(fixme[f], recipesysroot, recipesysroot, recipesysrootnative, d)<br>File: '/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/conf/../../<wbr>layers/poky/meta/classes/<wbr>staging.bbclass', lineno: 151, function: staging_copyfile<br> 0147: os.symlink(linkto, dest)<br> 0148: #bb.warn(c)<br> 0149: else:<br> 0150: try:<br> *** 0151: os.link(c, dest)<br> 0152: except OSError as err:<br> 0153: if err.errno == errno.EXDEV:<br> 0154: bb.utils.copyfile(c, dest)<br> 0155: else:<br>Exception: FileExistsError: [Errno 17] File exists: '/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/tmp/<wbr>sysroots-components/<wbr>raspberrypi3/userland/usr/<wbr>include/KHR/khrplatform.h' -> '/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/tmp/work/<wbr>cortexa7hf-neon-vfpv4-poky-<wbr>linux-gnueabi/gtk+3/3.22.16-<wbr>r0/recipe-sysroot/usr/include/<wbr>KHR/khrplatform.h'<br><br>ERROR: gtk+3-3.22.16-r0 do_prepare_recipe_sysroot: Function failed: extend_recipe_sysroot<br>ERROR: Logfile of failure stored in: /home/gizero/work/smartliving/<wbr>distro/repo-master/build-poky/<wbr>tmp/work/cortexa7hf-neon-<wbr>vfpv4-poky-linux-gnueabi/gtk+<wbr>3/3.22.16-r0/temp/log.do_<wbr>prepare_recipe_sysroot.31798<br>ERROR: Task (/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/conf/../../<wbr>layers/poky/meta/recipes-<wbr>gnome/gtk+/gtk+3_3.22.16.bb:do<wbr>_prepare_recipe_sysroot) failed with exit code '1'<br><br></div><div class="gmail_extra">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.<br></div><div class="gmail_extra"><br>| In file included from /home/gizero/work/smartliving/<wbr>distro/repo-master/build-poky/<wbr>tmp/work/cortexa7hf-neon-<wbr>vfpv4-poky-linux-gnueabi/gtk+<wbr>3/3.22.16-r0/recipe-sysroot/<wbr>usr/include/epoxy/egl.h:46:0,<br>| from ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>h:32,<br>| from ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:24:<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c: In function 'gdk_wayland_gl_context_<wbr>realize':<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:179:43: error: expected expression before 'EGLContext'<br>| <wbr> : EGL_NO_CONTEXT,<br>| <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:200:47: error: expected expression before 'EGLContext'<br>| <wbr> : EGL_NO_CONTEXT,<br>| <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c: In function 'gdk_x11_gl_context_dispose':<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:510:54: error: expected expression before 'EGLSurface'<br>| eglMakeCurrent(display_<wbr>wayland->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,<br>| <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:510:70: error: expected expression before 'EGLSurface'<br>| eglMakeCurrent(display_<wbr>wayland->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,<br>| <wbr> <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:511:24: error: expected expression before 'EGLContext'<br>| EGL_NO_CONTEXT);<br>| ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c: In function 'gdk_wayland_display_make_gl_<wbr>context_current':<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:534:52: error: expected expression before 'EGLSurface'<br>| eglMakeCurrent(display_<wbr>wayland->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,<br>| <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:534:68: error: expected expression before 'EGLSurface'<br>| eglMakeCurrent(display_<wbr>wayland->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,<br>| <wbr> <wbr> ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:535:22: error: expected expression before 'EGLContext'<br>| EGL_NO_CONTEXT);<br>| ^<br>| ../../../gtk+-3.22.16/gdk/<wbr>wayland/gdkglcontext-wayland.<wbr>c:547:16: error: expected expression before 'EGLSurface'<br>| egl_surface = EGL_NO_SURFACE;<br>| ^<br>| Makefile:692: recipe for target 'gdkglcontext-wayland.lo' failed<br>| make[5]: *** [gdkglcontext-wayland.lo] Error 1<br>| make[5]: *** Waiting for unfinished jobs....<br>| make[5]: Leaving directory '/home/gizero/work/<wbr>smartliving/distro/repo-<wbr>master/build-poky/tmp/work/<wbr>cortexa7hf-neon-vfpv4-poky-<wbr>linux-gnueabi/gtk+3/3.22.16-<wbr>r0/build/gdk/wayland'<br><br><br></div></div>