<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Aug 10, 2017 at 11:37 AM, Andreas Müller <span dir="ltr"><<a href="mailto:schnitzeltony@googlemail.com" target="_blank">schnitzeltony@googlemail.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">Optional installation of khrplatform.h was implemented upstream by a slightly<br>
different approach -> 0001-mapi-Only-install-khrplat<wbr>form.h-with-EGL-or-GLES.patch<br>
can be removed.</blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Signed-off-by: Andreas Müller <<a href="mailto:schnitzeltony@googlemail.com" target="_blank">schnitzeltony@googlemail.com</a>><br></blockquote><div><br></div><div><div>LGTM. Being reporting the issue that originated the here removed patch by Jussi, I build tested this commit on the original setup with meta-raspberrypi and everything still looks good.</div></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
...ly-install-khrplatform.h-w<wbr>ith-EGL-or-GLES.patch | 52 ----------------------<br>
.../mesa/{<a href="http://mesa-gl_17.1.5.bb" rel="noreferrer" target="_blank">mesa-gl_17.1.5.bb</a> => <a href="http://mesa-gl_17.1.6.bb" rel="noreferrer" target="_blank">mesa-gl_17.1.6.bb</a>} | 0<br>
.../mesa/{<a href="http://mesa_17.1.5.bb" rel="noreferrer" target="_blank">mesa_17.1.5.bb</a> => <a href="http://mesa_17.1.6.bb" rel="noreferrer" target="_blank">mesa_17.1.6.bb</a>} | 5 +--<br>
3 files changed, 2 insertions(+), 55 deletions(-)<br>
delete mode 100644 meta/recipes-graphics/mesa/fil<wbr>es/0001-mapi-Only-install-khrp<wbr>latform.h-with-EGL-or-GLES.<wbr>patch<br>
rename meta/recipes-graphics/mesa/{<a href="http://mesa-gl_17.1.5.bb" rel="noreferrer" target="_blank">me<wbr>sa-gl_17.1.5.bb</a> => <a href="http://mesa-gl_17.1.6.bb" rel="noreferrer" target="_blank">mesa-gl_17.1.6.bb</a>} (100%)<br>
rename meta/recipes-graphics/mesa/{<a href="http://mesa_17.1.5.bb" rel="noreferrer" target="_blank">me<wbr>sa_17.1.5.bb</a> => <a href="http://mesa_17.1.6.bb" rel="noreferrer" target="_blank">mesa_17.1.6.bb</a>} (81%)<br>
<br>
diff --git a/meta/recipes-graphics/mesa/f<wbr>iles/0001-mapi-Only-install-kh<wbr>rplatform.h-with-EGL-or-GLES.<wbr>patch b/meta/recipes-graphics/mesa/f<wbr>iles/0001-mapi-Only-install-kh<wbr>rplatform.h-with-EGL-or-GLES.<wbr>patch<br>
deleted file mode 100644<br>
index be61e2e..0000000<br>
--- a/meta/recipes-graphics/mesa/f<wbr>iles/0001-mapi-Only-install-kh<wbr>rplatform.h-with-EGL-or-GLES.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,52 +0,0 @@<br>
-From 922cb47a5b950ee5545a7a3cb4cd9a<wbr>88a8b15054 Mon Sep 17 00:00:00 2001<br>
-From: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
-Date: Wed, 12 Jul 2017 12:21:29 +0300<br>
-Subject: [PATCH] mapi: Only install khrplatform.h with EGL or GLES<br>
-<br>
-When mesa is built with "--disable-egl --disable-gles1<br>
---disable-gles2" the KHR platform headers are not needed.<br>
-<br>
-Not installing the header when not needed allows using mesa for GL<br>
-and another implementation for GLES+EGL (as is done in practice with<br>
-userland on raspberrypi).<br>
-<br>
-Upstream-Status: Pending [waiting for test results before sending]<br>
-Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com" target="_blank">jussi.kukkonen@intel.com</a>><br>
----<br>
- src/mapi/Makefile.am | 9 ++++++++-<br>
- 1 file changed, 8 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am<br>
-index 9ff70a14fd..94c77fb82c 100644<br>
---- a/src/mapi/Makefile.am<br>
-+++ b/src/mapi/Makefile.am<br>
-@@ -188,6 +188,8 @@ es1api_libGLESv1_CM_la_LDFLAGS = \<br>
- $(LD_NO_UNDEFINED)<br>
-<br>
- es1api_libGLESv1_CM_la_LIBADD += shared-glapi/<a href="http://libglapi.la" rel="noreferrer" target="_blank">libglapi.la</a><br>
-+<br>
-+khr_HEADERS = $(top_srcdir)/include/KHR/khrp<wbr>latform.h<br>
- endif<br>
-<br>
- es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)<br>
-@@ -233,6 +235,12 @@ es2api_libGLESv2_la_LDFLAGS = \<br>
- $(LD_NO_UNDEFINED)<br>
-<br>
- es2api_libGLESv2_la_LIBADD += shared-glapi/<a href="http://libglapi.la" rel="noreferrer" target="_blank">libglapi.la</a><br>
-+<br>
-+khr_HEADERS = $(top_srcdir)/include/KHR/khrp<wbr>latform.h<br>
-+endif<br>
-+<br>
-+if HAVE_EGL<br>
-+khr_HEADERS = $(top_srcdir)/include/KHR/khrp<wbr>latform.h<br>
- endif<br>
-<br>
- es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)<br>
-@@ -243,4 +251,3 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)<br>
- include $(top_srcdir)/<a href="http://install-lib-links.mk" rel="noreferrer" target="_blank">install-lib-link<wbr>s.mk</a><br>
-<br>
- khrdir = $(includedir)/KHR<br>
--khr_HEADERS = $(top_srcdir)/include/KHR/khrp<wbr>latform.h<br>
---<br>
-2.13.2<br>
-<br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa-gl_17.1.5.bb" rel="noreferrer" target="_blank">m<wbr>esa-gl_17.1.5.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa-gl_17.1.6.bb" rel="noreferrer" target="_blank">m<wbr>esa-gl_17.1.6.bb</a><br>
similarity index 100%<br>
rename from meta/recipes-graphics/mesa/<a href="http://mesa-gl_17.1.5.bb" rel="noreferrer" target="_blank">mes<wbr>a-gl_17.1.5.bb</a><br>
rename to meta/recipes-graphics/mesa/<a href="http://mesa-gl_17.1.6.bb" rel="noreferrer" target="_blank">mes<wbr>a-gl_17.1.6.bb</a><br>
diff --git a/meta/recipes-graphics/mesa/<a href="http://mesa_17.1.5.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.1.5.bb</a> b/meta/recipes-graphics/mesa/<a href="http://mesa_17.1.6.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.1.6.bb</a><br>
similarity index 81%<br>
rename from meta/recipes-graphics/mesa/<a href="http://mesa_17.1.5.bb" rel="noreferrer" target="_blank">mes<wbr>a_17.1.5.bb</a><br>
rename to meta/recipes-graphics/mesa/<a href="http://mesa_17.1.6.bb" rel="noreferrer" target="_blank">mes<wbr>a_17.1.6.bb</a><br>
index 36b0377..111c73a 100644<br>
--- a/meta/recipes-graphics/mesa/<a href="http://mesa_17.1.5.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.1.5.bb</a><br>
+++ b/meta/recipes-graphics/mesa/<a href="http://mesa_17.1.6.bb" rel="noreferrer" target="_blank">m<wbr>esa_17.1.6.bb</a><br>
@@ -5,14 +5,13 @@ SRC_URI = "<a href="https://mesa.freedesktop.org/archive/mesa-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">https://mesa.freedesktop.org/<wbr>archive/mesa-${PV}.tar.xz</a> \<br>
file://disable-asm-on-non-gcc.<wbr>patch \<br>
file://0001-Use-wayland-scanne<wbr>r-in-the-path.patch \<br>
file://0002-hardware-gloat.pat<wbr>ch \<br>
- file://0001-mapi-Only-<wbr>install-khrplatform.h-with-<wbr>EGL-or-GLES.patch \<br>
file://vulkan-mkdir.patch \<br>
file://llvm-config-version.pat<wbr>ch \<br>
file://0001-ac-fix-build-after<wbr>-LLVM-5.0-SVN-r300718.patch \<br>
file://0002-gallivm-Fix-build-<wbr>against-LLVM-SVN-r302589.patch \<br>
"<br>
-SRC_URI[md5sum] = "6cf936fbcaadd98924298a7009e82<wbr>65d"<br>
-SRC_URI[sha256sum] = "378516b171712687aace4c7ea8b37<wbr>c85895231d7a6d61e1e27362cf6034<wbr>fded9"<br>
+SRC_URI[md5sum] = "54758bf842f9ea53c8b57cce4311b<wbr>87e"<br>
+SRC_URI[sha256sum] = "0686deadde1f126b20aa67e47e8c5<wbr>0502043eee4ecdf60d5009ffda3ceb<wbr>fee50"<br>
<br>
#because we cannot rely on the fact that all apps will use pkgconfig,<br>
#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER<br>
<span class="gmail-m_5427951711383434573HOEnZb"><font color="#888888">--<br>
2.9.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div></div>