mesa: Improve Khronos header handling
PATCH 2/2 mesa-gl: Clean recipe
In reply to Jussi KukkonenDon't EXCLUDE_FROM_WORLD, mesa.inc already does this. Don't add a non-existing path to FILESEXTRAPATHS.
--- meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb | 4 ---- 1 file changed, 4 deletions(-)
meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb +0 -4
@@ -2,12 +2,8 @@ require mesa_${PV}.bb SUMMARY += " (OpenGL only, no EGL/GLES)" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/mesa:" - PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" PACKAGECONFIG ??= "dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.1.4
cover mesa: Improve Khronos header handling
Andrea: can you please confirm if this fixes the issue with meta-raspberrypi (the second patch is just cosmetic)?
This should fix mesa-gl and RPi userland conflict by not installing khrplatform.h in mesa-gl. I decided to do an actual mesa patch instead of a do_install_append() based on positive comments from upstream.
As a side note: the header is now installed in libegl-mesa-dev which is not really correct. I'll see about fixing this in a later patch.
Cheers,
Jussi
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628:
yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/khr-headers
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/khr-headers
Jussi Kukkonen (2):
mesa: Avoid installing khrplatfrom.h when not needed
mesa-gl: Clean recipe
...ly-install-khrplatform.h-with-EGL-or-GLES.patch | 52 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb | 4 -- meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch
Signature · 1 line
2.1.4
PATCH 1/2 mesa: Avoid installing khrplatfrom.h when not needed
Fix the conflict between mesa and userland (when former is used to provide GL and letter used to provide EGL+GLES) by not installing khrplatform.h header when its not needed.
--- ...ly-install-khrplatform.h-with-EGL-or-GLES.patch | 52 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch
meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch new file +52 -0
@@ -0,0 +1,52 @@ +From 922cb47a5b950ee5545a7a3cb4cd9a88a8b15054 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <[email protected]> +Date: Wed, 12 Jul 2017 12:21:29 +0300 +Subject: [PATCH] mapi: Only install khrplatform.h with EGL or GLES + +When mesa is built with "--disable-egl --disable-gles1 +--disable-gles2" the KHR platform headers are not needed. + +Not installing the header when not needed allows using mesa for GL +and another implementation for GLES+EGL (as is done in practice with +userland on raspberrypi). + +Upstream-Status: Pending [waiting for test results before sending] +Signed-off-by: Jussi Kukkonen <[email protected]> +--- + src/mapi/Makefile.am | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am +index 9ff70a14fd..94c77fb82c 100644 +--- a/src/mapi/Makefile.am ++++ b/src/mapi/Makefile.am +@@ -188,6 +188,8 @@ es1api_libGLESv1_CM_la_LDFLAGS = \ + $(LD_NO_UNDEFINED) + + es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la ++ ++khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h + endif + + es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) +@@ -233,6 +235,12 @@ es2api_libGLESv2_la_LDFLAGS = \ + $(LD_NO_UNDEFINED) + + es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la ++ ++khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h ++endif ++ ++if HAVE_EGL ++khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h + endif + + es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) +@@ -243,4 +251,3 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) + include $(top_srcdir)/install-lib-links.mk + + khrdir = $(includedir)/KHR +-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h +-- +2.13.2 +
meta/recipes-graphics/mesa/mesa_17.1.4.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://etnaviv_fix-shader-miscompilation.patch \ file://0001-Use-wayland-scanner-in-the-path.patch \ file://0002-hardware-gloat.patch \ + file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \ " SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
Signature · 1 line
2.1.4
Re: [PATCH 1/2] mesa: Avoid installing khrplatfrom.h when not needed
Quoted 5 lines · Jussi Kukkonen
Fix the conflict between mesa and userland (when former is used to provide GL and letter used to provide EGL+GLES) by not installing
khrplatform.hheader when its not needed.Signed-off-by Jussi Kukkonen <[email protected]>
It is fine; if Andrea could test it would be good.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Il 12 lug 2017 2:11 PM, "Jussi Kukkonen" <[email protected]> ha scritto:
Andrea: can you please confirm if this fixes the issue with meta-raspberrypi (the second patch is just cosmetic)?
I'll give it a spin as soon as I find some spare cycles! BTW, thank you guys for looking into it!
This should fix mesa-gl and RPi userland conflict by not installing khrplatform.h in mesa-gl. I decided to do an actual mesa patch instead of a do_install_append() based on positive comments from upstream.
As a side note: the header is now installed in libegl-mesa-dev which is not really correct. I'll see about fixing this in a later patch.
Cheers,
Jussi
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628:
yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/khr-headers
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/khr-headers
Jussi Kukkonen (2):
mesa: Avoid installing khrplatfrom.h when not needed
mesa-gl: Clean recipe
...ly-install-khrplatform.h-with-EGL-or-GLES.patch | 52 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb | 4 -- meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-mapi-Only-install-
khrplatform.h-with-EGL-or-GLES.patch
--
2.1.4
Quoted 10 lines · Jussi Kukkonen
Andrea: can you please confirm if this fixes the issue with meta-raspberrypi (the second patch is just cosmetic)?
This should fix mesa-gl and RPi userland conflict by not installing
khrplatform.hin mesa-gl. I decided to do an actual mesa patch instead of ado_install_append()based on positive comments from upstream.As a side note: the header is now installed in libegl-mesa-dev which is not really correct. I'll see about fixing this in a later patch.
you might have to express dependencies on it explicitly, so it get included into rootfs. but it looks a good solution for now.
Quoted 30 lines
Cheers,
JussiThe following changes since commit
81498aac9560fbeaeb58eaada32ce80e0ea51628:yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contribjku/khr-headers
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/khr-headersJussi Kukkonen (2):
mesa: Avoid installingkhrplatfrom.hwhen not needed
mesa-gl: Clean recipe...ly-install-khrplatform.h-with-EGL-or-GLES.patch | 52 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb | 4 -- meta/recipes-graphics/mesa/mesa_17.1.4.bb | 1 + 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch--
2.1.4--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core