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 (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 (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,149 +1,150 @@ @@ -1,149 +1,150 @@
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
17 18
18PKGCONFIG_OVERRIDE+= xorg-server.pc.in 19PKGCONFIG_OVERRIDE+= xorg-server.pc.in
19SHLIBTOOL_OVERRIDE= # empty 20SHLIBTOOL_OVERRIDE= # empty
20 21
21BUILD_DEFS+= VARBASE 22BUILD_DEFS+= VARBASE
22BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 23BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
23 24
24OWN_DIRS+= ${VARBASE}/log 25OWN_DIRS+= ${VARBASE}/log
25OWN_DIRS+= ${XKB_OUTPUT_DIR} 26OWN_DIRS+= ${XKB_OUTPUT_DIR}
26XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 27XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
27 28
28CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 29CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
29CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 30CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
30 31
31.if !empty(USE_TOOLS:Mauto*) 32.if !empty(USE_TOOLS:Mauto*)
32TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 33TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
33.endif 34.endif
34 35
35DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 36DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
36DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 37DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
37 38
38.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
39 40
40.if ${OPSYS} == "NetBSD" 41.if ${OPSYS} == "NetBSD"
41CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3) 42CPPFLAGS+= -D_OPENBSD_SOURCE # for reallocarray(3)
42CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 43CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
43CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 44CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
44# TLS is not supported by NetBSD<6 45# TLS is not supported by NetBSD<6
45. if !empty(OS_VERSION:M[0-5].*) 46. if !empty(OS_VERSION:M[0-5].*)
46CONFIGURE_ENV+= ac_cv_tls=no 47CONFIGURE_ENV+= ac_cv_tls=no
47CONFIGURE_ARGS+= --disable-glx-tls 48CONFIGURE_ARGS+= --disable-glx-tls
48. endif 49. endif
49.endif 50.endif
50CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 51CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
51 52
52CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11 53CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
53 54
54LEGACY_FONT_PATHS= 55LEGACY_FONT_PATHS=
55DEFAULT_FONT_PATHS= 56DEFAULT_FONT_PATHS=
56.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic 57.for f in misc TTF OTF Type1 100dpi 75dpi cyrillic
57DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f} 58DEFAULT_FONT_PATHS+= ${PREFIX}/share/fonts/X11/${f}
58LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f} 59LEGACY_FONT_PATHS+= ${PREFIX}/lib/X11/fonts/${f}
59.endfor 60.endfor
60FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS} 61FONT_PATHS= ${DEFAULT_FONT_PATHS} ${LEGACY_FONT_PATHS}
61 62
62CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q} 63CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATHS:ts,:Q}
63 64
64CONFIGURE_ARGS+= --disable-config-hal 65CONFIGURE_ARGS+= --disable-config-hal
65CONFIGURE_ARGS+= --disable-dmx 66CONFIGURE_ARGS+= --disable-dmx
66CONFIGURE_ARGS+= --disable-xwin 67CONFIGURE_ARGS+= --disable-xwin
67CONFIGURE_ARGS+= --disable-xephyr 68CONFIGURE_ARGS+= --disable-xephyr
68CONFIGURE_ARGS+= --disable-kdrive 69CONFIGURE_ARGS+= --disable-kdrive
69#CONFIGURE_ARGS+= --disable-kdrive-vesa 70#CONFIGURE_ARGS+= --disable-kdrive-vesa
70CONFIGURE_ARGS+= --enable-xtrans-send-fds 71CONFIGURE_ARGS+= --enable-xtrans-send-fds
71 72
72CONFIGURE_ARGS+= --with-int10=x86emu 73CONFIGURE_ARGS+= --with-int10=x86emu
73 74
74CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 75CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
75CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 76CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
76 77
77PLIST_VARS+= sunos 78PLIST_VARS+= sunos
78PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH} 79PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
79 80
80.if ${OPSYS} == "SunOS" 81.if ${OPSYS} == "SunOS"
81PLIST.sunos= yes 82PLIST.sunos= yes
82. if ${MACHINE_ARCH} == "i386" 83. if ${MACHINE_ARCH} == "i386"
83SUNOS_ARCH= ia32 84SUNOS_ARCH= ia32
84. elif ${MACHINE_ARCH} == "x86_64" 85. elif ${MACHINE_ARCH} == "x86_64"
85SUNOS_ARCH= amd64 86SUNOS_ARCH= amd64
86. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" 87. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
87SUNOS_ARCH= sparcv8plus 88SUNOS_ARCH= sparcv8plus
88. endif 89. endif
89.endif 90.endif
90 91
91PLIST_VARS+= sparc 92PLIST_VARS+= sparc
92.if !empty(MACHINE_ARCH:Msparc*) 93.if !empty(MACHINE_ARCH:Msparc*)
93PLIST.sparc= yes 94PLIST.sparc= yes
94.endif 95.endif
95 96
96# Workaround for PR#41556. 97# Workaround for PR#41556.
97# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead. 98# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
98CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no 99CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_event_h=no
99 100
100# Avoid picking up epoll on illumos 101# Avoid picking up epoll on illumos
101CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no 102CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_create1=no
102 103
103# Only available in newer releases 104# Only available in newer releases
104CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no 105CONFIGURE_ENV.SunOS+= ac_cv_func_mkostemp=no
105 106
106INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 107INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
107 108
108BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 109BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
109BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 110BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
110BUILDLINK_API_DEPENDS.dri+= dri>=7.8 111BUILDLINK_API_DEPENDS.dri+= dri>=7.8
111BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2 112BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
112BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 113BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
113 114
114BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 115BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
115CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 116CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
116 117
117.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD" 118.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
118CONFIGURE_ARGS+= --with-sha1=libc 119CONFIGURE_ARGS+= --with-sha1=libc
119.else 120.else
120.include "../../security/nettle/buildlink3.mk" 121.include "../../security/nettle/buildlink3.mk"
121CONFIGURE_ARGS+= --with-sha1=libnettle 122CONFIGURE_ARGS+= --with-sha1=libnettle
122.endif 123.endif
123 124
124.include "../../devel/ncurses/buildlink3.mk" 125.include "../../devel/ncurses/buildlink3.mk"
125.include "../../devel/zlib/buildlink3.mk" 126.include "../../devel/zlib/buildlink3.mk"
126.include "../../fonts/libfontenc/buildlink3.mk" 127.include "../../fonts/libfontenc/buildlink3.mk"
127BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 128BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
128BUILDLINK_DEPMETHOD.libpciaccess= full 129BUILDLINK_DEPMETHOD.libpciaccess= full
129.include "../../sysutils/libpciaccess/buildlink3.mk" 130.include "../../sysutils/libpciaccess/buildlink3.mk"
130BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.3 131BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.3
131.include "../../x11/xorgproto/buildlink3.mk" 132.include "../../x11/xorgproto/buildlink3.mk"
132.include "../../x11/evieext/buildlink3.mk" 133.include "../../x11/evieext/buildlink3.mk"
133.include "../../x11/libX11/buildlink3.mk" 134.include "../../x11/libX11/buildlink3.mk"
134.include "../../x11/libXau/buildlink3.mk" 135.include "../../x11/libXau/buildlink3.mk"
135.include "../../x11/libXaw/buildlink3.mk" 136.include "../../x11/libXaw/buildlink3.mk"
136BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 137BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
137.include "../../x11/libXext/buildlink3.mk" 138.include "../../x11/libXext/buildlink3.mk"
138.include "../../x11/libXfixes/buildlink3.mk" 139.include "../../x11/libXfixes/buildlink3.mk"
139.include "../../x11/libXfont2/buildlink3.mk" 140.include "../../x11/libXfont2/buildlink3.mk"
140.include "../../x11/libXt/buildlink3.mk" 141.include "../../x11/libXt/buildlink3.mk"
141.include "../../x11/libXxf86misc/buildlink3.mk" 142.include "../../x11/libXxf86misc/buildlink3.mk"
142.include "../../x11/libXxf86vm/buildlink3.mk" 143.include "../../x11/libXxf86vm/buildlink3.mk"
143.include "../../x11/libXinerama/buildlink3.mk" 144.include "../../x11/libXinerama/buildlink3.mk"
144.include "../../x11/libxkbfile/buildlink3.mk" 145.include "../../x11/libxkbfile/buildlink3.mk"
145.include "../../x11/libxkbui/buildlink3.mk" 146.include "../../x11/libxkbui/buildlink3.mk"
146.include "../../x11/pixman/buildlink3.mk" 147.include "../../x11/pixman/buildlink3.mk"
147.include "../../x11/xcb-util-keysyms/buildlink3.mk" 148.include "../../x11/xcb-util-keysyms/buildlink3.mk"
148.include "../../x11/xtrans/buildlink3.mk" 149.include "../../x11/xtrans/buildlink3.mk"
149.include "../../mk/pthread.buildlink3.mk" 150.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/PLIST (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,199 +1,198 @@ @@ -1,199 +1,198 @@
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
20include/xorg/compiler.h 19include/xorg/compiler.h
21include/xorg/compositeext.h 20include/xorg/compositeext.h
22include/xorg/cursor.h 21include/xorg/cursor.h
23include/xorg/cursorstr.h 22include/xorg/cursorstr.h
24include/xorg/damage.h 23include/xorg/damage.h
25include/xorg/damagestr.h 24include/xorg/damagestr.h
26include/xorg/dbestruct.h 25include/xorg/dbestruct.h
27include/xorg/dgaproc.h 26include/xorg/dgaproc.h
28include/xorg/displaymode.h 27include/xorg/displaymode.h
29include/xorg/dix.h 28include/xorg/dix.h
30include/xorg/dixaccess.h 29include/xorg/dixaccess.h
31include/xorg/dixevents.h 30include/xorg/dixevents.h
32include/xorg/dixfont.h 31include/xorg/dixfont.h
33include/xorg/dixfontstr.h 32include/xorg/dixfontstr.h
34include/xorg/dixgrabs.h 33include/xorg/dixgrabs.h
35include/xorg/dixstruct.h 34include/xorg/dixstruct.h
36${PLIST.dri}include/xorg/dri.h 35${PLIST.dri}include/xorg/dri.h
37${PLIST.dri}include/xorg/dri2.h 36${PLIST.dri}include/xorg/dri2.h
38${PLIST.dri}include/xorg/dri3.h 37${PLIST.dri}include/xorg/dri3.h
39${PLIST.dri}include/xorg/dristruct.h 38${PLIST.dri}include/xorg/dristruct.h
40include/xorg/edid.h 39include/xorg/edid.h
41include/xorg/events.h 40include/xorg/events.h
42include/xorg/exa.h 41include/xorg/exa.h
43include/xorg/exevents.h 42include/xorg/exevents.h
44include/xorg/extension.h 43include/xorg/extension.h
45include/xorg/extinit.h 44include/xorg/extinit.h
46include/xorg/extnsionst.h 45include/xorg/extnsionst.h
47include/xorg/fb.h 46include/xorg/fb.h
48include/xorg/fbdevhw.h 47include/xorg/fbdevhw.h
49include/xorg/fboverlay.h 48include/xorg/fboverlay.h
50include/xorg/fbpict.h 49include/xorg/fbpict.h
51include/xorg/fbrop.h 50include/xorg/fbrop.h
52include/xorg/fourcc.h 51include/xorg/fourcc.h
53include/xorg/gc.h 52include/xorg/gc.h
54include/xorg/gcstruct.h 53include/xorg/gcstruct.h
55include/xorg/geext.h 54include/xorg/geext.h
56include/xorg/geint.h 55include/xorg/geint.h
57${PLIST.dri}include/xorg/glamor.h 56${PLIST.dri}include/xorg/glamor.h
58include/xorg/globals.h 57include/xorg/globals.h
59include/xorg/glx_extinit.h 58include/xorg/glx_extinit.h
60include/xorg/glxvndabi.h 59include/xorg/glxvndabi.h
61include/xorg/glyphstr.h 60include/xorg/glyphstr.h
62include/xorg/hotplug.h 61include/xorg/hotplug.h
63include/xorg/i2c_def.h 62include/xorg/i2c_def.h
64include/xorg/input.h 63include/xorg/input.h
65include/xorg/inputstr.h 64include/xorg/inputstr.h
66include/xorg/list.h 65include/xorg/list.h
67include/xorg/mi.h 66include/xorg/mi.h
68include/xorg/micmap.h 67include/xorg/micmap.h
69include/xorg/micoord.h 68include/xorg/micoord.h
70include/xorg/migc.h 69include/xorg/migc.h
71include/xorg/miline.h 70include/xorg/miline.h
72include/xorg/mioverlay.h 71include/xorg/mioverlay.h
73include/xorg/mipict.h 72include/xorg/mipict.h
74include/xorg/mipointer.h 73include/xorg/mipointer.h
75include/xorg/mipointrst.h 74include/xorg/mipointrst.h
76include/xorg/misc.h 75include/xorg/misc.h
77include/xorg/miscstruct.h 76include/xorg/miscstruct.h
78include/xorg/mistruct.h 77include/xorg/mistruct.h
79include/xorg/misync.h 78include/xorg/misync.h
80include/xorg/misyncfd.h 79include/xorg/misyncfd.h
81include/xorg/misyncshm.h 80include/xorg/misyncshm.h
82include/xorg/misyncstr.h 81include/xorg/misyncstr.h
83include/xorg/mizerarc.h 82include/xorg/mizerarc.h
84include/xorg/nonsdk_extinit.h 83include/xorg/nonsdk_extinit.h
85include/xorg/opaque.h 84include/xorg/opaque.h
86include/xorg/optionstr.h 85include/xorg/optionstr.h
87include/xorg/os.h 86include/xorg/os.h
88include/xorg/panoramiX.h 87include/xorg/panoramiX.h
89include/xorg/panoramiXsrv.h 88include/xorg/panoramiXsrv.h
90include/xorg/picture.h 89include/xorg/picture.h
91include/xorg/picturestr.h 90include/xorg/picturestr.h
92include/xorg/pixmap.h 91include/xorg/pixmap.h
93include/xorg/pixmapstr.h 92include/xorg/pixmapstr.h
94${PLIST.dri}include/xorg/present.h 93${PLIST.dri}include/xorg/present.h
95${PLIST.dri}include/xorg/presentext.h 94${PLIST.dri}include/xorg/presentext.h
96include/xorg/privates.h 95include/xorg/privates.h
97include/xorg/property.h 96include/xorg/property.h
98include/xorg/propertyst.h 97include/xorg/propertyst.h
99include/xorg/ptrveloc.h 98include/xorg/ptrveloc.h
100include/xorg/randrstr.h 99include/xorg/randrstr.h
101include/xorg/region.h 100include/xorg/region.h
102include/xorg/regionstr.h 101include/xorg/regionstr.h
103include/xorg/registry.h 102include/xorg/registry.h
104include/xorg/resource.h 103include/xorg/resource.h
105include/xorg/rgb.h 104include/xorg/rgb.h
106include/xorg/rrtransform.h 105include/xorg/rrtransform.h
107${PLIST.dri}include/xorg/sarea.h 106${PLIST.dri}include/xorg/sarea.h
108include/xorg/screenint.h 107include/xorg/screenint.h
109include/xorg/scrnintstr.h 108include/xorg/scrnintstr.h
110include/xorg/selection.h 109include/xorg/selection.h
111include/xorg/servermd.h 110include/xorg/servermd.h
112include/xorg/shadow.h 111include/xorg/shadow.h
113include/xorg/shadowfb.h 112include/xorg/shadowfb.h
114include/xorg/shmint.h 113include/xorg/shmint.h
115include/xorg/site.h 114include/xorg/site.h
116${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il 115${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
117include/xorg/syncsdk.h 116include/xorg/syncsdk.h
118include/xorg/validate.h 117include/xorg/validate.h
119include/xorg/vbe.h 118include/xorg/vbe.h
120include/xorg/vbeModes.h 119include/xorg/vbeModes.h
121include/xorg/vgaHW.h 120include/xorg/vgaHW.h
122include/xorg/vndserver.h 121include/xorg/vndserver.h
123include/xorg/wfbrename.h 122include/xorg/wfbrename.h
124include/xorg/window.h 123include/xorg/window.h
125include/xorg/windowstr.h 124include/xorg/windowstr.h
126include/xorg/xaarop.h 125include/xorg/xaarop.h
127include/xorg/xace.h 126include/xorg/xace.h
128include/xorg/xacestr.h 127include/xorg/xacestr.h
129include/xorg/xf86.h 128include/xorg/xf86.h
130include/xorg/xf86Crtc.h 129include/xorg/xf86Crtc.h
131include/xorg/xf86Cursor.h 130include/xorg/xf86Cursor.h
132include/xorg/xf86DDC.h 131include/xorg/xf86DDC.h
133include/xorg/xf86MatchDrivers.h 132include/xorg/xf86MatchDrivers.h
134include/xorg/xf86Modes.h 133include/xorg/xf86Modes.h
135include/xorg/xf86Module.h 134include/xorg/xf86Module.h
136include/xorg/xf86Opt.h 135include/xorg/xf86Opt.h
137include/xorg/xf86Optionstr.h 136include/xorg/xf86Optionstr.h
138include/xorg/xf86Optrec.h 137include/xorg/xf86Optrec.h
139include/xorg/xf86Parser.h 138include/xorg/xf86Parser.h
140include/xorg/xf86Pci.h 139include/xorg/xf86Pci.h
141include/xorg/xf86PciInfo.h 140include/xorg/xf86PciInfo.h
142include/xorg/xf86Priv.h 141include/xorg/xf86Priv.h
143include/xorg/xf86Privstr.h 142include/xorg/xf86Privstr.h
144include/xorg/xf86RamDac.h 143include/xorg/xf86RamDac.h
145include/xorg/xf86RandR12.h 144include/xorg/xf86RandR12.h
146${PLIST.sparc}include/xorg/xf86Sbus.h 145${PLIST.sparc}include/xorg/xf86Sbus.h
147include/xorg/xf86VGAarbiter.h 146include/xorg/xf86VGAarbiter.h
148include/xorg/xf86Xinput.h 147include/xorg/xf86Xinput.h
149include/xorg/xf86_OSlib.h 148include/xorg/xf86_OSlib.h
150include/xorg/xf86_OSproc.h 149include/xorg/xf86_OSproc.h
151include/xorg/xf86cmap.h 150include/xorg/xf86cmap.h
152include/xorg/xf86fbman.h 151include/xorg/xf86fbman.h
153include/xorg/xf86i2c.h 152include/xorg/xf86i2c.h
154include/xorg/xf86int10.h 153include/xorg/xf86int10.h
155include/xorg/xf86platformBus.h 154include/xorg/xf86platformBus.h
156include/xorg/xf86sbusBus.h 155include/xorg/xf86sbusBus.h
157include/xorg/xf86str.h 156include/xorg/xf86str.h
158include/xorg/xf86xv.h 157include/xorg/xf86xv.h
159include/xorg/xf86xvmc.h 158include/xorg/xf86xvmc.h
160include/xorg/xf86xvpriv.h 159include/xorg/xf86xvpriv.h
161include/xorg/xisb.h 160include/xorg/xisb.h
162include/xorg/xkbfile.h 161include/xorg/xkbfile.h
163include/xorg/xkbrules.h 162include/xorg/xkbrules.h
164include/xorg/xkbsrv.h 163include/xorg/xkbsrv.h
165include/xorg/xkbstr.h 164include/xorg/xkbstr.h
166include/xorg/xorg-server.h 165include/xorg/xorg-server.h
167include/xorg/xorgVersion.h 166include/xorg/xorgVersion.h
168include/xorg/xserver-properties.h 167include/xorg/xserver-properties.h
169include/xorg/xserver_poll.h 168include/xorg/xserver_poll.h
170include/xorg/xvdix.h 169include/xorg/xvdix.h
171include/xorg/xvmcext.h 170include/xorg/xvmcext.h
172lib/pkgconfig/xorg-server.pc 171lib/pkgconfig/xorg-server.pc
173${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la 172${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
174${PLIST.dri}lib/xorg/modules/extensions/libglx.la 173${PLIST.dri}lib/xorg/modules/extensions/libglx.la
175lib/xorg/modules/libexa.la 174lib/xorg/modules/libexa.la
176lib/xorg/modules/libfb.la 175lib/xorg/modules/libfb.la
177lib/xorg/modules/libfbdevhw.la 176lib/xorg/modules/libfbdevhw.la
178${PLIST.dri}lib/xorg/modules/libglamoregl.la 177${PLIST.dri}lib/xorg/modules/libglamoregl.la
179lib/xorg/modules/libint10.la 178lib/xorg/modules/libint10.la
180lib/xorg/modules/libshadow.la 179lib/xorg/modules/libshadow.la
181lib/xorg/modules/libshadowfb.la 180lib/xorg/modules/libshadowfb.la
182lib/xorg/modules/libvbe.la 181lib/xorg/modules/libvbe.la
183lib/xorg/modules/libvgahw.la 182lib/xorg/modules/libvgahw.la
184lib/xorg/modules/libwfb.la 183lib/xorg/modules/libwfb.la
185lib/xorg/protocol.txt 184lib/xorg/protocol.txt
186man/man1/Xnest.1 185man/man1/Xnest.1
187man/man1/Xorg.1 186man/man1/Xorg.1
188man/man1/Xserver.1 187man/man1/Xserver.1
189man/man1/Xvfb.1 188man/man1/Xvfb.1
190man/man1/cvt.1 189man/man1/cvt.1
191man/man1/gtf.1 190man/man1/gtf.1
192man/man4/exa.4 191man/man4/exa.4
193man/man4/fbdevhw.4 192man/man4/fbdevhw.4
194${PLIST.dri}man/man4/modesetting.4 193${PLIST.dri}man/man4/modesetting.4
195man/man5/xorg.conf.5 194man/man5/xorg.conf.5
196man/man5/xorg.conf.d.5 195man/man5/xorg.conf.d.5
197share/aclocal/xorg-server.m4 196share/aclocal/xorg-server.m4
198${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml 197${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml
199@pkgdir lib/xorg/modules/input 198@pkgdir lib/xorg/modules/input
cvs diff -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/options.mk (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,67 +1,57 @@ @@ -1,67 +1,57 @@
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"
18PLIST.dri= yes 18PLIST.dri= yes
19CONFIGURE_ARGS+= --enable-dri 19CONFIGURE_ARGS+= --enable-dri
20CONFIGURE_ARGS+= --enable-dri2 20CONFIGURE_ARGS+= --enable-dri2
21CONFIGURE_ARGS+= --enable-dri3 21CONFIGURE_ARGS+= --enable-dri3
22CONFIGURE_ARGS+= --enable-glx 22CONFIGURE_ARGS+= --enable-glx
23CONFIGURE_ARGS+= --enable-glamor 23CONFIGURE_ARGS+= --enable-glamor
24CONFIGURE_ARGS+= --enable-present 24CONFIGURE_ARGS+= --enable-present
25.else 25.else
26### 26###
27### XXX Perhaps we should allow for a built-in glx without dri enabled? 27### XXX Perhaps we should allow for a built-in glx without dri enabled?
28### 28###
29CONFIGURE_ARGS+= --disable-dri 29CONFIGURE_ARGS+= --disable-dri
30CONFIGURE_ARGS+= --disable-dri2 30CONFIGURE_ARGS+= --disable-dri2
31CONFIGURE_ARGS+= --disable-dri3 31CONFIGURE_ARGS+= --disable-dri3
32CONFIGURE_ARGS+= --disable-glx 32CONFIGURE_ARGS+= --disable-glx
33CONFIGURE_ARGS+= --disable-glamor 33CONFIGURE_ARGS+= --disable-glamor
34CONFIGURE_ARGS+= --disable-present 34CONFIGURE_ARGS+= --disable-present
35pre-build: disable-modesetting 35pre-build: disable-modesetting
36.PHONY: disable-modesetting 36.PHONY: disable-modesetting
37disable-modesetting: 37disable-modesetting:
38 (${ECHO} "all:"; ${ECHO} "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile 38 (${ECHO} "all:"; ${ECHO} "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
39.endif 39.endif
40 40
41.if !empty(PKG_OPTIONS:Minet6) 41.if !empty(PKG_OPTIONS:Minet6)
42CONFIGURE_ARGS+= --enable-ipv6 42CONFIGURE_ARGS+= --enable-ipv6
43.else 43.else
44CONFIGURE_ARGS+= --disable-ipv6 44CONFIGURE_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 (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,37 +1,38 @@ @@ -1,37 +1,38 @@
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
32.include "../../x11/xcb-util/buildlink3.mk" 33.include "../../x11/xcb-util/buildlink3.mk"
33.include "../../x11/xcb-util-image/buildlink3.mk" 34.include "../../x11/xcb-util-image/buildlink3.mk"
34.include "../../x11/xcb-util-renderutil/buildlink3.mk" 35.include "../../x11/xcb-util-renderutil/buildlink3.mk"
35.include "../../x11/xcb-util-wm/buildlink3.mk" 36.include "../../x11/xcb-util-wm/buildlink3.mk"
36 37
37.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
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