commit: d0c732813860eaa7cf90c67486461a3b0f5beadd
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 16:25:56 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:40:01 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c73281
net-misc/turbovnc: add 3.2_beta1
- Add 3.2 beta1, a.k.a. 3.1.90.
- Adding unkeyworded (it's a beta version).
- Starting with this version, the viewer requires JDK 17+.
- The server uses a bundled copy of zlib-ng in compat mode;
Cannot use the system one (compat is masked).
- I will unkeyword 3.2 on x86, and will add a zlib-ng USE flag if
needed when rekeywording.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/turbovnc/Manifest | 2 +
net-misc/turbovnc/metadata.xml | 1 +
net-misc/turbovnc/turbovnc-3.2_beta1.ebuild | 167 ++++++++++++++++++++++++++++
3 files changed, 170 insertions(+)
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 596cbb5c1e3b..222845e7f31e 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,2 +1,4 @@
DIST turbovnc-3.1.4.tar.gz 9047653 BLAKE2B
70023b5e036913e9828e07d2f1f56a73649c79eabfa4fe11c8fa5b826be057b3b1486b6d7d5f3a44b8c69f3478562ceffebe7be303830d5b7636dabef6b19b0b
SHA512
b9d2f2b7f2e0c2d9485b85f55a762bd6e36f72db64d6bcace48100502624e2b805baee373fa1f7d0aa7b82623cc8d73b350adfbe87ce20357217722831d0d109
DIST turbovnc-3.1.4.tar.gz.sig 543 BLAKE2B
8e76eacf7564671c179a6769859ec19c63d4839a7529bdc49e7a66cd4b45d452e61f45df78670ce3e314e44d3cb1fce234bda53b5ff1120931b8e2f9d892b610
SHA512
e63fc61caea3a385d51b9c0ddba47091c7a463ec684cd62433c3d47cb6cbcef72c84d92d0498f747b192bd962e5701a805d1277588b030a4743772ac90c32d5d
+DIST turbovnc-3.1.90.tar.gz 5487295 BLAKE2B
a3e8867d0fa2bfbd3b4013142d502fd9cb48d14262beb252ab82f04128ce55b0936d4f72cb75cc6a5906bcf73ec26fff690921f137c0eae71c97cbab034b3f9e
SHA512
141fc55d89271e12b979a2b78b3560124e9bf9007bdfb1c5d6e551312fff34b3207e2b08965cf2ab4dd18cab644b4ec26a43939dc61de666f7ba87f1aa98e685
+DIST turbovnc-3.1.90.tar.gz.sig 543 BLAKE2B
24b6df39866baa9eb5d30fc6dec58edb532bca2fb048416ab1af349542c13b150774d705d6239226bf8bde3e7cbc66700508496d9b531b00b39d2c61d23721d5
SHA512
38075dbd73572849671a7a4087e5ddeac5a0b231fa658b6e6965faf1b17de6b94e3579c5ae66bd74b044909b3ade8bf45d395318d777e10437ccf6160a6fe918
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index 5c1cfb86ec9a..e7e552c66855 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -14,6 +14,7 @@
By The VirtualGL Project.
</longdescription>
<use>
+ <flag name="dri3">Build with DRI3 support</flag>
<flag name="server">Build the server (vncserver, Xvnc)</flag>
<flag name="viewer">Build the viewer (vncviewer)</flag>
</use>
diff --git a/net-misc/turbovnc/turbovnc-3.2_beta1.ebuild
b/net-misc/turbovnc/turbovnc-3.2_beta1.ebuild
new file mode 100644
index 000000000000..e0bf420e377d
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-3.2_beta1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_OPT_USE=viewer
+inherit cmake desktop java-pkg-opt-2 optfeature verify-sig
+
+MY_PV=${PV/_/}
+# Upstream's version 3.2beta1 is 3.1.90
+INTERNAL_PV=3.1.90
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/";
+SRC_URI="
+
https://github.com/TurboVNC/turbovnc/releases/download/${MY_PV}/turbovnc-${INTERNAL_PV}.tar.gz
+ verify-sig? (
https://github.com/TurboVNC/turbovnc/releases/download/${MY_PV}/turbovnc-${INTERNAL_PV}.tar.gz.sig
)
+"
+S="${WORKDIR}"/${PN}-${INTERNAL_PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +server +ssl +viewer"
+REQUIRED_USE="|| ( server viewer )"
+
+COMMON_DEPEND="
+ x11-apps/xauth
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-misc/xkeyboard-config
+ server? (
+ media-libs/libjpeg-turbo:=
+ sys-libs/pam
+ virtual/opengl
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXfont2
+ x11-libs/pixman
+ dri3? (
+ media-libs/mesa[opengl]
+ x11-libs/libxshmfence
+ )
+ ssl? ( dev-libs/openssl:= )
+ !net-misc/tigervnc[server]
+ )
+ viewer? (
+ media-libs/libjpeg-turbo:=[java]
+ x11-libs/libXi
+ !net-misc/tigervnc[viewer(+)]
+ )
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-apps/xkbcomp
+ viewer? ( >=virtual/jre-17:* )
+"
+
+# libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2
+# but cmake will look for them, so add them here
+DEPEND="
+ ${COMMON_DEPEND}
+ media-libs/mesa
+ x11-libs/xtrans
+ viewer? ( >=virtual/jdk-17:* )
+ server? (
+ app-arch/bzip2
+ media-libs/freetype
+ x11-libs/libfontenc
+ )
+"
+
+BDEPEND="
+ verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc )
+"
+
+PATCHES=(
+ "${FILESDIR}"/"${PN}"-3.0.90-fix-musl-compilation.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vgl-turbovnc.asc
+
+#879797 - BSD functions
+QA_CONFIG_IMPL_DECL_SKIP=( strlcat strlcpy )
+
+pkg_pretend() {
+ if use ssl && ! use server; then
+ einfo "USE=\"ssl\" selected but USE=\"server\" is not. The SSL
support is unused"
+ fi
+}
+
+src_prepare() {
+ use viewer && java-pkg-opt-2_src_prepare
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DTVNC_BUILDVIEWER=$(usex viewer)
+ -DTVNC_BUILDSERVER=$(usex server)
+ -DTVNC_BUILDWEBSERVER=$(usex server)
+ )
+
+ if use server ; then
+ mycmakeargs+=(
+ -DTVNC_ZLIBNG=ON
+ -DTVNC_DRI3=$(usex dri3)
+ -DXKB_BIN_DIRECTORY=/usr/bin
+ -DXKB_DFLT_RULES=base
+ )
+ if use ssl ; then
+ # Link properly against OpenSSL to ensure
+ # we catch e.g. ABI change
+ # (i.e. don't dlopen it)
+ mycmakeargs+=(
+ -DTVNC_USETLS=OpenSSL
+ -DTVNC_DLOPENSSL=OFF
+ )
+ else
+ mycmakeargs+=( -DTVNC_USETLS=OFF )
+ fi
+ fi
+
+ if use viewer ; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ # would need sys-libs/zlib-ng[compat] to unbundle this
+ use server && cmake_build unix/Xvnc/lib/zlib-ng
+
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+
+ if use viewer; then
+ java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+
+ # replace upstream bash wrapper with the Gentoo one to choose
the right javavm
+ rm "${ED}"/usr/bin/vncviewer
+ java-pkg_dolauncher vncviewer --jar VncViewer.jar \
+ --java_args "-server
-Djava.library.path=\"${EPREFIX}\"/usr/share/turbovnc/classes"
+
+ make_desktop_entry vncviewer "TurboVNC Viewer"
/usr/share/icons/hicolor/48x48/apps/${PN}.png
+ fi
+
+ # Don't install incompatible init script
+ if use server; then
+ rm -r "${ED}"/etc/init.d/ || die
+ rm -r "${ED}"/etc/sysconfig/ || die
+ fi
+
+ # Conflicts with x11-base/xorg-server
+ find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use server && optfeature "dbus support" sys-apps/dbus
+}
