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 unified 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,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.119 2019/07/20 22:46:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.120 2019/08/22 19:52:29 nia Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 8COMMENT= Modular X11 server from modular X.org
9 9
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 11
12NOT_FOR_PLATFORM= Darwin-*-* 12NOT_FOR_PLATFORM= Darwin-*-*
13 13
14.include "Makefile.common" 14.include "Makefile.common"
15 15
16CONFIGURE_ARGS+= --enable-xorg 16CONFIGURE_ARGS+= --enable-xorg
17CONFIGURE_ARGS+= --disable-xephyr 17CONFIGURE_ARGS+= --disable-xephyr
 18CONFIGURE_ARGS+= --disable-xwayland
18CONFIGURE_ARGS+= --disable-kdrive 19CONFIGURE_ARGS+= --disable-kdrive
19CONFIGURE_ARGS.SunOS+= --disable-input-thread 20CONFIGURE_ARGS.SunOS+= --disable-input-thread
20 21
21.include "options.mk" 22.include "options.mk"
22 23
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified 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,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile.common,v 1.27 2019/02/27 16:32:58 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.28 2019/08/22 19:52:29 nia Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
 4# used by x11/modular-xorg-xwayland/Makefile
4 5
5XORG_VERSION= 1.20.4 6XORG_VERSION= 1.20.4
6CATEGORIES= x11 7CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
11LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
12 13
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
16USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
cvs diff -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/PLIST (expand / switch to unified 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,19 +1,18 @@ @@ -1,19 +1,18 @@
1@comment $NetBSD: PLIST,v 1.29 2019/08/22 13:12:31 nia Exp $ 1@comment $NetBSD: PLIST,v 1.30 2019/08/22 19:52:29 nia Exp $
2bin/X 2bin/X
3bin/Xnest 3bin/Xnest
4bin/Xorg 4bin/Xorg
5bin/Xvfb 5bin/Xvfb
6${PLIST.wayland}bin/Xwayland 
7bin/cvt 6bin/cvt
8bin/gtf 7bin/gtf
9include/xorg/BT.h 8include/xorg/BT.h
10include/xorg/IBM.h 9include/xorg/IBM.h
11include/xorg/TI.h 10include/xorg/TI.h
12include/xorg/XIstubs.h 11include/xorg/XIstubs.h
13include/xorg/Xprintf.h 12include/xorg/Xprintf.h
14include/xorg/callback.h 13include/xorg/callback.h
15include/xorg/client.h 14include/xorg/client.h
16include/xorg/closestr.h 15include/xorg/closestr.h
17include/xorg/closure.h 16include/xorg/closure.h
18include/xorg/colormap.h 17include/xorg/colormap.h
19include/xorg/colormapst.h 18include/xorg/colormapst.h
cvs diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to unified 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,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.20 2019/08/22 13:12:31 nia Exp $ 1# $NetBSD: options.mk,v 1.21 2019/08/22 19:52:29 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
4PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace wayland 4PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace
5PKG_SUGGESTED_OPTIONS= inet6 dri 5PKG_SUGGESTED_OPTIONS= inet6 dri
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dri dtrace wayland 9PLIST_VARS+= dri dtrace wayland
10 10
11.if !empty(PKG_OPTIONS:Mdri) 11.if !empty(PKG_OPTIONS:Mdri)
12.include "../../graphics/libepoxy/buildlink3.mk" 12.include "../../graphics/libepoxy/buildlink3.mk"
13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11 13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
14.include "../../graphics/MesaLib/buildlink3.mk" 14.include "../../graphics/MesaLib/buildlink3.mk"
15.include "../../x11/xorgproto/buildlink3.mk" 15.include "../../x11/xorgproto/buildlink3.mk"
16.include "../../x11/libdrm/buildlink3.mk" 16.include "../../x11/libdrm/buildlink3.mk"
17.include "../../x11/libxshmfence/buildlink3.mk" 17.include "../../x11/libxshmfence/buildlink3.mk"
@@ -45,23 +45,13 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -45,23 +45,13 @@ CONFIGURE_ARGS+= --disable-ipv6
45.endif 45.endif
46 46
47.if !empty(PKG_OPTIONS:Mdebug) 47.if !empty(PKG_OPTIONS:Mdebug)
48CONFIGURE_ARGS+= --enable-debug 48CONFIGURE_ARGS+= --enable-debug
49CFLAGS+= -ggdb 49CFLAGS+= -ggdb
50.endif 50.endif
51 51
52.if !empty(PKG_OPTIONS:Mdtrace) 52.if !empty(PKG_OPTIONS:Mdtrace)
53PLIST.dtrace= yes 53PLIST.dtrace= yes
54CONFIGURE_ARGS+= --with-dtrace 54CONFIGURE_ARGS+= --with-dtrace
55.else 55.else
56CONFIGURE_ARGS+= --without-dtrace 56CONFIGURE_ARGS+= --without-dtrace
57.endif 57.endif
58 
59.if !empty(PKG_OPTIONS:Mwayland) 
60PLIST.wayland= yes 
61CONFIGURE_ARGS+= --enable-xwayland 
62CONFIGURE_ARGS+= --disable-xwayland-eglstream 
63.include "../../devel/wayland/buildlink3.mk" 
64.include "../../devel/wayland-protocols/buildlink3.mk" 
65.else 
66CONFIGURE_ARGS+= --disable-xwayland 
67.endif 
cvs diff -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to unified 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,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.14 2019/07/20 22:46:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2019/08/22 19:52:29 nia Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xephyr-${XORG_VERSION} 4PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6 6
7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11COMMENT= Xephyr server based on kdrive from modular X.org 11COMMENT= Xephyr server based on kdrive from modular X.org
12 12
13BROKEN_ON_PLATFORM+= Darwin-*-* 13BROKEN_ON_PLATFORM+= Darwin-*-*
14 14
15.include "../../x11/modular-xorg-server/Makefile.common" 15.include "../../x11/modular-xorg-server/Makefile.common"
16 16
17CONFIGURE_ARGS+= --disable-xorg 17CONFIGURE_ARGS+= --disable-xorg
18CONFIGURE_ARGS+= --disable-xnest 18CONFIGURE_ARGS+= --disable-xnest
 19CONFIGURE_ARGS+= --disable-xwayland
19CONFIGURE_ARGS+= --enable-xephyr 20CONFIGURE_ARGS+= --enable-xephyr
20CONFIGURE_ARGS+= --enable-kdrive 21CONFIGURE_ARGS+= --enable-kdrive
21CONFIGURE_ARGS+= --disable-xvfb 22CONFIGURE_ARGS+= --disable-xvfb
22 23
23post-install: 24post-install:
24 ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt 25 ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
25 ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1 26 ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
26 if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \ 27 if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \
27 ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \ 28 ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \
28 fi 29 fi
29 30
30.include "../../x11/modular-xorg-server/options.mk" 31.include "../../x11/modular-xorg-server/options.mk"
31 32
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