summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2018-04-10 15:06:09 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commit8097bf7012a0d97d3b8b48eceb5dc20cc4ae7ca9 (patch)
tree2bc83dba7ba1d3f6239302fcacc5714ef1d2f9ec /meta/recipes-graphics/mesa
parent45247cecfb2caff1e4c80a8fa6cfaa583b778955 (diff)
downloadpoky-8097bf7012a0d97d3b8b48eceb5dc20cc4ae7ca9.tar.gz
wayland: upgrade to 1.15.0
Official announcement: https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html | libwayland-egl is now part of libwayland, and will presumably be removed | from mesa in the not too distant future. Update mesa recipe by removing corresponding libwayland-egl entries. (From OE-Core rev: 6e5952fcfc13ff4b63c9376bd41a1dbba957f425) Signed-off-by: Denys Dmytriyenko <denys@ti.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.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 5660f44a3b..354271e826 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
119 libgles1-mesa libgles1-mesa-dev \ 119 libgles1-mesa libgles1-mesa-dev \
120 libgles2-mesa libgles2-mesa-dev \ 120 libgles2-mesa libgles2-mesa-dev \
121 libgles3-mesa libgles3-mesa-dev \ 121 libgles3-mesa libgles3-mesa-dev \
122 libwayland-egl libwayland-egl-dev \
123 libxatracker libxatracker-dev \ 122 libxatracker libxatracker-dev \
124 mesa-megadriver mesa-vulkan-drivers \ 123 mesa-megadriver mesa-vulkan-drivers \
125 " 124 "
@@ -134,6 +133,10 @@ do_install_append () {
134 # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 133 # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used
135 rm -f ${D}${sysconfdir}/drirc 134 rm -f ${D}${sysconfdir}/drirc
136 chrpath --delete ${D}${libdir}/dri/*_dri.so || true 135 chrpath --delete ${D}${libdir}/dri/*_dri.so || true
136
137 # libwayland-egl has been moved to wayland 1.15+
138 rm -f ${D}${libdir}/libwayland-egl.so*
139 rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
137} 140}
138 141
139# For the packages that make up the OpenGL interfaces, inject variables so that 142# For the packages that make up the OpenGL interfaces, inject variables so that
@@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
204FILES_libgl-mesa = "${libdir}/libGL.so.*" 207FILES_libgl-mesa = "${libdir}/libGL.so.*"
205FILES_libglapi = "${libdir}/libglapi.so.*" 208FILES_libglapi = "${libdir}/libglapi.so.*"
206FILES_libosmesa = "${libdir}/libOSMesa.so.*" 209FILES_libosmesa = "${libdir}/libOSMesa.so.*"
207FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
208FILES_libxatracker = "${libdir}/libxatracker.so.*" 210FILES_libxatracker = "${libdir}/libxatracker.so.*"
209 211
210FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" 212FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
@@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
216FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" 218FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
217FILES_libgles3-mesa-dev = "${includedir}/GLES3" 219FILES_libgles3-mesa-dev = "${includedir}/GLES3"
218FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" 220FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
219FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
220FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ 221FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
221 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ 222 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
222 ${libdir}/pkgconfig/xatracker.pc" 223 ${libdir}/pkgconfig/xatracker.pc"