Index: head/x11-servers/Makefile =================================================================== --- head/x11-servers/Makefile (revision 433899) +++ head/x11-servers/Makefile (revision 433900) @@ -1,16 +1,17 @@ # $FreeBSD$ # COMMENT = X11 servers SUBDIR += Xfstt SUBDIR += x11rdp SUBDIR += x2vnc SUBDIR += x2x SUBDIR += xephyr SUBDIR += xorg-dmx SUBDIR += xorg-nestserver SUBDIR += xorg-server SUBDIR += xorg-vfbserver + SUBDIR += xwayland .include Index: head/x11-servers/xephyr/Makefile =================================================================== --- head/x11-servers/xephyr/Makefile (revision 433899) +++ head/x11-servers/xephyr/Makefile (revision 433900) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= xephyr COMMENT= X server from X.Org based on kdrive LICENSE= MIT LIB_DEPENDS+= libxcb-image.so:x11/xcb-util-image \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-util.so:x11/xcb-util MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID USE_XORG= x11 xcb CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \ - --enable-kdrive + --enable-kdrive --disable-xwayland PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz do-install: cd ${WRKSRC}/hw/kdrive/ephyr; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" Index: head/x11-servers/xorg-dmx/Makefile =================================================================== --- head/x11-servers/xorg-dmx/Makefile (revision 433899) +++ head/x11-servers/xorg-dmx/Makefile (revision 433900) @@ -1,23 +1,24 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= xorg-dmx COMMENT= Distributed Multihead X from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID USE_XORG= dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst -CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb +CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ + --disable-xwayland do-install: cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" Index: head/x11-servers/xorg-nestserver/Makefile =================================================================== --- head/x11-servers/xorg-nestserver/Makefile (revision 433899) +++ head/x11-servers/xorg-nestserver/Makefile (revision 433900) @@ -1,31 +1,32 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= xorg-nestserver PORTVERSION= 1.19.1 PORTEPOCH= 2 COMMENT= Nesting X server from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr DISTINFO_FILE= ${.CURDIR}/distinfo PATCHDIR= ${.CURDIR}/files RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID USE_XORG= x11 xext xfont2 -CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb +CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb \ + --disable-xwayland PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz do-install: cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" Index: head/x11-servers/xorg-server/Makefile =================================================================== --- head/x11-servers/xorg-server/Makefile (revision 433899) +++ head/x11-servers/xorg-server/Makefile (revision 433900) @@ -1,135 +1,136 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp XORG_CAT= xserver SLAVE_PORT?= no OPTIONS_SUB= yes OPTIONS_DEFINE= SUID OPTIONS_RADIO= CONF OPTIONS_RADIO_CONF= DEVD HAL DEVD_DESC= Use devd for autoconfiguration of input devices HAL_DESC= Use hald for autoconfiguration of input devices SUID_DESC= Install the Xorg server with setuid bit set OPTIONS_DEFAULT=DEVD SUID OPTIONS_EXCLUDE_sparc64= HAL .include USES= gmake libtool perl5 ssl tar:bzip2 USE_PERL5= build USE_GL+= gl USE_XORG+= bigreqsproto compositeproto damageproto dri2proto dri3proto \ fixesproto fontsproto glproto inputproto kbproto pixman \ presentproto randrproto recordproto renderproto \ resourceproto scrnsaverproto videoproto xau \ xcmiscproto xdmcp xextproto xf86driproto xfont \ xineramaproto xkbfile xproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --localstatedir=/var --with-shared-memory-dir=/tmp \ - --without-dtrace --disable-xwayland --enable-glamor + --without-dtrace --enable-glamor INSTALL_TARGET= install-strip -.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" +.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr" || ${PORTNAME} == "xwayland" LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy .else BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .endif .if ${SLAVE_PORT} == "no" USE_GL+= gbm USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto -CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb +CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ + --disable-xwayland SUB_FILES= pkg-install pkg-deinstall .else CONFIGURE_ARGS+=--disable-xorg # for slave ports we need to overwrite PLIST, so it doesn't overwrite # PLIST_FILES, with the masterport plist. PLIST= ${.CURDIR}/pkg-plist .endif .include .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to # a *non-empty* value by-passes the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} LIB_DEPENDS+= libhal.so:sysutils/hal CONFIGURE_ARGS+= --enable-config-hal .else CONFIGURE_ARGS+= --disable-config-hal .endif # We handle Xorg setuid in the plist. This allows to build xorg-server as a user. CONFIGURE_ARGS+=--disable-install-setuid .if ${ARCH} == "i386" || ${ARCH} == "amd64" LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" .else PLIST_SUB+= SPARC64="@comment " .endif .if ${PORT_OPTIONS:MSUID} pre-everything:: @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" @${ECHO_MSG} "port before handling them normally. If you are concerned about the security" @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" @${ECHO_MSG} "xorg-server_UNSET=SUID in /etc/make.conf." .endif post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure # build libglx.so but don't install it yet. which is done in pre-install. @${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \ -e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \ ${WRKSRC}/hw/xfree86/dixmods/Makefile.in post-configure: .if ${PORT_OPTIONS:MDEVD} @${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \ -e 's|config\.lo|config.lo devd.lo|g' \ ${WRKSRC}/config/Makefile @${REINPLACE_CMD} -e 's|^/\* #undef CONFIG_UDEV \*/|#define CONFIG_DEVD 1|' \ ${WRKSRC}/include/dix-config.h .endif .if ${SLAVE_PORT} == "no" post-install: # The .xorg dir because else the xorg-server might not load the correct # libglx module. @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d .endif # ! SLAVE_PORT .include Index: head/x11-servers/xorg-vfbserver/Makefile =================================================================== --- head/x11-servers/xorg-vfbserver/Makefile (revision 433899) +++ head/x11-servers/xorg-vfbserver/Makefile (revision 433900) @@ -1,29 +1,30 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= xorg-vfbserver PORTVERSION= 1.19.1 PORTEPOCH= 1 COMMENT= X virtual framebuffer server from X.Org LICENSE= MIT MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr DISTINFO_FILE= ${.CURDIR}/distinfo PATCHDIR= ${.CURDIR}/files SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID USE_XORG= xfont2 -CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest +CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest \ + --disable-xwayland PLIST_FILES= bin/Xvfb man/man1/Xvfb.1.gz do-install: cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" Index: head/x11-servers/xwayland/Makefile =================================================================== --- head/x11-servers/xwayland/Makefile (nonexistent) +++ head/x11-servers/xwayland/Makefile (revision 433900) @@ -0,0 +1,34 @@ +# $FreeBSD$ + +PORTNAME= xwayland +PORTVERSION= 1.19.1 + +COMMENT= X Clients under Wayland + +LICENSE= MIT + +BUILD_DEPENDS= /usr/local/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols +LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libinput.so:x11/libinput + +MASTERDIR= ${.CURDIR}/../xorg-server +DESCR= ${.CURDIR}/pkg-descr +DISTINFO_FILE= ${.CURDIR}/distinfo +PATCHDIR= ${.CURDIR}/files + +SLAVE_PORT= yes +OPTIONS_EXCLUDE=DEVD HAL SUID + +USE_XORG= x11 xext xfont2 +USE_GL+= egl gbm + +CONFIGURE_ARGS+= --disable-docs --disable-devel-docs \ + --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \ + --disable-xquartz --disable-xwin + +PLIST_FILES= bin/Xwayland + +do-install: + cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install + +.include "${MASTERDIR}/Makefile" Property changes on: head/x11-servers/xwayland/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xwayland/distinfo =================================================================== --- head/x11-servers/xwayland/distinfo (nonexistent) +++ head/x11-servers/xwayland/distinfo (revision 433900) @@ -0,0 +1,3 @@ +TIMESTAMP = 1484388904 +SHA256 (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb +SIZE (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 6041792 Property changes on: head/x11-servers/xwayland/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-servers/xwayland/pkg-descr =================================================================== --- head/x11-servers/xwayland/pkg-descr (nonexistent) +++ head/x11-servers/xwayland/pkg-descr (revision 433900) @@ -0,0 +1,4 @@ +XWayland is an X Server running as a Wayland client, thus capable of displaying +native X11 client applications in a Wayland compositor environment. + +WWW: https://wayland.freedesktop.org/xserver.html Property changes on: head/x11-servers/xwayland/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property