[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 6a61c4e4402964aa0d86c65969a51a33ec89f383
Author: Thomas White <taw at bitwiz.org.uk>
Date:   Tue Aug 25 00:01:12 2009 +0100

    Fix headers for recent X.org
    
    I think this breaks compatability with older versions.  Some kind of conditional
    thing should be done.

diff --git a/src/glamo-display.c b/src/glamo-display.c
index 4562546..fede315 100644
--- a/src/glamo-display.c
+++ b/src/glamo-display.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "glamo.h"
 #include "glamo-regs.h"
diff --git a/src/glamo-driver.c b/src/glamo-driver.c
index 53b72e0..e8d39f6 100644
--- a/src/glamo-driver.c
+++ b/src/glamo-driver.c
@@ -23,8 +23,6 @@
 /* for visuals */
 #include "fb.h"
 
-#include "xf86RAC.h"
-
 #include "fbdevhw.h"
 
 #include "xf86xv.h"
diff --git a/src/glamo-kms-crtc.c b/src/glamo-kms-crtc.c
index 17444b0..fdf0e9f 100644
--- a/src/glamo-kms-crtc.c
+++ b/src/glamo-kms-crtc.c
@@ -55,7 +55,7 @@
 #include <xf86drmMode.h>
 #include <xf86Modes.h>
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 
 #include "glamo.h"
 #include "glamo-kms-crtc.h"
diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c
index 3c281a3..32fdb4e 100644
--- a/src/glamo-kms-driver.c
+++ b/src/glamo-kms-driver.c
@@ -63,7 +63,6 @@
 #include "xf86.h"
 #include "xf86Crtc.h"
 #include "xf86str.h"
-#include "xf86RAC.h"
 #include "xf86drm.h"
 #include "micmap.h"
 
diff --git a/src/glamo-kms-output.c b/src/glamo-kms-output.c
index 724dbad..7b9f997 100644
--- a/src/glamo-kms-output.c
+++ b/src/glamo-kms-output.c
@@ -52,7 +52,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#include <X11/extensions/dpmsconst.h>
 #include <X11/Xatom.h>
 #include <xf86drmMode.h>
 

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