Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Thu, 25 May 2017 08:36:45
Message-Id: 1495701401.e65f8a5fa843ae0dd9c2bcf4e9d732b7e5f1d3e0.monsieurp@gentoo
1 commit: e65f8a5fa843ae0dd9c2bcf4e9d732b7e5f1d3e0
2 Author: Takuto Yoshida <otakuto.gentoo <AT> gmail <DOT> com>
3 AuthorDate: Fri May 19 18:07:57 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu May 25 08:36:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e65f8a5f
7
8 net-misc/tigervnc: version bump to 1.8.0.
9
10 Gentoo-Bug: https://bugs.gentoo.org/602330
11 Package-Manager: Portage-2.3.5, Repoman-2.3.2
12 Closes: https://github.com/gentoo/gentoo/pull/4680
13
14 net-misc/tigervnc/Manifest | 1 +
15 net-misc/tigervnc/metadata.xml | 4 +-
16 net-misc/tigervnc/tigervnc-1.8.0.ebuild | 189 ++++++++++++++++++++++++++++++++
17 3 files changed, 191 insertions(+), 3 deletions(-)
18
19 diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
20 index c9c9ed2635d..a1dd114a37b 100644
21 --- a/net-misc/tigervnc/Manifest
22 +++ b/net-misc/tigervnc/Manifest
23 @@ -1,4 +1,5 @@
24 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
25 DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
26 +DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
27 DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
28 DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 WHIRLPOOL 9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555
29
30 diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
31 index ca02735318f..8dfc0c1b9f1 100644
32 --- a/net-misc/tigervnc/metadata.xml
33 +++ b/net-misc/tigervnc/metadata.xml
34 @@ -3,7 +3,7 @@
35 <pkgmetadata>
36 <maintainer type="person">
37 <email>otakuto.gentoo@×××××.com</email>
38 - <name>Tact Yoshida</name>
39 + <name>Takuto Yoshida</name>
40 </maintainer>
41 <maintainer type="project">
42 <email>proxy-maint@g.o</email>
43 @@ -11,12 +11,10 @@
44 </maintainer>
45 <use>
46 <flag name="drm">build with DRM support</flag>
47 - <flag name="nls">Add Native Language Support</flag>
48 <flag name="server">Build TigerVNC server</flag>
49 <flag name="xorgmodule">Build the Xorg module</flag>
50 </use>
51 <upstream>
52 <remote-id type="github">TigerVNC/tigervnc</remote-id>
53 - <remote-id type="sourceforge">tigervnc</remote-id>
54 </upstream>
55 </pkgmetadata>
56
57 diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
58 new file mode 100644
59 index 00000000000..5c9d21e3faf
60 --- /dev/null
61 +++ b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
62 @@ -0,0 +1,189 @@
63 +# Copyright 1999-2017 Gentoo Foundation
64 +# Distributed under the terms of the GNU General Public License v2
65 +
66 +EAPI="6"
67 +
68 +CMAKE_IN_SOURCE_BUILD=1
69 +
70 +inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
71 +
72 +XSERVER_VERSION="1.19.1"
73 +
74 +DESCRIPTION="Remote desktop viewer display system"
75 +HOMEPAGE="http://www.tigervnc.org"
76 +SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
77 + https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
78 + server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
79 +
80 +LICENSE="GPL-2"
81 +SLOT="0"
82 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
83 +IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
84 +
85 +CDEPEND="virtual/jpeg:0
86 + sys-libs/zlib
87 + >=x11-libs/libXtst-1.0.99.2
88 + >=x11-libs/fltk-1.3.1
89 + gnutls? ( net-libs/gnutls:= )
90 + nls? ( virtual/libiconv )
91 + pam? ( virtual/pam )
92 + server? (
93 + dev-lang/perl
94 + >=x11-libs/libXi-1.2.99.1
95 + >=x11-libs/libXfont-1.4.2
96 + >=x11-libs/libxkbfile-1.0.4
97 + x11-libs/libXrender
98 + >=x11-libs/pixman-0.27.2
99 + >=x11-apps/xauth-1.0.3
100 + x11-apps/xsetroot
101 + >=x11-misc/xkeyboard-config-2.4.1-r3
102 + opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
103 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
104 + drm? ( x11-libs/libdrm )
105 + )"
106 +
107 +RDEPEND="${CDEPEND}
108 + !net-misc/tightvnc
109 + !net-misc/vnc
110 + !net-misc/xf4vnc
111 + java? ( >=virtual/jre-1.5:* )"
112 +
113 +DEPEND="${CDEPEND}
114 + amd64? ( dev-lang/nasm )
115 + x86? ( dev-lang/nasm )
116 + >=x11-proto/inputproto-2.2.99.1
117 + >=x11-proto/xextproto-7.2.99.901
118 + >=x11-proto/xproto-7.0.31
119 + x11-libs/libXfont2
120 + nls? ( sys-devel/gettext )
121 + java? ( >=virtual/jdk-1.5 )
122 + server? (
123 + virtual/pkgconfig
124 + media-fonts/font-util
125 + x11-misc/util-macros
126 + >=x11-proto/bigreqsproto-1.1.0
127 + >=x11-proto/compositeproto-0.4
128 + >=x11-proto/damageproto-1.1
129 + >=x11-proto/fixesproto-5.0
130 + >=x11-proto/fontsproto-2.1.3
131 + >=x11-proto/glproto-1.4.17
132 + >=x11-proto/randrproto-1.4.0
133 + >=x11-proto/renderproto-0.11
134 + >=x11-proto/resourceproto-1.2.0
135 + >=x11-proto/scrnsaverproto-1.1
136 + >=x11-proto/videoproto-2.2.2
137 + >=x11-proto/xcmiscproto-1.2.0
138 + >=x11-proto/xineramaproto-1.1.3
139 + >=x11-libs/xtrans-1.3.3
140 + >=x11-proto/dri2proto-2.8
141 + opengl? ( >=media-libs/mesa-10.3.4-r1 )
142 + )"
143 +
144 +PATCHES=(
145 + "${WORKDIR}"/patches/030_manpages.patch
146 + "${WORKDIR}"/patches/055_xstartup.patch
147 +)
148 +
149 +src_prepare() {
150 + if use server ; then
151 + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
152 + fi
153 +
154 + default
155 +
156 + if use server; then
157 + cd unix/xserver || die
158 + eapply "${FILESDIR}/xserver119.patch"
159 + eautoreconf
160 + fi
161 +}
162 +
163 +src_configure() {
164 + use arm || use hppa && append-flags "-fPIC"
165 +
166 + local mycmakeargs=(
167 + -DENABLE_GNUTLS=$(usex gnutls)
168 + -DENABLE_NLS=$(usex nls)
169 + -DENABLE_PAM=$(usex pam)
170 + -DBUILD_JAVA=$(usex java)
171 + )
172 +
173 + cmake-utils_src_configure
174 +
175 + if use server; then
176 + cd unix/xserver || die
177 + econf \
178 + $(use_enable opengl glx) \
179 + $(use_enable drm libdrm) \
180 + --disable-config-hal \
181 + --disable-config-udev \
182 + --disable-devel-docs \
183 + --disable-dmx \
184 + --disable-dri \
185 + --disable-dri3 \
186 + --disable-glamor \
187 + --disable-kdrive \
188 + --disable-libunwind \
189 + --disable-linux-acpi \
190 + --disable-record \
191 + --disable-selective-werror \
192 + --disable-silent-rules \
193 + --disable-static \
194 + --disable-tslib \
195 + --disable-unit-tests \
196 + --disable-xephyr \
197 + --disable-xinerama \
198 + --disable-xnest \
199 + --disable-xorg \
200 + --disable-xvfb \
201 + --disable-xwin \
202 + --disable-xwayland \
203 + --enable-dri2 \
204 + --with-pic \
205 + --without-dtrace \
206 + --disable-present \
207 + --disable-unit-tests
208 + fi
209 +}
210 +
211 +src_compile() {
212 + cmake-utils_src_compile
213 +
214 + if use server; then
215 + # deps of the vnc module and the module itself
216 + local d subdirs=(
217 + fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
218 + composite dix mi os hw/vnc
219 + )
220 + for d in "${subdirs[@]}"; do
221 + emake -C unix/xserver/"${d}"
222 + done
223 + fi
224 +}
225 +
226 +src_install() {
227 + cmake-utils_src_install
228 +
229 + if use server; then
230 + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
231 + if ! use xorgmodule; then
232 + rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
233 + else
234 + rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
235 + fi
236 +
237 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
238 + if use systemd; then
239 + systemd_douserunit contrib/systemd/user/vncserver@.service
240 + else
241 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
242 + fi
243 + else
244 + local f
245 + cd "${ED}" || die
246 + for f in vncserver x0vncserver vncconfig; do
247 + rm usr/bin/$f || die
248 + rm usr/share/man/man1/$f.1 || die
249 + done
250 + fi
251 +}