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

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Tue, 29 Jun 2021 04:58:01
Message-Id: 1624942629.d4978e8ece6c64dc6ecb75594aa8fcacc2d06640.sam@gentoo
1 commit: d4978e8ece6c64dc6ecb75594aa8fcacc2d06640
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Fri Jun 25 07:57:13 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 04:57:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4978e8e
7
8 net-misc/tigervnc: min java :1.8
9
10 Bug: https://bugs.gentoo.org/787635
11 Package-Manager: Portage-3.0.20, Repoman-3.0.2
12 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild | 180 +++++++++++++++++++++++++
16 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 198 ++++++++++++++++++++++++++++
17 2 files changed, 378 insertions(+)
18
19 diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
20 new file mode 100644
21 index 00000000000..576dcb604f1
22 --- /dev/null
23 +++ b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
24 @@ -0,0 +1,180 @@
25 +# Copyright 1999-2021 Gentoo Authors
26 +# Distributed under the terms of the GNU General Public License v2
27 +
28 +EAPI=7
29 +CMAKE_IN_SOURCE_BUILD=1
30 +
31 +inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
32 +
33 +XSERVER_VERSION="1.20.0"
34 +
35 +DESCRIPTION="Remote desktop viewer display system"
36 +HOMEPAGE="http://www.tigervnc.org"
37 +SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
38 + server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
39 +
40 +LICENSE="GPL-2"
41 +SLOT="0"
42 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
43 +IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
44 +
45 +CDEPEND="
46 + virtual/jpeg:0
47 + sys-libs/zlib:=
48 + >=x11-libs/fltk-1.3.1
49 + gnutls? ( net-libs/gnutls:= )
50 + nls? ( virtual/libiconv )
51 + pam? ( sys-libs/pam )
52 + x11-libs/libX11
53 + x11-libs/libXext
54 + x11-libs/libXrender
55 + x11-libs/pixman
56 + server? (
57 + x11-libs/libXau
58 + x11-libs/libXdamage
59 + x11-libs/libXdmcp
60 + x11-libs/libXfont2
61 + x11-libs/libXtst
62 + >=x11-libs/pixman-0.27.2
63 + >=x11-apps/xauth-1.0.3
64 + x11-apps/xsetroot
65 + >=x11-misc/xkeyboard-config-2.4.1-r3
66 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
67 + drm? ( x11-libs/libdrm )
68 + dev-libs/openssl:0=
69 + )
70 + xinerama? ( x11-libs/libXinerama )
71 + "
72 +
73 +RDEPEND="${CDEPEND}
74 + !net-misc/tightvnc
75 + !net-misc/vnc
76 + !net-misc/xf4vnc
77 + java? ( virtual/jre:1.8 )"
78 +
79 +DEPEND="${CDEPEND}
80 + nls? ( sys-devel/gettext )
81 + java? ( virtual/jdk:1.8 )
82 + x11-base/xorg-proto
83 + media-libs/fontconfig
84 + x11-libs/libICE
85 + x11-libs/libSM
86 + x11-libs/libXcursor
87 + x11-libs/libXfixes
88 + x11-libs/libXft
89 + x11-libs/libXi
90 + server? (
91 + dev-libs/libbsd
92 + x11-libs/libxkbfile
93 + x11-libs/libxshmfence
94 + virtual/pkgconfig
95 + media-fonts/font-util
96 + x11-misc/util-macros
97 + >=x11-libs/xtrans-1.3.3
98 + opengl? ( >=media-libs/mesa-10.3.4-r1 )
99 + )"
100 +
101 +src_prepare() {
102 + if use server; then
103 + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
104 + fi
105 +
106 + cmake_src_prepare
107 +
108 + if use server; then
109 + cd unix/xserver || die
110 + eapply "${FILESDIR}"/xserver120.patch
111 + eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
112 + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
113 + eautoreconf
114 + fi
115 +}
116 +
117 +src_configure() {
118 + if use arm || use hppa; then
119 + append-flags "-fPIC"
120 + fi
121 +
122 + local mycmakeargs=(
123 + -DENABLE_GNUTLS=$(usex gnutls)
124 + -DENABLE_NLS=$(usex nls)
125 + -DENABLE_PAM=$(usex pam)
126 + -DBUILD_JAVA=$(usex java)
127 + )
128 +
129 + cmake_src_configure
130 +
131 + if use server; then
132 + cd unix/xserver || die
133 + econf \
134 + $(use_enable opengl glx) \
135 + $(use_enable drm libdrm) \
136 + --disable-config-hal \
137 + --disable-config-udev \
138 + --disable-devel-docs \
139 + --disable-dmx \
140 + --disable-dri \
141 + $(use_enable dri3) \
142 + --disable-glamor \
143 + --disable-kdrive \
144 + --disable-libunwind \
145 + --disable-linux-acpi \
146 + --disable-record \
147 + --disable-selective-werror \
148 + --disable-static \
149 + --disable-unit-tests \
150 + --disable-xephyr \
151 + $(use_enable xinerama) \
152 + --disable-xnest \
153 + --disable-xorg \
154 + --disable-xvfb \
155 + --disable-xwin \
156 + --disable-xwayland \
157 + --enable-dri2 \
158 + --with-pic \
159 + --without-dtrace \
160 + --disable-present \
161 + --with-sha1=libcrypto
162 + fi
163 +}
164 +
165 +src_compile() {
166 + cmake_src_compile
167 +
168 + if use server; then
169 + # deps of the vnc module and the module itself
170 + local d subdirs=(
171 + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
172 + damageext miext Xi xkb composite dix mi os hw/vnc
173 + )
174 + for d in "${subdirs[@]}"; do
175 + emake -C unix/xserver/"${d}"
176 + done
177 + fi
178 +}
179 +
180 +src_install() {
181 + cmake_src_install
182 +
183 + if use server; then
184 + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
185 + if ! use xorgmodule; then
186 + rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
187 + else
188 + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
189 + fi
190 +
191 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
192 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
193 +
194 + systemd_douserunit unix/vncserver/vncserver@.service
195 + else
196 + local f
197 + for f in x0vncserver vncconfig; do
198 + rm "${ED}"/usr/bin/${f} || die
199 + rm "${ED}"/usr/share/man/man1/${f}.1 || die
200 + done
201 + rm -r "${ED}"/usr/{sbin,libexec} || die
202 + rm -r "${ED}"/usr/share/man/man8 || die
203 + fi
204 +}
205
206 diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
207 new file mode 100644
208 index 00000000000..09c050aec41
209 --- /dev/null
210 +++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
211 @@ -0,0 +1,198 @@
212 +# Copyright 1999-2021 Gentoo Authors
213 +# Distributed under the terms of the GNU General Public License v2
214 +
215 +EAPI=6
216 +
217 +CMAKE_IN_SOURCE_BUILD=1
218 +
219 +inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
220 +
221 +XSERVER_VERSION="1.20.0"
222 +
223 +DESCRIPTION="Remote desktop viewer display system"
224 +HOMEPAGE="http://www.tigervnc.org"
225 +SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
226 + server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
227 +
228 +LICENSE="GPL-2"
229 +SLOT="0"
230 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
231 +IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
232 +
233 +CDEPEND="
234 + virtual/jpeg:0
235 + sys-libs/zlib:=
236 + >=x11-libs/fltk-1.3.1
237 + gnutls? ( net-libs/gnutls:= )
238 + nls? ( virtual/libiconv )
239 + pam? ( sys-libs/pam )
240 + x11-libs/libX11
241 + x11-libs/libXext
242 + x11-libs/libXrender
243 + server? (
244 + x11-libs/libXau
245 + x11-libs/libXdamage
246 + x11-libs/libXdmcp
247 + x11-libs/libXfont2
248 + x11-libs/libXtst
249 + >=x11-libs/pixman-0.27.2
250 + >=x11-apps/xauth-1.0.3
251 + x11-apps/xsetroot
252 + >=x11-misc/xkeyboard-config-2.4.1-r3
253 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
254 + drm? ( x11-libs/libdrm )
255 + dev-libs/openssl:0=
256 + )
257 + xinerama? ( x11-libs/libXinerama )
258 + "
259 +
260 +RDEPEND="${CDEPEND}
261 + !net-misc/tightvnc
262 + !net-misc/vnc
263 + !net-misc/xf4vnc
264 + java? ( virtual/jre:1.8 )"
265 +
266 +DEPEND="${CDEPEND}
267 + nls? ( sys-devel/gettext )
268 + java? ( virtual/jdk:1.8 )
269 + x11-base/xorg-proto
270 + media-libs/fontconfig
271 + x11-libs/libICE
272 + x11-libs/libSM
273 + x11-libs/libXcursor
274 + x11-libs/libXfixes
275 + x11-libs/libXft
276 + x11-libs/libXi
277 + server? (
278 + dev-libs/libbsd
279 + x11-libs/libxkbfile
280 + x11-libs/libxshmfence
281 + virtual/pkgconfig
282 + media-fonts/font-util
283 + x11-misc/util-macros
284 + >=x11-libs/xtrans-1.3.3
285 + opengl? ( >=media-libs/mesa-10.3.4-r1 )
286 + )"
287 +
288 +PATCHES=(
289 + "${FILESDIR}"/${P}-030_manpages.patch
290 + "${FILESDIR}"/${P}-055_xstartup.patch
291 +)
292 +
293 +src_prepare() {
294 + if use server ; then
295 + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
296 + fi
297 +
298 + # do not rely on the build system to install docs
299 + sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
300 + cmake/BuildPackages.cmake || die
301 +
302 + cmake-utils_src_prepare
303 +
304 + if use server ; then
305 + cd unix/xserver || die
306 + eapply "${FILESDIR}"/xserver120.patch
307 + eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
308 + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
309 + eautoreconf
310 + fi
311 +}
312 +
313 +src_configure() {
314 + if use arm || use hppa ; then
315 + append-flags "-fPIC"
316 + fi
317 +
318 + local mycmakeargs=(
319 + -DENABLE_GNUTLS=$(usex gnutls)
320 + -DENABLE_NLS=$(usex nls)
321 + -DENABLE_PAM=$(usex pam)
322 + -DBUILD_JAVA=$(usex java)
323 + )
324 +
325 + cmake-utils_src_configure
326 +
327 + if use server ; then
328 + cd unix/xserver || die
329 + econf \
330 + $(use_enable opengl glx) \
331 + $(use_enable drm libdrm) \
332 + --disable-config-hal \
333 + --disable-config-udev \
334 + --disable-devel-docs \
335 + --disable-dmx \
336 + --disable-dri \
337 + $(use_enable dri3) \
338 + --disable-glamor \
339 + --disable-kdrive \
340 + --disable-libunwind \
341 + --disable-linux-acpi \
342 + --disable-record \
343 + --disable-selective-werror \
344 + --disable-static \
345 + --disable-unit-tests \
346 + --disable-xephyr \
347 + $(use_enable xinerama) \
348 + --disable-xnest \
349 + --disable-xorg \
350 + --disable-xvfb \
351 + --disable-xwin \
352 + --disable-xwayland \
353 + --enable-dri2 \
354 + --with-pic \
355 + --without-dtrace \
356 + --disable-present \
357 + --with-sha1=libcrypto
358 + fi
359 +}
360 +
361 +src_compile() {
362 + cmake-utils_src_compile
363 +
364 + if use server ; then
365 + # deps of the vnc module and the module itself
366 + local d subdirs=(
367 + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
368 + composite dix mi os hw/vnc
369 + )
370 + for d in "${subdirs[@]}"; do
371 + emake -C unix/xserver/"${d}"
372 + done
373 + fi
374 +}
375 +
376 +src_install() {
377 + cmake-utils_src_install
378 +
379 + if use server ; then
380 + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
381 + if ! use xorgmodule; then
382 + rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
383 + else
384 + rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
385 + fi
386 +
387 + newconfd "${FILESDIR}"/${PN}.confd ${PN}
388 + newinitd "${FILESDIR}"/${PN}.initd ${PN}
389 +
390 + systemd_douserunit contrib/systemd/user/vncserver@.service
391 + else
392 + local f
393 + cd "${ED}" || die
394 + for f in vncserver x0vncserver vncconfig; do
395 + rm usr/bin/$f || die
396 + rm usr/share/man/man1/$f.1 || die
397 + done
398 + fi
399 +}
400 +
401 +pkg_postinst() {
402 + xdg_desktop_database_update
403 + gnome2_icon_cache_update
404 +}
405 +
406 +pkg_postrm() {
407 + xdg_desktop_database_update
408 + gnome2_icon_cache_update
409 +}
Report Message
Find on MARC Find on Google Groups