Update talk to 60923971
Review URL: https://webrtc-codereview.appspot.com/7909004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5475 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/testutils.h b/talk/base/testutils.h
index e8ad720..363fb4c 100644
--- a/talk/base/testutils.h
+++ b/talk/base/testutils.h
@@ -32,6 +32,8 @@
#ifdef LINUX
#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
+
// X defines a few macros that stomp on types that gunit.h uses.
#undef None
#undef Bool
@@ -601,6 +603,16 @@
LOG(LS_WARNING) << "No X Display available.";
return false;
}
+ int ignored_int, major_version, minor_version;
+ if (!XRRQueryExtension(display, &ignored_int, &ignored_int) ||
+ !XRRQueryVersion(display, &major_version, &minor_version) ||
+ major_version < 1 ||
+ (major_version < 2 && minor_version < 3)) {
+ LOG(LS_WARNING) << "XRandr version: " << major_version << "."
+ << minor_version;
+ LOG(LS_WARNING) << "XRandr is not supported or is too old (pre 1.3).";
+ return false;
+ }
#endif
return true;
}