commit:     303a00cbbe41c5961227cfd5314afc515c14bfe7
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 17:32:24 2025 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 17:38:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303a00cb

net-misc/tigervnc: add 1.15.0

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-misc/tigervnc/Manifest               |   1 +
 net-misc/tigervnc/tigervnc-1.15.0.ebuild | 237 +++++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 6f9e98885706..f71a678aab0b 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 
44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba
 SHA512 
d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31
 DIST tigervnc-1.14.90.tar.gz 2106976 BLAKE2B 
02c9509580790a65d76c05067f132a8ac7a834e02f4d46910f235dd55deba995630e74a8dd2e81b7d77bc7ee2f5ccbfbb565aee8f3bf0d15d8c532d366819e69
 SHA512 
c842f1beb0610a8dc039136592cf4acd8d2ef42f7681c44f98c4ec57c35dd759cb98ad7e8462852a1c85ee8f7f63e3283909e30cc52de6c30b602235f4ffafd2
+DIST tigervnc-1.15.0.tar.gz 2126369 BLAKE2B 
c8646860884ae8fec7f81d9e87967bb279e7bf7ebcc69973660ed827f5a1cf6d8700a70a364e9099e68779b6dfb168242db2afa428f5cfc11784020696261191
 SHA512 
0b550296b5bd06ac9d63ce10861ff54d24e79b6ac1551d80e9b81845fa873d85bfd684112c66d86188c9c61fdffb9421ea8696c1c7fd15a24fb1bf6bfe6a5e05
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B 
b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e
 SHA512 
833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
 DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B 
a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f
 SHA512 
677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363

diff --git a/net-misc/tigervnc/tigervnc-1.15.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
new file mode 100644
index 000000000000..ef7fe09fa151
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.15"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org";
+SRC_URI="server? ( 
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
 )"
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/";
+else
+       SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+       dri3? ( drm )
+       java? ( viewer )
+       opengl? ( server )
+       || ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+# <fltk-1.4: 
https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546
+COMMON_DEPEND="
+       dev-libs/gmp:=
+       dev-libs/nettle:=
+       media-libs/libjpeg-turbo:=
+       sys-libs/zlib:=
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXrandr
+       x11-libs/pixman
+       gnutls? ( net-libs/gnutls:= )
+       nls? ( virtual/libiconv )
+       server? (
+               dev-libs/openssl:0=
+               sys-libs/pam
+               x11-libs/libXau
+               x11-libs/libxcvt
+               x11-libs/libXdamage
+               x11-libs/libXdmcp
+               x11-libs/libXfixes
+               x11-libs/libXfont2
+               x11-libs/libXtst
+               x11-libs/pixman
+               x11-apps/xauth
+               x11-apps/xinit
+               x11-apps/xkbcomp
+               x11-apps/xsetroot
+               x11-misc/xkeyboard-config
+               dri3? (
+                       media-libs/mesa[opengl]
+                       x11-libs/libxshmfence
+               )
+               opengl? ( media-libs/libglvnd[X] )
+               !net-misc/turbovnc[server]
+       )
+       viewer? (
+               media-video/ffmpeg:=
+               <x11-libs/fltk-1.4:1=
+               x11-libs/libXi
+               x11-libs/libXrender
+               !net-misc/turbovnc[viewer]
+       )
+"
+RDEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jre-1.8:* )
+       server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+       java? ( >=virtual/jdk-1.8:* )
+       drm? ( x11-libs/libdrm )
+       server? (
+               media-fonts/font-util
+               x11-base/xorg-proto
+               x11-libs/libXi
+               x11-libs/libxkbfile
+               x11-libs/libXrender
+               x11-libs/xtrans
+               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.14.0-xsession-path.patch
+       "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+       "${FILESDIR}"/${PN}-1.14.1-pam.patch
+)
+
+src_unpack() {
+       if [[ ${PV} == *9999 ]]; then
+               git-r3_src_unpack
+               use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       if use server; then
+               cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
+       fi
+
+       cmake_src_prepare
+
+       if use server; then
+               cd unix/xserver || die
+               eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+               eautoreconf
+               sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || 
die
+
+               if use drm; then
+                       cd "${WORKDIR}" && \
+                       sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep 
drm_fourcc.h -rl .) || die
+               fi
+       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)
+               -DBUILD_SERVER=$(usex server)
+               -DBUILD_VIEWER=$(usex viewer)
+       )
+
+       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 \
+                       --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 present 
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
+               rm -v 
"${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+               newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+               newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+               systemd_douserunit unix/vncserver/vncserver@.service
+
+               # install vncserver to /usr/bin too, see bug #836620
+               dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+       fi
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+
+       use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test 
"${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+               elog 'OpenRC users: please migrate to one service per display 
as documented here:'
+               elog 
'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+               elog
+       }
+
+       use server && {
+               elog 'PLEASE NOTE:'
+               elog '  The default config directory is now 
${XDG_CONFIG_HOME}/tigervnc or'
+               elog '  ~/.config/tigervnc instead of ~/.vnc'
+               elog
+       }
+
+       local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm 
x11-misc/slim"
+       use server && \
+               optfeature "keeping track of the xorg-server module" 
net-misc/tigervnc-xorg-module && \
+               optfeature_header "Install any additional display manager 
package:" && \
+               optfeature "proper session support" ${OPTIONAL_DM}
+}

Reply via email to