Index: x11-servers/xwayland/Makefile =================================================================== --- x11-servers/xwayland/Makefile +++ x11-servers/xwayland/Makefile @@ -1,36 +1,50 @@ PORTNAME= xwayland -PORTREVISION= 0 +PORTVERSION= 22.1.2 +PORTEPOCH= 1 +CATEGORIES= x11-servers +MASTER_SITES= XORG/individual/xserver -COMMENT= X Clients under Wayland +MAINTAINER= x11@FreeBSD.org +COMMENT= X11 server as Wayland Client LICENSE= MIT - -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \ - ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -LIB_DEPENDS= libwayland-client.so:graphics/wayland \ - libinput.so:x11/libinput - -CONFLICTS_INSTALL= ${PORTNAME}-devel - -MASTERDIR= ${.CURDIR}/../xorg-server -DESCR= ${.CURDIR}/pkg-descr - -SLAVE_PORT= yes -USE_XORG= x11 xext -USE_GL+= egl gbm - -CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ - --enable-xwayland --with-default-xkb-ruleset=evdev - -PLIST_FILES= bin/Xwayland +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ + ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ + wayland-protocols>=1.18:graphics/wayland-protocols +LIB_DEPENDS= libdrm.so:graphics/libdrm \ + libepoxy.so:graphics/libepoxy \ + libwayland-client.so:graphics/wayland \ + libxcvt.so:x11/libxcvt +RUN_DEPENDS= xkbcomp:x11/xkbcomp \ + xkeyboard-config>0:x11/xkeyboard-config + +#CONFLICTS_INSTALL= ${PORTNAME}-devel + +USES= compiler:c11 gl meson pkgconfig xorg tar:xz +USE_GL+= egl gbm gl +USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans + +MESON_ARGS= -Dxvfb=false \ + -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" + +# Keep in sync with xorg-server +FONTPATH_ROOT?= ${LOCALBASE}/share/fonts +FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d +DEFAULT_FONTPATH_LIST= \ + ${FONTPATH_ROOT}/misc/ \ + ${FONTPATH_ROOT}/TTF/ \ + ${FONTPATH_ROOT}/OTF/ \ + ${FONTPATH_ROOT}/Type1/ \ + ${FONTPATH_ROOT}/100dpi/ \ + ${FONTPATH_ROOT}/75dpi/ \ + catalogue:${FONTPATHD} OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland -NVIDIA_CONFIGURE_ENABLE=xwayland-eglstream - -do-install: - cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install +NVIDIA_MESON_TRUE= xwayland_eglstream -.include "${MASTERDIR}/Makefile" +.include Index: x11-servers/xwayland/pkg-plist =================================================================== --- /dev/null +++ x11-servers/xwayland/pkg-plist @@ -0,0 +1,5 @@ +bin/Xwayland +@comment lib/xorg/protocol.txt +libdata/pkgconfig/xwayland.pc +@comment man/man1/Xserver.1.gz +man/man1/Xwayland.1.gz