diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:33:57 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:33:57 +1000 |
| commit | 7e6557b81026d8a4d6c837839e68c28b151f8a97 (patch) | |
| tree | f41aced5585a03a4a8bbda860f2fd9d8f98d3442 | |
| parent | 95d431e8b260dd43cf6d93b90eecab1dc0ec7c26 (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/atombios_crtc.c | 5 | ||||
| -rw-r--r-- | src/atombios_output.c | 5 | ||||
| -rw-r--r-- | src/drmmode_display.c | 5 | ||||
| -rw-r--r-- | src/radeon_driver.c | 5 |
5 files changed, 24 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 39018b8a..48375eec 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 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/atombios_crtc.c b/src/atombios_crtc.c index 6d24c2b1..e04b3c41 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -33,8 +33,13 @@ #include "config.h" #endif /* DPMS */ +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "radeon.h" #include "radeon_reg.h" diff --git a/src/atombios_output.c b/src/atombios_output.c index 158e76f5..00d17cb0 100644 --- a/src/atombios_output.c +++ b/src/atombios_output.c @@ -34,8 +34,13 @@ #include "config.h" #endif /* DPMS */ +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <unistd.h> #include "radeon.h" diff --git a/src/drmmode_display.c b/src/drmmode_display.c index b5846df1..ea2f71f4 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -41,8 +41,13 @@ #include "drmmode_display.h" /* DPMS */ +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + static void drmmode_ConvertFromKMode(ScrnInfoPtr scrn, diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 317612d3..535b3166 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -104,8 +104,13 @@ #include "vgaHW.h" #endif +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "atipciids.h" #include "radeon_chipset_gen.h" |