]>
Commit | Line | Data |
---|---|---|
7d6a554b AM |
1 | diff -up xserver/configure.ac.xserver116-rebased xserver/configure.ac |
2 | --- xserver/configure.ac.xserver116-rebased 2016-09-29 13:14:45.595441590 +0200 | |
3 | +++ xserver/configure.ac 2016-09-29 13:14:45.631442006 +0200 | |
4 | @@ -74,6 +74,7 @@ dnl forcing an entire recompile.x | |
68652edc MK |
5 | AC_CONFIG_HEADERS(include/version-config.h) |
6 | ||
7 | AM_PROG_AS | |
8 | +AC_PROG_CXX | |
9 | AC_PROG_LN_S | |
7d6a554b AM |
10 | LT_PREREQ([2.2]) |
11 | LT_INIT([disable-static win32-dll]) | |
12 | @@ -1863,6 +1864,10 @@ if test "x$XVFB" = xyes; then | |
68652edc MK |
13 | AC_SUBST([XVFB_SYS_LIBS]) |
14 | fi | |
15 | ||
16 | +dnl Xvnc DDX | |
17 | +AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) | |
7d6a554b | 18 | +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"]) |
68652edc MK |
19 | +AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) |
20 | ||
21 | dnl Xnest DDX | |
22 | ||
7d6a554b | 23 | @@ -1898,6 +1903,8 @@ if test "x$XORG" = xauto; then |
68652edc MK |
24 | fi |
25 | AC_MSG_RESULT([$XORG]) | |
26 | ||
27 | +AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |
28 | + | |
29 | if test "x$XORG" = xyes; then | |
10862a87 JR |
30 | PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) |
31 | ||
7d6a554b | 32 | @@ -2116,7 +2123,6 @@ if test "x$XORG" = xyes; then |
68652edc MK |
33 | AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) |
34 | AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |
35 | AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |
36 | - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |
37 | AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |
38 | AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |
39 | AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |
7d6a554b | 40 | @@ -2691,6 +2697,7 @@ hw/dmx/Makefile |
10862a87 | 41 | hw/xfree86/utils/gtf/Makefile |
68652edc MK |
42 | hw/vfb/Makefile |
43 | hw/vfb/man/Makefile | |
44 | +hw/vnc/Makefile | |
45 | hw/xnest/Makefile | |
46 | hw/xnest/man/Makefile | |
47 | hw/xwin/Makefile | |
7d6a554b AM |
48 | diff -up xserver/hw/Makefile.am.xserver116-rebased xserver/hw/Makefile.am |
49 | --- xserver/hw/Makefile.am.xserver116-rebased 2016-09-29 13:14:45.601441659 +0200 | |
50 | +++ xserver/hw/Makefile.am 2016-09-29 13:14:45.631442006 +0200 | |
51 | @@ -38,7 +38,8 @@ SUBDIRS = \ | |
10862a87 JR |
52 | $(XVFB_SUBDIRS) \ |
53 | $(XNEST_SUBDIRS) \ | |
68652edc | 54 | $(KDRIVE_SUBDIRS) \ |
10862a87 JR |
55 | - $(XQUARTZ_SUBDIRS) |
56 | + $(XQUARTZ_SUBDIRS) \ | |
68652edc MK |
57 | + vnc |
58 | ||
10862a87 | 59 | DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive |
68652edc | 60 | |
7d6a554b AM |
61 | diff -up xserver/mi/miinitext.c.xserver116-rebased xserver/mi/miinitext.c |
62 | --- xserver/mi/miinitext.c.xserver116-rebased 2016-09-29 13:14:45.618441855 +0200 | |
63 | +++ xserver/mi/miinitext.c 2016-09-29 13:14:45.631442006 +0200 | |
f3b4f89f | 64 | @@ -114,8 +114,15 @@ SOFTWARE. |
10862a87 JR |
65 | |
66 | #include "miinitext.h" | |
68652edc MK |
67 | |
68 | +#ifdef TIGERVNC | |
69 | +extern void vncExtensionInit(INITARGS); | |
70 | +#endif | |
71 | + | |
7d6a554b AM |
72 | /* List of built-in (statically linked) extensions */ |
73 | static const ExtensionModule staticExtensions[] = { | |
68652edc MK |
74 | +#ifdef TIGERVNC |
75 | + {vncExtensionInit, "VNC-EXTENSION", NULL}, | |
76 | +#endif | |
7d6a554b AM |
77 | {GEExtensionInit, "Generic Event Extension", &noGEExtension}, |
78 | {ShapeExtensionInit, "SHAPE", NULL}, | |
79 | #ifdef MITSHM | |
80 | --- xserver/include/os.h~ 2016-10-03 09:07:29.000000000 +0200 | |
81 | +++ xserver/include/os.h 2016-10-03 14:13:00.013654506 +0200 | |
82 | @@ -621,7 +621,7 @@ | |
83 | extern _X_EXPORT void | |
84 | LogClose(enum ExitCode error); | |
85 | extern _X_EXPORT Bool | |
86 | -LogSetParameter(LogParameter param, int value); | |
87 | +LogSetParameter(enum _LogParameter param, int value); | |
88 | extern _X_EXPORT void | |
89 | LogVWrite(int verb, const char *f, va_list args) | |
90 | _X_ATTRIBUTE_PRINTF(2, 0); |