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