Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Raul Porcel (armin76)" <armin76@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/tigervnc: ChangeLog tigervnc-1.1.0-r7.ebuild tigervnc-1.1.0-r6.ebuild
Date: Sun, 03 Jun 2012 18:37:56
Message-Id: 20120603183741.B97F22004B@flycatcher.gentoo.org
1 armin76 12/06/03 18:37:41
2
3 Modified: ChangeLog
4 Added: tigervnc-1.1.0-r7.ebuild tigervnc-1.1.0-r6.ebuild
5 Log:
6 Revision bump wrt #418193
7
8 (Portage version: 2.1.10.53/cvs/Linux ia64)
9
10 Revision Changes Path
11 1.123 net-misc/tigervnc/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.123&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.123&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?r1=1.122&r2=1.123
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v
20 retrieving revision 1.122
21 retrieving revision 1.123
22 diff -u -r1.122 -r1.123
23 --- ChangeLog 13 May 2012 19:28:52 -0000 1.122
24 +++ ChangeLog 3 Jun 2012 18:37:41 -0000 1.123
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-misc/tigervnc
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.122 2012/05/13 19:28:52 armin76 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.123 2012/06/03 18:37:41 armin76 Exp $
30 +
31 +*tigervnc-1.1.0-r7 (03 Jun 2012)
32 +*tigervnc-1.1.0-r6 (03 Jun 2012)
33 +
34 + 03 Jun 2012; Raúl Porcel <armin76@g.o> +tigervnc-1.1.0-r6.ebuild,
35 + +tigervnc-1.1.0-r7.ebuild:
36 + Revision bump wrt #418193
37
38 *tigervnc-1.1.0-r5 (13 May 2012)
39 *tigervnc-1.1.0-r4 (13 May 2012)
40
41
42
43 1.1 net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild?rev=1.1&content-type=text/plain
47
48 Index: tigervnc-1.1.0-r7.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild,v 1.1 2012/06/03 18:37:41 armin76 Exp $
53
54 EAPI="1"
55
56 inherit eutils toolchain-funcs multilib autotools
57
58 XSERVER_VERSION="1.12.2"
59 OPENGL_DIR="xorg-x11"
60
61 DESCRIPTION="Remote desktop viewer display system"
62 HOMEPAGE="http://www.tigervnc.org"
63 #SRC_URI="mirror://gentoo/${P}.tar.bz2
64 # http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
65 SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
66 mirror://gentoo/${PN}.png
67 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
68 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2
69 mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )"
70
71 LICENSE="GPL-2"
72 SLOT="0"
73 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
74 IUSE="nptl +opengl server +xorgmodule"
75
76 RDEPEND="virtual/jpeg
77 sys-libs/zlib
78 media-libs/freetype
79 x11-libs/libSM
80 x11-libs/libXtst
81 app-admin/eselect-opengl
82 server? (
83 x11-libs/libXi
84 x11-libs/libXfont
85 x11-libs/libXmu
86 x11-libs/libxkbfile
87 x11-libs/libXrender
88 x11-libs/pixman
89 x11-apps/xauth
90 x11-apps/xsetroot
91 x11-misc/xkeyboard-config
92 media-fonts/font-adobe-100dpi
93 media-fonts/font-adobe-75dpi
94 media-fonts/font-alias
95 media-fonts/font-cursor-misc
96 media-fonts/font-misc-misc
97 xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
98 )
99 !net-misc/vnc
100 !net-misc/tightvnc
101 !net-misc/xf4vnc"
102 DEPEND="${RDEPEND}
103 amd64? ( dev-lang/nasm )
104 x86? ( dev-lang/nasm )
105 >=x11-proto/inputproto-1.5
106 >=x11-proto/xextproto-7.0.3
107 >=x11-proto/xproto-7.0.13
108 server? (
109 virtual/pkgconfig
110 media-fonts/font-util
111 x11-misc/util-macros
112 x11-proto/bigreqsproto
113 x11-proto/compositeproto
114 x11-proto/damageproto
115 x11-proto/dri2proto
116 x11-proto/fixesproto
117 x11-proto/fontsproto
118 >=x11-proto/randrproto-1.2.99
119 x11-proto/resourceproto
120 x11-proto/scrnsaverproto
121 x11-proto/trapproto
122 x11-proto/videoproto
123 x11-proto/xcmiscproto
124 x11-proto/xineramaproto
125 x11-proto/xf86bigfontproto
126 x11-proto/xf86dgaproto
127 x11-proto/xf86driproto
128 x11-proto/xf86miscproto
129 x11-proto/xf86vidmodeproto
130 opengl? ( >=x11-proto/glproto-1.4.10 )
131 >=media-libs/mesa-7.1
132 >=x11-proto/renderproto-0.9.3
133 x11-libs/libpciaccess
134 >=x11-libs/xtrans-1.2.2
135 )"
136
137 #S="${WORKDIR}/${PN}"
138
139 pkg_setup() {
140 if ! use server ; then
141 echo
142 einfo "The 'server' USE flag will build tigervnc's server."
143 einfo "If '-server' is chosen only the client is built to save space."
144 einfo "Stop the build now if you need to add 'server' to USE flags.\n"
145 ebeep
146 epause 5
147 else
148 ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
149 OLD_IMPLEM="$(eselect opengl show)"
150 eselect opengl set ${OPENGL_DIR}
151 fi
152 }
153
154 switch_opengl_implem() {
155 # Switch to the xorg implementation.
156 # Use new opengl-update that will not reset user selected
157 # OpenGL interface ...
158 echo
159 eselect opengl set ${OLD_IMPLEM}
160 }
161
162 src_unpack() {
163 unpack ${A}
164 cd "${S}"
165
166 if use server ; then
167 cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
168 fi
169
170 eautoreconf
171 cd unix
172
173 if use server ; then
174 epatch xserver110.patch
175 epatch "${WORKDIR}"/${P}_xorg-1.11.patch
176 epatch "${WORKDIR}"/${P}_xorg-1.12.patch
177 cd xserver
178 epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
179 epatch "${FILESDIR}"/1.1.0-gethomedir.patch
180 epatch "${FILESDIR}"/1.1.0-xorg-1.12_fix.patch
181 eautoreconf
182 fi
183 }
184
185 src_compile() {
186 econf --without-included-zlib --with-system-jpeg || die "econf failed"
187 emake || die "emake failed"
188
189 if use server ; then
190 cd unix/xserver
191 econf \
192 --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
193 --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
194 --disable-static --disable-xinerama \
195 --disable-composite \
196 --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
197 --enable-install-libxf86config \
198 --enable-dri2 \
199 --disable-config-dbus \
200 --disable-config-hal \
201 --with-xmlto=no \
202 --disable-unit-tests \
203 --disable-devel-docs \
204 $(use_enable opengl glx) \
205 $(use_enable nptl glx-tls) \
206 || die "econf server failed"
207 emake || die "emake server failed"
208 fi
209 }
210
211 src_install() {
212 dodoc README.txt
213
214 cd unix
215 emake DESTDIR="${D}" install || die "emake install failed"
216 newman vncviewer/vncviewer.man vncviewer.1
217
218 newicon "${DISTDIR}"/tigervnc.png vncviewer.png
219 make_desktop_entry vncviewer vncviewer vncviewer Network
220
221 if use server ; then
222 cd xserver/hw/vnc
223 emake DESTDIR="${D}" install || die "emake install failed"
224 ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
225
226 newconfd "${FILESDIR}"/${PN}.confd ${PN}
227 newinitd "${FILESDIR}"/${PN}.initd ${PN}
228
229 rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
230 else
231 cd "${D}"
232 for f in vncserver vncpasswd x0vncserver vncconfig; do
233 rm usr/bin/$f
234 rm usr/share/man/man1/$f.1
235 done
236 fi
237 }
238
239 pkg_postinst() {
240 use server && switch_opengl_implem
241 }
242
243
244
245 1.1 net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild
246
247 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild?rev=1.1&view=markup
248 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild?rev=1.1&content-type=text/plain
249
250 Index: tigervnc-1.1.0-r6.ebuild
251 ===================================================================
252 # Copyright 1999-2012 Gentoo Foundation
253 # Distributed under the terms of the GNU General Public License v2
254 # $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r6.ebuild,v 1.1 2012/06/03 18:37:41 armin76 Exp $
255
256 EAPI="1"
257
258 inherit eutils toolchain-funcs multilib autotools
259
260 XSERVER_VERSION="1.11.4"
261 OPENGL_DIR="xorg-x11"
262
263 DESCRIPTION="Remote desktop viewer display system"
264 HOMEPAGE="http://www.tigervnc.org"
265 #SRC_URI="mirror://gentoo/${P}.tar.bz2
266 # http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
267 SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
268 mirror://gentoo/${PN}.png
269 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
270 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )"
271
272 LICENSE="GPL-2"
273 SLOT="0"
274 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
275 IUSE="nptl +opengl server +xorgmodule"
276
277 RDEPEND="virtual/jpeg
278 sys-libs/zlib
279 media-libs/freetype
280 x11-libs/libSM
281 x11-libs/libXtst
282 app-admin/eselect-opengl
283 server? (
284 x11-libs/libXi
285 x11-libs/libXfont
286 x11-libs/libXmu
287 x11-libs/libxkbfile
288 x11-libs/libXrender
289 x11-libs/pixman
290 x11-apps/xauth
291 x11-apps/xsetroot
292 x11-misc/xkeyboard-config
293 media-fonts/font-adobe-100dpi
294 media-fonts/font-adobe-75dpi
295 media-fonts/font-alias
296 media-fonts/font-cursor-misc
297 media-fonts/font-misc-misc
298 xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
299 )
300 !net-misc/vnc
301 !net-misc/tightvnc
302 !net-misc/xf4vnc"
303 DEPEND="${RDEPEND}
304 amd64? ( dev-lang/nasm )
305 x86? ( dev-lang/nasm )
306 >=x11-proto/inputproto-1.5
307 >=x11-proto/xextproto-7.0.3
308 >=x11-proto/xproto-7.0.13
309 server? (
310 virtual/pkgconfig
311 media-fonts/font-util
312 x11-misc/util-macros
313 x11-proto/bigreqsproto
314 x11-proto/compositeproto
315 x11-proto/damageproto
316 x11-proto/dri2proto
317 x11-proto/fixesproto
318 x11-proto/fontsproto
319 >=x11-proto/randrproto-1.2.99
320 x11-proto/resourceproto
321 x11-proto/scrnsaverproto
322 x11-proto/trapproto
323 x11-proto/videoproto
324 x11-proto/xcmiscproto
325 x11-proto/xineramaproto
326 x11-proto/xf86bigfontproto
327 x11-proto/xf86dgaproto
328 x11-proto/xf86driproto
329 x11-proto/xf86miscproto
330 x11-proto/xf86vidmodeproto
331 opengl? ( >=x11-proto/glproto-1.4.10 )
332 >=media-libs/mesa-7.1
333 >=x11-proto/renderproto-0.9.3
334 x11-libs/libpciaccess
335 >=x11-libs/xtrans-1.2.2
336 )"
337
338 #S="${WORKDIR}/${PN}"
339
340 pkg_setup() {
341 if ! use server ; then
342 echo
343 einfo "The 'server' USE flag will build tigervnc's server."
344 einfo "If '-server' is chosen only the client is built to save space."
345 einfo "Stop the build now if you need to add 'server' to USE flags.\n"
346 ebeep
347 epause 5
348 else
349 ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
350 OLD_IMPLEM="$(eselect opengl show)"
351 eselect opengl set ${OPENGL_DIR}
352 fi
353 }
354
355 switch_opengl_implem() {
356 # Switch to the xorg implementation.
357 # Use new opengl-update that will not reset user selected
358 # OpenGL interface ...
359 echo
360 eselect opengl set ${OLD_IMPLEM}
361 }
362
363 src_unpack() {
364 unpack ${A}
365 cd "${S}"
366
367 if use server ; then
368 cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
369 fi
370
371 eautoreconf
372 cd unix
373
374 if use server ; then
375 epatch xserver110.patch
376 epatch "${WORKDIR}"/${P}_xorg-1.11.patch
377 cd xserver
378 epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
379 epatch "${FILESDIR}"/1.1.0-gethomedir.patch
380 eautoreconf
381 fi
382 }
383
384 src_compile() {
385 econf --without-included-zlib --with-system-jpeg || die "econf failed"
386 emake || die "emake failed"
387
388 if use server ; then
389 cd unix/xserver
390 econf \
391 --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
392 --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
393 --disable-static --disable-xinerama \
394 --disable-composite \
395 --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
396 --enable-install-libxf86config \
397 --enable-dri2 \
398 --disable-config-dbus \
399 --disable-config-hal \
400 --with-xmlto=no \
401 --disable-unit-tests \
402 $(use_enable opengl glx) \
403 $(use_enable nptl glx-tls) \
404 || die "econf server failed"
405 emake || die "emake server failed"
406 fi
407 }
408
409 src_install() {
410 dodoc README.txt
411
412 cd unix
413 emake DESTDIR="${D}" install || die "emake install failed"
414 newman vncviewer/vncviewer.man vncviewer.1
415
416 newicon "${DISTDIR}"/tigervnc.png vncviewer.png
417 make_desktop_entry vncviewer vncviewer vncviewer Network
418
419 if use server ; then
420 cd xserver/hw/vnc
421 emake DESTDIR="${D}" install || die "emake install failed"
422 ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
423
424 newconfd "${FILESDIR}"/${PN}.confd ${PN}
425 newinitd "${FILESDIR}"/${PN}.initd ${PN}
426
427 rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
428 else
429 cd "${D}"
430 for f in vncserver vncpasswd x0vncserver vncconfig; do
431 rm usr/bin/$f
432 rm usr/share/man/man1/$f.1
433 done
434 fi
435 }
436
437 pkg_postinst() {
438 use server && switch_opengl_implem
439 }
Report Message
Find on MARC Find on Google Groups