Patchwork [v3] mesa-dri: add extra dri drivers

login
mail settings
Submitter igeiser@devonit.com
Date Jan. 31, 2013, 11:30 a.m.
Message ID <1359631839-12941-1-git-send-email-igeiser@devonit.com>
Download mbox | patch
Permalink /patch/43733/
State New
Headers show

Comments

igeiser@devonit.com - Jan. 31, 2013, 11:30 a.m.
From: Ian Reinhart Geiser <igeiser@devonit.com>

 * By default enable only swrast.  This needs to
   be here or for some reason qemuarm tries to
   detect the intel dri libraries and fails.
 * For x86 and x86-64 clear out the field so mesa
   enabled all of the modules.

 builds properly with qemux86 qemuarm and qemux86-64

Signed-off-by: Ian Reinhart Geiser <igeiser@devonit.com>
---
 meta/recipes-graphics/mesa/mesa-dri.inc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Ross Burton - Jan. 31, 2013, 4:47 p.m.
On 31 January 2013 11:30,  <igeiser@devonit.com> wrote:
>  * For x86 and x86-64 clear out the field so mesa
>    enabled all of the modules.

I really prefer recipes that specify what they are doing, so please
list all the drivers.  If it autodetects we might regress in libdrm
and drop a driver, and not notice because Mesa was silently handling
it.

Ross

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 1f6ec78..7d11dac 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -1,12 +1,12 @@ 
 DEPENDS += "libdrm expat udev"
 X11_DEPS += "dri2proto"
 
-DRIDRIVERS = "swrast"
-DRIDRIVERS_append_x86 = ",i915,i965"
-DRIDRIVERS_append_x86-64 = ",i915,i965"
+DRIDRIVERS = "--with-dri-drivers=swrast"
+DRIDRIVERS_x86 = ""
+DRIDRIVERS_x86-64 = ""
 
 EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
-EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
+EXTRA_OECONF += "--enable-dri ${DRIDRIVERS}"
 EXTRA_OECONF += "--enable-gbm"
 
 PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"