configure.ac | 6 +++++- src/glide_driver.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit 5b9a71341522cee5984061affb1a8d38c220c414 Author: Guillem Jover <[email protected]> Date: Thu Aug 27 13:07:33 2009 +0300 Bump to 1.0.3 diff --git a/configure.ac b/configure.ac index 77fc250..cd27822 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-glide], - 1.0.2, + 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-glide) commit c8b97d2f53501903bfa06cc396e97443e5bfe8e3 Author: Guillem Jover <[email protected]> Date: Thu Aug 27 13:06:02 2009 +0300 Remove inclusion of obsolete and now inexistent xf86_ansic.h diff --git a/src/glide_driver.c b/src/glide_driver.c index a7650c4..e88a1b5 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -54,7 +54,6 @@ #include "colormapst.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "mipointer.h" #include "mibstore.h" #include "micmap.h" commit 48fddeb136aba247e06688d8127ee133ae3b8dd2 Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:38:29 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 <[email protected]> diff --git a/configure.ac b/configure.ac index f257c78..77fc250 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $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/glide_driver.c b/src/glide_driver.c index fac93b2..a7650c4 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -60,8 +60,13 @@ #include "micmap.h" #include "xf86DDC.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "fb.h" #include "xf86cmap.h" #include "shadowfb.h" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
