diff options
author | Viorel Munteanu <ceamac.paragon@gmail.com> | 2022-05-09 19:10:23 +0300 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-05-13 20:03:45 +0000 |
commit | aabb6b116e78b4e93773e599018811120e5c4ca5 (patch) | |
tree | ec5488994852fed28a640f0c010ff5f668bc2a59 /net-misc/tigervnc | |
parent | net-misc/tigervnc: update live ebuild to 1.12 (diff) | |
download | gentoo-aabb6b116e78b4e93773e599018811120e5c4ca5.tar.gz gentoo-aabb6b116e78b4e93773e599018811120e5c4ca5.tar.bz2 gentoo-aabb6b116e78b4e93773e599018811120e5c4ca5.zip |
net-misc/tigervnc: drop 1.9.0-r2
Bug: https://bugs.gentoo.org/700464
Signed-off-by: Viorel Munteanu <ceamac.paragon@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25403
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc/tigervnc')
-rw-r--r-- | net-misc/tigervnc/Manifest | 2 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch | 55 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch | 33 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc.confd | 9 | ||||
-rw-r--r-- | net-misc/tigervnc/files/tigervnc.initd | 72 | ||||
-rw-r--r-- | net-misc/tigervnc/files/xserver120-drmfourcc-header.patch | 36 | ||||
-rw-r--r-- | net-misc/tigervnc/files/xserver120.patch | 91 | ||||
-rw-r--r-- | net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 185 |
8 files changed, 0 insertions, 483 deletions
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 69a6995f580f..272e2edc7499 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,5 +1,3 @@ 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.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/files/tigervnc-1.9.0-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch deleted file mode 100644 index 8a30f18d7d92..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/unix/vncserver b/unix/vncserver -index 9e7a6ac5..139f9601 100755 ---- a/unix/vncserver -+++ b/unix/vncserver -@@ -684,6 +684,7 @@ sub Usage - " [-geometry <width>x<height>]\n". - " [-pixelformat rgbNNN|bgrNNN]\n". - " [-fp <font-path>]\n". -+ " [-cc <visual>]\n". - " [-fg]\n". - " [-autokill]\n". - " [-noxstartup]\n". -diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx -index f076565f..05669a42 100644 ---- a/vncviewer/vncviewer.cxx -+++ b/vncviewer/vncviewer.cxx -@@ -352,6 +352,11 @@ static void usage(const char *programName) - " %s [parameters] -listen [port] [parameters]\n" - " %s [parameters] [.tigervnc file]\n", - programName, programName, programName); -+ fprintf(stderr,"\n" -+ "Options:\n\n" -+ " -display Xdisplay - Specifies the X display for the viewer window\n" -+ " -geometry geometry - Standard X position and sizing specification.\n"); -+ - fprintf(stderr,"\n" - "Parameters can be turned on with -<param> or off with -<param>=0\n" - "Parameters which take a value can be specified as " -diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man -index 729c01d6..07dc58f1 100644 ---- a/vncviewer/vncviewer.man -+++ b/vncviewer/vncviewer.man -@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE", - Disable lossy JPEG compression in Tight encoding. Default is off. - . - .TP -+.B \-ImprovedHextile -+Try harder to compress data (default). -+. -+.TP - .B \-QualityLevel \fIlevel\fP - JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if - \fB-AutoSelect\fP is turned on. Default is 8. -@@ -296,6 +300,11 @@ respectively. - .B \-AlertOnFatalError - Display a dialog with any fatal error before exiting. Default is on. - -+. -+.TP -+.B \-ZlibLevel -+Zlib compression level. -+ - .SH FILES - .TP - $HOME/.vnc/default.tigervnc diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch deleted file mode 100644 index 8b50d8ccf159..000000000000 --- a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/unix/vncserver b/unix/vncserver -index 9e7a6ac5..fff53bdb 100755 ---- a/unix/vncserver -+++ b/unix/vncserver -@@ -63,27 +63,7 @@ $defaultXStartup - = ("#!/bin/sh\n\n". - "unset SESSION_MANAGER\n". - "unset DBUS_SESSION_BUS_ADDRESS\n". -- "OS=`uname -s`\n". -- "if [ \$OS = 'Linux' ]; then\n". -- " case \"\$WINDOWMANAGER\" in\n". -- " \*gnome\*)\n". -- " if [ -e /etc/SuSE-release ]; then\n". -- " PATH=\$PATH:/opt/gnome/bin\n". -- " export PATH\n". -- " fi\n". -- " ;;\n". -- " esac\n". -- "fi\n". -- "if [ -x /etc/X11/xinit/xinitrc ]; then\n". -- " exec /etc/X11/xinit/xinitrc\n". -- "fi\n". -- "if [ -f /etc/X11/xinit/xinitrc ]; then\n". -- " exec sh /etc/X11/xinit/xinitrc\n". -- "fi\n". -- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". -- "xsetroot -solid grey\n". -- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". -- "twm &\n"); -+ "exec /etc/X11/xinit/xinitrc\n"); - - $defaultConfig - = ("## Supported server options to pass to vncserver upon invocation can be listed\n". diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd deleted file mode 100644 index e651dbbe7889..000000000000 --- a/net-misc/tigervnc/files/tigervnc.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/tigervnc - -# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display". -# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space. -# DISPLAYS="myuser:1" - -# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information. -# VNC_OPTS="" - diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd deleted file mode 100644 index 06a154257e6f..000000000000 --- a/net-misc/tigervnc/files/tigervnc.initd +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need net -} - -checkconfig() { - if [ -n "${DISPLAYS}" ]; then - if [ $1 = "start" ]; then - local user - for user in $DISPLAYS; do - if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then - eerror "There are no passwords defined for user ${user%%:*}." - return 1 - elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then - eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}" - eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" - return 1 - elif [ -e "/tmp/.X${user##*:}-lock" ]; then - eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock" - eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" - return 1 - fi - done - fi - return 0 - else - eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc' - return 1 - fi -} - -start() { - checkconfig start || return 1 - ebegin "Starting TigerVNC server" - for user in $DISPLAYS; do - usrname=${user%%:*} - usropts=VNC_OPTS_${usrname} - usrdisp=${user##*:} - usrvar=$usropts"["$usrdisp"]" - [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar} - - # A user may have an invalid shell, so we default to /bin/sh if its the case - if [ -x /usr/bin/getent ] ; then - usrshell=`getent passwd ${user%%:*} | cut -d: -f 7` - case "$usrshell" in - */bash|*/ksh|*/sh|*/csh|*/tcsh) ;; - *) shell="-s /bin/sh" ;; - esac - echo $usrshell $shell - fi - - su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null - done - eend $? -} - -stop() { - checkconfig stop || return 2 - ebegin "Stopping TigerVNC server" - for user in $DISPLAYS; do - su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null - done - eend $? -} - -restart() { - svc_stop - svc_start -} diff --git a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch b/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch deleted file mode 100644 index 4028ebb74518..000000000000 --- a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urpN xorg-server-1.20.0.orig/dri3/dri3.c xorg-server-1.20.0/dri3/dri3.c ---- xorg-server-1.20.0.orig/dri3/dri3.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3.c 2018-06-13 19:32:52.131915519 -0700 -@@ -26,7 +26,7 @@ - - #include "dri3_priv.h" - --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - - static int dri3_request; - DevPrivateKeyRec dri3_screen_private_key; -diff -urpN xorg-server-1.20.0.orig/dri3/dri3_request.c xorg-server-1.20.0/dri3/dri3_request.c ---- xorg-server-1.20.0.orig/dri3/dri3_request.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3_request.c 2018-06-13 19:33:46.164444267 -0700 -@@ -30,7 +30,7 @@ - #include <xace.h> - #include "../Xext/syncsdk.h" - #include <protocol-versions.h> --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - - static Bool - dri3_screen_can_one_point_two(ScreenPtr screen) -diff -urpN xorg-server-1.20.0.orig/dri3/dri3_screen.c xorg-server-1.20.0/dri3/dri3_screen.c ---- xorg-server-1.20.0.orig/dri3/dri3_screen.c 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/dri3/dri3_screen.c 2018-06-13 19:33:13.885725528 -0700 -@@ -29,7 +29,7 @@ - #include <misync.h> - #include <misyncshm.h> - #include <randrstr.h> --#include <drm_fourcc.h> -+#include <libdrm/drm_fourcc.h> - #include <unistd.h> - - int diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch deleted file mode 100644 index e823a651ae03..000000000000 --- a/net-misc/tigervnc/files/xserver120.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac ---- xorg-server-1.20.0.orig/configure.ac 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/configure.ac 2018-06-13 19:04:47.536413626 -0700 -@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - LT_PREREQ([2.2]) - LT_INIT([disable-static win32-dll]) -@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2565,6 +2571,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am ---- xorg-server-1.20.0.orig/hw/Makefile.am 2018-05-10 09:32:34.000000000 -0700 -+++ xorg-server-1.20.0/hw/Makefile.am 2018-06-13 19:04:47.536413626 -0700 -@@ -38,7 +38,8 @@ SUBDIRS = \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) \ -- $(XWAYLAND_SUBDIRS) -+ $(XWAYLAND_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland - -diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h ---- xorg-server-1.20.0.orig/include/os.h 2018-05-10 09:32:36.000000000 -0700 -+++ xorg-server-1.20.0/include/os.h 2018-06-13 19:04:47.537413618 -0700 -@@ -633,7 +633,7 @@ LogSetDisplay(void); - extern _X_EXPORT void - LogClose(enum ExitCode error); - extern _X_EXPORT Bool --LogSetParameter(LogParameter param, int value); -+LogSetParameter(enum _LogParameter param, int value); - extern _X_EXPORT void - LogVWrite(int verb, const char *f, va_list args) - _X_ATTRIBUTE_PRINTF(2, 0); -diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c ---- xorg-server-1.20.0.orig/mi/miinitext.c 2018-05-10 09:32:37.000000000 -0700 -+++ xorg-server-1.20.0/mi/miinitext.c 2018-06-13 19:05:14.742200675 -0700 -@@ -107,8 +107,15 @@ SOFTWARE. - #include "os.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* List of built-in (statically linked) extensions */ - static const ExtensionModule staticExtensions[] = { -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - {GEExtensionInit, "Generic Event Extension", &noGEExtension}, - {ShapeExtensionInit, "SHAPE", NULL}, - #ifdef MITSHM diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild deleted file mode 100644 index 8b4f9d535a12..000000000000 --- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2022 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 ~riscv ~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} - 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_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 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 -} |