[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 7ba80e79f33439d5a97fd20a69c1ff159e7a6440
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Fri Aug 21 12:12:24 2009 +0100

    Fix DRI2InfoRec problems

diff --git a/src/glamo-dri2.c b/src/glamo-dri2.c
index bac8331..6198522 100644
--- a/src/glamo-dri2.c
+++ b/src/glamo-dri2.c
@@ -57,7 +57,7 @@ typedef struct {
 } GlamoDRI2BufferPrivateRec, *GlamoDRI2BufferPrivatePtr;
 
 
-#ifdef USE_DRI2_1_1_0
+#if DRI2INFOREC_VERSION >= 3
 
 static DRI2BufferPtr glamoCreateBuffer(DrawablePtr pDraw,
                                        unsigned int attachment,
@@ -129,20 +129,19 @@ static DRI2BufferPtr glamoCreateBuffers(DrawablePtr pDraw,
 
 #endif
 
-#ifdef USE_DRI2_1_1_0
+#if DRI2INFOREC_VERSION >= 3
 
 static void glamoDestroyBuffer(DrawablePtr pDraw,
                                DRI2BufferPtr buffer)
 {
 	ScreenPtr pScreen = pDraw->pScreen;
-	int i;
 	GlamoDRI2BufferPrivatePtr private;
 
-	private = buffer.driverPrivate;
+	private = buffer->driverPrivate;
 	(*pScreen->DestroyPixmap)(private->pPixmap);
 
 	if ( buffer ) {
-		xfree(buffer.driverPrivate);
+		xfree(buffer->driverPrivate);
 	}
 }
 
@@ -205,7 +204,7 @@ void driScreenInit(ScreenPtr pScreen)
 	dri2info.deviceName = p;
 	dri2info.driverName = "glamo";
 
-#ifdef USE_DRI2_1_1_0
+#if DRI2INFOREC_VERSION >= 3
 	dri2info.CreateBuffer = glamoCreateBuffer;
 	dri2info.DestroyBuffer = glamoDestroyBuffer;
 #else

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