You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
91 lines
3.4 KiB
91 lines
3.4 KiB
diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac |
|
--- xserver/configure.ac.xserver116-rebased 2016-09-29 13:14:45.595441590 +0200 |
|
+++ xserver/configure.ac 2016-09-29 13:14:45.631442006 +0200 |
|
@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x |
|
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]) |
|
@@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then |
|
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 |
|
|
|
@@ -1898,6 +1903,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' |
|
@@ -2116,7 +2123,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]) |
|
@@ -2691,6 +2697,7 @@ hw/dmx/Makefile |
|
hw/dmx/man/Makefile |
|
hw/vfb/Makefile |
|
hw/vfb/man/Makefile |
|
+hw/vnc/Makefile |
|
hw/xnest/Makefile |
|
hw/xnest/man/Makefile |
|
hw/xwin/Makefile |
|
diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am |
|
--- xserver/hw/Makefile.am.xserver116-rebased 2016-09-29 13:14:45.601441659 +0200 |
|
+++ xserver/hw/Makefile.am 2016-09-29 13:14:45.631442006 +0200 |
|
@@ -38,7 +38,8 @@ SUBDIRS = \ |
|
$(DMX_SUBDIRS) \ |
|
$(KDRIVE_SUBDIRS) \ |
|
$(XQUARTZ_SUBDIRS) \ |
|
- $(XWAYLAND_SUBDIRS) |
|
+ $(XWAYLAND_SUBDIRS) \ |
|
+ vnc |
|
|
|
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland |
|
|
|
diff --git xserver/mi/miinitext.c xserver/mi/miinitext.c |
|
index 5596e21..003fc3c 100644 |
|
--- xserver/mi/miinitext.c |
|
+++ xserver/mi/miinitext.c |
|
@@ -107,8 +107,15 @@ SOFTWARE. |
|
#include "os.h" |
|
#include "globals.h" |
|
|
|
+#ifdef TIGERVNC |
|
+extern void vncExtensionInit(INITARGS); |
|
+#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 |
|
--- xserver/include/os.h~ 2016-10-03 09:07:29.000000000 +0200 |
|
+++ xserver/include/os.h 2016-10-03 14:13:00.013654506 +0200 |
|
@@ -621,7 +621,7 @@ |
|
extern _X_EXPORT void |
|
LogClose(enum ExitCode error); |
|
extern _X_EXPORT Bool |
|
-LogSetParameter(LogParameter param, int value); |
|
+LogSetParameter(enum _LogParameter param, int value); |
|
extern _X_EXPORT void |
|
LogVWrite(int verb, const char *f, va_list args) |
|
_X_ATTRIBUTE_PRINTF(2, 0);
|
|
|