|
 |
418d68 |
diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac
|
|
|
418d68 |
--- xserver/configure.ac.xserver116-rebased 2016-09-29 13:14:45.595441590 +0200
|
|
|
418d68 |
+++ xserver/configure.ac 2016-09-29 13:14:45.631442006 +0200
|
|
|
288618 |
@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
|
|
|
288618 |
AC_CONFIG_HEADERS(include/version-config.h)
|
|
|
c7bdbd |
|
|
|
288618 |
AM_PROG_AS
|
|
|
288618 |
+AC_PROG_CXX
|
|
|
288618 |
AC_PROG_LN_S
|
|
|
288618 |
LT_PREREQ([2.2])
|
|
|
288618 |
LT_INIT([disable-static win32-dll])
|
|
|
418d68 |
@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then
|
|
|
288618 |
AC_SUBST([XVFB_SYS_LIBS])
|
|
|
288618 |
fi
|
|
|
c7bdbd |
|
|
|
288618 |
+dnl Xvnc DDX
|
|
|
288618 |
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
|
|
|
288618 |
+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"])
|
|
|
288618 |
+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
|
|
|
c7bdbd |
|
|
|
288618 |
dnl Xnest DDX
|
|
|
c7bdbd |
|
|
|
418d68 |
@@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then
|
|
|
288618 |
fi
|
|
|
288618 |
AC_MSG_RESULT([$XORG])
|
|
|
c7bdbd |
|
|
|
288618 |
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
|
288618 |
+
|
|
|
288618 |
if test "x$XORG" = xyes; then
|
|
|
288618 |
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
|
|
|
288618 |
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
|
|
|
418d68 |
@@ -2116,7 +2123,6 @@ if test "x$XORG" = xyes; then
|
|
|
288618 |
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
|
|
|
288618 |
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
|
|
|
288618 |
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
|
|
|
288618 |
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
|
|
|
288618 |
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
|
|
|
288618 |
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
|
|
|
288618 |
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
|
|
|
418d68 |
@@ -2691,6 +2697,7 @@ hw/dmx/Makefile
|
|
|
288618 |
hw/dmx/man/Makefile
|
|
|
288618 |
hw/vfb/Makefile
|
|
|
288618 |
hw/vfb/man/Makefile
|
|
|
288618 |
+hw/vnc/Makefile
|
|
|
288618 |
hw/xnest/Makefile
|
|
|
288618 |
hw/xnest/man/Makefile
|
|
|
288618 |
hw/xwin/Makefile
|
|
|
418d68 |
diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am
|
|
|
418d68 |
--- xserver/hw/Makefile.am.xserver116-rebased 2016-09-29 13:14:45.601441659 +0200
|
|
|
418d68 |
+++ xserver/hw/Makefile.am 2016-09-29 13:14:45.631442006 +0200
|
|
|
288618 |
@@ -38,7 +38,8 @@ SUBDIRS = \
|
|
|
288618 |
$(DMX_SUBDIRS) \
|
|
|
288618 |
$(KDRIVE_SUBDIRS) \
|
|
|
288618 |
$(XQUARTZ_SUBDIRS) \
|
|
|
288618 |
- $(XWAYLAND_SUBDIRS)
|
|
|
288618 |
+ $(XWAYLAND_SUBDIRS) \
|
|
|
288618 |
+ vnc
|
|
|
c7bdbd |
|
|
|
288618 |
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
|
|
|
c7bdbd |
|
|
|
c7bdbd |
diff --git xserver/mi/miinitext.c xserver/mi/miinitext.c
|
|
|
c7bdbd |
index 5596e21..003fc3c 100644
|
|
|
c7bdbd |
--- xserver/mi/miinitext.c
|
|
|
c7bdbd |
+++ xserver/mi/miinitext.c
|
|
|
c7bdbd |
@@ -107,8 +107,15 @@ SOFTWARE.
|
|
|
c7bdbd |
#include "os.h"
|
|
|
288618 |
#include "globals.h"
|
|
|
c7bdbd |
|
|
|
288618 |
+#ifdef TIGERVNC
|
|
|
288618 |
+extern void vncExtensionInit(INITARGS);
|
|
|
288618 |
+#endif
|
|
|
288618 |
+
|
|
|
288618 |
/* List of built-in (statically linked) extensions */
|
|
|
288618 |
static const ExtensionModule staticExtensions[] = {
|
|
|
288618 |
+#ifdef TIGERVNC
|
|
|
288618 |
+ {vncExtensionInit, "VNC-EXTENSION", NULL},
|
|
|
288618 |
+#endif
|
|
|
288618 |
{GEExtensionInit, "Generic Event Extension", &noGEExtension},
|
|
|
288618 |
{ShapeExtensionInit, "SHAPE", NULL},
|
|
|
288618 |
#ifdef MITSHM
|
|
|
418d68 |
--- xserver/include/os.h~ 2016-10-03 09:07:29.000000000 +0200
|
|
|
418d68 |
+++ xserver/include/os.h 2016-10-03 14:13:00.013654506 +0200
|
|
|
418d68 |
@@ -621,7 +621,7 @@
|
|
|
418d68 |
extern _X_EXPORT void
|
|
|
418d68 |
LogClose(enum ExitCode error);
|
|
|
418d68 |
extern _X_EXPORT Bool
|
|
|
418d68 |
-LogSetParameter(LogParameter param, int value);
|
|
|
418d68 |
+LogSetParameter(enum _LogParameter param, int value);
|
|
|
418d68 |
extern _X_EXPORT void
|
|
|
418d68 |
LogVWrite(int verb, const char *f, va_list args)
|
|
|
418d68 |
_X_ATTRIBUTE_PRINTF(2, 0);
|