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:42:25 +0100 |
| commit | 03136ebc529dbc82f2db14055e124114da7e84b3 (patch) | |
| tree | 443fb6fd7d0db5989ce6243b79e096a70172eaae | |
| parent | d3e60b835c5abcf2345e761027aa520409c19efc (diff) | |
| download | openembedded-core-03136ebc529dbc82f2db14055e124114da7e84b3.tar.gz openembedded-core-03136ebc529dbc82f2db14055e124114da7e84b3.tar.bz2 openembedded-core-03136ebc529dbc82f2db14055e124114da7e84b3.zip | |
mesa: enable EGL, with DRM and X11 platforms
Patch originally by Damien Lespiau <damien.lespiau@intel.com>.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -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" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" +PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" # for mesa-dri and mesa-xlib FILESEXTRAPATHS_append := "${THISDIR}/mesa:" @@ -30,6 +30,7 @@ EXTRA_OECONF = "--enable-glu \ --enable-shared-glapi" PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" @@ -60,7 +61,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" -FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 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" EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" -EXTRA_OECONF += "--disable-egl --enable-gbm" +EXTRA_OECONF += "--enable-gbm" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" +EGL_PLATFORMS = "drm" +EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}" +PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" + python populate_packages_prepend() { dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") |