[pkgsrc/trunk]: pkgsrc/x11 Add x11/modular-xorg-xwayland.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92ab1a1c3055
branches:  trunk
changeset: 400129:92ab1a1c3055
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 22 19:52:29 2019 +0000

description:
Add x11/modular-xorg-xwayland.

XWayland is a fully fledged X server implementation that acts as a proxy
between X11 clients and a Wayland compositor.

It runs as a specialized Wayland client, while optionally using a set of
XWayland specific Wayland protocols for implementing certain functionality.

The Wayland compositor acts both as the Wayland display server XWayland
connects to, as well as the window manager.

diffstat:

 x11/modular-xorg-server/Makefile        |   3 ++-
 x11/modular-xorg-server/Makefile.common |   3 ++-
 x11/modular-xorg-server/PLIST           |   3 +--
 x11/modular-xorg-server/options.mk      |  14 ++------------
 x11/modular-xorg-xephyr/Makefile        |   3 ++-
 x11/modular-xorg-xwayland/DESCR         |   8 ++++++++
 x11/modular-xorg-xwayland/Makefile      |  31 +++++++++++++++++++++++++++++++
 x11/modular-xorg-xwayland/PLIST         |   2 ++
 8 files changed, 50 insertions(+), 17 deletions(-)

diffs (140 lines):

diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Thu Aug 22 18:37:34 2019 +0000
+++ b/x11/modular-xorg-server/Makefile  Thu Aug 22 19:52:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2019/07/20 22:46:57 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2019/08/22 19:52:29 nia Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
@@ -15,6 +15,7 @@
 
 CONFIGURE_ARGS+=       --enable-xorg
 CONFIGURE_ARGS+=       --disable-xephyr
+CONFIGURE_ARGS+=       --disable-xwayland
 CONFIGURE_ARGS+=       --disable-kdrive
 CONFIGURE_ARGS.SunOS+= --disable-input-thread
 
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-server/Makefile.common
--- a/x11/modular-xorg-server/Makefile.common   Thu Aug 22 18:37:34 2019 +0000
+++ b/x11/modular-xorg-server/Makefile.common   Thu Aug 22 19:52:29 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.27 2019/02/27 16:32:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2019/08/22 19:52:29 nia Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
+# used by x11/modular-xorg-xwayland/Makefile
 
 XORG_VERSION=  1.20.4
 CATEGORIES=    x11
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-server/PLIST
--- a/x11/modular-xorg-server/PLIST     Thu Aug 22 18:37:34 2019 +0000
+++ b/x11/modular-xorg-server/PLIST     Thu Aug 22 19:52:29 2019 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.29 2019/08/22 13:12:31 nia Exp $
+@comment $NetBSD: PLIST,v 1.30 2019/08/22 19:52:29 nia Exp $
 bin/X
 bin/Xnest
 bin/Xorg
 bin/Xvfb
-${PLIST.wayland}bin/Xwayland
 bin/cvt
 bin/gtf
 include/xorg/BT.h
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-server/options.mk
--- a/x11/modular-xorg-server/options.mk        Thu Aug 22 18:37:34 2019 +0000
+++ b/x11/modular-xorg-server/options.mk        Thu Aug 22 19:52:29 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.20 2019/08/22 13:12:31 nia Exp $
+# $NetBSD: options.mk,v 1.21 2019/08/22 19:52:29 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.modular-xorg-server
-PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace wayland
+PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace
 PKG_SUGGESTED_OPTIONS= inet6 dri
 
 .include "../../mk/bsd.options.mk"
@@ -55,13 +55,3 @@
 .else
 CONFIGURE_ARGS+=       --without-dtrace
 .endif
-
-.if !empty(PKG_OPTIONS:Mwayland)
-PLIST.wayland=         yes
-CONFIGURE_ARGS+=       --enable-xwayland
-CONFIGURE_ARGS+=       --disable-xwayland-eglstream
-.include "../../devel/wayland/buildlink3.mk"
-.include "../../devel/wayland-protocols/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-xwayland
-.endif
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-xephyr/Makefile
--- a/x11/modular-xorg-xephyr/Makefile  Thu Aug 22 18:37:34 2019 +0000
+++ b/x11/modular-xorg-xephyr/Makefile  Thu Aug 22 19:52:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/07/20 22:46:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/08/22 19:52:29 nia Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xephyr-${XORG_VERSION}
@@ -16,6 +16,7 @@
 
 CONFIGURE_ARGS+=       --disable-xorg
 CONFIGURE_ARGS+=       --disable-xnest
+CONFIGURE_ARGS+=       --disable-xwayland
 CONFIGURE_ARGS+=       --enable-xephyr
 CONFIGURE_ARGS+=       --enable-kdrive
 CONFIGURE_ARGS+=       --disable-xvfb
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-xwayland/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-xwayland/DESCR   Thu Aug 22 19:52:29 2019 +0000
@@ -0,0 +1,8 @@
+XWayland is a fully fledged X server implementation that acts as a proxy
+between X11 clients and a Wayland compositor.
+
+It runs as a specialized Wayland client, while optionally using a set of
+XWayland specific Wayland protocols for implementing certain functionality.
+
+The Wayland compositor acts both as the Wayland display server XWayland
+connects to, as well as the window manager.
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-xwayland/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-xwayland/Makefile        Thu Aug 22 19:52:29 2019 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2019/08/22 19:52:29 nia Exp $
+
+DISTNAME=      xorg-server-${XORG_VERSION}
+PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
+
+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
+
+.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
+       if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \
+               ${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 "../../mk/bsd.pkg.mk"
diff -r 1f778de86858 -r 92ab1a1c3055 x11/modular-xorg-xwayland/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/modular-xorg-xwayland/PLIST   Thu Aug 22 19:52:29 2019 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2019/08/22 19:52:29 nia Exp $
+bin/Xwayland