Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / 1288813476941b2e8c195e39e58a4b16ec86fa72 / . / unix / xserver.patch
blob: dbcc589ca863dca61f9efd2520919f32b68a084c [file] [log] [blame]
Adam Tkac80c67e82008-10-15 16:33:33 +0000[diff] [blame]1diff -up xserver/configure.ac.vnc xserver/configure.ac
2--- xserver/configure.ac.vnc 2008-10-15 17:22:22.000000000 +0200
3+++ xserver/configure.ac 2008-10-15 17:22:23.000000000 +0200
Adam Tkac0c2f4932008-10-15 15:55:06 +0000[diff] [blame]4@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.2, [https://b
5 RELEASE_DATE="10 October 2008"
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]6 AC_CONFIG_SRCDIR([Makefile.am])
7 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
8-AM_MAINTAINER_MODE
9
10 dnl this gets generated by autoheader, and thus contains all the defines. we
11 dnl don't ever actually use it, internally.
Adam Tkac0c2f4932008-10-15 15:55:06 +0000[diff] [blame]12@@ -1214,6 +1213,9 @@ if test "x$XVFB" = xyes; then
Adam Tkacea74b2b2008-04-16 12:27:25 +0000[diff] [blame]13 AC_SUBST([XVFB_SYS_LIBS])
14 fi
15
16+dnl Xvnc DDX
17+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
18+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"])
19
20 dnl Xnest DDX
21
Adam Tkac0c2f4932008-10-15 15:55:06 +0000[diff] [blame]22@@ -2178,6 +2180,7 @@ hw/dmx/input/Makefile
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]23 hw/dmx/glxProxy/Makefile
24 hw/dmx/Makefile
25 hw/vfb/Makefile
26+hw/vnc/Makefile
27 hw/xgl/Makefile
28 hw/xgl/egl/Makefile
29 hw/xgl/egl/module/Makefile
Adam Tkac80c67e82008-10-15 16:33:33 +0000[diff] [blame]30diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
31--- xserver/hw/Makefile.am.vnc 2008-10-15 17:22:23.000000000 +0200
32+++ xserver/hw/Makefile.am 2008-10-15 17:22:23.000000000 +0200
33@@ -43,7 +43,8 @@ SUBDIRS = \
34 $(DMX_SUBDIRS) \
35 $(KDRIVE_SUBDIRS) \
36 $(XQUARTZ_SUBDIRS) \
37- $(XPRINT_SUBDIRS)
38+ $(XPRINT_SUBDIRS) \
39+ vnc
40
41 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
42
43diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
44--- xserver/mi/miinitext.c.vnc 2008-10-15 17:22:23.000000000 +0200
45+++ xserver/mi/miinitext.c 2008-10-15 17:22:23.000000000 +0200
Adam Tkac0c2f4932008-10-15 15:55:06 +0000[diff] [blame]46@@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
47 #ifdef MITMISC
48 extern void MITMiscExtensionInit(INITARGS);
49 #endif
50+extern void vncExtensionInit(INITARGS);
51 #ifdef XIDLE
52 extern void XIdleExtensionInit(INITARGS);
53 #endif
54@@ -566,6 +567,7 @@ InitExtensions(argc, argv)
55 #ifdef MITMISC
56 if (!noMITMiscExtension) MITMiscExtensionInit();
57 #endif
58+ vncExtensionInit();
59 #ifdef XIDLE
60 if (!noXIdleExtension) XIdleExtensionInit();
61 #endif