summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-02-28 11:26:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:19 +0000
commite4ffcaea2282f08bf7a7079330b5102ef7d26128 (patch)
treeee63f3ee4357662fc4624283271632d78c57a3c5 /meta/recipes-graphics/mesa
parent851bdd2d69ac505fa64044bda84518585ae4200f (diff)
downloadpoky-e4ffcaea2282f08bf7a7079330b5102ef7d26128.tar.gz
mesa: Upgrade 13.0.4 -> 17.0.0
17.0.0 is considered a development release: 17.0.1 is expected to be the first stable in this series. Typically the .1 release comes about two weeks after .0. * New feature release with lots of changes * Versioning change (17 as in 2017, no longer relates to GL bumps) * OpenGL 4.5 support on Haswell * mesa now implements its own sha1 instead of having 5 configurable sha-providers * Remove libxvmcsoftpipe packaging, the library hasn't existed since 2013 (From OE-Core rev: be95558834eed0564ec00c65ac8067c7c65006c5) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc11
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa_13.0.4.bb)7
3 files changed, 4 insertions, 14 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb
index 85cc396fe3..85cc396fe3 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_17.0.0.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 87c6821e65..f0d01c6b23 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
24 24
25EXTRA_OECONF = "--enable-shared-glapi" 25EXTRA_OECONF = "--enable-shared-glapi"
26 26
27PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ 27PACKAGECONFIG ??= "gbm egl gles dri \
28 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ 28 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
29 " 29 "
30 30
@@ -66,12 +66,6 @@ PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
66OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" 66OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}"
67PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" 67PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}"
68 68
69# Mesa requires one of the following crypto implementation, pick one of them
70MESA_CRYPTO ??= "openssl"
71PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
72PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
73PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
74
75# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) 69# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
76FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" 70FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
77 71
@@ -93,7 +87,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
93 libgles2-mesa libgles2-mesa-dev \ 87 libgles2-mesa libgles2-mesa-dev \
94 libgles3-mesa libgles3-mesa-dev \ 88 libgles3-mesa libgles3-mesa-dev \
95 libwayland-egl libwayland-egl-dev \ 89 libwayland-egl libwayland-egl-dev \
96 libxvmcsoftpipe libxvmcsoftpipe-dev \
97 libxatracker libxatracker-dev \ 90 libxatracker libxatracker-dev \
98 mesa-megadriver \ 91 mesa-megadriver \
99 " 92 "
@@ -177,7 +170,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*"
177FILES_libglapi = "${libdir}/libglapi.so.*" 170FILES_libglapi = "${libdir}/libglapi.so.*"
178FILES_libosmesa = "${libdir}/libOSMesa.so.*" 171FILES_libosmesa = "${libdir}/libOSMesa.so.*"
179FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" 172FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
180FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*"
181FILES_libxatracker = "${libdir}/libxatracker.so.*" 173FILES_libxatracker = "${libdir}/libxatracker.so.*"
182 174
183FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" 175FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
@@ -190,7 +182,6 @@ FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/p
190FILES_libgles3-mesa-dev = "${includedir}/GLES3" 182FILES_libgles3-mesa-dev = "${includedir}/GLES3"
191FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" 183FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
192FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" 184FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
193FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la"
194FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ 185FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
195 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ 186 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
196 ${libdir}/pkgconfig/xatracker.pc" 187 ${libdir}/pkgconfig/xatracker.pc"
diff --git a/meta/recipes-graphics/mesa/mesa_13.0.4.bb b/meta/recipes-graphics/mesa/mesa_17.0.0.bb
index 1416c9f8b8..6576e3c62b 100644
--- a/meta/recipes-graphics/mesa/mesa_13.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.0.0.bb
@@ -1,13 +1,12 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ 3SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
4 file://replace_glibc_check_with_linux.patch \ 4 file://replace_glibc_check_with_linux.patch \
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" 7"
8 8SRC_URI[md5sum] = "932e4171a86b14940c06812356486155"
9SRC_URI[md5sum] = "d088a921e935218833a8071cb672a574" 9SRC_URI[sha256sum] = "39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481"
10SRC_URI[sha256sum] = "a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726"
11 10
12#because we cannot rely on the fact that all apps will use pkgconfig, 11#because we cannot rely on the fact that all apps will use pkgconfig,
13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 12#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER