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.1.0-r4.ebuild ChangeLog tigervnc-1.1.0-r5.ebuild tigervnc-1.1.0-r3.ebuild
Date: Sun, 13 May 2012 19:29:07
Message-Id: 20120513192852.6FC582004B@flycatcher.gentoo.org
1 armin76 12/05/13 19:28:52
2
3 Modified: ChangeLog
4 Added: tigervnc-1.1.0-r4.ebuild tigervnc-1.1.0-r5.ebuild
5 Removed: tigervnc-1.1.0-r3.ebuild
6 Log:
7 Revision bump to support xorg-server-1.12, bug #412757, refresh xorg-server-1.11 patch for bug #405321
8
9 (Portage version: 2.1.10.53/cvs/Linux ia64, RepoMan options: --force)
10
11 Revision Changes Path
12 1.122 net-misc/tigervnc/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.122&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.122&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?r1=1.121&r2=1.122
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v
21 retrieving revision 1.121
22 retrieving revision 1.122
23 diff -u -r1.121 -r1.122
24 --- ChangeLog 5 May 2012 03:20:43 -0000 1.121
25 +++ ChangeLog 13 May 2012 19:28:52 -0000 1.122
26 @@ -1,6 +1,15 @@
27 # ChangeLog for net-misc/tigervnc
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.121 2012/05/05 03:20:43 jdhore Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.122 2012/05/13 19:28:52 armin76 Exp $
31 +
32 +*tigervnc-1.1.0-r5 (13 May 2012)
33 +*tigervnc-1.1.0-r4 (13 May 2012)
34 +
35 + 13 May 2012; Raúl Porcel <armin76@g.o> -tigervnc-1.1.0-r3.ebuild,
36 + -files/xserver111.patch, +tigervnc-1.1.0-r4.ebuild,
37 + +tigervnc-1.1.0-r5.ebuild, +files/1.1.0-xorg-1.12_fix.patch:
38 + Revision bump to support xorg-server-1.12, bug #412757, refresh
39 + xorg-server-1.11 patch for bug #405321
40
41 05 May 2012; Jeff Horelick <jdhore@g.o> tigervnc-1.1.0-r3.ebuild:
42 dev-util/pkgconfig -> virtual/pkgconfig
43
44
45
46 1.1 net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild?rev=1.1&content-type=text/plain
50
51 Index: tigervnc-1.1.0-r4.ebuild
52 ===================================================================
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r4.ebuild,v 1.1 2012/05/13 19:28:52 armin76 Exp $
56
57 EAPI="1"
58
59 inherit eutils toolchain-funcs multilib autotools
60
61 XSERVER_VERSION="1.11.2"
62 OPENGL_DIR="xorg-x11"
63
64 DESCRIPTION="Remote desktop viewer display system"
65 HOMEPAGE="http://www.tigervnc.org"
66 #SRC_URI="mirror://gentoo/${P}.tar.bz2
67 # http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
68 SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
69 mirror://gentoo/${PN}.png
70 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
71 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2 )"
72
73 LICENSE="GPL-2"
74 SLOT="0"
75 KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86"
76 IUSE="nptl +opengl server +xorgmodule"
77
78 RDEPEND="virtual/jpeg
79 sys-libs/zlib
80 media-libs/freetype
81 x11-libs/libSM
82 x11-libs/libXtst
83 app-admin/eselect-opengl
84 server? (
85 x11-libs/libXi
86 x11-libs/libXfont
87 x11-libs/libXmu
88 x11-libs/libxkbfile
89 x11-libs/libXrender
90 x11-libs/pixman
91 x11-apps/xauth
92 x11-apps/xsetroot
93 x11-misc/xkeyboard-config
94 media-fonts/font-adobe-100dpi
95 media-fonts/font-adobe-75dpi
96 media-fonts/font-alias
97 media-fonts/font-cursor-misc
98 media-fonts/font-misc-misc
99 xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
100 )
101 !net-misc/vnc
102 !net-misc/tightvnc
103 !net-misc/xf4vnc"
104 DEPEND="${RDEPEND}
105 amd64? ( dev-lang/nasm )
106 x86? ( dev-lang/nasm )
107 >=x11-proto/inputproto-1.5
108 >=x11-proto/xextproto-7.0.3
109 >=x11-proto/xproto-7.0.13
110 server? (
111 virtual/pkgconfig
112 media-fonts/font-util
113 x11-misc/util-macros
114 x11-proto/bigreqsproto
115 x11-proto/compositeproto
116 x11-proto/damageproto
117 x11-proto/dri2proto
118 x11-proto/fixesproto
119 x11-proto/fontsproto
120 >=x11-proto/randrproto-1.2.99
121 x11-proto/resourceproto
122 x11-proto/scrnsaverproto
123 x11-proto/trapproto
124 x11-proto/videoproto
125 x11-proto/xcmiscproto
126 x11-proto/xineramaproto
127 x11-proto/xf86bigfontproto
128 x11-proto/xf86dgaproto
129 x11-proto/xf86driproto
130 x11-proto/xf86miscproto
131 x11-proto/xf86vidmodeproto
132 opengl? ( >=x11-proto/glproto-1.4.10 )
133 >=media-libs/mesa-7.1
134 >=x11-proto/renderproto-0.9.3
135 x11-libs/libpciaccess
136 >=x11-libs/xtrans-1.2.2
137 )"
138
139 #S="${WORKDIR}/${PN}"
140
141 pkg_setup() {
142 if ! use server ; then
143 echo
144 einfo "The 'server' USE flag will build tigervnc's server."
145 einfo "If '-server' is chosen only the client is built to save space."
146 einfo "Stop the build now if you need to add 'server' to USE flags.\n"
147 ebeep
148 epause 5
149 else
150 ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
151 OLD_IMPLEM="$(eselect opengl show)"
152 eselect opengl set ${OPENGL_DIR}
153 fi
154 }
155
156 switch_opengl_implem() {
157 # Switch to the xorg implementation.
158 # Use new opengl-update that will not reset user selected
159 # OpenGL interface ...
160 echo
161 eselect opengl set ${OLD_IMPLEM}
162 }
163
164 src_unpack() {
165 unpack ${A}
166 cd "${S}"
167
168 if use server ; then
169 cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
170 fi
171
172 eautoreconf
173 cd unix
174
175 if use server ; then
176 epatch xserver110.patch
177 epatch "${WORKDIR}"/${P}_xorg-1.11.patch
178 cd xserver
179 epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
180 epatch "${FILESDIR}"/1.1.0-gethomedir.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 $(use_enable opengl glx) \
204 $(use_enable nptl glx-tls) \
205 || die "econf server failed"
206 emake || die "emake server failed"
207 fi
208 }
209
210 src_install() {
211 dodoc README.txt
212
213 cd unix
214 emake DESTDIR="${D}" install || die "emake install failed"
215 newman vncviewer/vncviewer.man vncviewer.1
216
217 newicon "${DISTDIR}"/tigervnc.png vncviewer.png
218 make_desktop_entry vncviewer vncviewer vncviewer Network
219
220 if use server ; then
221 cd xserver/hw/vnc
222 emake DESTDIR="${D}" install || die "emake install failed"
223 ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
224
225 newconfd "${FILESDIR}"/${PN}.confd ${PN}
226 newinitd "${FILESDIR}"/${PN}.initd ${PN}
227
228 rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
229 else
230 cd "${D}"
231 for f in vncserver vncpasswd x0vncserver vncconfig; do
232 rm usr/bin/$f
233 rm usr/share/man/man1/$f.1
234 done
235 fi
236 }
237
238 pkg_postinst() {
239 use server && switch_opengl_implem
240 }
241
242
243
244 1.1 net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild
245
246 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild?rev=1.1&view=markup
247 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild?rev=1.1&content-type=text/plain
248
249 Index: tigervnc-1.1.0-r5.ebuild
250 ===================================================================
251 # Copyright 1999-2012 Gentoo Foundation
252 # Distributed under the terms of the GNU General Public License v2
253 # $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r5.ebuild,v 1.1 2012/05/13 19:28:52 armin76 Exp $
254
255 EAPI="1"
256
257 inherit eutils toolchain-funcs multilib autotools
258
259 XSERVER_VERSION="1.12.1"
260 OPENGL_DIR="xorg-x11"
261
262 DESCRIPTION="Remote desktop viewer display system"
263 HOMEPAGE="http://www.tigervnc.org"
264 #SRC_URI="mirror://gentoo/${P}.tar.bz2
265 # http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
266 SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
267 mirror://gentoo/${PN}.png
268 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
269 mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2
270 mirror://gentoo/tigervnc-1.1.0_xorg-1.12.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 epatch "${WORKDIR}"/${P}_xorg-1.12.patch
378 cd xserver
379 epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
380 epatch "${FILESDIR}"/1.1.0-gethomedir.patch
381 epatch "${FILESDIR}"/1.1.0-xorg-1.12_fix.patch
382 eautoreconf
383 fi
384 }
385
386 src_compile() {
387 econf --without-included-zlib --with-system-jpeg || die "econf failed"
388 emake || die "emake failed"
389
390 if use server ; then
391 cd unix/xserver
392 econf \
393 --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
394 --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
395 --disable-static --disable-xinerama \
396 --disable-composite \
397 --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
398 --enable-install-libxf86config \
399 --enable-dri2 \
400 --disable-config-dbus \
401 --disable-config-hal \
402 --with-xmlto=no \
403 --disable-unit-tests \
404 --disable-devel-docs \
405 $(use_enable opengl glx) \
406 $(use_enable nptl glx-tls) \
407 || die "econf server failed"
408 emake || die "emake server failed"
409 fi
410 }
411
412 src_install() {
413 dodoc README.txt
414
415 cd unix
416 emake DESTDIR="${D}" install || die "emake install failed"
417 newman vncviewer/vncviewer.man vncviewer.1
418
419 newicon "${DISTDIR}"/tigervnc.png vncviewer.png
420 make_desktop_entry vncviewer vncviewer vncviewer Network
421
422 if use server ; then
423 cd xserver/hw/vnc
424 emake DESTDIR="${D}" install || die "emake install failed"
425 ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
426
427 newconfd "${FILESDIR}"/${PN}.confd ${PN}
428 newinitd "${FILESDIR}"/${PN}.initd ${PN}
429
430 rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
431 else
432 cd "${D}"
433 for f in vncserver vncpasswd x0vncserver vncconfig; do
434 rm usr/bin/$f
435 rm usr/share/man/man1/$f.1
436 done
437 fi
438 }
439
440 pkg_postinst() {
441 use server && switch_opengl_implem
442 }
Report Message
Find on MARC Find on Google Groups