commit: c1cdfd13843b40362a3b0a538f0a9bdbe564f050 Author: Jan Psota <jasiupsota <AT> gmail <DOT> com> AuthorDate: Mon Dec 6 21:36:38 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 6 23:36:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cdfd13
net-misc/tigervnc: live ebuild for xorg-server-21.1.1 support [sam: Includes its own copy of xserver for now (not ideal, but this package already uses a bunch of patched versions of things).] Closes: https://bugs.gentoo.org/828469 Signed-off-by: Jan Psota <jasiupsota <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/tigervnc/Manifest | 1 + net-misc/tigervnc/tigervnc-9999.ebuild | 185 +++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 7c7e79a01771..4f5a3da9f469 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,3 +1,4 @@ DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde +DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild new file mode 100644 index 000000000000..01ff15488f6e --- /dev/null +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -0,0 +1,185 @@ +# 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 git-r3 systemd xdg + +XSERVER_VERSION="21.1.1" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="http://www.tigervnc.org"; +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" +EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="dri3 +drm gnutls 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/libxcvt + 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" + +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext ) + 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_unpack() { + git-r3_src_unpack + unpack xorg-server-${XSERVER_VERSION}.tar.xz +} + +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_VERSION}.patch + eautoreconf + sed -i 's:\(present.h\):../present/\1:' os/utils.c || die + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die + fi + cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die +} + +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=no + ) + + 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 +}
