diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:58:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:58:59 +1000 |
| commit | 4e482d17e69c0179a552859b7f035a0f4b026805 (patch) | |
| tree | 5dd055c0ab5ceb6b19a2f708b20b120f40ff52d1 | |
| parent | 89512b609911dede1a3074fdc5a1ebceee77c8f8 (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/via_driver.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1bea69c..7c2ad65 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages # via_3d_reg.h comes with libdrm ATM. PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto xvmc fontsproto libdrm $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/via_driver.c b/src/via_driver.c index c2312a8..fe59dfe 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -38,8 +38,13 @@ #include "shadowfb.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "via_driver.h" |