diff options
author | Ross Burton <ross.burton@intel.com> | 2012-07-30 16:54:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:57 +0100 |
commit | 05b343ee4b3ce410eafe5a301a10f252f542c547 (patch) | |
tree | 8e9a018961c3896c38ab00d3797da0e7705bdcdb /meta | |
parent | 7477153dd81bcf6c9afed47e73b388c755df30b4 (diff) | |
download | poky-05b343ee4b3ce410eafe5a301a10f252f542c547.tar.gz |
mesa: enable EGL, with DRM and X11 platforms
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
(From OE-Core rev: 03136ebc529dbc82f2db14055e124114da7e84b3)
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.inc | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri.inc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index feb152b13d..de171f0845 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc | |||
@@ -17,7 +17,7 @@ PE = "2" | |||
17 | 17 | ||
18 | DEPENDS = "libxml2-native makedepend-native flex-native bison-native" | 18 | DEPENDS = "libxml2-native makedepend-native flex-native bison-native" |
19 | 19 | ||
20 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" | 20 | PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" |
21 | 21 | ||
22 | # for mesa-dri and mesa-xlib | 22 | # for mesa-dri and mesa-xlib |
23 | FILESEXTRAPATHS_append := "${THISDIR}/mesa:" | 23 | FILESEXTRAPATHS_append := "${THISDIR}/mesa:" |
@@ -30,6 +30,7 @@ EXTRA_OECONF = "--enable-glu \ | |||
30 | --enable-shared-glapi" | 30 | --enable-shared-glapi" |
31 | 31 | ||
32 | PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ | 32 | PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ |
33 | ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \ | ||
33 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 34 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
34 | 35 | ||
35 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" | 36 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" |
@@ -60,7 +61,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*" | |||
60 | FILES_libglu = "${libdir}/libGLU.so.*" | 61 | FILES_libglu = "${libdir}/libGLU.so.*" |
61 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" | 62 | FILES_libosmesa = "${libdir}/libOSMesa.so.*" |
62 | 63 | ||
63 | FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" | 64 | FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" |
64 | FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" | 65 | FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" |
65 | FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" | 66 | FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" |
66 | FILES_libglapi-dev = "${libdir}/libglapi.*" | 67 | FILES_libglapi-dev = "${libdir}/libglapi.*" |
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc index ef1ca78af8..7a1164bf30 100644 --- a/meta/recipes-graphics/mesa/mesa-dri.inc +++ b/meta/recipes-graphics/mesa/mesa-dri.inc | |||
@@ -10,10 +10,14 @@ DRIDRIVERS_append_x86-64 = ",i915,i965" | |||
10 | 10 | ||
11 | EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" | 11 | EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" |
12 | EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" | 12 | EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" |
13 | EXTRA_OECONF += "--disable-egl --enable-gbm" | 13 | EXTRA_OECONF += "--enable-gbm" |
14 | 14 | ||
15 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" | 15 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" |
16 | 16 | ||
17 | EGL_PLATFORMS = "drm" | ||
18 | EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}" | ||
19 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" | ||
20 | |||
17 | python populate_packages_prepend() { | 21 | python populate_packages_prepend() { |
18 | dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") | 22 | dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") |
19 | 23 | ||