diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 7 |
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.*" | |||
204 | FILES_libgl-mesa = "${libdir}/libGL.so.*" | 207 | FILES_libgl-mesa = "${libdir}/libGL.so.*" |
205 | FILES_libglapi = "${libdir}/libglapi.so.*" | 208 | FILES_libglapi = "${libdir}/libglapi.so.*" |
206 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 209 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
207 | FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" | ||
208 | FILES_libxatracker = "${libdir}/libxatracker.so.*" | 210 | FILES_libxatracker = "${libdir}/libxatracker.so.*" |
209 | 211 | ||
210 | FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" | 212 | FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" |
@@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p | |||
216 | FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" | 218 | FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" |
217 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" | 219 | FILES_libgles3-mesa-dev = "${includedir}/GLES3" |
218 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" | 220 | FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" |
219 | FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" | ||
220 | FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ | 221 | FILES_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" |