summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-08-10 11:37:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 23:46:38 +0100
commit782cdf14e3f2d5b321efa59d8d1b93554af86516 (patch)
tree07b1e499359bc7b38b15010548c4f4b445dfbd13
parente0679d21f42a5c1c8f2405943eea91223c28e9c7 (diff)
downloadpoky-782cdf14e3f2d5b321efa59d8d1b93554af86516.tar.gz
mesa: update to 17.1.6
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. (From OE-Core rev: 4473c9e846826bfb4f48cec9c6c7b1cad6666bb3) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch52
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.1.6.bb (renamed from meta/recipes-graphics/mesa/mesa_17.1.5.bb)5
3 files changed, 2 insertions, 55 deletions
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 @@
1From 922cb47a5b950ee5545a7a3cb4cd9a88a8b15054 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 12 Jul 2017 12:21:29 +0300
4Subject: [PATCH] mapi: Only install khrplatform.h with EGL or GLES
5
6When mesa is built with "--disable-egl --disable-gles1
7--disable-gles2" the KHR platform headers are not needed.
8
9Not installing the header when not needed allows using mesa for GL
10and another implementation for GLES+EGL (as is done in practice with
11userland on raspberrypi).
12
13Upstream-Status: Pending [waiting for test results before sending]
14Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
15---
16 src/mapi/Makefile.am | 9 ++++++++-
17 1 file changed, 8 insertions(+), 1 deletion(-)
18
19diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
20index 9ff70a14fd..94c77fb82c 100644
21--- a/src/mapi/Makefile.am
22+++ b/src/mapi/Makefile.am
23@@ -188,6 +188,8 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
24 $(LD_NO_UNDEFINED)
25
26 es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la
27+
28+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
29 endif
30
31 es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
32@@ -233,6 +235,12 @@ es2api_libGLESv2_la_LDFLAGS = \
33 $(LD_NO_UNDEFINED)
34
35 es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
36+
37+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
38+endif
39+
40+if HAVE_EGL
41+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
42 endif
43
44 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
45@@ -243,4 +251,3 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
46 include $(top_srcdir)/install-lib-links.mk
47
48 khrdir = $(includedir)/KHR
49-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
50--
512.13.2
52
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb
index b9e3b805b5..b9e3b805b5 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_17.1.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_17.1.6.bb
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.5.bb b/meta/recipes-graphics/mesa/mesa_17.1.6.bb
index 4d82452b07..64a15e3fb7 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.5.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.6.bb
@@ -5,15 +5,14 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
5 file://disable-asm-on-non-gcc.patch \ 5 file://disable-asm-on-non-gcc.patch \
6 file://0001-Use-wayland-scanner-in-the-path.patch \ 6 file://0001-Use-wayland-scanner-in-the-path.patch \
7 file://0002-hardware-gloat.patch \ 7 file://0002-hardware-gloat.patch \
8 file://0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch \
9 file://vulkan-mkdir.patch \ 8 file://vulkan-mkdir.patch \
10 file://llvm-config-version.patch \ 9 file://llvm-config-version.patch \
11 file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \ 10 file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \
12 file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ 11 file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \
13 file://0001-winsys-svga-drm-Include-sys-types.h.patch \ 12 file://0001-winsys-svga-drm-Include-sys-types.h.patch \
14 " 13 "
15SRC_URI[md5sum] = "6cf936fbcaadd98924298a7009e8265d" 14SRC_URI[md5sum] = "54758bf842f9ea53c8b57cce4311b87e"
16SRC_URI[sha256sum] = "378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9" 15SRC_URI[sha256sum] = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50"
17 16
18#because we cannot rely on the fact that all apps will use pkgconfig, 17#because we cannot rely on the fact that all apps will use pkgconfig,
19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 18#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER