37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
|
|
index 9d1c0eb..79ff79a 100644
|
|
--- a/unix/xserver/hw/vnc/xorg-version.h
|
|
+++ b/unix/xserver/hw/vnc/xorg-version.h
|
|
@@ -52,8 +52,10 @@
|
|
#define XORG 118
|
|
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
|
|
#define XORG 119
|
|
+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000))
|
|
+#define XORG 120
|
|
#else
|
|
-#error "X.Org newer than 1.19 is not supported"
|
|
+#error "X.Org newer than 1.20 is not supported"
|
|
#endif
|
|
|
|
#endif
|
|
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
|
|
index 93d8af4..1517809 100644
|
|
--- a/unix/xserver/hw/vnc/xvnc.c
|
|
+++ b/unix/xserver/hw/vnc/xvnc.c
|
|
@@ -202,6 +202,7 @@ vfbBitsPerPixel(int depth)
|
|
|
|
static void vfbFreeFramebufferMemory(vfbFramebufferInfoPtr pfb);
|
|
|
|
+#if XORG < 120
|
|
#ifdef DPMSExtension
|
|
/* Why support DPMS? Because stupid modern desktop environments
|
|
such as Unity 2D on Ubuntu 11.10 crashes if DPMS is not
|
|
@@ -219,6 +220,7 @@ Bool DPMSSupported(void)
|
|
return FALSE;
|
|
}
|
|
#endif
|
|
+#endif
|
|
|
|
#if XORG < 111
|
|
void ddxGiveUp()
|