Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / ceb45207e9cf906c54a2eab6fd802ee9c02d7f86 / . / unix / xserver19.patch
blob: 4f05fcabedb365a022706ef059959bb83df81b9f [file] [log] [blame]
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]1diff -up xserver/configure.ac.vnc xserver/configure.ac
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]2--- xserver/configure.ac.vnc 2011-05-11 11:16:50.764292985 +0200
3+++ xserver/configure.ac 2011-05-11 11:16:55.675101840 +0200
4@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.9.5, [https://b
5 RELEASE_DATE="2011-03-17"
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]6 AC_CONFIG_SRCDIR([Makefile.am])
7 AM_INIT_AUTOMAKE([foreign dist-bzip2])
8-AM_MAINTAINER_MODE
9
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]10 # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]11 m4_ifndef([XORG_MACROS_VERSION],
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]12@@ -65,6 +64,7 @@ dnl forcing an entire recompile.x
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]13 AC_CONFIG_HEADERS(include/version-config.h)
14
15 AC_PROG_CC
16+AC_PROG_CXX
17 AM_PROG_AS
18 AC_PROG_INSTALL
19 AC_PROG_LN_S
DRCceb45202011-06-22 00:33:13 +0000[diff] [blame^]20@@ -1514,6 +1514,9 @@ if test "x$XVFB" = xyes; then
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]21 AC_SUBST([XVFB_SYS_LIBS])
22 fi
23
24+dnl Xvnc DDX
25+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
26+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
27
28 dnl Xnest DDX
29
DRCceb45202011-06-22 00:33:13 +0000[diff] [blame^]30@@ -1552,6 +1555,8 @@ xorg_bus_linuxpci=no
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]31 xorg_bus_bsdpci=no
32 xorg_bus_sparc=no
33
34+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
35+
36 if test "x$XORG" = xyes; then
37 XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
38 XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
DRCceb45202011-06-22 00:33:13 +0000[diff] [blame^]39@@ -1798,7 +1803,6 @@ if test "x$XORG" = xyes; then
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]40 AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
41 AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
42 AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
43- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
44 AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
45 AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
46 AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
DRCceb45202011-06-22 00:33:13 +0000[diff] [blame^]47@@ -2252,6 +2256,7 @@ hw/dmx/input/Makefile
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]48 hw/dmx/glxProxy/Makefile
49 hw/dmx/Makefile
50 hw/vfb/Makefile
51+hw/vnc/Makefile
52 hw/xnest/Makefile
53 hw/xwin/Makefile
54 hw/xwin/glx/Makefile
55diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]56--- xserver/hw/Makefile.am.vnc 2011-05-11 11:16:50.836290382 +0200
57+++ xserver/hw/Makefile.am 2011-05-11 11:16:55.675101840 +0200
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]58@@ -33,7 +33,8 @@ SUBDIRS = \
59 $(XNEST_SUBDIRS) \
60 $(DMX_SUBDIRS) \
61 $(KDRIVE_SUBDIRS) \
62- $(XQUARTZ_SUBDIRS)
63+ $(XQUARTZ_SUBDIRS) \
64+ vnc
65
66 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
67
68diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]69--- xserver/mi/miinitext.c.vnc 2011-05-11 11:16:50.916287489 +0200
70+++ xserver/mi/miinitext.c 2011-05-11 11:17:12.758477353 +0200
71@@ -263,6 +263,9 @@ extern void DamageExtensionInit(INITARGS
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]72 extern void CompositeExtensionInit(INITARGS);
73 #endif
74 extern void GEExtensionInit(INITARGS);
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]75+#ifdef TIGERVNC
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]76+extern void vncExtensionInit(INITARGS);
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]77+#endif
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]78
79 /* The following is only a small first step towards run-time
80 * configurable extensions.
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]81@@ -435,6 +438,9 @@ InitExtensions(int argc, char *argv[])
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]82 #ifdef XF86BIGFONT
83 if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
84 #endif
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]85+#ifdef TIGERVNC
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]86+ vncExtensionInit();
Adam Tkacc65827f2011-05-11 10:22:24 +0000[diff] [blame]87+#endif
Adam Tkacf515c002010-07-20 09:35:50 +0000[diff] [blame]88 #if !defined(NO_HW_ONLY_EXTS)
89 #if defined(XF86VIDMODE)
90 if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();