summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-19 16:04:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-19 17:00:14 +0000
commite79987bc4bac1d739f92790f8e9840cd02f073d3 (patch)
tree686400cc70975a5b73b365e3ca389e2d48c84c3f /meta/recipes-graphics/mesa
parent64c77bf395310e55b4d8e0ec754fa19e9034ab35 (diff)
downloadopenembedded-core-e79987bc4bac1d739f92790f8e9840cd02f073d3.tar.gz
openembedded-core-e79987bc4bac1d739f92790f8e9840cd02f073d3.tar.bz2
openembedded-core-e79987bc4bac1d739f92790f8e9840cd02f073d3.zip
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc3
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_8.0.4.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_git.bb2
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"