<div dir="ltr">Hi,<div><br></div><div>Sorry again. The patch was based on openembedded-core rather than poky, and this is why the patchwork failed to apply it.</div><div>This should be the last one.</div><div><br></div><div>Thanks for the patience,</div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Francesco Giancane</div><div dir="ltr"><br></div></div></div></div></div></div></div>
<br><div class="gmail_quote">2018-02-28 23:08 GMT+01:00 Francesco Giancane <span dir="ltr"><<a href="mailto:francescogiancane8@gmail.com" target="_blank">francescogiancane8@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">libepoxy 1.4.3 did not compile successfully because of<br>
implicit symbol definitions and link-time errors.<br>
A new recipe with latest libepoxy release (1.5.0) which<br>
successfully compiles is provided.<br>
<br>
</span><span class="">Patch to disable 'dlvsym' has also been forward-ported<br>
to be applicable to version 1.5.0.<br>
The patch 'Add-fallback-definition-for-<wbr>EGL-CAST.patch' is<br>
mainline now; thus it can be safely removed.<br>
</span>Also, the patch<br>
0001-Define-MESA_EGL_NO_X11_<wbr>HEADERS-before-including-eglp.<wbr>patch<br>
is no longer required since mainline fixed this too.<br>
<span class=""><br>
Signed-off-by: Francesco Giancane <<a href="mailto:francescogiancane8@gmail.com">francescogiancane8@gmail.com</a>><br>
---<br>
</span> ..._EGL_NO_X11_HEADERS-before-<wbr>including-eglp.patch | 30 --------------------<br>
<span class=""> ...sible-to-disable-the-use-<wbr>of-dlvsym-needed.patch | 26 +++++++++--------<br>
.../Add-fallback-definition-<wbr>for-EGL-CAST.patch | 33 ----------------------<br>
</span> .../{<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a> => <a href="http://libepoxy_1.5.0.bb" rel="noreferrer" target="_blank">libepoxy_1.5.0.bb</a>} | 10 +++----<br>
4 files changed, 18 insertions(+), 81 deletions(-)<br>
delete mode 100644 meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Define-<wbr>MESA_EGL_NO_X11_HEADERS-<wbr>before-including-eglp.patch<br>
delete mode 100644 meta/recipes-graphics/<wbr>libepoxy/libepoxy/Add-<wbr>fallback-definition-for-EGL-<wbr>CAST.patch<br>
rename meta/recipes-graphics/<wbr>libepoxy/{<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a> => <a href="http://libepoxy_1.5.0.bb" rel="noreferrer" target="_blank">libepoxy_1.5.0.bb</a>} (61%)<br>
<br>
diff --git a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Define-<wbr>MESA_EGL_NO_X11_HEADERS-<wbr>before-including-eglp.patch b/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Define-<wbr>MESA_EGL_NO_X11_HEADERS-<wbr>before-including-eglp.patch<br>
deleted file mode 100644<br>
index ebe5754a7a..0000000000<br>
--- a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Define-<wbr>MESA_EGL_NO_X11_HEADERS-<wbr>before-including-eglp.patch<br>
+++ /dev/null<br>
@@ -1,30 +0,0 @@<br>
-From 62e178ddae24c7633d2a03b129dc52<wbr>261e0a15bf Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Wed, 7 Feb 2018 00:48:<a href="tel:03%20-0800" value="+39030800">03 -0800</a><br>
-Subject: [PATCH] Define MESA_EGL_NO_X11_HEADERS before including eglplatform.h<br>
- when X11 is disabled<br>
-<br>
-This helps in compiling when GL implementations e.g. mesa use<br>
-this define to exclude X11 headers<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
-Upstream-Status: Submitted [<a href="https://github.com/anholt/libepoxy/pull/153" rel="noreferrer" target="_blank">https://github.com/anholt/<wbr>libepoxy/pull/153</a>]<br>
-<br>
- src/dispatch_common.h | 3 +++<br>
- 1 file changed, 3 insertions(+)<br>
-<br>
-Index: libepoxy-1.4.3/src/dispatch_<wbr>common.h<br>
-=============================<wbr>==============================<wbr>========<br>
---- libepoxy-1.4.3.orig/src/<wbr>dispatch_common.h<br>
-+++ libepoxy-1.4.3/src/dispatch_<wbr>common.h<br>
-@@ -46,6 +46,9 @@<br>
- #include "epoxy/glx.h"<br>
- #endif<br>
- #if PLATFORM_HAS_EGL<br>
-+#if !PLATFORM_HAS_GLX<br>
-+#define MESA_EGL_NO_X11_HEADERS 1<br>
-+#endif<br>
- #include "epoxy/egl.h"<br>
- #endif<br>
- #if PLATFORM_HAS_WGL<br>
<div><div class="h5">diff --git a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Make-<wbr>it-possible-to-disable-the-<wbr>use-of-dlvsym-needed.patch b/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Make-<wbr>it-possible-to-disable-the-<wbr>use-of-dlvsym-needed.patch<br>
index c2a2fa3453..5bddc12033 100644<br>
--- a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Make-<wbr>it-possible-to-disable-the-<wbr>use-of-dlvsym-needed.patch<br>
+++ b/meta/recipes-graphics/<wbr>libepoxy/libepoxy/0001-Make-<wbr>it-possible-to-disable-the-<wbr>use-of-dlvsym-needed.patch<br>
@@ -1,36 +1,38 @@<br>
-From 7bcefd311cd696955376fe2c5298ec<wbr>85e8f954ce Mon Sep 17 00:00:00 2001<br>
-From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
-Date: Wed, 15 Nov 2017 12:48:27 +0200<br>
+From 9c964427656ef71210e2c5b48b2798<wbr>57806574e9 Mon Sep 17 00:00:00 2001<br>
+From: Francesco Giancane <<a href="mailto:francescogiancane8@gmail.com">francescogiancane8@gmail.com</a>><br>
+Date: Wed, 28 Feb 2018 21:32:24 +0100<br>
Subject: [PATCH] Make it possible to disable the use of dlvsym() (needed for<br>
musl)<br>
<br>
-Upstream-Status: Pending<br>
-Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
+Add a patch to work around absence of dlvsym() on musl<br>
+(wasn't previously a problem as autotools weren't building tests by default)<br>
<br>
+Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.<wbr>intel.com</a>><br>
+Signed-off-by: Francesco Giancane <<a href="mailto:francescogiancane8@gmail.com">francescogiancane8@gmail.com</a>><br>
---<br>
meson_options.txt | 3 +++<br>
test/meson.build | 6 +++---<br>
2 files changed, 6 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/meson_options.txt b/meson_options.txt<br>
-index 244476a..071f0b6 100644<br>
+index b5d7c98..aa849c2 100644<br>
--- a/meson_options.txt<br>
+++ b/meson_options.txt<br>
@@ -1,6 +1,9 @@<br>
- option('enable-docs',<br>
+ option('docs',<br>
type: 'boolean', value: false,<br>
description: 'Enable generating the Epoxy API reference (depends on Doxygen)')<br>
+option('has-dlvsym',<br>
+ type: 'boolean', value: true,<br>
+ description: 'Whether dlvsym() is available (it is not when using musl C library)')<br>
- option('enable-glx',<br>
+ option('glx',<br>
type: 'combo',<br>
choices: [ 'auto', 'yes', 'no' ],<br>
diff --git a/test/meson.build b/test/meson.build<br>
-index 2340fc6..bc4330b 100644<br>
+index c5788b4..4c46ae6 100644<br>
--- a/test/meson.build<br>
+++ b/test/meson.build<br>
-@@ -86,8 +86,8 @@ if build_glx<br>
+@@ -92,8 +92,8 @@ if build_glx<br>
[ 'glx_has_extension_nocontext', [ 'glx_has_extension_nocontext.<wbr>c' ], [], [], true ],<br>
[ 'glx_static', [ 'glx_static.c' ], [ '-DNEEDS_TO_BE_STATIC'], [ '-static' ], libtype == 'static' ],<br>
[ 'glx_shared_znow', [ 'glx_static.c', ], [], [ '-Wl,-z,now' ], has_znow ],<br>
@@ -41,7 +43,7 @@ index 2340fc6..bc4330b 100644<br>
]<br>
<br>
foreach test: glx_tests<br>
-@@ -108,7 +108,7 @@ if build_glx<br>
+@@ -114,7 +114,7 @@ if build_glx<br>
endif<br>
endforeach<br>
<br>
@@ -51,5 +53,5 @@ index 2340fc6..bc4330b 100644<br>
if build_egl<br>
glx_egl_sources = [<br>
--<br>
-2.15.0<br>
+2.14.3<br>
<br>
diff --git a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/Add-<wbr>fallback-definition-for-EGL-<wbr>CAST.patch b/meta/recipes-graphics/<wbr>libepoxy/libepoxy/Add-<wbr>fallback-definition-for-EGL-<wbr>CAST.patch<br>
deleted file mode 100644<br>
index b9297257dc..0000000000<br>
--- a/meta/recipes-graphics/<wbr>libepoxy/libepoxy/Add-<wbr>fallback-definition-for-EGL-<wbr>CAST.patch<br>
+++ /dev/null<br>
@@ -1,33 +0,0 @@<br>
-Add fallback definition for EGL_CAST<br>
-<br>
-The EGL API update from d11104f introduced a dependency on the<br>
-EGL_CAST() macro, provided by an updated eglplatform.h. Given that we<br>
-don't provide eglplatform.h, add a fallback definition for if we're<br>
-building against Mesa 17.0.x or similar.<br>
-<br>
-<a href="https://bugs.gentoo.org/show_bug.cgi?id=623926" rel="noreferrer" target="_blank">https://bugs.gentoo.org/show_<wbr>bug.cgi?id=623926</a><br>
-<br>
-Upstream-Status: Backport [<a href="https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8" rel="noreferrer" target="_blank">https://github.com/anholt/<wbr>libepoxy/commit/<wbr>ebe3a53db1c0bb34e1ca963b95d1f2<wbr>22115f93f8</a>]<br>
-<br>
-Signed-off-by: Tom Hochstein <<a href="mailto:tom.hochstein@nxp.com">tom.hochstein@nxp.com</a>><br>
-<br>
-Index: libepoxy-1.4.3/src/gen_<wbr>dispatch.py<br>
-=============================<wbr>==============================<wbr>========<br>
---- libepoxy-1.4.3.orig/src/gen_<wbr>dispatch.py 2017-06-06 04:24:13.000000000 -0500<br>
-+++ libepoxy-1.4.3/src/gen_<wbr>dispatch.py 2017-11-06 12:45:43.594966473 -0600<br>
-@@ -491,6 +491,15 @@<br>
- self.outln('#include "epoxy/gl.h"')<br>
- if self.target == "egl":<br>
- self.outln('#include "EGL/eglplatform.h"')<br>
-+ # Account for older eglplatform.h, which doesn't define<br>
-+ # the EGL_CAST macro.<br>
-+ self.outln('#ifndef EGL_CAST')<br>
-+ self.outln('#if defined(__cplusplus)')<br>
-+ self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))')<br>
-+ self.outln('#else')<br>
-+ self.outln('#define EGL_CAST(type, value) ((type) (value))')<br>
-+ self.outln('#endif')<br>
-+ self.outln('#endif')<br>
- else:<br>
- # Add some ridiculous inttypes.h redefinitions that are<br>
- # from khrplatform.h and not included in the XML. We<br>
diff --git a/meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a> b/meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.5.0.bb" rel="noreferrer" target="_blank">libepoxy_1.5.0.bb</a><br>
</div></div>similarity index 61%<br>
<span class="">rename from meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a><br>
rename to meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.5.0.bb" rel="noreferrer" target="_blank">libepoxy_1.5.0.bb</a><br>
</span>index 8a5cb8f49f..dfdd19248d 100644<br>
--- a/meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.4.3.bb" rel="noreferrer" target="_blank">libepoxy_1.4.3.bb</a><br>
+++ b/meta/recipes-graphics/<wbr>libepoxy/<a href="http://libepoxy_1.5.0.bb" rel="noreferrer" target="_blank">libepoxy_1.5.0.bb</a><br>
@@ -6,12 +6,10 @@ LICENSE = "MIT"<br>
<span class=""> LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>58ef4c80d401e07bd9ee8b6b58cf46<wbr>4b"<br>
<br>
</span><span class=""> SRC_URI = "<a href="https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz" rel="noreferrer" target="_blank">https://github.com/anholt/${<wbr>BPN}/releases/download/${PV}/$<wbr>{BP}.tar.xz</a> \<br>
</span><span class="">- file://Add-fallback-<wbr>definition-for-EGL-CAST.patch \<br>
file://0001-Make-it-possible-<wbr>to-disable-the-use-of-dlvsym-<wbr>needed.patch \<br>
</span>- file://0001-Define-MESA_EGL_<wbr>NO_X11_HEADERS-before-<wbr>including-eglp.patch \<br>
<span class=""> "<br>
-SRC_URI[md5sum] = "<wbr>af4c3ce0fb1143bdc4e43f85695a9b<wbr>ed"<br>
-SRC_URI[sha256sum] = "<wbr>0b808a06c9685a62fca34b680abb8b<wbr>c7fb2fda074478e329b063c1f872b8<wbr>26f6"<br>
</span><span class="">+SRC_URI[md5sum] = "<wbr>63fe3847789258254dcd7e3fdb9e7f<wbr>5e"<br>
+SRC_URI[sha256sum] = "<wbr>4c94995398a6ebf691600dda2e9685<wbr>a0cac261414175c2adf4645cdfab42<wbr>a5d5"<br>
</span><span class=""> UPSTREAM_CHECK_URI = "<a href="https://github.com/anholt/libepoxy/releases" rel="noreferrer" target="_blank">https://github.com/anholt/<wbr>libepoxy/releases</a>"<br>
<br>
inherit meson pkgconfig distro_features_check<br>
</span>@@ -20,8 +18,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"<br>
<span class="im HOEnZb"><br>
DEPENDS = "util-macros"<br>
<br>
-PACKAGECONFIG[egl] = "-Denable-egl=yes, -Denable-egl=no, virtual/egl"<br>
-PACKAGECONFIG[x11] = "-Denable-glx=yes, -Denable-glx=no, virtual/libx11"<br>
+PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl"<br>
+PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl"<br>
</span><span class="im HOEnZb"> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_<wbr>FEATURES', 'x11', d)} egl"<br>
<br>
</span><div class="HOEnZb"><div class="h5"> EXTRA_OEMESON_append_libc-musl = " -Dhas-dlvsym=false "<br>
--<br>
2.14.3<br>
<br>
</div></div></blockquote></div><br></div></div>