diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-02-20 12:59:25 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-06-19 16:39:07 +0200 |
| commit | 55ef4dbc9b04a2a3312488e95de6c7cf5909913a (patch) | |
| tree | 8ba52393a034fb2d891e7eaa74fb20815ce74f97 /unix/xserver120.patch | |
| parent | 28c3f121613807df6d53dde9ac653916dcf8902d (diff) | |
| download | tigervnc-55ef4dbc9b04a2a3312488e95de6c7cf5909913a.tar.gz tigervnc-55ef4dbc9b04a2a3312488e95de6c7cf5909913a.zip | |
Simplify Xorg version handling
VENDOR_RELEASE has been available as a #define since Xorg 1.7, so let's
use that and remove all of our custom magic.
Diffstat (limited to 'unix/xserver120.patch')
| -rw-r--r-- | unix/xserver120.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/unix/xserver120.patch b/unix/xserver120.patch index d8598494..b20b7ea3 100644 --- a/unix/xserver120.patch +++ b/unix/xserver120.patch @@ -21,23 +21,6 @@ Index: xserver/configure.ac dnl Xnest DDX -@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) @@ -2565,6 +2571,7 @@ hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile |