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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20F17158086 for ; Tue, 7 Dec 2021 23:45:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D8602BC006; Tue, 7 Dec 2021 23:45:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 801622BC006 for ; Tue, 7 Dec 2021 23:45:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6486A342B15 for ; Tue, 7 Dec 2021 23:45:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE56579 for ; Tue, 7 Dec 2021 23:45:37 +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: <1638920729.14e8c0f75ccd89f10dca5f83b3991c3bab5c7523.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/Manifest net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild net-misc/tigervnc/tigervnc-1.12.0.ebuild X-VCS-Directories: net-misc/tigervnc/ net-misc/tigervnc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 14e8c0f75ccd89f10dca5f83b3991c3bab5c7523 X-VCS-Branch: master Date: Tue, 7 Dec 2021 23:45:37 +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: 328bd02b-95b7-45af-8cd2-cd2c234b40a4 X-Archives-Hash: f828527a98c64e82688a143e5c4f9c19 commit: 14e8c0f75ccd89f10dca5f83b3991c3bab5c7523 Author: Sam James gentoo org> AuthorDate: Tue Dec 7 23:44:49 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 7 23:45:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e8c0f7 net-misc/tigervnc: fix 1.12.0 for xorg 1.21.1 Add additional patches and apply the right one in the source tree too. Bug: https://bugs.gentoo.org/746227 Thanks-to: Joakim Tjernlund infinera.com> Signed-off-by: Sam James gentoo.org> net-misc/tigervnc/Manifest | 1 + .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 ++++++++++++++++++++++ ...vnc-1.12.0.ebuild => tigervnc-1.12.0-r1.ebuild} | 15 +++--- 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index d58cbabda1a3..004231b045fb 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,4 +1,5 @@ DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025 +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 diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch new file mode 100644 index 000000000000..c3e003d328a6 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch @@ -0,0 +1,55 @@ +https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch +https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch + +From: Joakim Tjernlund +Date: Wed, 24 Nov 2021 21:09:36 +0100 +Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21 + +--- a/unix/xserver/hw/vnc/xorg-version.h ++++ b/unix/xserver/hw/vnc/xorg-version.h +@@ -33,8 +33,8 @@ + #error "X.Org older than 1.16 is not supported" + #endif + +-#if XORG_AT_LEAST(1, 21, 0) +-#error "X.Org newer than 1.20 is not supported" ++#if XORG_AT_LEAST(1, 22, 0) ++#error "X.Org newer than 1.21 is not supported" + #endif + + #endif + +From: Joakim Tjernlund +Date: Wed, 24 Nov 2021 21:10:56 +0100 +Subject: [PATCH] xvnc: adapt for 1.21 + +VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY +site.h has been removed and is not needed. +--- a/unix/xserver/hw/vnc/xvnc.c ++++ b/unix/xserver/hw/vnc/xvnc.c +@@ -69,7 +69,6 @@ extern char buildtime[]; + #undef VENDOR_RELEASE + #undef VENDOR_STRING + #include "version-config.h" +-#include "site.h" + + #define XVNCVERSION "TigerVNC 1.12.80" + #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \ +@@ -111,14 +110,13 @@ static Bool Render = TRUE; + static Bool displaySpecified = FALSE; + static char displayNumStr[16]; + +-static int vncVerbose = DEFAULT_LOG_VERBOSITY; ++static int vncVerbose = 0; + + static void + vncPrintBanner(void) + { + ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT); +- ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE, +- VENDOR_STRING); ++ ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE); + } + + static void + diff --git a/net-misc/tigervnc/tigervnc-1.12.0.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild similarity index 88% rename from net-misc/tigervnc/tigervnc-1.12.0.ebuild rename to net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild index 3fc099abd296..a00c4d13860f 100644 --- a/net-misc/tigervnc/tigervnc-1.12.0.ebuild +++ b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild @@ -11,7 +11,10 @@ XSERVER_VERSION="21.1.1" 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.xz )" + server? ( + ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz + https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch + )" LICENSE="GPL-2" SLOT="0" @@ -82,16 +85,18 @@ PATCHES=( src_prepare() { if use server; then cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + eapply "${FILESDIR}"/${P}-xorg-1.21.patch + eapply "${DISTDIR}"/${P}-xserver-21.patch 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 + 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 } @@ -116,7 +121,6 @@ src_configure() { --disable-config-hal \ --disable-config-udev \ --disable-devel-docs \ - --disable-dmx \ --disable-dri \ $(use_enable dri3) \ --disable-glamor \ @@ -133,7 +137,6 @@ src_configure() { --disable-xorg \ --disable-xvfb \ --disable-xwin \ - --disable-xwayland \ --enable-dri2 \ --with-pic \ --without-dtrace \