public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Sun,  3 Apr 2022 10:02:39 +0000 (UTC)	[thread overview]
Message-ID: <1648979782.7354726a8775617b6f82431f7f46aae7e5c84a8c.flow@gentoo> (raw)

commit:     7354726a8775617b6f82431f7f46aae7e5c84a8c
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sat Apr  2 06:46:43 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 09:56:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7354726a

net-misc/tigervnc: Install vncserver in $PATH

Closes: https://bugs.gentoo.org/836620
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 207 ++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
new file mode 100644
index 000000000000..9665552943b5
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? (
+		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+		https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+REQUIRED_USE="dri3? ( drm )"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	x11-libs/fltk:1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+	)
+	"
+
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)"
+
+DEPEND="${CDEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+)
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+		eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+		eapply "${DISTDIR}"/${P}-xserver-21.patch
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	else
+		local f
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
+		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
+		rm -r "${ED}"/etc || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}


             reply	other threads:[~2022-04-03 10:02 UTC|newest]

Thread overview: 169+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-03 10:02 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-21 15:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ Viorel Munteanu
2024-09-01 10:56 Viorel Munteanu
2024-08-27 21:04 Sam James
2024-08-27 10:29 Jakov Smolić
2024-08-27 10:29 Jakov Smolić
2024-08-27 10:29 Jakov Smolić
2024-08-27 10:29 Jakov Smolić
2024-06-22  8:07 Viorel Munteanu
2024-06-20 16:44 Viorel Munteanu
2023-08-03  5:53 Viorel Munteanu
2023-07-25 13:45 Sam James
2023-07-25 13:45 Sam James
2023-07-25 13:45 Sam James
2023-07-25 13:29 Sam James
2023-06-03  1:47 Matt Turner
2023-05-30  5:36 Viorel Munteanu
2023-05-29 17:49 Arthur Zamarin
2023-05-29 13:58 Sam James
2023-05-29 13:10 Sam James
2023-05-29 13:01 Sam James
2023-05-29 13:01 Sam James
2023-05-03 17:06 Viorel Munteanu
2023-04-29 15:48 Arthur Zamarin
2023-04-28  8:01 Viorel Munteanu
2023-04-28  8:01 Viorel Munteanu
2023-04-19  9:59 Viorel Munteanu
2023-04-14 19:55 Sam James
2023-04-14 19:55 Sam James
2023-04-14 19:33 Sam James
2023-03-30 17:32 Arthur Zamarin
2023-03-09  1:10 Sam James
2023-03-09  1:10 Sam James
2023-03-08 23:35 Sam James
2023-03-08 11:12 Arthur Zamarin
2023-03-01  6:15 Viorel Munteanu
2023-02-03 11:18 Viorel Munteanu
2023-02-03 11:18 Viorel Munteanu
2022-11-02 16:17 Viorel Munteanu
2022-08-23  5:34 Sam James
2022-08-14  3:19 WANG Xuerui
2022-08-05  6:57 Arthur Zamarin
2022-08-04  6:27 Arthur Zamarin
2022-08-04  6:27 Arthur Zamarin
2022-08-04  5:21 Joonas Niilola
2022-08-04  5:21 Joonas Niilola
2022-07-07 17:24 Mike Gilbert
2022-06-23  5:51 Sam James
2022-06-16 10:26 Jakov Smolić
2022-06-16  9:56 Jakov Smolić
2022-06-16  9:33 Jakov Smolić
2022-06-16  7:41 Joonas Niilola
2022-06-16  6:50 Joonas Niilola
2022-05-14  1:03 Sam James
2022-05-13 20:04 Sam James
2022-05-09  9:58 Jakov Smolić
2022-05-08 18:06 Sam James
2022-05-07 14:30 Jakov Smolić
2022-05-07 10:05 Arthur Zamarin
2022-05-07 10:03 Arthur Zamarin
2022-04-03 10:02 Florian Schmaus
2022-04-03 10:02 Florian Schmaus
2022-03-31 11:56 Joonas Niilola
2022-03-31 11:56 Joonas Niilola
2022-03-31 11:56 Joonas Niilola
2022-03-18 18:52 Sam James
2022-03-18 18:52 Sam James
2022-03-18 18:52 Sam James
2021-12-07 23:16 Sam James
2021-12-06 23:36 Sam James
2021-09-12 21:12 Ionen Wolkens
2021-08-03 16:39 Ionen Wolkens
2021-08-03 15:36 Agostino Sarubbo
2021-08-03 10:57 Agostino Sarubbo
2021-08-02  4:04 Agostino Sarubbo
2021-08-02  4:03 Agostino Sarubbo
2021-08-02  3:18 Sam James
2021-06-29  4:57 Sam James
2021-06-29  4:57 Sam James
2021-06-29  4:57 Sam James
2021-05-01 14:30 Mikle Kolyada
2021-02-21 13:53 Joonas Niilola
2020-12-14 21:51 Sergei Trofimovich
2020-10-03 17:20 Ulrich Müller
2020-10-03  9:13 Ulrich Müller
2020-10-03  9:13 Ulrich Müller
2020-10-01 12:52 Jeroen Roovers
2020-10-01 11:55 Jeroen Roovers
2019-10-24  2:54 Joonas Niilola
2019-10-23 13:46 Joonas Niilola
2019-10-12 20:30 Mikle Kolyada
2018-12-16 21:58 Jeroen Roovers
2018-12-04 16:04 Mikle Kolyada
2018-11-28 12:15 Tobias Klausmann
2018-11-18 10:38 Sergei Trofimovich
2018-11-05 16:02 Mikle Kolyada
2018-11-05  7:51 Sergei Trofimovich
2018-11-05  7:51 Sergei Trofimovich
2018-11-04 19:14 Thomas Deutschmann
2018-11-04 14:16 Sergei Trofimovich
2018-08-05 21:48 Patrice Clement
2018-05-20 16:16 Matt Turner
2018-05-20 16:16 Matt Turner
2018-05-20 16:16 Matt Turner
2018-05-16  8:37 Jeroen Roovers
2018-05-16  8:34 Jeroen Roovers
2018-05-15 19:59 Mikle Kolyada
2018-05-15 19:56 Mikle Kolyada
2018-05-14 19:21 Tobias Klausmann
2018-05-13 23:34 Aaron Bauman
2018-05-13 22:06 Thomas Deutschmann
2018-05-13  9:53 Sergei Trofimovich
2018-05-12 15:33 Sergei Trofimovich
2018-05-08  6:47 Matt Turner
2018-05-08  6:47 Matt Turner
2018-05-08  6:47 Matt Turner
2018-03-31 19:01 Mart Raudsepp
2017-12-24 17:11 Patrice Clement
2017-12-24 17:11 Patrice Clement
2017-12-24 17:11 Patrice Clement
2017-11-24 22:09 Sergei Trofimovich
2017-06-13 12:31 Agostino Sarubbo
2017-06-08 10:16 Agostino Sarubbo
2017-06-08  5:06 Markus Meier
2017-05-25  8:36 Patrice Clement
2017-05-07  9:08 Michał Górny
2017-04-28  7:11 Jeroen Roovers
2017-04-27 17:00 Alice Ferrazzi
2017-04-27 16:17 Alice Ferrazzi
2017-04-27  6:05 Alice Ferrazzi
2017-03-26 18:53 Michael Orlitzky
2017-03-24 15:38 Matt Turner
2017-03-24 15:38 Matt Turner
2017-03-17 10:42 Agostino Sarubbo
2017-03-17 10:15 Agostino Sarubbo
2017-03-16 13:01 Jeroen Roovers
2017-03-16  7:59 Michael Weber
2017-03-05  8:48 Patrice Clement
2017-02-12 20:08 Markus Meier
2017-01-29 20:30 Jeroen Roovers
2017-01-29 13:55 Agostino Sarubbo
2017-01-28 19:52 Tobias Klausmann
2017-01-27 20:49 Thomas Deutschmann
2017-01-25 15:52 Agostino Sarubbo
2016-11-15 22:29 David Seifert
2016-11-15 22:29 David Seifert
2016-11-13  9:18 Agostino Sarubbo
2016-11-12 11:55 Agostino Sarubbo
2016-11-12 11:55 Agostino Sarubbo
2016-10-21  8:52 Patrice Clement
2016-10-01 12:11 Jeroen Roovers
2016-09-27 18:43 Markus Meier
2016-09-22 17:03 Tobias Klausmann
2016-09-17 11:19 Pacho Ramos
2016-09-17 11:19 Pacho Ramos
2016-08-30 20:09 Markus Meier
2016-08-21 17:57 Pacho Ramos
2016-08-03  4:32 Jeroen Roovers
2016-07-11  5:50 Jeroen Roovers
2016-06-12 10:45 Pacho Ramos
2016-06-02 17:29 Tobias Klausmann
2016-05-24 20:13 Markus Meier
2016-05-24  7:58 Michał Górny
2016-05-21 15:35 Pacho Ramos
2016-01-29 15:55 Michał Górny
2016-01-29 15:55 Michał Górny
2016-01-27 20:48 Michał Górny
2016-01-27 20:48 Michał Górny
2016-01-09 14:35 Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648979782.7354726a8775617b6f82431f7f46aae7e5c84a8c.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox