CVS commit: pkgsrc/x11

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 22 Aug 2019 19:52:29 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 22 19:52:29 UTC 2019

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile Makefile.common PLIST
            options.mk
        pkgsrc/x11/modular-xorg-xephyr: Makefile
Added Files:
        pkgsrc/x11/modular-xorg-xwayland: DESCR Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/modular-xorg-xwayland/DESCR \
    pkgsrc/x11/modular-xorg-xwayland/Makefile \
    pkgsrc/x11/modular-xorg-xwayland/PLIST

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-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.119 pkgsrc/x11/modular-xorg-server/Makefile:1.120
--- pkgsrc/x11/modular-xorg-server/Makefile:1.119       Sat Jul 20 22:46:57 2019
+++ pkgsrc/x11/modular-xorg-server/Makefile     Thu Aug 22 19:52:29 2019
@@ -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 @@ NOT_FOR_PLATFORM=     Darwin-*-*
 
 CONFIGURE_ARGS+=       --enable-xorg
 CONFIGURE_ARGS+=       --disable-xephyr
+CONFIGURE_ARGS+=       --disable-xwayland
 CONFIGURE_ARGS+=       --disable-kdrive
 CONFIGURE_ARGS.SunOS+= --disable-input-thread
 

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.27 pkgsrc/x11/modular-xorg-server/Makefile.common:1.28
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.27 Wed Feb 27 16:32:58 2019
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Thu Aug 22 19:52:29 2019
@@ -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

Index: pkgsrc/x11/modular-xorg-server/PLIST
diff -u pkgsrc/x11/modular-xorg-server/PLIST:1.29 pkgsrc/x11/modular-xorg-server/PLIST:1.30
--- pkgsrc/x11/modular-xorg-server/PLIST:1.29   Thu Aug 22 13:12:31 2019
+++ pkgsrc/x11/modular-xorg-server/PLIST        Thu Aug 22 19:52:29 2019
@@ -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

Index: pkgsrc/x11/modular-xorg-server/options.mk
diff -u pkgsrc/x11/modular-xorg-server/options.mk:1.20 pkgsrc/x11/modular-xorg-server/options.mk:1.21
--- pkgsrc/x11/modular-xorg-server/options.mk:1.20      Thu Aug 22 13:12:31 2019
+++ pkgsrc/x11/modular-xorg-server/options.mk   Thu Aug 22 19:52:29 2019
@@ -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 @@ 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

Index: pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -u pkgsrc/x11/modular-xorg-xephyr/Makefile:1.14 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.15
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.14        Sat Jul 20 22:46:57 2019
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile     Thu Aug 22 19:52:29 2019
@@ -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 @@ BROKEN_ON_PLATFORM+=  Darwin-*-*
 
 CONFIGURE_ARGS+=       --disable-xorg
 CONFIGURE_ARGS+=       --disable-xnest
+CONFIGURE_ARGS+=       --disable-xwayland
 CONFIGURE_ARGS+=       --enable-xephyr
 CONFIGURE_ARGS+=       --enable-kdrive
 CONFIGURE_ARGS+=       --disable-xvfb

Added files:

Index: pkgsrc/x11/modular-xorg-xwayland/DESCR
diff -u /dev/null pkgsrc/x11/modular-xorg-xwayland/DESCR:1.1
--- /dev/null   Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xwayland/DESCR      Thu Aug 22 19:52:29 2019
@@ -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.
Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u /dev/null pkgsrc/x11/modular-xorg-xwayland/Makefile:1.1
--- /dev/null   Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Thu Aug 22 19:52:29 2019
@@ -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"
Index: pkgsrc/x11/modular-xorg-xwayland/PLIST
diff -u /dev/null pkgsrc/x11/modular-xorg-xwayland/PLIST:1.1
--- /dev/null   Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xwayland/PLIST      Thu Aug 22 19:52:29 2019
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2019/08/22 19:52:29 nia Exp $
+bin/Xwayland

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index