CVS commit: pkgsrc/x11/modular-xorg-xwayland

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 30 08:45:06 UTC 2023

Modified Files:
        pkgsrc/x11/modular-xorg-xwayland: Makefile PLIST
Added Files:
        pkgsrc/x11/modular-xorg-xwayland/patches:
            patch-hw_xwayland_xwayland-input.c patch-os_rpcauth.c

Log Message:
modular-xorg-xwayland: update to 23.1.1.

Un-BROKEN this package by switching to the new, separate distfile
and making it compile.

The patches are just compile fixes and wrong (for NetBSD), so input
handling will most probably not work nor will RPC authentication.

However, this might build on Linux again, and so is still better
than a BROKEN package.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/modular-xorg-xwayland/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/modular-xorg-xwayland/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-xwayland/patches/patch-hw_xwayland_xwayland-input.c \
    pkgsrc/x11/modular-xorg-xwayland/patches/patch-os_rpcauth.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/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.16 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.17
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.16      Sun Jan 29 21:18:18 2023
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Thu Mar 30 08:45:05 2023
@@ -1,8 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2023/01/29 21:18:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2023/03/30 08:45:05 wiz Exp $
 
-DISTNAME=      xorg-server-${XORG_VERSION}
-PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
-PKGREVISION=   1
+DISTNAME=      xwayland-23.1.1
+PKGNAME=       modular-xorg-${DISTNAME}
+CATEGORIES=    x11
+MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://xorg.freedesktop.org/
+COMMENT=       Server for running X clients under Wayland from modular X.org
+LICENSE=       mit AND modified-bsd AND x11 # with no-advertising clause
+
+USE_TOOLS+=    pkg-config
 
 .include "../../devel/wayland/platform.mk"
 
@@ -10,22 +19,6 @@ PKGREVISION= 1
 PKG_SKIP_REASON+=      "Platform does not support Wayland"
 .endif
 
-DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
-PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches
-
-MAINTAINER=    nia%NetBSD.org@localhost
-COMMENT=       Server for running X clients under Wayland from modular X.org
-
-BROKEN=                "needs updating to separate unshared distfile"
-.include "../../x11/modular-xorg-server/Makefile.common"
-
-CONFIGURE_ARGS+=       --disable-xorg
-CONFIGURE_ARGS+=       --disable-xephyr
-CONFIGURE_ARGS+=       --disable-xnest
-CONFIGURE_ARGS+=       --disable-xvfb
-CONFIGURE_ARGS+=       --disable-xwayland-eglstream
-CONFIGURE_ARGS+=       --enable-xwayland
-
 post-install:
        ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
        ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
@@ -33,7 +26,15 @@ post-install:
                ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \
        fi
 
-.include "../../x11/modular-xorg-server/options.mk"
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+.include "../../graphics/libepoxy/buildlink3.mk"
+.include "../../x11/libXfont2/buildlink3.mk"
+.include "../../x11/libxcvt/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/modular-xorg-xwayland/PLIST
diff -u pkgsrc/x11/modular-xorg-xwayland/PLIST:1.1 pkgsrc/x11/modular-xorg-xwayland/PLIST:1.2
--- pkgsrc/x11/modular-xorg-xwayland/PLIST:1.1  Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xwayland/PLIST      Thu Mar 30 08:45:05 2023
@@ -1,2 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/08/22 19:52:29 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/03/30 08:45:05 wiz Exp $
 bin/Xwayland
+lib/pkgconfig/xwayland.pc
+man/man1/Xwayland.1
+share/applications/org.freedesktop.Xwayland.desktop

Added files:

Index: pkgsrc/x11/modular-xorg-xwayland/patches/patch-hw_xwayland_xwayland-input.c
diff -u /dev/null pkgsrc/x11/modular-xorg-xwayland/patches/patch-hw_xwayland_xwayland-input.c:1.1
--- /dev/null   Thu Mar 30 08:45:06 2023
+++ pkgsrc/x11/modular-xorg-xwayland/patches/patch-hw_xwayland_xwayland-input.c Thu Mar 30 08:45:06 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.1 2023/03/30 08:45:06 wiz Exp $
+
+Linux-specific input code. Compiles, but probably won't work on non-Linux.
+
+--- hw/xwayland/xwayland-input.c.orig  2023-03-29 12:26:36.000000000 +0000
++++ hw/xwayland/xwayland-input.c
+@@ -26,7 +26,18 @@
+ 
+ #include <xwayland-config.h>
+ 
++#ifdef __Linux__
+ #include <linux/input.h>
++#else
++#define BTN_LEFT 1
++#define BTN_MIDDLE 2
++#define BTN_RIGHT 3
++#define BTN_SIDE 4
++#define KEY_LEFTSHIFT 5
++#define KEY_RIGHTSHIFT 6
++#define KEY_LEFTCTRL 7
++#define KEY_RIGHTCTRL 8
++#endif
+ #include <sys/mman.h>
+ 
+ #include <inputstr.h>
Index: pkgsrc/x11/modular-xorg-xwayland/patches/patch-os_rpcauth.c
diff -u /dev/null pkgsrc/x11/modular-xorg-xwayland/patches/patch-os_rpcauth.c:1.1
--- /dev/null   Thu Mar 30 08:45:06 2023
+++ pkgsrc/x11/modular-xorg-xwayland/patches/patch-os_rpcauth.c Thu Mar 30 08:45:06 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-os_rpcauth.c,v 1.1 2023/03/30 08:45:06 wiz Exp $
+
+Ugly hack - NetBSD doesn't provide 'struct authdes_cred'.
+
+--- os/rpcauth.c.orig  2023-03-29 12:26:36.000000000 +0000
++++ os/rpcauth.c
+@@ -106,7 +106,11 @@ authdes_ezdecode(const char *inmsg, int 
+ #endif
+         goto bad2;
+     }
++#ifdef __NetBSD__
++    return NULL;
++#else
+     return (((struct authdes_cred *) r.rq_clntcred)->adc_fullname.name);
++#endif
+ 
+  bad2:
+     free(r.rq_clntcred);