From 4473c9e846826bfb4f48cec9c6c7b1cad6666bb3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 10 Aug 2017 11:37:55 +0200 Subject: mesa: update to 17.1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Optional installation of khrplatform.h was implemented upstream by a slightly different approach -> 0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch can be removed. Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie --- ...ly-install-khrplatform.h-with-EGL-or-GLES.patch | 52 ---------------------- meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb | 9 ---- meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb | 9 ++++ meta/recipes-graphics/mesa/mesa_17.1.5.bb | 24 ---------- meta/recipes-graphics/mesa/mesa_17.1.6.bb | 23 ++++++++++ 5 files changed, 32 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.1.5.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.1.6.bb diff --git a/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch b/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch deleted file mode 100644 index be61e2edfe..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 922cb47a5b950ee5545a7a3cb4cd9a88a8b15054 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -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 ---- - 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 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb deleted file mode 100644 index b9e3b805b5..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb new file mode 100644 index 0000000000..b9e3b805b5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb @@ -0,0 +1,9 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_17.1.5.bb b/meta/recipes-graphics/mesa/mesa_17.1.5.bb deleted file mode 100644 index 4d82452b07..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.1.5.bb +++ /dev/null @@ -1,24 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - file://disable-asm-on-non-gcc.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 \ - file://vulkan-mkdir.patch \ - file://llvm-config-version.patch \ - file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \ - file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ - file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - " -SRC_URI[md5sum] = "6cf936fbcaadd98924298a7009e8265d" -SRC_URI[sha256sum] = "378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_17.1.6.bb b/meta/recipes-graphics/mesa/mesa_17.1.6.bb new file mode 100644 index 0000000000..64a15e3fb7 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.1.6.bb @@ -0,0 +1,23 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ + file://0002-hardware-gloat.patch \ + file://vulkan-mkdir.patch \ + file://llvm-config-version.patch \ + file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \ + file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ + file://0001-winsys-svga-drm-Include-sys-types.h.patch \ + " +SRC_URI[md5sum] = "54758bf842f9ea53c8b57cce4311b87e" +SRC_URI[sha256sum] = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit 1.2.3-korg