[pkg-fso-commits] [SCM] xf86-video-glamo, SMedia Glamo video driver for X.Org branch, master, updated. upstream/0.0.0+20091108.git9918e082-8-g16af3c0

[Thomas White]

The following commit has been merged in the master branch:
commit c9b0bd77ea232b8ccd6cdabf25b0686d83bcb3a4
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Thu Feb 18 22:17:44 2010 +0100

    Support DRI2InfoRec version 2 if that's all that's available, 3 if possible, but nothing higher
    
    There's a higher version than 3 available now, but we aren't "aware" of it yet.

diff --git a/src/glamo-dri2.c b/src/glamo-dri2.c
index 6b743f4..856eb8f 100644
--- a/src/glamo-dri2.c
+++ b/src/glamo-dri2.c
@@ -326,7 +326,11 @@ void driScreenInit(ScreenPtr pScreen)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "[glamo-dri] Name of DRM device is '%s'\n", p);
 
-	dri2info.version = DRI2INFOREC_VERSION;
+#if DRI2INFOREC_VERSION >= 3
+	dri2info.version = 3;
+#else
+	dri2info.version = 2;
+#endif
 	dri2info.fd = pGlamo->drm_fd;
 	dri2info.deviceName = p;
 	dri2info.driverName = "glamo";

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