Contents of /trunk/vnc/patches/vnc-server-modular-xorg.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5296 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5296 byte(s)
-import
1 | --- unix/xorg-x11-server-source/mi/miinitext.c.modular-xorg 2007-03-02 15:45:37.000000000 +0100 |
2 | +++ unix/xorg-x11-server-source/mi/miinitext.c 2007-03-02 15:45:38.000000000 +0100 |
3 | @@ -283,6 +283,9 @@ |
4 | #ifdef MITMISC |
5 | extern void MITMiscExtensionInit(INITARGS); |
6 | #endif |
7 | +#ifdef VNCEXT |
8 | +extern void vncExtensionInit(INITARGS); |
9 | +#endif |
10 | #ifdef XIDLE |
11 | extern void XIdleExtensionInit(INITARGS); |
12 | #endif |
13 | @@ -561,6 +564,9 @@ |
14 | #ifdef MITMISC |
15 | if (!noMITMiscExtension) MITMiscExtensionInit(); |
16 | #endif |
17 | +#ifdef VNCEXT |
18 | + vncExtensionInit(); |
19 | +#endif |
20 | #ifdef XIDLE |
21 | if (!noXIdleExtension) XIdleExtensionInit(); |
22 | #endif |
23 | --- unix/xorg-x11-server-source/hw/Makefile.am.modular-xorg 2007-03-02 15:45:38.000000000 +0100 |
24 | +++ unix/xorg-x11-server-source/hw/Makefile.am 2007-03-02 15:47:10.000000000 +0100 |
25 | @@ -30,6 +30,8 @@ |
26 | XPRINT_SUBDIRS = xprint |
27 | endif |
28 | |
29 | +XVNC_SUBDIRS = vnc |
30 | + |
31 | # need to add darwin support here |
32 | |
33 | SUBDIRS = \ |
34 | @@ -39,6 +41,7 @@ |
35 | $(XVFB_SUBDIRS) \ |
36 | $(XNEST_SUBDIRS) \ |
37 | $(DMX_SUBDIRS) \ |
38 | + $(XVNC_SUBDIRS) \ |
39 | $(KDRIVE_SUBDIRS) \ |
40 | $(XPRINT_SUBDIRS) |
41 | |
42 | --- /dev/null 2007-03-01 10:25:08.783929433 +0100 |
43 | +++ unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-03-02 15:45:38.000000000 +0100 |
44 | @@ -0,0 +1,85 @@ |
45 | +noinst_LTLIBRARIES = libvnccommon.la |
46 | +libvnccommon_la_SOURCES = \ |
47 | + RegionHelper.h \ |
48 | + vncExtInit.cc \ |
49 | + vncExtInit.h \ |
50 | + vncHooks.cc \ |
51 | + vncHooks.h \ |
52 | + XserverDesktop.cc \ |
53 | + XserverDesktop.h |
54 | + |
55 | +libvnccommon_la_CXXFLAGS = \ |
56 | + -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
57 | + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ |
58 | + -DGC_HAS_COMPOSITE_CLIP \ |
59 | + -DVNC_USE_FB \ |
60 | + -I/usr/include/X11 \ |
61 | + -I../../../../common \ |
62 | + -I../../../vncconfig |
63 | + |
64 | +bin_PROGRAMS = Xvnc |
65 | + |
66 | +Xvnc_SOURCES = \ |
67 | + xvnc.cc \ |
68 | + $(top_srcdir)/Xext/dpmsstubs.c \ |
69 | + $(top_srcdir)/Xi/stubs.c \ |
70 | + $(top_srcdir)/mi/miinitext.c \ |
71 | + $(top_srcdir)/fb/fbcmap.c |
72 | + |
73 | +Xvnc_LDADD = $(XORG_CORE_LIBS) \ |
74 | + $(XORG_LIBS) \ |
75 | + $(XSERVER_LIBS) \ |
76 | + ../../fb/libfb.la \ |
77 | + ../../mi/libminimi.la \ |
78 | + ../../render/librender.la \ |
79 | + ../../xkb/libxkbstubs.la \ |
80 | + ../../dbe/libdbe.la \ |
81 | + ../../Xext/libXext.la \ |
82 | + ../../XTrap/libxtrap.la \ |
83 | + ../../record/librecord.la \ |
84 | + ../xfree86/os-support/libxorgos.la \ |
85 | + ../../os/libos.la \ |
86 | + ../xfree86/common/libcommon.la \ |
87 | + -lX11 \ |
88 | + libvnccommon.la \ |
89 | + ../../../../common/rfb/librfb.a \ |
90 | + ../../../../common/rdr/librdr.a \ |
91 | + ../../../../common/network/libnetwork.a \ |
92 | + ../../../../common/Xregion/libXregion.a |
93 | + |
94 | +Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ |
95 | + -DNO_HW_ONLY_EXTS \ |
96 | + -DNO_MODULE_EXTS \ |
97 | + -DXFree86Server -DVNCEXT |
98 | + |
99 | +Xvnc_CXXFLAGS = $(Xvnc_CFLAGS) \ |
100 | + -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
101 | + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \ |
102 | + -DVNC_USE_FB \ |
103 | + -I../../../../common \ |
104 | + -I../../../vncconfig \ |
105 | + -I../../mi \ |
106 | + -I ../../render \ |
107 | + -I/usr/include/X11 |
108 | + |
109 | +libvnc_la_LTLIBRARIES = libvnc.la |
110 | +libvnc_la_LDFLAGS = -module -avoid-version |
111 | +libvnc_ladir = $(moduledir)/extensions |
112 | +libvnc_la_SOURCES = xf86vncModule.cc |
113 | +libvnc_la_LIBADD = \ |
114 | + libvnccommon.la \ |
115 | + ../../../../common/rfb/librfb.a \ |
116 | + ../../../../common/rdr/librdr.a \ |
117 | + ../../../../common/network/libnetwork.a \ |
118 | + ../../../../common/Xregion/libXregion.a |
119 | +libvnc_la_CXXFLAGS = \ |
120 | + -I../../../../common \ |
121 | + -I$(top_srcdir)/hw/xfree86/common \ |
122 | + -I$(top_srcdir)/hw/xfree86/os-support \ |
123 | + -I$(top_srcdir)/hw/xfree86/os-support/bus \ |
124 | + -DXFree86Module -DXFree86LOADER -DIN_MODULE |
125 | + |
126 | +AM_CXXFLAGS = $(CFLAGS) \ |
127 | + -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
128 | + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" |
129 | + |
130 | --- unix/xorg-x11-server-source/configure.ac.modular-xorg 2007-03-02 15:45:38.000000000 +0100 |
131 | +++ unix/xorg-x11-server-source/configure.ac 2007-03-02 15:45:38.000000000 +0100 |
132 | @@ -1793,6 +1793,7 @@ |
133 | hw/xnest/Makefile |
134 | hw/xwin/Makefile |
135 | hw/darwin/Makefile |
136 | +hw/vnc/Makefile |
137 | hw/kdrive/Makefile |
138 | hw/kdrive/ati/Makefile |
139 | hw/kdrive/chips/Makefile |
140 | --- unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100 |
141 | +++ unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100 |
142 | @@ -36,8 +36,6 @@ |
143 | extern "C" { |
144 | #define class c_class |
145 | #define public c_public |
146 | -#define xor c_xor |
147 | -#define and c_and |
148 | #ifdef WIN32 |
149 | #include <X11/Xwinsock.h> |
150 | #endif |
151 | @@ -72,11 +70,8 @@ |
152 | #include "inputstr.h" |
153 | #include "keysym.h" |
154 | extern int defaultColorVisualClass; |
155 | - extern char buildtime[]; |
156 | #undef class |
157 | #undef public |
158 | -#undef xor |
159 | -#undef and |
160 | #ifndef VNC_USE_FB |
161 | extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int); |
162 | extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int); |
163 | @@ -221,7 +216,7 @@ |
164 | |
165 | void ddxUseMsg() |
166 | { |
167 | - ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); |
168 | + ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); |
169 | ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, |
170 | VENDOR_STRING); |
171 | ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); |
172 | @@ -927,7 +922,7 @@ |
173 | |
174 | void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) |
175 | { |
176 | - ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); |
177 | + ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT); |
178 | ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, |
179 | VENDOR_STRING); |
180 | wellKnownSocketsCreated = true; |