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-r2.ebuild
Date: Sun, 01 Jan 2012 11:58:09
Message-Id: 20120101115756.A129B2004B@flycatcher.gentoo.org
1 armin76 12/01/01 11:57:56
2
3 Modified: ChangeLog
4 Added: tigervnc-1.1.0-r2.ebuild
5 Log:
6 Add patch from upstream to fix bug #395645, straight to stable
7
8 (Portage version: 2.1.10.43/cvs/Linux ia64, RepoMan options: --force)
9
10 Revision Changes Path
11 1.117 net-misc/tigervnc/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.117&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?rev=1.117&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/ChangeLog?r1=1.116&r2=1.117
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v
20 retrieving revision 1.116
21 retrieving revision 1.117
22 diff -u -r1.116 -r1.117
23 --- ChangeLog 27 Dec 2011 21:15:45 -0000 1.116
24 +++ ChangeLog 1 Jan 2012 11:57:56 -0000 1.117
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-misc/tigervnc
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.116 2011/12/27 21:15:45 maekke Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.117 2012/01/01 11:57:56 armin76 Exp $
31 +
32 +*tigervnc-1.1.0-r2 (01 Jan 2012)
33 +
34 + 01 Jan 2012; Raúl Porcel <armin76@g.o>
35 + +files/1.1.0-export_missing_symbol.patch, +tigervnc-1.1.0-r2.ebuild:
36 + Add patch from upstream to fix bug #395645, straight to stable
37
38 27 Dec 2011; Markus Meier <maekke@g.o> tigervnc-1.1.0-r1.ebuild:
39 x86 stable, bug #394395
40
41
42
43 1.1 net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r2.ebuild?rev=1.1&content-type=text/plain
47
48 Index: tigervnc-1.1.0-r2.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-r2.ebuild,v 1.1 2012/01/01 11:57:56 armin76 Exp $
53
54 EAPI="1"
55
56 inherit eutils toolchain-funcs multilib autotools
57
58 XSERVER_VERSION="1.11.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
69 LICENSE="GPL-2"
70 SLOT="0"
71 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
72 IUSE="nptl +opengl server +xorgmodule"
73
74 RDEPEND="virtual/jpeg
75 sys-libs/zlib
76 media-libs/freetype
77 x11-libs/libSM
78 x11-libs/libXtst
79 app-admin/eselect-opengl
80 server? (
81 x11-libs/libXi
82 x11-libs/libXfont
83 x11-libs/libXmu
84 x11-libs/libxkbfile
85 x11-libs/libXrender
86 x11-libs/pixman
87 x11-apps/xauth
88 x11-apps/xsetroot
89 x11-misc/xkeyboard-config
90 media-fonts/font-adobe-100dpi
91 media-fonts/font-adobe-75dpi
92 media-fonts/font-alias
93 media-fonts/font-cursor-misc
94 media-fonts/font-misc-misc
95 xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
96 )
97 !net-misc/vnc
98 !net-misc/tightvnc
99 !net-misc/xf4vnc"
100 DEPEND="${RDEPEND}
101 amd64? ( dev-lang/nasm )
102 x86? ( dev-lang/nasm )
103 >=x11-proto/inputproto-1.5
104 >=x11-proto/xextproto-7.0.3
105 >=x11-proto/xproto-7.0.13
106 server? (
107 x11-misc/util-macros
108 x11-proto/bigreqsproto
109 x11-proto/compositeproto
110 x11-proto/damageproto
111 x11-proto/dri2proto
112 x11-proto/fixesproto
113 x11-proto/fontsproto
114 >=x11-proto/randrproto-1.2.99
115 x11-proto/resourceproto
116 x11-proto/scrnsaverproto
117 x11-proto/trapproto
118 x11-proto/videoproto
119 x11-proto/xcmiscproto
120 x11-proto/xineramaproto
121 x11-proto/xf86bigfontproto
122 x11-proto/xf86dgaproto
123 x11-proto/xf86driproto
124 x11-proto/xf86miscproto
125 x11-proto/xf86vidmodeproto
126 opengl? ( >=x11-proto/glproto-1.4.10 )
127 >=media-libs/mesa-7.1
128 >=x11-proto/renderproto-0.9.3
129 x11-libs/libpciaccess
130 >=x11-libs/xtrans-1.2.2
131 )"
132
133 #S="${WORKDIR}/${PN}"
134
135 pkg_setup() {
136 if ! use server ; then
137 echo
138 einfo "The 'server' USE flag will build tigervnc's server."
139 einfo "If '-server' is chosen only the client is built to save space."
140 einfo "Stop the build now if you need to add 'server' to USE flags.\n"
141 ebeep
142 epause 5
143 else
144 ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
145 OLD_IMPLEM="$(eselect opengl show)"
146 eselect opengl set ${OPENGL_DIR}
147 fi
148 }
149
150 switch_opengl_implem() {
151 # Switch to the xorg implementation.
152 # Use new opengl-update that will not reset user selected
153 # OpenGL interface ...
154 echo
155 eselect opengl set ${OLD_IMPLEM}
156 }
157
158 src_unpack() {
159 unpack ${A}
160 cd "${S}"
161
162 if use server ; then
163 cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
164 fi
165
166 eautoreconf
167 cd unix
168
169 if use server ; then
170 epatch xserver110.patch
171 epatch "${FILESDIR}"/xserver111.patch
172 cd xserver
173 epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
174 eautoreconf
175 fi
176 }
177
178 src_compile() {
179 econf --without-included-zlib --with-system-jpeg || die "econf failed"
180 emake || die "emake failed"
181
182 if use server ; then
183 cd unix/xserver
184 econf \
185 --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
186 --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
187 --disable-static --disable-xinerama \
188 --disable-composite \
189 --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
190 --enable-install-libxf86config \
191 --enable-dri2 \
192 --disable-config-dbus \
193 --disable-config-hal \
194 --with-xmlto=no \
195 --disable-unit-tests \
196 $(use_enable opengl glx) \
197 $(use_enable nptl glx-tls) \
198 || die "econf server failed"
199 emake || die "emake server failed"
200 fi
201 }
202
203 src_install() {
204 dodoc README.txt
205
206 cd unix
207 emake DESTDIR="${D}" install || die "emake install failed"
208 newman vncviewer/vncviewer.man vncviewer.1
209
210 newicon "${DISTDIR}"/tigervnc.png vncviewer.png
211 make_desktop_entry vncviewer vncviewer vncviewer Network
212
213 if use server ; then
214 cd xserver/hw/vnc
215 emake DESTDIR="${D}" install || die "emake install failed"
216 ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
217
218 newconfd "${FILESDIR}"/${PN}.confd ${PN}
219 newinitd "${FILESDIR}"/${PN}.initd ${PN}
220
221 rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
222 else
223 cd "${D}"
224 for f in vncserver vncpasswd x0vncserver vncconfig; do
225 rm usr/bin/$f
226 rm usr/share/man/man1/$f.1
227 done
228 fi
229 }
230
231 pkg_postinst() {
232 use server && switch_opengl_implem
233 }
Report Message
Find on MARC Find on Google Groups