mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-misc/tigervnc: drop 1.13.1-r3
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
This commit is contained in:
Viorel Munteanu
@@ -1,4 +1,2 @@
|
||||
DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
|
||||
DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
|
||||
DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
|
||||
DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
Add more possible paths for Xsession, depending on which display manager is
|
||||
installed. We need an Xsession that executes its command line parameters, so
|
||||
leave xinit last.
|
||||
|
||||
See also https://bugs.gentoo.org/746227
|
||||
|
||||
--- a/unix/vncserver/vncserver.in
|
||||
+++ b/unix/vncserver/vncserver.in
|
||||
@@ -437,11 +437,14 @@
|
||||
die "$prog: couldn't find \"$cmd\" on your PATH.\n";
|
||||
}
|
||||
|
||||
- foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
|
||||
- if (-x "$cmd") {
|
||||
- $Xsession = $cmd;
|
||||
- last;
|
||||
- }
|
||||
+ $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
|
||||
+ if (not defined $Xsession) {
|
||||
+ foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
|
||||
+ if (-x "$cmd") {
|
||||
+ $Xsession = $cmd;
|
||||
+ last;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
if (not defined $Xsession) {
|
||||
die "$prog: Couldn't find suitable Xsession.\n";
|
||||
@@ -1,230 +0,0 @@
|
||||
# Copyright 1999-2023 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.8"
|
||||
XSERVER_PATCH_VERSION="21.1.1"
|
||||
|
||||
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 ~ia64 ~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
|
||||
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/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-apps/xauth
|
||||
x11-apps/xinit
|
||||
x11-apps/xkbcomp
|
||||
x11-apps/xsetroot
|
||||
x11-misc/xkeyboard-config
|
||||
opengl? ( media-libs/libglvnd[X] )
|
||||
!net-misc/turbovnc[server]
|
||||
)
|
||||
viewer? (
|
||||
media-video/ffmpeg:=
|
||||
x11-libs/fltk: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/libxcvt
|
||||
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.12.0-xsession-path.patch
|
||||
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-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 's:\(present.h\):../present/\1:' os/utils.c || die
|
||||
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 \
|
||||
--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
|
||||
rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
|
||||
|
||||
newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN}
|
||||
newinitd "${FILESDIR}"/${PN}-1.13.1.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
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
|
||||
use server && {
|
||||
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:'
|
||||
}
|
||||
|
||||
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}
|
||||
}
|
||||
Reference in New Issue
Block a user