[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20090707.git98c012f7-57-g9918e08

[Thomas White]

The following commit has been merged in the master branch:
commit a1f4b5a29a2dcecab97117258c7510baf6c6bf8a
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Tue Aug 25 15:59:06 2009 +0100

    Fix DRI2 registration with recent X servers

diff --git a/src/glamo-dri2.c b/src/glamo-dri2.c
index 6198522..286094a 100644
--- a/src/glamo-dri2.c
+++ b/src/glamo-dri2.c
@@ -199,7 +199,7 @@ void driScreenInit(ScreenPtr pScreen)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "[glamo-dri] Name of DRM device is '%s'\n", p);
 
-	dri2info.version = 1;
+	dri2info.version = DRI2INFOREC_VERSION;
 	dri2info.fd = pGlamo->drm_fd;
 	dri2info.deviceName = p;
 	dri2info.driverName = "glamo";
@@ -213,7 +213,13 @@ void driScreenInit(ScreenPtr pScreen)
 #endif
 	dri2info.CopyRegion = glamoCopyRegion;
 
-	if ( !DRI2ScreenInit(pScreen, &dri2info) ) return;
+	if ( !DRI2ScreenInit(pScreen, &dri2info) ) {
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		           "[glamo-dri] DRI2 initialisation failed\n");
+	} else {
+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		           "[glamo-dri] DRI2 initialisation succeeded\n");
+	}
 }
 
 

-- 
xf86-video-glamo, SMedia Glamo video driver for X.Org