Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_tigervnc / 84496811af21de34263d6f03261457e1425fb76b / . / unix / xserver16.patch
blob: b3edaf629e52957d7da34c6c970833f78777b74d [file] [log] [blame]
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]1diff -up xserver/configure.ac.vnc xserver/configure.ac
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]2--- xserver/configure.ac.vnc 2009-02-04 17:59:08.000000000 +0100
3+++ xserver/configure.ac 2009-02-04 17:59:38.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]4@@ -29,7 +29,6 @@ AC_PREREQ(2.57)
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]5 AC_INIT([xorg-server], 1.5.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]6 AC_CONFIG_SRCDIR([Makefile.am])
7 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
8-AM_MAINTAINER_MODE
9
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]10 RELEASE_DATE="2009-1-30"
11
12@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]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
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]20@@ -1203,6 +1203,9 @@ if test "x$XVFB" = xyes; then
Adam Tkac43df9132009-01-05 15:33:13 +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"])
Adam Tkace3c3e4a2009-01-07 17:12:00 +0000[diff] [blame]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"])
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]27
28 dnl Xnest DDX
29
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]30@@ -1879,6 +1882,7 @@ hw/dmx/input/Makefile
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]31 hw/dmx/glxProxy/Makefile
32 hw/dmx/Makefile
33 hw/vfb/Makefile
34+hw/vnc/Makefile
35 hw/xnest/Makefile
36 hw/xwin/Makefile
37 hw/xquartz/Makefile
38diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]39--- xserver/hw/Makefile.am.vnc 2009-02-04 17:59:08.000000000 +0100
40+++ xserver/hw/Makefile.am 2009-02-04 17:59:27.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]41@@ -33,7 +33,8 @@ SUBDIRS = \
42 $(XNEST_SUBDIRS) \
43 $(DMX_SUBDIRS) \
44 $(KDRIVE_SUBDIRS) \
45- $(XQUARTZ_SUBDIRS)
46+ $(XQUARTZ_SUBDIRS) \
47+ vnc
48
49 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
50
51diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
Adam Tkac84496812009-02-04 17:02:03 +0000[diff] [blame^]52--- xserver/mi/miinitext.c.vnc 2009-02-04 17:59:08.000000000 +0100
53+++ xserver/mi/miinitext.c 2009-02-04 17:59:27.000000000 +0100
Adam Tkac43df9132009-01-05 15:33:13 +0000[diff] [blame]54@@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
55 extern void CompositeExtensionInit(INITARGS);
56 #endif
57 extern void GEExtensionInit(INITARGS);
58+extern void vncExtensionInit(INITARGS);
59
60 /* The following is only a small first step towards run-time
61 * configurable extensions.
62@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[])
63 GlxPushProvider(&__glXDRISWRastProvider);
64 if (!noGlxExtension) GlxExtensionInit();
65 #endif
66+ vncExtensionInit();
67 }
68
69 #else /* XFree86LOADER */