CVS commit: pkgsrc/x11/x11vnc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May  3 16:51:15 UTC 2025

Modified Files:
        pkgsrc/x11/x11vnc: Makefile distinfo options.mk
Added Files:
        pkgsrc/x11/x11vnc/patches: patch-src_uinput.c

Log Message:
x11vnc: Update to 0.9.17

This release contains various build fixes for various platforms,
support for more mouse buttons, and fixes various bugs that
may be security-relevant.

This was verified to build on FreeBSD, NetBSD, Linux (retro & modern),
illumos, and macOS 13 by drecklypkg ci.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/x11/x11vnc/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/x11vnc/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/x11vnc/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/x11vnc/patches/patch-src_uinput.c

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

Modified files:

Index: pkgsrc/x11/x11vnc/Makefile
diff -u pkgsrc/x11/x11vnc/Makefile:1.100 pkgsrc/x11/x11vnc/Makefile:1.101
--- pkgsrc/x11/x11vnc/Makefile:1.100    Thu Apr 24 14:16:33 2025
+++ pkgsrc/x11/x11vnc/Makefile  Sat May  3 16:51:15 2025
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.100 2025/04/24 14:16:33 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2025/05/03 16:51:15 nia Exp $
 #
 
-DISTNAME=      x11vnc-0.9.16
-PKGREVISION=   22
+DISTNAME=      x11vnc-0.9.17
 CATEGORIES=    x11 net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=LibVNC/}
 GITHUB_PROJECT=        x11vnc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.karlrunge.com/x11vnc/
+HOMEPAGE=      https://github.com/LibVNC/x11vnc
 COMMENT=       VNC server for real X displays
 LICENSE=       gnu-gpl-v2
 
 USE_TOOLS+=    autoconf automake autoreconf gmake pkg-config
 GNU_CONFIGURE= yes
 
-PTHREAD_AUTO_VARS=     yes
-SUBST_CLASSES+=                pthread
-SUBST_STAGE.pthread=   pre-configure
-SUBST_FILES.pthread=   configure
-SUBST_SED.pthread=     -e 's|-lpthread||g'
-SUBST_NOOP_OK.pthread= yes # configure does not contain "pthread"
-
 .include "options.mk"
 
 pre-configure:

Index: pkgsrc/x11/x11vnc/distinfo
diff -u pkgsrc/x11/x11vnc/distinfo:1.25 pkgsrc/x11/x11vnc/distinfo:1.26
--- pkgsrc/x11/x11vnc/distinfo:1.25     Tue Oct 26 11:34:32 2021
+++ pkgsrc/x11/x11vnc/distinfo  Sat May  3 16:51:15 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:34:32 nia Exp $
+$NetBSD: distinfo,v 1.26 2025/05/03 16:51:15 nia Exp $
 
-BLAKE2s (x11vnc-0.9.16.tar.gz) = 88014f45551dbddb870f16259a2db8d6ca2f583957d32a1cc9fd1a6fd065fe38
-SHA512 (x11vnc-0.9.16.tar.gz) = 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
-Size (x11vnc-0.9.16.tar.gz) = 1708009 bytes
+BLAKE2s (x11vnc-0.9.17.tar.gz) = afca0d47d38c54bfd38a08140191248c9ed3b48f0a19a80f668a52a0e7605582
+SHA512 (x11vnc-0.9.17.tar.gz) = 687c41e03cca43dbca6ffdeb40960dddfba54ba00cf890f89f63fd66b9559a4c09602f84c1d4b7ffd7ac58818b90893013925d94a45a6feb83ab8cf7a02c1fe8
+Size (x11vnc-0.9.17.tar.gz) = 1691520 bytes
 SHA1 (patch-configure.ac) = 8ec2a6c8727614aacec4fb18340b16a215902ca5
+SHA1 (patch-src_uinput.c) = 37976b4bfe07535a8b183496e384456aa11bf0bf
 SHA1 (patch-x11vnc_unixpw.c) = bb611f4b307a54ef2898de635acde59da9102074

Index: pkgsrc/x11/x11vnc/options.mk
diff -u pkgsrc/x11/x11vnc/options.mk:1.6 pkgsrc/x11/x11vnc/options.mk:1.7
--- pkgsrc/x11/x11vnc/options.mk:1.6    Tue Dec 18 15:53:46 2018
+++ pkgsrc/x11/x11vnc/options.mk        Sat May  3 16:51:15 2025
@@ -1,10 +1,16 @@
-# $NetBSD: options.mk,v 1.6 2018/12/18 15:53:46 tnn Exp $
+# $NetBSD: options.mk,v 1.7 2025/05/03 16:51:15 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.x11vnc
-PKG_SUPPORTED_OPTIONS= avahi x11
+PKG_SUPPORTED_OPTIONS= avahi libdrm x11
 PKG_SUGGESTED_OPTIONS= x11
 
+.include "../../graphics/MesaLib/features.mk"
+
+.if ${MESALIB_SUPPORTS_DRI:tl} != "no"
+PKG_SUGGESTED_OPTIONS+=        libdrm
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mavahi)
@@ -14,6 +20,13 @@ CONFIGURE_ARGS+=     --with-avahi=${BUILDLIN
 CONFIGURE_ARGS+=       --without-avahi
 .endif
 
+.if !empty(PKG_OPTIONS:Mlibdrm)
+.include "../../x11/libdrm/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-drm
+.else
+CONFIGURE_ARGS+=       --without-drm
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=               --with-x
 BUILDLINK_DEPMETHOD.libXt?=    build

Added files:

Index: pkgsrc/x11/x11vnc/patches/patch-src_uinput.c
diff -u /dev/null pkgsrc/x11/x11vnc/patches/patch-src_uinput.c:1.1
--- /dev/null   Sat May  3 16:51:15 2025
+++ pkgsrc/x11/x11vnc/patches/patch-src_uinput.c        Sat May  3 16:51:15 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_uinput.c,v 1.1 2025/05/03 16:51:15 nia Exp $
+
+Fix building on older Linux systems, e.g. CentOS 7.
+
+--- src/uinput.c.orig  2025-05-03 16:33:30.192475504 +0000
++++ src/uinput.c
+@@ -433,7 +433,9 @@ int initialize_uinput(void) {
+       ioctl(fd, UI_SET_RELBIT, REL_X);
+       ioctl(fd, UI_SET_RELBIT, REL_Y);
+       ioctl(fd, UI_SET_RELBIT, REL_WHEEL);
++#ifdef REL_WHEEL_HI_RES
+       ioctl(fd, UI_SET_RELBIT, REL_WHEEL_HI_RES);
++#endif
+ 
+       ioctl(fd, UI_SET_EVBIT, EV_KEY);
+ 
+@@ -1019,16 +1021,20 @@ static void button_click(int down, int b
+               ev.code = REL_WHEEL;
+               ev.type = EV_REL;
+               ev.value = 1;
++#ifdef REL_WHEEL_HI_RES
+               write(d, &ev, sizeof(ev));
+               ev.code = REL_WHEEL_HI_RES;
+               ev.value = 120;
++#endif
+       } else if (btn == 5) {
+               ev.code = REL_WHEEL;
+               ev.type = EV_REL;
+               ev.value = -1;
++#ifdef REL_WHEEL_HI_RES
+               write(d, &ev, sizeof(ev));
+               ev.code = REL_WHEEL_HI_RES;
+               ev.value = -120;
++#endif
+       } else {
+               return;
+       }