From e79987bc4bac1d739f92790f8e9840cd02f073d3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 19 Nov 2012 16:04:55 +0000 Subject: mesa: default to enabling EGL and GLES Even on systems where Mesa has no hardware support, building the software renderers is useful for build testing and limited functionality. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-common.inc | 3 +-- meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb | 2 +- meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index 8e7137818b..9e42dbfe2f 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -29,8 +29,7 @@ EXTRA_OECONF = "--disable-glu \ --disable-glut \ --enable-shared-glapi" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_append_x86 = " gles egl" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} egl gles" X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" diff --git a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb index fabb99d59a..a5a592d86d 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb @@ -1,4 +1,4 @@ require mesa-common.inc require mesa-${PV}.inc require mesa-dri.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb index 5f8697a1dd..e9e4a88a7f 100644 --- a/meta/recipes-graphics/mesa/mesa-dri_git.bb +++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb @@ -5,4 +5,4 @@ require mesa-dri.inc # this needs to be lower than -1 because all mesa-dri have -1 and git version has highest PV, but shouldn't be default DEFAULT_PREFERENCE = "-2" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" -- cgit 1.2.3-korg