commit: 61edb13feb920235ca828256639512b68d8de066 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Sat Jan 14 18:50:54 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 08:39:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61edb13f
net-misc/tigervnc: add 1.12.90 This is called "1.13.0 Beta" in their release page, so try to get ready for "1.13.0": https://github.com/TigerVNC/tigervnc/releases/tag/v1.12.90 Also add viewer USE flag to complement turbovnc. I tested and I can install and run both combinations of {tiger,turbo}vnc {server,viewer} Sync live (live is 1.13.80 now) Bug: https://bugs.gentoo.org/864809 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> net-misc/tigervnc/Manifest | 1 + .../files/tigervnc-1.13.80-depend-po-files.patch | 36 +++++++++++ net-misc/tigervnc/metadata.xml | 4 +- ...igervnc-9999.ebuild => tigervnc-1.12.90.ebuild} | 72 +++++++++++++++------- net-misc/tigervnc/tigervnc-9999.ebuild | 72 +++++++++++++++------- 5 files changed, 138 insertions(+), 47 deletions(-) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 272e2edc7499..d5340081add2 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,3 +1,4 @@ DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb +DIST tigervnc-1.12.90.tar.gz 1963656 BLAKE2B cef93c05dc0e22f67db02d62de276329102b86119263f7224cde7648d8d705ae8f82ec10c7d895a9ae99477cf437038acc3345903b61a1ac30f5649948f9adde SHA512 c9f650e9985ab073042c15f8f3fafd57d5a56b3109c15ffbcfa6ea2fe6c6e56626aa8677415b9826700374d7fbd376e05004921194408604b8550758bd402025 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch new file mode 100644 index 000000000000..d611ece53fb1 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch @@ -0,0 +1,36 @@ +Currently the live version does not build because of this dependency. Remove it for now + +--- a/vncviewer/CMakeLists.txt ++++ b/vncviewer/CMakeLists.txt +@@ -81,7 +81,6 @@ + --desktop --template vncviewer.desktop.in + -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in +- ${CMAKE_SOURCE_DIR}/po/*.po + ) + elseif(INTLTOOL_MERGE_EXECUTABLE) + add_custom_command(OUTPUT vncviewer.desktop +@@ -93,7 +92,6 @@ + -d ${CMAKE_SOURCE_DIR}/po + vncviewer.desktop.intl vncviewer.desktop + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in +- ${CMAKE_SOURCE_DIR}/po/*.po + ) + else() + add_custom_command(OUTPUT vncviewer.desktop +@@ -110,7 +108,6 @@ + --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in + -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in +- ${CMAKE_SOURCE_DIR}/po/*.po + ) + elseif(INTLTOOL_MERGE_EXECUTABLE) + add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml +@@ -123,7 +120,6 @@ + -x ${CMAKE_SOURCE_DIR}/po + org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in +- ${CMAKE_SOURCE_DIR}/po/*.po + ) + else() + add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml index 09bd90e4d40b..7c4c48e857d6 100644 --- a/net-misc/tigervnc/metadata.xml +++ b/net-misc/tigervnc/metadata.xml @@ -6,9 +6,11 @@ <name>Viorel Munteanu</name> </maintainer> <use> + <flag name="dri3">Build with DRI3 support</flag> <flag name="drm">Build with DRM support</flag> + <flag name="java">Build TigerVNC Java viewer</flag> <flag name="server">Build TigerVNC server</flag> - <flag name="dri3">Build with DRI3 support</flag> + <flag name="viewer">Build TigerVNC viewer</flag> </use> <upstream> <remote-id type="github">TigerVNC/tigervnc</remote-id> diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-1.12.90.ebuild similarity index 75% copy from net-misc/tigervnc/tigervnc-9999.ebuild copy to net-misc/tigervnc/tigervnc-1.12.90.ebuild index d8ae0f70e5f1..fc6cb7d77a07 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-1.12.90.ebuild @@ -1,36 +1,44 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg XSERVER_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 )" -EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"; + +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" -KEYWORDS="" -IUSE="dri3 +drm gnutls java nls +opengl +server xinerama" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" REQUIRED_USE=" dri3? ( drm ) + java? ( viewer ) opengl? ( server ) + || ( server viewer ) " -CDEPEND=" +# TODO: sys-libs/libselinux +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= - x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext - x11-libs/libXi x11-libs/libXrandr - x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) @@ -52,31 +60,40 @@ CDEPEND=" x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] ) - " - -RDEPEND="${CDEPEND} + 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 sys-process/psmisc - )" - -DEPEND="${CDEPEND} + ) +" +DEPEND="${COMMON_DEPEND} 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-misc/util-macros opengl? ( media-libs/mesa ) - )" - + ) +" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - " +" PATCHES=( # Restore Java viewer @@ -84,10 +101,15 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch ) +[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch ) src_unpack() { - git-r3_src_unpack - use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi } src_prepare() { @@ -104,7 +126,10 @@ src_prepare() { sed -i 's:\(present.h\):../present/\1:' os/utils.c || die sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die - cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi fi } @@ -118,6 +143,7 @@ src_configure() { -DENABLE_NLS=$(usex nls) -DBUILD_JAVA=$(usex java) -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) ) cmake_src_configure @@ -186,7 +212,7 @@ src_install() { sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die # install vncserver to /usr/bin too, see bug #836620 - dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver + dosym -r /usr/libexec/vncserver /usr/bin/vncserver fi } diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index d8ae0f70e5f1..fc6cb7d77a07 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -1,36 +1,44 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg XSERVER_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 )" -EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"; + +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" -KEYWORDS="" -IUSE="dri3 +drm gnutls java nls +opengl +server xinerama" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" REQUIRED_USE=" dri3? ( drm ) + java? ( viewer ) opengl? ( server ) + || ( server viewer ) " -CDEPEND=" +# TODO: sys-libs/libselinux +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= - x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext - x11-libs/libXi x11-libs/libXrandr - x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) @@ -52,31 +60,40 @@ CDEPEND=" x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] ) - " - -RDEPEND="${CDEPEND} + 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 sys-process/psmisc - )" - -DEPEND="${CDEPEND} + ) +" +DEPEND="${COMMON_DEPEND} 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-misc/util-macros opengl? ( media-libs/mesa ) - )" - + ) +" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - " +" PATCHES=( # Restore Java viewer @@ -84,10 +101,15 @@ PATCHES=( "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch ) +[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch ) src_unpack() { - git-r3_src_unpack - use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi } src_prepare() { @@ -104,7 +126,10 @@ src_prepare() { sed -i 's:\(present.h\):../present/\1:' os/utils.c || die sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die - cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi fi } @@ -118,6 +143,7 @@ src_configure() { -DENABLE_NLS=$(usex nls) -DBUILD_JAVA=$(usex java) -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) ) cmake_src_configure @@ -186,7 +212,7 @@ src_install() { sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die # install vncserver to /usr/bin too, see bug #836620 - dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver + dosym -r /usr/libexec/vncserver /usr/bin/vncserver fi }
