diff -u -r xserver.orig/configure.ac xserver/configure.ac --- xserver.orig/configure.ac 2021-10-28 11:39:43.200727345 +0000 +++ xserver/configure.ac 2021-10-28 11:39:57.993008591 +0000 @@ -72,6 +72,7 @@ AC_CONFIG_HEADERS(include/version-config.h) AM_PROG_AS +AC_PROG_CXX AC_PROG_LN_S LT_PREREQ([2.2]) LT_INIT([disable-static win32-dll]) @@ -1713,6 +1714,10 @@ AC_SUBST([XVFB_SYS_LIBS]) fi +dnl Xvnc DDX +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) +AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) dnl Xnest DDX @@ -1748,6 +1753,8 @@ fi AC_MSG_RESULT([$XORG]) +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + if test "x$XORG" = xyes; then PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) @@ -1956,7 +1963,6 @@ 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]) @@ -2339,6 +2345,7 @@ hw/xfree86/utils/gtf/Makefile hw/vfb/Makefile hw/vfb/man/Makefile +hw/vnc/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile diff -u -r xserver.orig/hw/Makefile.am xserver/hw/Makefile.am --- xserver.orig/hw/Makefile.am 2021-10-28 11:39:43.156726511 +0000 +++ xserver/hw/Makefile.am 2021-10-28 11:41:02.890242547 +0000 @@ -28,7 +28,8 @@ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) + $(XQUARTZ_SUBDIRS) \ + vnc DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive diff -u -r xserver.orig/mi/miinitext.c xserver/mi/miinitext.c --- xserver.orig/mi/miinitext.c 2021-10-28 11:39:43.232727953 +0000 +++ xserver/mi/miinitext.c 2021-10-28 11:39:57.993008591 +0000 @@ -106,8 +106,15 @@ #include "miinitext.h" +#ifdef TIGERVNC +extern void vncExtensionInit(void); +#endif + /* List of built-in (statically linked) extensions */ static const ExtensionModule staticExtensions[] = { +#ifdef TIGERVNC + {vncExtensionInit, "VNC-EXTENSION", NULL}, +#endif {GEExtensionInit, "Generic Event Extension", &noGEExtension}, {ShapeExtensionInit, "SHAPE", NULL}, #ifdef MITSHM diff -u -r xserver.old/hw/vnc/xvnc.c xserver/hw/vnc/xvnc.c --- xserver.old/hw/vnc/xvnc.c 2021-10-28 12:14:39.360628791 +0000 +++ xserver/hw/vnc/xvnc.c 2021-10-28 12:30:56.599310018 +0000 @@ -85,7 +85,18 @@ #undef VENDOR_RELEASE #undef VENDOR_STRING #include "version-config.h" -#include "site.h" + +#ifndef VENDOR_STRING +#define VENDOR_STRING "The X.Org Foundation" +#endif + +/* Default logging parameters. */ +#ifndef DEFAULT_LOG_VERBOSITY +#define DEFAULT_LOG_VERBOSITY 0 +#endif +#ifndef DEFAULT_LOG_FILE_VERBOSITY +#define DEFAULT_LOG_FILE_VERBOSITY 3 +#endif #define XVNCVERSION "TigerVNC 1.10.0" #define XVNCCOPYRIGHT ("Copyright (C) 1999-2019 TigerVNC Team and many others (see README.rst)\n" \