Annotation of /trunk/deprecated/vnc/vnc-4.1.3-r1.smage2
Parent Directory | Revision Log
Revision 1705 -
(hide annotations)
(download)
Tue May 19 15:56:51 2009 UTC (15 years, 4 months ago) by niro
Original Path: trunk/extras/vnc/vnc-4.1.3-r1.smage2
File size: 8323 byte(s)
Tue May 19 15:56:51 2009 UTC (15 years, 4 months ago) by niro
Original Path: trunk/extras/vnc/vnc-4.1.3-r1.smage2
File size: 8323 byte(s)
-re-diffed vnc-server-xorg.patch against xorg-server-1.6.1
1 | niro | 1704 | # $Id$ |
2 | |||
3 | PNAME="vnc" | ||
4 | PVER="4.1.3" | ||
5 | PBUILD="r1" | ||
6 | |||
7 | PCATEGORIE="net-misc" | ||
8 | STATE="unstable" | ||
9 | |||
10 | DESCRIPTION="RealVNC vnc server and client utilities." | ||
11 | HOMEPAGE="http://www.realvnc.com/" | ||
12 | |||
13 | sminclude xorg xdg | ||
14 | |||
15 | DEPEND=">= x11-libs/libSM-1 | ||
16 | >= x11-libs/libXtst-1 | ||
17 | >= x11-libs/libXi-1 | ||
18 | >= x11-libs/libXmu-1 | ||
19 | >= x11-libs/libXrender-1 | ||
20 | >= sys-libs/zlib-1.2.3 | ||
21 | >= media-libs/freetype-2.3.9" | ||
22 | |||
23 | SDEPEND=">= dev-util/desktop-file-utils-0.15 | ||
24 | >= x11-proto/xextproto-7" | ||
25 | |||
26 | SRCFILE="${PNAME}-$(echo ${PVER} | sed "s:\.:_:g")-unixsrc.tar.gz" | ||
27 | SRCDIR="${BUILDDIR}/${PNAME}-$(echo ${PVER} | sed "s:\.:_:g")-unixsrc" | ||
28 | |||
29 | XORG_PVER="1.6.1" | ||
30 | XORG="xorg-server-${XORG_PVER}.tar.bz2" | ||
31 | XORGSDIR="${BUILDDIR}/xorg-server-${XORG_PVER}" | ||
32 | XORGDDIR="${SRCDIR}/unix/xorg-x11-server-source" | ||
33 | |||
34 | sminclude mtools xdg | ||
35 | |||
36 | SRC_URI=( | ||
37 | mirror://${PNAME}/${SRCFILE} | ||
38 | http://ftp.x.org/pub/individual/xserver/${XORG} | ||
39 | mirror://xorg-server/${XORG} | ||
40 | mirror://${PNAME}/vnc-48x48.png | ||
41 | mirror://${PNAME}/vnc-cookie.patch | ||
42 | mirror://${PNAME}/vnc-gcc4.patch | ||
43 | mirror://${PNAME}/vnc-via.patch | ||
44 | mirror://${PNAME}/vnc-idle.patch | ||
45 | mirror://${PNAME}/vnc-fPIC.patch | ||
46 | mirror://${PNAME}/vnc-restart.patch | ||
47 | mirror://${PNAME}/vnc-use-fb.patch | ||
48 | mirror://${PNAME}/vnc-xclients.patch | ||
49 | mirror://${PNAME}/vnc-render-2.patch | ||
50 | mirror://${PNAME}/vnc-nohttpd.patch | ||
51 | mirror://${PNAME}/vnc-vncpasswd.patch | ||
52 | mirror://${PNAME}/vnc-server-modular-xorg-2.patch | ||
53 | niro | 1705 | mirror://${PNAME}/vnc-server-xorg-3.patch |
54 | niro | 1704 | mirror://${PNAME}/vnc-viewer-reparent.patch |
55 | mirror://${PNAME}/vnc-64bit.patch | ||
56 | mirror://${PNAME}/vnc-select.patch | ||
57 | mirror://${PNAME}/vnc-newfbsize.patch | ||
58 | mirror://${PNAME}/vnc-gnome-mouse-locale.patch | ||
59 | mirror://${PNAME}/vnc-ipv6-2.patch | ||
60 | mirror://${PNAME}/vnc-password-stdin.patch | ||
61 | mirror://${PNAME}/vnc-config.patch | ||
62 | mirror://${PNAME}/vnc-render.patch | ||
63 | mirror://${PNAME}/vnc-autotools-2.patch | ||
64 | mirror://${PNAME}/vnc-autotools-compile.patch | ||
65 | mirror://${PNAME}/vnc-server-always-use-fb-2.patch | ||
66 | mirror://${PNAME}/vnc-vsnprintf.patch | ||
67 | mirror://${PNAME}/vnc-manminor.patch | ||
68 | mirror://${PNAME}/vnc-scrollbars.patch | ||
69 | mirror://${PNAME}/vnc-24bit.patch | ||
70 | mirror://${PNAME}/vnc-clipboard.patch | ||
71 | mirror://${PNAME}/vnc-server-allocate.patch | ||
72 | mirror://${PNAME}/vnc-server-bounds.patch | ||
73 | mirror://${PNAME}/vnc-server-includes.patch | ||
74 | mirror://${PNAME}/vnc-server-mieq.patch | ||
75 | mirror://${PNAME}/vnc-server-noxkb.patch | ||
76 | mirror://${PNAME}/vnc-server-paint.patch | ||
77 | mirror://${PNAME}/vnc-server-privates.patch | ||
78 | mirror://${PNAME}/vnc-server-selections.patch | ||
79 | mirror://${PNAME}/Makefile.am | ||
80 | ) | ||
81 | |||
82 | src_prepare() | ||
83 | { | ||
84 | munpack ${SRCFILE} || die | ||
85 | munpack ${XORG} || die | ||
86 | mv ${XORGSDIR} ${XORGDDIR} || die | ||
87 | cd ${SRCDIR} | ||
88 | |||
89 | # client patches | ||
90 | mpatch vnc-cookie.patch || die | ||
91 | mpatch vnc-gcc4.patch || die | ||
92 | mpatch vnc-via.patch || die | ||
93 | mpatch vnc-idle.patch || die | ||
94 | mpatch vnc-fPIC.patch || die | ||
95 | mpatch vnc-restart.patch || die | ||
96 | mpatch vnc-viewer-reparent.patch || die | ||
97 | mpatch vnc-newfbsize.patch || die | ||
98 | mpatch vnc-gnome-mouse-locale.patch || die | ||
99 | # must use -Np1 here, patch create new files | ||
100 | mpatch -Np1 vnc-autotools-2.patch || die | ||
101 | mpatch vnc-ipv6-2.patch || die | ||
102 | mpatch vnc-password-stdin.patch || die | ||
103 | mpatch vnc-vsnprintf.patch || die | ||
104 | mpatch vnc-manminor.patch || die | ||
105 | mpatch vnc-scrollbars.patch || die | ||
106 | |||
107 | # x11 module and server patches | ||
108 | mpatch vnc-use-fb.patch || die | ||
109 | mpatch vnc-xclients.patch || die | ||
110 | mpatch vnc-render-2.patch || die | ||
111 | mpatch vnc-64bit.patch || die | ||
112 | mpatch vnc-select.patch || die | ||
113 | mpatch vnc-config.patch || die | ||
114 | mpatch vnc-autotools-compile.patch || die | ||
115 | mpatch vnc-clipboard.patch || die | ||
116 | |||
117 | # adds -nohttpd option to vncserver | ||
118 | mpatch vnc-nohttpd.patch || die | ||
119 | |||
120 | # fix crashes | ||
121 | mpatch vnc-vncpasswd.patch || die | ||
122 | |||
123 | # patches for the server module to xvnc.cc, before we copy it | ||
124 | mpatch vnc-server-modular-xorg-2.patch || die | ||
125 | mpatch vnc-server-always-use-fb-2.patch || die | ||
126 | mpatch vnc-24bit.patch || die | ||
127 | |||
128 | # needed files for xorg | ||
129 | cd ${SRCDIR}/unix | ||
130 | install -d ${XORGDDIR}/hw/vnc || die | ||
131 | # copy missing makefile | ||
132 | cp ${SOURCEDIR}/${PNAME}/Makefile.am ${XORGDDIR}/hw/vnc || die | ||
133 | cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc ${XORGDDIR}/hw/vnc || die | ||
134 | cp -a xc/programs/Xserver/Xvnc.man ${XORGDDIR}/hw/vnc || die | ||
135 | cp -a xc/programs/Xserver/vnc/*.{h,cc} ${XORGDDIR}/hw/vnc || die | ||
136 | |||
137 | # patches for xorg-src | ||
138 | cd ${XORGDDIR} | ||
139 | niro | 1705 | mpatch vnc-server-xorg-3.patch || die |
140 | niro | 1704 | cd ${SRCDIR} |
141 | mpatch vnc-server-allocate.patch || die | ||
142 | mpatch vnc-server-bounds.patch || die | ||
143 | mpatch vnc-server-mieq.patch || die | ||
144 | mpatch vnc-server-noxkb.patch || die | ||
145 | mpatch vnc-server-paint.patch || die | ||
146 | cd ${XORGDDIR}/hw/vnc | ||
147 | mpatch vnc-server-privates.patch || die | ||
148 | cd ${SRCDIR} | ||
149 | mpatch vnc-server-selections.patch || die | ||
150 | mpatch vnc-server-includes.patch || die | ||
151 | |||
152 | cd ${XORGDDIR} | ||
153 | # this fixes errors like: | ||
154 | # hw/dmx/doc/Makefile.am:24: BUILD_LINUXDOC does not appear in AM_CONDITIONAL | ||
155 | # hw/dmx/doc/Makefile.am:27: BUILD_PDFDOC does not appear in AM_CONDITIONAL | ||
156 | # !!remove this one with the next xorg-server dump!! | ||
157 | echo 'AM_CONDITIONAL([BUILD_PDFDOC], [ test x = y ])' >> configure.ac || die | ||
158 | echo 'AM_CONDITIONAL([BUILD_LINUXDOC], [ test x = y ])' >> configure.ac || die | ||
159 | autoreconf --verbose --install --force || die | ||
160 | |||
161 | # vnc-use-fb.patch patches the configure.in | ||
162 | cd ${SRCDIR}/unix | ||
163 | autoreconf --verbose --install --force || die | ||
164 | |||
165 | cd ${SRCDIR}/common | ||
166 | autoreconf --verbose --install --force || die | ||
167 | } | ||
168 | |||
169 | src_compile() | ||
170 | { | ||
171 | cd ${SRCDIR}/common | ||
172 | mconfigure || die | ||
173 | mmake || die | ||
174 | |||
175 | cd ${SRCDIR}/unix | ||
176 | mconfigure || die | ||
177 | mmake || die | ||
178 | |||
179 | # fixed build issues | ||
180 | export CFLAGS="${CFLAGS} -I/usr/include/drm" | ||
181 | export CXXFLAGS="${CXXFLAGS} -I/usr/include/drm" | ||
182 | |||
183 | # build the x11 module | ||
184 | cd ${XORGDDIR} | ||
185 | mconfigure \ | ||
186 | --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \ | ||
187 | --with-rgb-path=/usr/share/X11/rgb.txt \ | ||
188 | --with-xkb-output=/usr/share/X11/xkb \ | ||
189 | --with-pic \ | ||
190 | --disable-xorg \ | ||
191 | --disable-composite \ | ||
192 | --enable-xtrap \ | ||
193 | --enable-xcsecurity \ | ||
194 | --enable-glx \ | ||
195 | --disable-xnest \ | ||
196 | --disable-xvfb \ | ||
197 | --disable-dmx \ | ||
198 | --disable-xwin \ | ||
199 | --disable-xephyr \ | ||
200 | --disable-kdrive \ | ||
201 | --disable-xorgcfg \ | ||
202 | --disable-xprint \ | ||
203 | --disable-static \ | ||
204 | --disable-xevie \ | ||
205 | --disable-dri \ | ||
206 | --disable-dri2 \ | ||
207 | --disable-config-dbus \ | ||
208 | --disable-config-hal \ | ||
209 | --enable-install-libxf86config \ | ||
210 | || die | ||
211 | |||
212 | mmake || die | ||
213 | } | ||
214 | |||
215 | src_install() | ||
216 | { | ||
217 | cd ${SRCDIR}/common | ||
218 | make DESTDIR=${BINDIR} install || die | ||
219 | |||
220 | cd ${SRCDIR}/unix | ||
221 | make DESTDIR=${BINDIR} install || die | ||
222 | |||
223 | # install server binaries | ||
224 | minstallexec vncserver || die | ||
225 | |||
226 | # install server module and binaries | ||
227 | cd ${XORGDDIR}/hw/vnc | ||
228 | make DESTDIR=${BINDIR} install || die | ||
229 | |||
230 | # not needed | ||
231 | rm ${BINDIR}/usr/$(mlibdir)/xorg/modules/extensions/libvnc.la || die | ||
232 | rm ${BINDIR}/usr/$(mlibdir)/librfb.{a,la,so} || die | ||
233 | |||
234 | # install man pages | ||
235 | mv ${SRCDIR}/unix/vncviewer/vncviewer.{man,1} || die | ||
236 | mv ${SRCDIR}/unix/vncpasswd/vncpasswd.{man,1} || die | ||
237 | mv ${SRCDIR}/unix/vncconfig/vncconfig.{man,1} || die | ||
238 | mv ${SRCDIR}/unix/vncserver.{man,1} || die | ||
239 | mv ${SRCDIR}/unix/x0vncserver/x0vncserver.{man,1} || die | ||
240 | mv ${XORGDDIR}/hw/vnc/Xvnc.{man,1} || die | ||
241 | minstallman ${SRCDIR}/unix/vncviewer/vncviewer.1 || die | ||
242 | minstallman ${SRCDIR}/unix/vncpasswd/vncpasswd.1 || die | ||
243 | minstallman ${SRCDIR}/unix/vncconfig/vncconfig.1 || die | ||
244 | minstallman ${SRCDIR}/unix/vncserver.1 || die | ||
245 | minstallman ${SRCDIR}/unix/x0vncserver/x0vncserver.1 || die | ||
246 | minstallman ${XORGDDIR}/hw/vnc/Xvnc.1 || die | ||
247 | |||
248 | # desktop icon | ||
249 | minstallpixmap vnc-48x48.png vncviewer.png || die | ||
250 | minstall_desktop_icon \ | ||
251 | --name "VNC Viewer" \ | ||
252 | --file "vncviewer" \ | ||
253 | --comment "VNC client application" \ | ||
254 | --exec /usr/bin/vncviewer \ | ||
255 | --icon vncviewer.png \ | ||
256 | --categories "Utility,Network" \ | ||
257 | || die | ||
258 | |||
259 | # docs | ||
260 | cd ${SRCDIR} | ||
261 | minstalldocs README LICENCE.TXT || die | ||
262 | } | ||
263 | |||
264 | postinstall() | ||
265 | { | ||
266 | echo | ||
267 | echo "Add following to /etc/X11/xorg.conf for native X display support:" | ||
268 | echo ' Section "Module"' | ||
269 | echo " ..." | ||
270 | echo ' Load "vnc"' | ||
271 | echo " EndSection" | ||
272 | echo | ||
273 | echo "To enable VNC password authentification use the vncpasswd program:" | ||
274 | echo " 'vncpasswd'" | ||
275 | echo | ||
276 | echo "You will also need to tell the VNC module where the password is stored:" | ||
277 | echo ' Section "Screen"' | ||
278 | echo " ..." | ||
279 | echo ' Option "SecurityTypes" "VncAuth"' | ||
280 | echo ' Option "UserPasswdVerifier" "VncAuth"' | ||
281 | echo ' Option "PasswordFile" "/root/.vnc/passwd"' | ||
282 | echo " EndSection" | ||
283 | echo | ||
284 | } |
Properties
Name | Value |
---|---|
svn:keywords | Id |