Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / 47af8113336ddcb85503ea5ba8e078d28415e041 / . / unix / xserver15.patch
blob: 15b3beef3be981b086ff807773f428a2b8a0e325 [file] [log] [blame]
Adam Tkac80c67e82008-10-15 16:33:33 +0000[diff] [blame]1diff -up xserver/configure.ac.vnc xserver/configure.ac
Adam Tkacce1b4542008-11-20 15:02:32 +0000[diff] [blame]2--- xserver/configure.ac.vnc 2008-11-20 14:21:34.000000000 +0100
3+++ xserver/configure.ac 2008-11-20 14:22:17.000000000 +0100
4@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008"
5 REMEMBER_REMEMBER="The Fifth of November"
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 Tkacce1b4542008-11-20 15:02:32 +0000[diff] [blame]12@@ -54,6 +53,7 @@ dnl kdrive-config.h covers the kdrive DD
13 AC_CONFIG_HEADERS(include/kdrive-config.h)
14
15 AC_PROG_CC
16+AC_PROG_CXX
17 AM_PROG_AS
18 AC_PROG_INSTALL
19 AC_PROG_LN_S
20@@ -1215,6 +1215,9 @@ if test "x$XVFB" = xyes; then
Adam Tkacea74b2b2008-04-16 12:27:25 +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"])
26+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"])
27
28 dnl Xnest DDX
29
Adam Tkacce1b4542008-11-20 15:02:32 +0000[diff] [blame]30@@ -2179,6 +2182,7 @@ hw/dmx/input/Makefile
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]31 hw/dmx/glxProxy/Makefile
32 hw/dmx/Makefile
33 hw/vfb/Makefile
34+hw/vnc/Makefile
35 hw/xgl/Makefile
36 hw/xgl/egl/Makefile
37 hw/xgl/egl/module/Makefile
Adam Tkac80c67e82008-10-15 16:33:33 +0000[diff] [blame]38diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
Adam Tkacce1b4542008-11-20 15:02:32 +0000[diff] [blame]39--- xserver/hw/Makefile.am.vnc 2008-11-20 14:21:34.000000000 +0100
40+++ xserver/hw/Makefile.am 2008-11-20 14:21:38.000000000 +0100
Adam Tkac80c67e82008-10-15 16:33:33 +0000[diff] [blame]41@@ -43,7 +43,8 @@ SUBDIRS = \
42 $(DMX_SUBDIRS) \
43 $(KDRIVE_SUBDIRS) \
44 $(XQUARTZ_SUBDIRS) \
45- $(XPRINT_SUBDIRS)
46+ $(XPRINT_SUBDIRS) \
47+ vnc
48
49 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
50
51diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
Adam Tkacce1b4542008-11-20 15:02:32 +0000[diff] [blame]52--- xserver/mi/miinitext.c.vnc 2008-11-20 14:21:37.000000000 +0100
53+++ xserver/mi/miinitext.c 2008-11-20 14:21:38.000000000 +0100
Adam Tkac0c2f4932008-10-15 15:55:06 +0000[diff] [blame]54@@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
55 #ifdef MITMISC
56 extern void MITMiscExtensionInit(INITARGS);
57 #endif
58+extern void vncExtensionInit(INITARGS);
59 #ifdef XIDLE
60 extern void XIdleExtensionInit(INITARGS);
61 #endif
62@@ -566,6 +567,7 @@ InitExtensions(argc, argv)
63 #ifdef MITMISC
64 if (!noMITMiscExtension) MITMiscExtensionInit();
65 #endif
66+ vncExtensionInit();
67 #ifdef XIDLE
68 if (!noXIdleExtension) XIdleExtensionInit();
69 #endif