diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:57:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:57:07 +1000 |
| commit | 60a7cad2c07bd23f58de07e927d0abbadd5e3bc8 (patch) | |
| tree | d7d807f1e76d848dd22325ca2e17de9dc174365c | |
| parent | a1de18228b0e6743f9615d820229a7b144f3f5ac (diff) | |
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>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/tga_driver.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b47a6d0..3ff2dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) # 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/tga_driver.c b/src/tga_driver.c index c315d2e..8615b29 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -70,8 +70,13 @@ #endif #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "xf86xv.h" #include <X11/extensions/Xv.h> |