configure.ac | 6 +++++- src/atombios_crtc.c | 5 +++++ src/atombios_output.c | 5 +++++ src/radeon_driver.c | 5 +++++ 4 files changed, 20 insertions(+), 1 deletion(-)
New commits: commit b7c14b00ff6a217cb69727b384cc4f4b433a907e Author: Dave Airlie <[email protected]> Date: Fri Sep 11 09:31:46 2009 +1000 ati 6.12.4 diff --git a/configure.ac b/configure.ac index 40045c5..f081c67 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-ati], - 6.12.3, + 6.12.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-ati) commit 93df2faf1ea2008248566326f10ed737e7f6fc66 Author: Dave Airlie <[email protected]> Date: Fri Sep 11 09:19:17 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]> Conflicts: src/drmmode_display.c diff --git a/configure.ac b/configure.ac index 7c113e9..40045c5 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,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 f060d8d..cd98c21 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 e6ef025..57345b3 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/radeon_driver.c b/src/radeon_driver.c index 9d8bd39..551cb7f 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -106,8 +106,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" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
