summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2012-12-18 13:38:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:04 +0000
commit1e3372bdd1f662f5db5c4efd40649bd43a821ec8 (patch)
treef6843aaf9deac704cc62bcd65ead98fa6c2367a2 /meta
parentcca05e3dca88e751b353249cfbba0287c9ff49ff (diff)
downloadpoky-1e3372bdd1f662f5db5c4efd40649bd43a821ec8.tar.gz
mesa-dri: enable the wayland-egl platform
If the "wayland" DISTRO_FEATURE is present, enable the Wayland EGL platform. This is required by the reference Wayland compositor, Weston. (From OE-Core rev: 0e56ecdd78212e7743e71c5d6a42ceb65c182786) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc10
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc1
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 838ce11c78..1ff08fb53f 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -28,10 +28,15 @@ EXTRA_OECONF = "--disable-glu \
28 --disable-glut \ 28 --disable-glut \
29 --enable-shared-glapi" 29 --enable-shared-glapi"
30 30
31PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} egl gles" 31PACKAGECONFIG ??= "egl gles \
32 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
33 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
34 "
32 35
33X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 36X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
34PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" 37PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
38PACKAGECONFIG[wayland] = ",,wayland"
39
35 40
36# Multiple virtual/gl providers being built breaks staging 41# Multiple virtual/gl providers being built breaks staging
37EXCLUDE_FROM_WORLD = "1" 42EXCLUDE_FROM_WORLD = "1"
@@ -48,6 +53,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
48 libgles1-mesa libgles1-mesa-dev \ 53 libgles1-mesa libgles1-mesa-dev \
49 libgles2-mesa libgles2-mesa-dev \ 54 libgles2-mesa libgles2-mesa-dev \
50 libgles3-mesa libgles3-mesa-dev \ 55 libgles3-mesa libgles3-mesa-dev \
56 libwayland-egl libwayland-egl-dev \
51 " 57 "
52 58
53do_install_append () { 59do_install_append () {
@@ -89,6 +95,7 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
89FILES_libgl-mesa = "${libdir}/libGL.so.*" 95FILES_libgl-mesa = "${libdir}/libGL.so.*"
90FILES_libglapi = "${libdir}/libglapi.so.*" 96FILES_libglapi = "${libdir}/libglapi.so.*"
91FILES_libosmesa = "${libdir}/libOSMesa.so.*" 97FILES_libosmesa = "${libdir}/libOSMesa.so.*"
98FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
92 99
93FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" 100FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
94FILES_libdricore-dev = "${libdir}/libdricore*.*" 101FILES_libdricore-dev = "${libdir}/libdricore*.*"
@@ -100,5 +107,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
100FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" 107FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
101FILES_libgles3-mesa-dev = "${includedir}/GLES3" 108FILES_libgles3-mesa-dev = "${includedir}/GLES3"
102FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" 109FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
110FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
103 111
104FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" 112FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 07544abd45..1f6ec78c68 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -13,6 +13,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-
13 13
14EGL_PLATFORMS = "drm" 14EGL_PLATFORMS = "drm"
15EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}" 15EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
16EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland', '', d)}"
16PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" 17PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
17 18
18python populate_packages_prepend() { 19python populate_packages_prepend() {