summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc7
-rw-r--r--meta/recipes-graphics/wayland/wayland_1.15.0.bb (renamed from meta/recipes-graphics/wayland/wayland_1.14.0.bb)4
2 files changed, 6 insertions, 5 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"
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
index 1a9ff9807b..788105bff8 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
@@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"
15SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 15SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
16 file://fixpathinpcfiles.patch \ 16 file://fixpathinpcfiles.patch \
17 " 17 "
18SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108" 18SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
19SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8" 19SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
20 20
21inherit autotools pkgconfig 21inherit autotools pkgconfig
22 22