Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / refs/heads/android-16 / . / unix / xserver120.patch
blob: d8598494be010aaf0225283035514bc33683b845 [file] [log] [blame]
Michal Srb3a37af32018-06-06 13:33:37 +0200[diff] [blame]1Index: xserver/configure.ac
2===================================================================
3--- xserver.orig/configure.ac
4+++ xserver/configure.ac
5@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
6 AC_CONFIG_HEADERS(include/version-config.h)
7
8 AM_PROG_AS
9+AC_PROG_CXX
10 AC_PROG_LN_S
11 LT_PREREQ([2.2])
12 LT_INIT([disable-static win32-dll])
13@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
14 AC_SUBST([XVFB_SYS_LIBS])
15 fi
16
17+dnl Xvnc DDX
18+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
19+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"])
20+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
21
22 dnl Xnest DDX
23
24@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then
25 fi
26 AC_MSG_RESULT([$XORG])
27
28+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
29+
30 if test "x$XORG" = xyes; then
31 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
32 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
33@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then
34 AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
35 AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
36 AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
37- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
38 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
39 AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
40 AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
41@@ -2565,6 +2571,7 @@ hw/dmx/Makefile
42 hw/dmx/man/Makefile
43 hw/vfb/Makefile
44 hw/vfb/man/Makefile
45+hw/vnc/Makefile
46 hw/xnest/Makefile
47 hw/xnest/man/Makefile
48 hw/xwin/Makefile
49Index: xserver/hw/Makefile.am
50===================================================================
51--- xserver.orig/hw/Makefile.am
52+++ xserver/hw/Makefile.am
53@@ -38,7 +38,8 @@ SUBDIRS = \
54 $(DMX_SUBDIRS) \
55 $(KDRIVE_SUBDIRS) \
56 $(XQUARTZ_SUBDIRS) \
57- $(XWAYLAND_SUBDIRS)
58+ $(XWAYLAND_SUBDIRS) \
59+ vnc
60
61 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
62
63Index: xserver/mi/miinitext.c
64===================================================================
65--- xserver.orig/mi/miinitext.c
66+++ xserver/mi/miinitext.c
67@@ -107,8 +107,15 @@ SOFTWARE.
68 #include "os.h"
69 #include "globals.h"
70
71+#ifdef TIGERVNC
72+extern void vncExtensionInit(void);
73+#endif
74+
75 /* List of built-in (statically linked) extensions */
76 static const ExtensionModule staticExtensions[] = {
77+#ifdef TIGERVNC
78+ {vncExtensionInit, "VNC-EXTENSION", NULL},
79+#endif
80 {GEExtensionInit, "Generic Event Extension", &noGEExtension},
81 {ShapeExtensionInit, "SHAPE", NULL},
82 #ifdef MITSHM