Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / ea74b2ba374c4f1b7e05601b9eb93120cf7e93ca / . / unix / xserver.patch
blob: ec1fa3419caa056b514f61366d4299390e67ec3b [file] [log] [blame]
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]1diff -up mi/miinitext.c.orig xorg/mi/miinitext.c
2--- mi/miinitext.c.orig 2008-01-28 10:18:46.000000000 +0100
3+++ mi/miinitext.c 2008-01-28 10:18:58.000000000 +0100
4@@ -289,6 +289,7 @@ extern void BigReqExtensionInit(INITARGS
5 #ifdef MITMISC
6 extern void MITMiscExtensionInit(INITARGS);
7 #endif
8+extern void vncExtensionInit(INITARGS);
9 #ifdef XIDLE
10 extern void XIdleExtensionInit(INITARGS);
11 #endif
12@@ -560,6 +561,7 @@ InitExtensions(argc, argv)
13 #ifdef MITMISC
14 if (!noMITMiscExtension) MITMiscExtensionInit();
15 #endif
16+ vncExtensionInit();
17 #ifdef XIDLE
18 if (!noXIdleExtension) XIdleExtensionInit();
19 #endif
20diff -up hw/Makefile.am.orig xorg/hw/Makefile.am
21--- hw/Makefile.am.orig 2008-01-28 10:18:46.000000000 +0100
22+++ hw/Makefile.am 2008-01-28 10:18:58.000000000 +0100
23@@ -43,7 +43,8 @@ SUBDIRS = \
24 $(DMX_SUBDIRS) \
25 $(KDRIVE_SUBDIRS) \
26 $(XQUARTZ_SUBDIRS) \
27- $(XPRINT_SUBDIRS)
28+ $(XPRINT_SUBDIRS) \
29+ vnc
30
31 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
32
Adam Tkacea74b2b2008-04-16 12:27:25 +0000[diff] [blame^]33diff -up configure.ac.orig xserver/configure.ac
34--- configure.ac.orig 2008-03-25 14:32:36.000000000 +0100
35+++ configure.ac 2008-03-26 20:14:16.000000000 +0100
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]36@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
37 AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
38 AC_CONFIG_SRCDIR([Makefile.am])
39 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
40-AM_MAINTAINER_MODE
41
42 dnl this gets generated by autoheader, and thus contains all the defines. we
43 dnl don't ever actually use it, internally.
Adam Tkacea74b2b2008-04-16 12:27:25 +0000[diff] [blame^]44@@ -1206,6 +1205,9 @@ if test "x$XVFB" = xyes; then
45 AC_SUBST([XVFB_SYS_LIBS])
46 fi
47
48+dnl Xvnc DDX
49+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
50+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"])
51
52 dnl Xnest DDX
53
54@@ -2186,6 +2188,7 @@ hw/dmx/input/Makefile
Adam Tkac4c0427f2008-03-21 18:56:48 +0000[diff] [blame]55 hw/dmx/glxProxy/Makefile
56 hw/dmx/Makefile
57 hw/vfb/Makefile
58+hw/vnc/Makefile
59 hw/xgl/Makefile
60 hw/xgl/egl/Makefile
61 hw/xgl/egl/module/Makefile