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