From 523eeb1062797a8562446fbefe9413a59540816b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 18 Nov 2008 20:44:07 +0100
Subject: [PATCH] mesa 7.2: install internal headers like 7.0.2 did, xorg 1.5.x
 needs them, also enable swrast next to proper GL drivers * the missing
 headers where masked by a bug in packaged-staging where it seems to get
 confused by PE

---
 packages/mesa/mesa-common.inc | 2 ++
 packages/mesa/mesa-dri_7.2.bb | 4 ++--
 packages/mesa/mesa-dri_git.bb | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/mesa/mesa-common.inc b/packages/mesa/mesa-common.inc
index b79c70a1e4..4254ba57b7 100644
--- a/packages/mesa/mesa-common.inc
+++ b/packages/mesa/mesa-common.inc
@@ -19,6 +19,8 @@ EXTRA_OECONF = "--enable-glu \
 
 do_stage() {
         autotools_stage_all
+		install -d ${STAGING_INCDIR}/GL/	
+		cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
 }
 
 
diff --git a/packages/mesa/mesa-dri_7.2.bb b/packages/mesa/mesa-dri_7.2.bb
index 97f6a77586..d93fc30c00 100644
--- a/packages/mesa/mesa-dri_7.2.bb
+++ b/packages/mesa/mesa-dri_7.2.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r4"
+PR = "r5"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -20,7 +20,7 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 
 do_install_append () {
     install -d ${D}/usr/bin
diff --git a/packages/mesa/mesa-dri_git.bb b/packages/mesa/mesa-dri_git.bb
index ec4557f426..bca681c76d 100644
--- a/packages/mesa/mesa-dri_git.bb
+++ b/packages/mesa/mesa-dri_git.bb
@@ -17,5 +17,5 @@ S = "${WORKDIR}/git"
 FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 
-EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}"
+EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
 
-- 
2.39.5