diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2015-08-04 08:37:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-10 12:40:30 -0700 |
commit | 34b59db3e64c07b393cef2a128cf301683758b67 (patch) | |
tree | ba6162558979448de39ffb71b150b5fa0d1b8563 /meta/recipes-graphics | |
parent | fbe44c4cd537276e39064d8f52bf41529f3ab10b (diff) | |
download | poky-34b59db3e64c07b393cef2a128cf301683758b67.tar.gz |
mesa: upgrade 10.5.8 -> 10.6.3
* Removed openvg references in PACKAGECONFIG, FILES and PACKAGES since OpenVG
support was removed in mesa 10.6
* Tested with X11 :
* xf86-video-freedreno on IFC6410 and DragonBoard 410c
* softpipe on DragonBoard 410c
* using meta-qualcomm BSP
(From OE-Core rev: 8c7803683bee780f0bc8913cc32653ff173329b7)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_10.6.3.bb (renamed from meta/recipes-graphics/mesa/mesa_10.5.8.bb) | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb index fc2bca9982..fc2bca9982 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 09e80e8f04..af7a2c47fc 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -49,8 +49,6 @@ EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" | |||
49 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" | 49 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" |
50 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" | 50 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" |
51 | 51 | ||
52 | PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" | ||
53 | |||
54 | GALLIUMDRIVERS = "swrast" | 52 | GALLIUMDRIVERS = "swrast" |
55 | GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" | 53 | GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" |
56 | PACKAGECONFIG[r600] = "" | 54 | PACKAGECONFIG[r600] = "" |
@@ -84,7 +82,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ | |||
84 | libgles2-mesa libgles2-mesa-dev \ | 82 | libgles2-mesa libgles2-mesa-dev \ |
85 | libgles3-mesa libgles3-mesa-dev \ | 83 | libgles3-mesa libgles3-mesa-dev \ |
86 | libwayland-egl libwayland-egl-dev \ | 84 | libwayland-egl libwayland-egl-dev \ |
87 | libopenvg libopenvg-dev \ | ||
88 | libxvmcsoftpipe libxvmcsoftpipe-dev \ | 85 | libxvmcsoftpipe libxvmcsoftpipe-dev \ |
89 | libxatracker libxatracker-dev \ | 86 | libxatracker libxatracker-dev \ |
90 | mesa-megadriver \ | 87 | mesa-megadriver \ |
@@ -167,7 +164,6 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" | |||
167 | FILES_libglapi = "${libdir}/libglapi.so.*" | 164 | FILES_libglapi = "${libdir}/libglapi.so.*" |
168 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 165 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
169 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" | 166 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" |
170 | FILES_libopenvg = "${libdir}/libOpenVG.so.*" | ||
171 | FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" | 167 | FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" |
172 | FILES_libxatracker = "${libdir}/libxatracker.so.*" | 168 | FILES_libxatracker = "${libdir}/libxatracker.so.*" |
173 | 169 | ||
@@ -181,8 +177,6 @@ FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/p | |||
181 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" | 177 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" |
182 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | 178 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" |
183 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" | 179 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" |
184 | FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ | ||
185 | ${includedir}/VG ${libdir}/pkgconfig/vg.pc" | ||
186 | FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" | 180 | FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" |
187 | FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ | 181 | FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ |
188 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ | 182 | ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ |
diff --git a/meta/recipes-graphics/mesa/mesa_10.5.8.bb b/meta/recipes-graphics/mesa/mesa_10.6.3.bb index 072cde9395..8c55064fd9 100644 --- a/meta/recipes-graphics/mesa/mesa_10.5.8.bb +++ b/meta/recipes-graphics/mesa/mesa_10.6.3.bb | |||
@@ -2,8 +2,8 @@ require ${BPN}.inc | |||
2 | 2 | ||
3 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" | 3 | SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "5332a3576c5e3a0c3947ee6668dd4157" | 5 | SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" |
6 | SRC_URI[sha256sum] = "2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54" | 6 | SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" |
7 | 7 | ||
8 | #because we cannot rely on the fact that all apps will use pkgconfig, | 8 | #because we cannot rely on the fact that all apps will use pkgconfig, |
9 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 9 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |