From 2fd6598a2ced86a54e82062e9e2a547544360e32 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 14 Oct 2011 15:32:20 +0100 Subject: mesa-dri: Enable swrast only by default and intel drivers only on IA platform (From OE-Core rev: d1b12b92439805ec9ca5d031d34d264acd0cab3b) Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa-dri.inc | 6 +++++- meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 ---- meta/recipes-graphics/mesa/mesa-dri_git.bb | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'meta/recipes-graphics/mesa') diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc index 603438ef0b..795144a2e6 100644 --- 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 6a4f9a9c3b..5d25127fcf 100644 --- 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 15cde609d2..a0e19459f1 100644 --- 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' - -- cgit v1.2.3-54-g00ecf