diff options
| author | Brian Paul <brianp@vmware.com> | 2009-11-18 08:07:56 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-11-18 08:07:56 -0700 |
| commit | d449c07b8bfd1789b4f643b0eb0b1fac5314ebbe (patch) | |
| tree | deaac915e34914b327da84afda26706c1edae580 | |
| parent | 2b3ea2be906fbe0bf08f08f23ec39c0feb7a8f39 (diff) | |
xorg/st: fixup builds against later dpms headers.
(cherry picked from master, commit e9d6ab72be065becf7a077c33919d37faa8db92e)
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_crtc.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_output.c | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5d11cf8452..85385452c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1157,6 +1157,11 @@ yes) if test "$tracker" = egl && test "x$enable_egl" != xyes; then AC_MSG_ERROR([cannot build egl state tracker without EGL library]) fi + if test "$tracker" = xorg; then + PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71" + HAVE_XEXTPROTO_71="no") + fi done GALLIUM_STATE_TRACKERS_DIRS="$state_trackers" ;; diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index fe08bde9ef..67fe29a69d 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -42,8 +42,12 @@ #include "xorg_tracker.h" #include "xf86Modes.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif #include "pipe/p_inlines.h" #include "util/u_rect.h" diff --git a/src/gallium/state_trackers/xorg/xorg_output.c b/src/gallium/state_trackers/xorg/xorg_output.c index 950af942f5..26f45f8d64 100644 --- a/src/gallium/state_trackers/xorg/xorg_output.c +++ b/src/gallium/state_trackers/xorg/xorg_output.c @@ -42,8 +42,12 @@ #include <sys/stat.h> #include <sys/types.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif #include "X11/Xatom.h" |