tigervnc: switch to xorg-server-1.20.11

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 28 16:54:08 2021 +0200
Changeset:	68599073dca9dc7d13693cc23ed3f1103602a23d

Modified Files:
	tigervnc/Makefile
	tigervnc/distinfo
Added Files:
	tigervnc/patches/patch-unix_xserver_os_inputthread.c

Log Message:
tigervnc: switch to xorg-server-1.20.11

This starts up and seems to work so far.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=68599073dca9dc7d13693cc23ed3f1103602a23d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tigervnc/Makefile                                    | 10 +++++++---
 tigervnc/distinfo                                    |  9 +++++----
 tigervnc/patches/patch-unix_xserver_os_inputthread.c | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diffs:
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
index 0d7218c4f2..0984924ad5 100644
--- a/tigervnc/Makefile
+++ b/tigervnc/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.37 2021/04/21 13:25:14 adam Exp $
 
 DISTNAME=		tigervnc-1.9.0
-PKGNAME=		${DISTNAME}.1.19.7
+PKGNAME=		${DISTNAME}.1.20.11
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=TigerVNC/}
 GITHUB_TAG=		v${PKGVERSION_NOREV}
-XORG_SERVER_FILE=	xorg-server-1.19.7
+XORG_SERVER_FILE=	xorg-server-1.20.11
 SITES.${XORG_SERVER_FILE}.tar.bz2=	${MASTER_SITE_XORG:=xserver/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
 
@@ -29,6 +29,9 @@ USE_TOOLS+=	intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf
 BUILD_DIRS=	. unix/xserver
 INSTALL_DIRS=	. unix/xserver/hw/vnc
 
+# for reallocarray()
+CPPFLAGS.NetBSD+=	-D_OPENBSD_SOURCE
+
 LDFLAGS+=	${BUILDLINK_LDADD.gettext}
 
 CONFIGURE_ENV+=			ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
@@ -49,7 +52,7 @@ post-extract:
 	cp -r ${WRKDIR}/${XORG_SERVER_FILE}/* ${WRKSRC}/unix/xserver
 
 post-patch:
-	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver119.patch
+	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch
 
 XORG_CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 XORG_CONFIGURE_ARGS+=	--disable-xwayland --disable-kdrive --disable-xephyr
@@ -96,4 +99,5 @@ BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.3.3
 .include "../../x11/libXfont/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
index 870aec0842..fecc8ecf9a 100644
--- a/tigervnc/distinfo
+++ b/tigervnc/distinfo
@@ -4,13 +4,14 @@ SHA1 (tigervnc-1.9.0.tar.gz) = c56656c596fb863bb2c4b67fb62b4165011d181f
 RMD160 (tigervnc-1.9.0.tar.gz) = 990e872addf459432584c176b3565504e994899e
 SHA512 (tigervnc-1.9.0.tar.gz) = 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 Size (tigervnc-1.9.0.tar.gz) = 1506520 bytes
-SHA1 (xorg-server-1.19.7.tar.bz2) = 70c06a92a531aa3bf49d9d3de66e9a97c9f1191c
-RMD160 (xorg-server-1.19.7.tar.bz2) = b77b3ec73631e7fd29aaac7cc8c471d5bb6145f3
-SHA512 (xorg-server-1.19.7.tar.bz2) = 5942c08aa53309965fbe127aaf1e7b079c5cb65dbd21acc7c2c09e74a305eb8e2fda521e2bf59f6f83a5f879d1ea061d76f33bc2af4ab302335316b1623a8947
-Size (xorg-server-1.19.7.tar.bz2) = 6104222 bytes
+SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d
+RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23
+SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
+Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes
 SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
 SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
 SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 29b33e6d94a070bb0a55a264cd1c4e120c9b1b3c
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5
+SHA1 (patch-unix_xserver_os_inputthread.c) = da8f1a6ab905d2569f61e92d8cf9891ed14ec42a
diff --git a/tigervnc/patches/patch-unix_xserver_os_inputthread.c b/tigervnc/patches/patch-unix_xserver_os_inputthread.c
new file mode 100644
index 0000000000..e67869ae47
--- /dev/null
+++ b/tigervnc/patches/patch-unix_xserver_os_inputthread.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- unix/xserver/os/inputthread.c.orig	2021-04-28 14:41:01.046740215 +0000
++++ unix/xserver/os/inputthread.c
+@@ -318,7 +317,9 @@ InputThreadDoWork(void *arg)
+     sigfillset(&set);
+     pthread_sigmask(SIG_BLOCK, &set, NULL);
+ 
++#ifndef __NetBSD__
+     ddxInputThreadInit();
++#endif
+ 
+     inputThreadInfo->running = TRUE;
+