From 721e451ec418e1712f6962404e111f0ebd487389 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Dec 2024 06:30:35 +0000 Subject: gentoo auto-resync : 27:12:2024 - 06:30:34 --- net-misc/Manifest.gz | Bin 54138 -> 54137 bytes net-misc/tigervnc/Manifest | 4 +- net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild | 236 --------------------------- net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild | 237 ++++++++++++++++++++++++++++ net-misc/tigervnc/tigervnc-9999.ebuild | 2 +- 5 files changed, 240 insertions(+), 239 deletions(-) delete mode 100644 net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild create mode 100644 net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index cd45dc596ec2..9189e8b22ba3 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 0b9f1b591b17..55f9125a321b 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -6,6 +6,6 @@ AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251 AUX tigervnc-1.14.1-pam.patch 959 BLAKE2B 384b065ac6f273ff302f8469c039e81f0bc7a98f684162aa8883af5332bc3450032e2a87f12d0f0c576df167817b3b7875b6675cc8af26de14f0c0147077b353 SHA512 d6ee39c53cab920a9f3432012714aaaa7f87db90763156bfcea26e394e381fa47eed8cbe62a956cb983059b28811932b16e79dc0445390a59288c27fc77d6caa DIST tigervnc-1.14.1.tar.gz 2097932 BLAKE2B 44593837154e019562f63cad54afaa41d1af7a5199988571002019dc60af193162a54b4c3f4e57a3cef2c824253bec5d83f029ba489a7f5459873255b1968cba SHA512 d7a6cff4a3a1e4c30e2dbd6e17ad2d76145e76f5c1a93abbaf32b1c488377a4eaf936d4e8a24a97863948138ba40031c862f9da1c1cd427da35ebffa8eaa4f31 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973 -EBUILD tigervnc-1.14.1-r2.ebuild 5537 BLAKE2B e974553e7d9fb0a7513723ba08f2f43c3ebba0a0bb46401b3e2fe6b91100595c48bb9c776c91e0d162bde22897b02b97c0a1caaf61d7582c8972dd0611caec9e SHA512 4c5d65a4e9266dd341fcd804bf4449b2987c6e0dd4253bf163dabd428fdc588e39056d39d9b4a1822eb1993111f8a806b81bab6a340b476f0402cfd25ecb8e6c -EBUILD tigervnc-9999.ebuild 5542 BLAKE2B 8edb8cfe98d6a0d2a7438cbe776d15f994b4ba5c455b745e58de47a92dd9f1489a793974d5066336420c457fa11d6cc779fb358cdb3363eccbd392cf3c2b1b56 SHA512 9279f578c2665dbe96561d595b80ac000a942134e6c56a572af52c64e753d3e11087eb491441ef370429de2c9c4a5ec244b4358bbc50b7aa398f1b56c922bfea +EBUILD tigervnc-1.14.1-r3.ebuild 5627 BLAKE2B db59a02eb600fee173539da9f7949e4e9cabb3dca487bb12f1983362888dc4a264f25c6acdcaac4427aeb3ce9e67431974ce08c4bdd292d3bfe1b5012c9249bd SHA512 7a9a27c13a46a9370cb18a494738f6e53524450d085bc00d84b7a789f97757ee1e301886a71baa294323afea810ffd69c81f565ea42db439759c04a4cec4228c +EBUILD tigervnc-9999.ebuild 5543 BLAKE2B 956f93a567fdcb35afcf62b46fa316b44a7da1ea997ca64e173af535f1d1e8b0f742577b66fb5bb87b2a609ae03dfcd8ec1379408c1eb495f7c9d13ab3064571 SHA512 818c1b9025f391170d2fbe565e2c372e59b722289ab518533836b9548e930f66b600fe06b9badf1e3bfaac9afd560222a673959e884ea52dcb6d44e9047dbf81 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743 diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild deleted file mode 100644 index d935ad0c303f..000000000000 --- a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2024 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.14" -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 -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 - 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} -} diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild new file mode 100644 index 000000000000..8268a5a44c3a --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2024 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.14" +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 +#