[oe-commits] Martin.Jansa : shr/merge: fix xf86-video-glamo-kms build with newer toolchain

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 7de5b4216f0916b4e03b6c8297d95bfc21ba3aa7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7de5b4216f0916b4e03b6c8297d95bfc21ba3aa7

Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date:   Sat Oct 17 09:04:27 2009 +0000

shr/merge: fix xf86-video-glamo-kms build with newer toolchain

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 .../0001-Check-pScrn-variable-before-usage.patch   |   42 ++++++++++++++++++++
 recipes/xorg-driver/xf86-video-glamo-kms_git.bb    |    6 ++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch b/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch
new file mode 100644
index 0000000..5f24097
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-glamo-kms/0001-Check-pScrn-variable-before-usage.patch
@@ -0,0 +1,42 @@
+From e5156b9c23a65abede157df55c143e3cbc67ac61 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Sat, 17 Oct 2009 02:18:56 +0200
+Subject: [PATCH] Check pScrn variable before usage
+
+---
+ src/glamo-driver.c |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/glamo-driver.c b/src/glamo-driver.c
+index e8d39f6..82c6a0c 100644
+--- a/src/glamo-driver.c
++++ b/src/glamo-driver.c
+@@ -367,7 +367,7 @@ GlamoKMSProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections)
+ static Bool
+ GlamoProbe(DriverPtr drv, int flags)
+ {
+-	ScrnInfoPtr pScrn;
++	ScrnInfoPtr pScrn = NULL;
+ 	GDevPtr *devSections;
+ 	int numDevSections;
+ 	Bool foundScreen = FALSE;
+@@ -384,10 +384,14 @@ GlamoProbe(DriverPtr drv, int flags)
+ 	/* Is today a good day to use KMS? */
+ 	if ( GlamoKernelModesettingAvailable() ) {
+ 		foundScreen = GlamoKMSProbe(drv, devSections, numDevSections);
+-		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
++		if ( pScrn ) {
++			xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using KMS!\n");
++		}
+ 	} else {
+ 		foundScreen = GlamoFbdevProbe(drv, devSections, numDevSections);
+-		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS\n");
++		if ( pScrn ) {
++			xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS\n");
++		}
+ 	}
+ 
+ 	xfree(devSections);
+-- 
+1.6.5
+
diff --git a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
index eb8fd30..04cfd51 100644
--- a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
@@ -1,5 +1,7 @@
 require xorg-driver-video.inc
-SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms"
+SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms \
+           file://0001-Check-pScrn-variable-before-usage.patch;patch=1"
+
 PROVIDES = "xf86-video-glamo"
 
 S = "${WORKDIR}/git"
@@ -7,6 +9,6 @@ S = "${WORKDIR}/git"
 PV=1.0.0+gitr${SRCREV}
 PR = "r1"
 
-RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
+RDEPENDS = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
 
 DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"