xserver-xorg-video-voodoo: Changes to 'upstream-unstable'
configure.ac | 6 +++++-
src/voodoo_dga.c | 7 +++++--
src/voodoo_driver.c | 7 +++++++
src/voodoo_hardware.c | 7 +++++--
4 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit 89250c594f29fbad78f2006c32573ac083cccd73
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:30 2009 +1000
voodoo: bump for release 1.2.3
diff --git a/configure.ac b/configure.ac
index 2fc06b2..7cac538 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.2.2,
+ 1.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 405bab2048a4077b7fbe456f4f24e0d9b448829f
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:42 2009 +1000
voodoo: change to using ABI version check
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6f35fe1..7ea8e05 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,7 +56,7 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
commit 023f464e830185c12de90f38219b34498d3e55d0
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:45:59 2009 +1000
voodoo: remove rac/resources includes
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9ad1962..622c1f9 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -47,8 +47,6 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xaa.h"
#include "dgaproc.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index e38ea46..6f35fe1 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -56,8 +56,10 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "compiler.h"
#include "xaa.h"
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 2493612..60f9dc9 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -48,8 +48,6 @@
#include "xf86cmap.h"
#include "shadowfb.h"
#include "vgaHW.h"
-#include "xf86RAC.h"
-#include "xf86Resources.h"
#include "xaa.h"
#include "compiler.h"
commit 840b9fe089d79507b660bdda3f26afb72faaa6ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:59:34 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 919e29f..2fc06b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 9d088a7..9ad1962 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -59,8 +59,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
/***********************************************************************
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index f412215..e38ea46 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -67,8 +67,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid);
static void VoodooIdentify(int flags);
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index d988b33..2493612 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -58,8 +58,13 @@
#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include "mipict.h"
#include "dixstruct.h"
Reply to: