Gentoo Archives: gentoo-commits

From: Viorel Munteanu <ceamac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Wed, 01 Mar 2023 06:15:11
Message-Id: 1677651257.47af1aeaf2231512af7f700ae1ce35d441178cb9.ceamac@gentoo
1 commit: 47af1aeaf2231512af7f700ae1ce35d441178cb9
2 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 28 18:54:15 2023 +0000
4 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 06:14:17 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47af1aea
7
8 net-misc/tigervnc: add 1.13.1
9
10 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
11
12 net-misc/tigervnc/Manifest | 1 +
13 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 227 +++++++++++++++++++++++++++++++
14 2 files changed, 228 insertions(+)
15
16 diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
17 index a2a9e9e7c73c..3d98f06d8bf5 100644
18 --- a/net-misc/tigervnc/Manifest
19 +++ b/net-misc/tigervnc/Manifest
20 @@ -1,4 +1,5 @@
21 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
22 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
23 DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8
24 +DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
25 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
26
27 diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
28 new file mode 100644
29 index 000000000000..fc6cb7d77a07
30 --- /dev/null
31 +++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
32 @@ -0,0 +1,227 @@
33 +# Copyright 1999-2023 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +CMAKE_IN_SOURCE_BUILD=1
39 +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
40 +
41 +XSERVER_VERSION="21.1.1"
42 +
43 +DESCRIPTION="Remote desktop viewer display system"
44 +HOMEPAGE="https://tigervnc.org"
45 +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
46 +
47 +if [[ ${PV} == *9999 ]]; then
48 + inherit git-r3
49 + EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
50 +else
51 + SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
52 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
53 +fi
54 +
55 +LICENSE="GPL-2"
56 +SLOT="0"
57 +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
58 +REQUIRED_USE="
59 + dri3? ( drm )
60 + java? ( viewer )
61 + opengl? ( server )
62 + || ( server viewer )
63 +"
64 +
65 +# TODO: sys-libs/libselinux
66 +COMMON_DEPEND="
67 + dev-libs/gmp:=
68 + dev-libs/nettle:=
69 + media-libs/libjpeg-turbo:=
70 + sys-libs/zlib:=
71 + x11-libs/libX11
72 + x11-libs/libXext
73 + x11-libs/libXrandr
74 + x11-libs/pixman
75 + gnutls? ( net-libs/gnutls:= )
76 + nls? ( virtual/libiconv )
77 + server? (
78 + dev-libs/libbsd
79 + dev-libs/openssl:0=
80 + sys-libs/pam
81 + x11-libs/libXau
82 + x11-libs/libXdamage
83 + x11-libs/libXdmcp
84 + x11-libs/libXfixes
85 + x11-libs/libXfont2
86 + x11-libs/libXtst
87 + x11-libs/pixman
88 + x11-libs/xtrans
89 + x11-apps/xauth
90 + x11-apps/xinit
91 + x11-apps/xkbcomp
92 + x11-apps/xsetroot
93 + x11-misc/xkeyboard-config
94 + opengl? ( media-libs/libglvnd[X] )
95 + !net-misc/turbovnc[server]
96 + )
97 + viewer? (
98 + media-video/ffmpeg:=
99 + x11-libs/fltk:1
100 + x11-libs/libXi
101 + x11-libs/libXrender
102 + !net-misc/turbovnc[viewer]
103 + )
104 +"
105 +RDEPEND="${COMMON_DEPEND}
106 + java? ( virtual/jre:1.8 )
107 + server? (
108 + dev-lang/perl
109 + sys-process/psmisc
110 + )
111 +"
112 +DEPEND="${COMMON_DEPEND}
113 + drm? ( x11-libs/libdrm )
114 + server? (
115 + media-fonts/font-util
116 + x11-base/xorg-proto
117 + x11-libs/libxcvt
118 + x11-libs/libXi
119 + x11-libs/libxkbfile
120 + x11-libs/libXrender
121 + x11-misc/util-macros
122 + opengl? ( media-libs/mesa )
123 + )
124 +"
125 +BDEPEND="
126 + virtual/pkgconfig
127 + nls? ( sys-devel/gettext )
128 +"
129 +
130 +PATCHES=(
131 + # Restore Java viewer
132 + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
133 + "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
134 + "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
135 +)
136 +[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
137 +
138 +src_unpack() {
139 + if [[ ${PV} == *9999 ]]; then
140 + git-r3_src_unpack
141 + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
142 + else
143 + default
144 + fi
145 +}
146 +
147 +src_prepare() {
148 + if use server; then
149 + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
150 + fi
151 +
152 + cmake_src_prepare
153 +
154 + if use server; then
155 + cd unix/xserver || die
156 + eapply ../xserver${XSERVER_VERSION}.patch
157 + eautoreconf
158 + sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
159 + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
160 +
161 + if use drm; then
162 + cd "${WORKDIR}" && \
163 + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
164 + fi
165 + fi
166 +}
167 +
168 +src_configure() {
169 + if use arm || use hppa; then
170 + append-flags "-fPIC"
171 + fi
172 +
173 + local mycmakeargs=(
174 + -DENABLE_GNUTLS=$(usex gnutls)
175 + -DENABLE_NLS=$(usex nls)
176 + -DBUILD_JAVA=$(usex java)
177 + -DBUILD_SERVER=$(usex server)
178 + -DBUILD_VIEWER=$(usex viewer)
179 + )
180 +
181 + cmake_src_configure
182 +
183 + if use server; then
184 + cd unix/xserver || die
185 + econf \
186 + $(use_enable opengl glx) \
187 + $(use_enable drm libdrm) \
188 + --disable-config-hal \
189 + --disable-config-udev \
190 + --disable-devel-docs \
191 + --disable-dri \
192 + $(use_enable dri3) \
193 + --disable-glamor \
194 + --disable-kdrive \
195 + --disable-libunwind \
196 + --disable-linux-acpi \
197 + --disable-record \
198 + --disable-selective-werror \
199 + --disable-static \
200 + --disable-unit-tests \
201 + --disable-xephyr \
202 + $(use_enable xinerama) \
203 + --disable-xnest \
204 + --disable-xorg \
205 + --disable-xvfb \
206 + --disable-xwin \
207 + --enable-dri2 \
208 + --with-pic \
209 + --without-dtrace \
210 + --disable-present \
211 + --with-sha1=libcrypto
212 + fi
213 +}
214 +
215 +src_compile() {
216 + cmake_src_compile
217 +
218 + if use server; then
219 + # deps of the vnc module and the module itself
220 + local d subdirs=(
221 + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
222 + damageext miext Xi xkb composite dix mi os hw/vnc
223 + )
224 + for d in "${subdirs[@]}"; do
225 + emake -C unix/xserver/"${d}"
226 + done
227 + fi
228 +}
229 +
230 +src_install() {
231 + cmake_src_install
232 +
233 + if use server; then
234 + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
235 + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
236 +
237 + newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
238 + newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
239 +
240 + systemd_douserunit unix/vncserver/vncserver@.service
241 +
242 + # comment out pam_selinux.so, the server does not start if missing
243 + # part of bug #746227
244 + sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
245 +
246 + # install vncserver to /usr/bin too, see bug #836620
247 + dosym -r /usr/libexec/vncserver /usr/bin/vncserver
248 + fi
249 +}
250 +
251 +pkg_postinst() {
252 + xdg_pkg_postinst
253 +
254 + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
255 + use server && \
256 + optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
257 + optfeature_header "Install any additional display manager package:" && \
258 + optfeature "proper session support" ${OPTIONAL_DM}
259 +}