From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F78E139336 for ; Tue, 29 Jun 2021 04:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B479E0895; Tue, 29 Jun 2021 04:58:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E16FDE0895 for ; Tue, 29 Jun 2021 04:57:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3799335D3B for ; Tue, 29 Jun 2021 04:57:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5273B7B3 for ; Tue, 29 Jun 2021 04:57:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1624942629.d4978e8ece6c64dc6ecb75594aa8fcacc2d06640.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild X-VCS-Directories: net-misc/tigervnc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d4978e8ece6c64dc6ecb75594aa8fcacc2d06640 X-VCS-Branch: master Date: Tue, 29 Jun 2021 04:57:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ee0b542-a800-451b-81f8-6cc699b84d3a X-Archives-Hash: 1e2599cca0e2a4c77eca1876785bcbff commit: d4978e8ece6c64dc6ecb75594aa8fcacc2d06640 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Jun 25 07:57:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 29 04:57:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4978e8e net-misc/tigervnc: min java :1.8 Bug: https://bugs.gentoo.org/787635 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Sam James gentoo.org> net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild | 180 +++++++++++++++++++++++++ net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 198 ++++++++++++++++++++++++++++ 2 files changed, 378 insertions(+) diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild new file mode 100644 index 00000000000..576dcb604f1 --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2021 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 systemd xdg + +XSERVER_VERSION="1.20.0" + +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.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" + +CDEPEND=" + virtual/jpeg:0 + sys-libs/zlib:= + >=x11-libs/fltk-1.3.1 + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + pam? ( sys-libs/pam ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + x11-libs/pixman + server? ( + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/libXtst + >=x11-libs/pixman-0.27.2 + >=x11-apps/xauth-1.0.3 + x11-apps/xsetroot + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) + drm? ( x11-libs/libdrm ) + dev-libs/openssl:0= + ) + xinerama? ( x11-libs/libXinerama ) + " + +RDEPEND="${CDEPEND} + !net-misc/tightvnc + !net-misc/vnc + !net-misc/xf4vnc + java? ( virtual/jre:1.8 )" + +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext ) + java? ( virtual/jdk:1.8 ) + x11-base/xorg-proto + media-libs/fontconfig + x11-libs/libICE + x11-libs/libSM + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXi + server? ( + dev-libs/libbsd + x11-libs/libxkbfile + x11-libs/libxshmfence + virtual/pkgconfig + media-fonts/font-util + x11-misc/util-macros + >=x11-libs/xtrans-1.3.3 + opengl? ( >=media-libs/mesa-10.3.4-r1 ) + )" + +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 "${FILESDIR}"/xserver120.patch + eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + eautoreconf + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DENABLE_PAM=$(usex pam) + -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-dmx \ + --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 \ + --disable-xwayland \ + --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}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + 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 + fi +} diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild new file mode 100644 index 00000000000..09c050aec41 --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_IN_SOURCE_BUILD=1 + +inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils + +XSERVER_VERSION="1.20.0" + +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.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" + +CDEPEND=" + virtual/jpeg:0 + sys-libs/zlib:= + >=x11-libs/fltk-1.3.1 + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + pam? ( sys-libs/pam ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + server? ( + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/libXtst + >=x11-libs/pixman-0.27.2 + >=x11-apps/xauth-1.0.3 + x11-apps/xsetroot + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) + drm? ( x11-libs/libdrm ) + dev-libs/openssl:0= + ) + xinerama? ( x11-libs/libXinerama ) + " + +RDEPEND="${CDEPEND} + !net-misc/tightvnc + !net-misc/vnc + !net-misc/xf4vnc + java? ( virtual/jre:1.8 )" + +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext ) + java? ( virtual/jdk:1.8 ) + x11-base/xorg-proto + media-libs/fontconfig + x11-libs/libICE + x11-libs/libSM + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXi + server? ( + dev-libs/libbsd + x11-libs/libxkbfile + x11-libs/libxshmfence + virtual/pkgconfig + media-fonts/font-util + x11-misc/util-macros + >=x11-libs/xtrans-1.3.3 + opengl? ( >=media-libs/mesa-10.3.4-r1 ) + )" + +PATCHES=( + "${FILESDIR}"/${P}-030_manpages.patch + "${FILESDIR}"/${P}-055_xstartup.patch +) + +src_prepare() { + if use server ; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + # do not rely on the build system to install docs + sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \ + cmake/BuildPackages.cmake || die + + cmake-utils_src_prepare + + if use server ; then + cd unix/xserver || die + eapply "${FILESDIR}"/xserver120.patch + eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + eautoreconf + fi +} + +src_configure() { + if use arm || use hppa ; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DENABLE_PAM=$(usex pam) + -DBUILD_JAVA=$(usex java) + ) + + cmake-utils_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-dmx \ + --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 \ + --disable-xwayland \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake-utils_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-utils_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}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + systemd_douserunit contrib/systemd/user/vncserver@.service + else + local f + cd "${ED}" || die + for f in vncserver x0vncserver vncconfig; do + rm usr/bin/$f || die + rm usr/share/man/man1/$f.1 || die + done + fi +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +}