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

Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/
Date: Wed, 25 Jan 2017 18:05:13
Message-Id: 1485367480.05604b3b28504cf0bbb91d95c7d7d2441e2fcd40.mattst88@gentoo
1 commit: 05604b3b28504cf0bbb91d95c7d7d2441e2fcd40
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 25 06:14:30 2017 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 25 18:04:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05604b3b
7
8 net-misc/tigervnc: Drop old.
9
10 net-misc/tigervnc/Manifest | 4 -
11 net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch | 78 ---------
12 net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild | 201 ----------------------
13 net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild | 180 -------------------
14 4 files changed, 463 deletions(-)
15
16 diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
17 index 94796da..0e5a2ce 100644
18 --- a/net-misc/tigervnc/Manifest
19 +++ b/net-misc/tigervnc/Manifest
20 @@ -1,11 +1,7 @@
21 -DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 5bcaabd8993274a5ce1718efc15fdaf22041003a49a94293eeea9b5b72d3b822 SHA512 f7afc3e7062976b704802e58bb654e46ded5f9dcf8e089d1633e82ce8f5383b60885158319142ac8a58d4d0cf0c8fb51134124bb2dd00dc38fb441bc079b31d4 WHIRLPOOL 33c149415633fe4b0c08cd96c9208c70728acc4b2935835bad1c39037af5aec70c54ad9b98503f6ca93441608e3eef82bc3b17dfcdda97f95ae5dbc41cfcd4a4
22 -DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d WHIRLPOOL 35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99
23 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
24 DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f WHIRLPOOL 420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5
25 DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135 WHIRLPOOL a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec
26 DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004 WHIRLPOOL 63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668
27 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
28 -DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
29 DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
30 -DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
31 DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
32
33 diff --git a/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch b/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch
34 deleted file mode 100644
35 index dd27073..00000000
36 --- a/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch
37 +++ /dev/null
38 @@ -1,78 +0,0 @@
39 -Patch-Mainline: To be upstreamed
40 -References: bnc#900896 CVE-2014-8240
41 -Signed-off-by: Michal Srb <msrb@××××.com>
42 -
43 -Index: tigervnc-1.4.1/unix/x0vncserver/Image.cxx
44 -===================================================================
45 ---- tigervnc-1.4.1.orig/unix/x0vncserver/Image.cxx
46 -+++ tigervnc-1.4.1/unix/x0vncserver/Image.cxx
47 -@@ -80,6 +80,14 @@ void Image::Init(int width, int height)
48 - xim = XCreateImage(dpy, vis, DefaultDepth(dpy, DefaultScreen(dpy)),
49 - ZPixmap, 0, 0, width, height, BitmapPad(dpy), 0);
50 -
51 -+ if (xim->bytes_per_line <= 0 ||
52 -+ xim->height <= 0 ||
53 -+ xim->height >= INT_MAX / xim->bytes_per_line) {
54 -+ vlog.error("Invalid display size");
55 -+ XDestroyImage(xim);
56 -+ exit(1);
57 -+ }
58 -+
59 - xim->data = (char *)malloc(xim->bytes_per_line * xim->height);
60 - if (xim->data == NULL) {
61 - vlog.error("malloc() failed");
62 -@@ -254,6 +262,17 @@ void ShmImage::Init(int width, int heigh
63 - delete shminfo;
64 - shminfo = NULL;
65 - return;
66 -+ }
67 -+
68 -+ if (xim->bytes_per_line <= 0 ||
69 -+ xim->height <= 0 ||
70 -+ xim->height >= INT_MAX / xim->bytes_per_line) {
71 -+ vlog.error("Invalid display size");
72 -+ XDestroyImage(xim);
73 -+ xim = NULL;
74 -+ delete shminfo;
75 -+ shminfo = NULL;
76 -+ return;
77 - }
78 -
79 - shminfo->shmid = shmget(IPC_PRIVATE,
80 -Index: tigervnc-1.4.1/vncviewer/X11PixelBuffer.cxx
81 -===================================================================
82 ---- tigervnc-1.4.1.orig/vncviewer/X11PixelBuffer.cxx
83 -+++ tigervnc-1.4.1/vncviewer/X11PixelBuffer.cxx
84 -@@ -106,6 +106,15 @@ X11PixelBuffer::X11PixelBuffer(int width
85 - if (!xim)
86 - throw rfb::Exception(_("Could not create framebuffer image"));
87 -
88 -+ if (xim->bytes_per_line <= 0 ||
89 -+ xim->height <= 0 ||
90 -+ xim->height >= INT_MAX / xim->bytes_per_line) {
91 -+ if (xim)
92 -+ XDestroyImage(xim);
93 -+ xim = NULL;
94 -+ throw rfb::Exception("Invalid display size");
95 -+ }
96 -+
97 - xim->data = (char*)malloc(xim->bytes_per_line * xim->height);
98 - if (!xim->data)
99 - throw rfb::Exception(_("Not enough memory for framebuffer"));
100 -@@ -172,6 +181,16 @@ int X11PixelBuffer::setupShm()
101 - if (!xim)
102 - goto free_shminfo;
103 -
104 -+ if (xim->bytes_per_line <= 0 ||
105 -+ xim->height <= 0 ||
106 -+ xim->height >= INT_MAX / xim->bytes_per_line) {
107 -+ XDestroyImage(xim);
108 -+ xim = NULL;
109 -+ delete shminfo;
110 -+ shminfo = NULL;
111 -+ throw rfb::Exception("Invalid display size");
112 -+ }
113 -+
114 - shminfo->shmid = shmget(IPC_PRIVATE,
115 - xim->bytes_per_line * xim->height,
116 - IPC_CREAT|0777);
117
118 diff --git a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
119 deleted file mode 100644
120 index f0ff99f..00000000
121 --- a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
122 +++ /dev/null
123 @@ -1,201 +0,0 @@
124 -# Copyright 1999-2015 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -# $Id$
127 -
128 -EAPI="4"
129 -
130 -inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
131 -
132 -PATCHVER="0.1"
133 -XSERVER_VERSION="1.16.0"
134 -OPENGL_DIR="xorg-x11"
135 -#MY_P="${PN}-1.2.80-20130314svn5065"
136 -#S="${WORKDIR}/${MY_P}"
137 -
138 -DESCRIPTION="Remote desktop viewer display system"
139 -HOMEPAGE="http://www.tigervnc.org"
140 -SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
141 - mirror://gentoo/${PN}.png
142 - mirror://gentoo/${PN}-1.3.1-patches-${PATCHVER}.tar.bz2
143 - https://dev.gentoo.org/~armin76/dist/${PN}-1.3.1-patches-${PATCHVER}.tar.bz2
144 - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
145 -
146 -LICENSE="GPL-2"
147 -SLOT="0"
148 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
149 -IUSE="gnutls java nptl +opengl pam server +xorgmodule"
150 -
151 -RDEPEND="virtual/jpeg:0
152 - sys-libs/zlib
153 - >=x11-libs/libXtst-1.0.99.2
154 - >=x11-libs/fltk-1.3.1
155 - gnutls? ( net-libs/gnutls )
156 - java? ( >=virtual/jre-1.5 )
157 - pam? ( virtual/pam )
158 - server? (
159 - dev-lang/perl
160 - >=x11-libs/libXi-1.2.99.1
161 - >=x11-libs/libXfont-1.4.2
162 - >=x11-libs/libxkbfile-1.0.4
163 - x11-libs/libXrender
164 - >=x11-libs/pixman-0.27.2
165 - >=x11-apps/xauth-1.0.3
166 - x11-apps/xsetroot
167 - >=x11-misc/xkeyboard-config-2.4.1-r3
168 - opengl? ( >=app-eselect/eselect-opengl-1.0.8 )
169 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
170 - )
171 - !net-misc/vnc
172 - !net-misc/tightvnc
173 - !net-misc/xf4vnc"
174 -DEPEND="${RDEPEND}
175 - amd64? ( dev-lang/nasm )
176 - x86? ( dev-lang/nasm )
177 - >=x11-proto/inputproto-2.2.99.1
178 - >=x11-proto/xextproto-7.2.99.901
179 - >=x11-proto/xproto-7.0.26
180 - java? ( >=virtual/jdk-1.5 )
181 - server? (
182 - virtual/pkgconfig
183 - media-fonts/font-util
184 - x11-misc/util-macros
185 - >=x11-proto/bigreqsproto-1.1.0
186 - >=x11-proto/compositeproto-0.4
187 - >=x11-proto/damageproto-1.1
188 - >=x11-proto/fixesproto-5.0
189 - >=x11-proto/fontsproto-2.1.3
190 - >=x11-proto/glproto-1.4.17
191 - >=x11-proto/randrproto-1.4.0
192 - >=x11-proto/renderproto-0.11
193 - >=x11-proto/resourceproto-1.2.0
194 - >=x11-proto/scrnsaverproto-1.1
195 - >=x11-proto/videoproto-2.2.2
196 - >=x11-proto/xcmiscproto-1.2.0
197 - >=x11-proto/xineramaproto-1.1.3
198 - >=x11-libs/xtrans-1.3.3
199 - >=x11-proto/dri2proto-2.8
200 - opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
201 - )"
202 -
203 -CMAKE_IN_SOURCE_BUILD=1
204 -
205 -pkg_setup() {
206 - if ! use server ; then
207 - echo
208 - einfo "The 'server' USE flag will build tigervnc's server."
209 - einfo "If '-server' is chosen only the client is built to save space."
210 - einfo "Stop the build now if you need to add 'server' to USE flags.\n"
211 - else
212 - ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
213 - OLD_IMPLEM="$(eselect opengl show)"
214 - eselect opengl set ${OPENGL_DIR}
215 - fi
216 -}
217 -
218 -switch_opengl_implem() {
219 - # Switch to the xorg implementation.
220 - # Use new opengl-update that will not reset user selected
221 - # OpenGL interface ...
222 - echo
223 - eselect opengl set ${OLD_IMPLEM}
224 -}
225 -
226 -src_prepare() {
227 - if use server ; then
228 - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
229 - else
230 - rm "${WORKDIR}"/patches/*_server_*
231 - fi
232 -
233 - EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="*999*" \
234 - EPATCH_FORCE="yes" epatch
235 -
236 - epatch "${FILESDIR}"/1.3.1-CVE-2014-8240.patch
237 -
238 - if use server ; then
239 - cd unix/xserver
240 - epatch "${WORKDIR}"/patches/0999_server_xserver-1.14-rebased.patch
241 - eautoreconf
242 - fi
243 -}
244 -
245 -src_configure() {
246 -
247 - use arm || use hppa && append-flags "-fPIC"
248 -
249 - mycmakeargs=(
250 - -G "Unix Makefiles"
251 - $(cmake-utils_use_enable gnutls GNUTLS)
252 - $(cmake-utils_use_enable pam PAM)
253 - $(cmake-utils_use_build java JAVA)
254 - )
255 -
256 - cmake-utils_src_configure
257 -
258 - if use server; then
259 - cd unix/xserver
260 - econf \
261 - $(use_enable nptl glx-tls) \
262 - $(use_enable opengl glx) \
263 - --disable-config-hal \
264 - --disable-config-udev \
265 - --disable-devel-docs \
266 - --disable-dmx \
267 - --disable-dri \
268 - --disable-dri3 \
269 - --disable-kdrive \
270 - --disable-selective-werror \
271 - --disable-silent-rules \
272 - --disable-static \
273 - --disable-unit-tests \
274 - --disable-xephyr \
275 - --disable-xinerama \
276 - --disable-xnest \
277 - --disable-xorg \
278 - --disable-xvfb \
279 - --disable-xwin \
280 - --disable-xwayland \
281 - --enable-dri2 \
282 - --with-pic \
283 - --without-dtrace \
284 - --disable-present \
285 - --disable-unit-tests
286 - fi
287 -}
288 -
289 -src_compile() {
290 - cmake-utils_src_compile
291 -
292 - if use server ; then
293 - cd unix/xserver
294 - emake
295 - fi
296 -}
297 -
298 -src_install() {
299 - cmake-utils_src_install
300 -
301 - newicon "${DISTDIR}"/tigervnc.png vncviewer.png
302 - make_desktop_entry vncviewer vncviewer vncviewer Network
303 -
304 - if use server ; then
305 - cd unix/xserver/hw/vnc
306 - emake DESTDIR="${D}" install
307 - ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
308 -
309 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
310 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
311 -
312 - rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
313 - else
314 - cd "${D}"
315 - for f in vncserver vncpasswd x0vncserver vncconfig; do
316 - rm usr/bin/$f
317 - rm usr/share/man/man1/$f.1
318 - done
319 - fi
320 -}
321 -
322 -pkg_postinst() {
323 - use server && switch_opengl_implem
324 -}
325
326 diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild
327 deleted file mode 100644
328 index bc81240..00000000
329 --- a/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild
330 +++ /dev/null
331 @@ -1,180 +0,0 @@
332 -# Copyright 1999-2016 Gentoo Foundation
333 -# Distributed under the terms of the GNU General Public License v2
334 -# $Id$
335 -
336 -EAPI=6
337 -
338 -inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2
339 -
340 -XSERVER_VERSION="1.18.0"
341 -
342 -DESCRIPTION="Remote desktop viewer display system"
343 -HOMEPAGE="http://www.tigervnc.org"
344 -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
345 - mirror://gentoo/${PN}.png
346 - https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
347 - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
348 -
349 -LICENSE="GPL-2"
350 -SLOT="0"
351 -KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
352 -IUSE="gnutls java +opengl pam server +xorgmodule"
353 -
354 -RDEPEND="virtual/jpeg:0
355 - sys-libs/zlib
356 - >=x11-libs/libXtst-1.0.99.2
357 - >=x11-libs/fltk-1.3.1
358 - gnutls? ( net-libs/gnutls )
359 - java? ( >=virtual/jre-1.5:* )
360 - pam? ( virtual/pam )
361 - server? (
362 - dev-lang/perl
363 - >=x11-libs/libXi-1.2.99.1
364 - >=x11-libs/libXfont-1.4.2
365 - >=x11-libs/libxkbfile-1.0.4
366 - x11-libs/libXrender
367 - >=x11-libs/pixman-0.27.2
368 - >=x11-apps/xauth-1.0.3
369 - x11-apps/xsetroot
370 - >=x11-misc/xkeyboard-config-2.4.1-r3
371 - opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
372 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
373 - )
374 - !net-misc/vnc
375 - !net-misc/tightvnc
376 - !net-misc/xf4vnc"
377 -DEPEND="${RDEPEND}
378 - amd64? ( dev-lang/nasm )
379 - x86? ( dev-lang/nasm )
380 - >=x11-proto/inputproto-2.2.99.1
381 - >=x11-proto/xextproto-7.2.99.901
382 - >=x11-proto/xproto-7.0.26
383 - java? ( >=virtual/jdk-1.5 )
384 - server? (
385 - virtual/pkgconfig
386 - media-fonts/font-util
387 - x11-misc/util-macros
388 - >=x11-proto/bigreqsproto-1.1.0
389 - >=x11-proto/compositeproto-0.4
390 - >=x11-proto/damageproto-1.1
391 - >=x11-proto/fixesproto-5.0
392 - >=x11-proto/fontsproto-2.1.3
393 - >=x11-proto/glproto-1.4.17
394 - >=x11-proto/randrproto-1.4.0
395 - >=x11-proto/renderproto-0.11
396 - >=x11-proto/resourceproto-1.2.0
397 - >=x11-proto/scrnsaverproto-1.1
398 - >=x11-proto/videoproto-2.2.2
399 - >=x11-proto/xcmiscproto-1.2.0
400 - >=x11-proto/xineramaproto-1.1.3
401 - >=x11-libs/xtrans-1.3.3
402 - >=x11-proto/dri2proto-2.8
403 - opengl? ( >=media-libs/mesa-10.3.4-r1 )
404 - )"
405 -
406 -CMAKE_IN_SOURCE_BUILD=1
407 -
408 -src_prepare() {
409 - if use server ; then
410 - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver
411 - fi
412 -
413 - eapply "${WORKDIR}"/patches/010_libvnc-os.patch
414 - eapply "${WORKDIR}"/patches/030_manpages.patch
415 - eapply "${WORKDIR}"/patches/055_xstartup.patch
416 - eapply "${FILESDIR}"/${P}-xorg118-1.patch
417 -
418 - default
419 -
420 - if use server ; then
421 - cd unix/xserver || die
422 - eapply ../xserver117.patch
423 - eautoreconf
424 - fi
425 -}
426 -
427 -src_configure() {
428 - use arm || use hppa && append-flags "-fPIC"
429 -
430 - local mycmakeargs=(
431 - -DENABLE_GNUTLS=$(usex gnutls)
432 - -DENABLE_PAM=$(usex pam)
433 - -DBUILD_JAVA=$(usex java)
434 - )
435 -
436 - cmake-utils_src_configure
437 -
438 - if use server; then
439 - cd unix/xserver || die
440 - econf \
441 - $(use_enable opengl glx) \
442 - --disable-config-hal \
443 - --disable-config-udev \
444 - --disable-devel-docs \
445 - --disable-dmx \
446 - --disable-dri \
447 - --disable-dri3 \
448 - --disable-glamor \
449 - --disable-kdrive \
450 - --disable-libunwind \
451 - --disable-linux-acpi \
452 - --disable-record \
453 - --disable-selective-werror \
454 - --disable-silent-rules \
455 - --disable-static \
456 - --disable-tslib \
457 - --disable-unit-tests \
458 - --disable-xephyr \
459 - --disable-xinerama \
460 - --disable-xnest \
461 - --disable-xorg \
462 - --disable-xvfb \
463 - --disable-xwin \
464 - --disable-xwayland \
465 - --enable-dri2 \
466 - --with-pic \
467 - --without-dtrace \
468 - --disable-present \
469 - --disable-unit-tests
470 - fi
471 -}
472 -
473 -src_compile() {
474 - cmake-utils_src_compile
475 -
476 - if use server; then
477 - # deps of the vnc module and the module itself
478 - local d subdirs=(
479 - fb xfixes Xext dbe glx randr render damageext miext Xi xkb
480 - composite dix mi os hw/vnc
481 - )
482 - for d in "${subdirs[@]}"; do
483 - emake -C unix/xserver/"${d}"
484 - done
485 - fi
486 -}
487 -
488 -src_install() {
489 - cmake-utils_src_install
490 -
491 - newicon "${DISTDIR}"/tigervnc.png vncviewer.png
492 - make_desktop_entry vncviewer vncviewer vncviewer Network
493 -
494 - if use server ; then
495 - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
496 - if ! use xorgmodule; then
497 - rm -r "${D}"/usr/$(get_libdir)/xorg || die
498 - else
499 - rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
500 - fi
501 -
502 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
503 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
504 - else
505 - cd "${D}" || die
506 - for f in vncserver vncpasswd x0vncserver vncconfig; do
507 - rm usr/bin/$f || die
508 - rm usr/share/man/man1/$f.1 || die
509 - done
510 - fi
511 -}
Report Message
Find on MARC Find on Google Groups