Thu Aug 22 19:52:29 2019 UTC ()
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.


(nia)
diff -r1.119 -r1.120 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.27 -r1.28 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/PLIST
diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/options.mk
diff -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-xwayland/DESCR
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-xwayland/PLIST
cvs diff -r1.119 -r1.120 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/Makefile 2019/07/20 22:46:57 1.119
+++ pkgsrc/x11/modular-xorg-server/Makefile 2019/08/22 19:52:29 1.120
@@ -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
cvs diff -r1.27 -r1.28 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/Makefile.common 2019/02/27 16:32:58 1.27
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2019/08/22 19:52:29 1.28
@@ -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
cvs diff -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/PLIST (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/PLIST 2019/08/22 13:12:31 1.29
+++ pkgsrc/x11/modular-xorg-server/PLIST 2019/08/22 19:52:29 1.30
@@ -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
cvs diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-server/options.mk 2019/08/22 13:12:31 1.20
+++ pkgsrc/x11/modular-xorg-server/options.mk 2019/08/22 19:52:29 1.21
@@ -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"
@@ -54,14 +54,4 @@
 CONFIGURE_ARGS+=	--with-dtrace
 .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
cvs diff -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to context diff)
--- pkgsrc/x11/modular-xorg-xephyr/Makefile 2019/07/20 22:46:57 1.14
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile 2019/08/22 19:52:29 1.15
@@ -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
File Added: pkgsrc/x11/modular-xorg-xwayland/DESCR
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.
File Added: pkgsrc/x11/modular-xorg-xwayland/Makefile
# $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
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"
File Added: pkgsrc/x11/modular-xorg-xwayland/PLIST
@comment $NetBSD: PLIST,v 1.1 2019/08/22 19:52:29 nia Exp $
bin/Xwayland