mesa-dri: Enable swrast only by default and intel drivers only on IA platform

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 603438ef0b2b288f033fb4523c8a1cc0f7405f80..795144a2e6d19c3701130c136d7bd868d3e60258 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -4,7 +4,11 @@ LIB_DEPS += "libdrm expat"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers"
+DRIDRIVERS = "swrast"
+DRIDRIVERS_x86 = "swrast,i915,i965"
+DRIDRIVERS_x86-64 = "swrast,i915,i965"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
 
 python populate_packages_prepend() {
        import os.path

diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 6a4f9a9c3b292b059da9ed178cb7c94974f25207..5d25127fcf7523633ebc9907292d8b55e17e5a17 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -2,7 +2,3 @@ include mesa-common.inc
 include mesa-${PV}.inc
 include mesa-dri.inc
 PR = "${INC_PR}.0"
-
-EXTRA_OECONF += "--with-dri-drivers=swrast,i915,i965"
-
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'

diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
index 15cde609d283bbf82656cfd585a0a32b1220d368..a0e19459f1f539ceb02eae95c22973ece5179057 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_git.bb
@@ -7,5 +7,3 @@ DEFAULT_PREFERENCE = "-2"
 
 PR = "${INC_PR}.0"
 
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-