Index: x11-servers/xwayland-devel/Makefile =================================================================== --- x11-servers/xwayland-devel/Makefile +++ x11-servers/xwayland-devel/Makefile @@ -1,76 +1,25 @@ # $FreeBSD$ -PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 1.20.0-844 DISTVERSIONSUFFIX= -gc9a3b14c1 -CATEGORIES= x11-servers +PORTEPOCH= 0 PKGNAMESUFFIX= -devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 231720f8b212.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= 48a7bfeb4687.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -PATCHFILES+= 2b3c4983f937.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +MASTERDIR= ${.CURDIR}/../xwayland +DISTINFO_FILE= ${.CURDIR}/distinfo -MAINTAINER= jbeich@FreeBSD.org -COMMENT= X11 server as Wayland client (development snapshot) - -LICENSE= MIT -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 -RUN_DEPENDS= xkbcomp:x11/xkbcomp \ - xkeyboard-config>0:x11/xkeyboard-config - -CONFLICTS_INSTALL= ${PORTNAME} - -USES= compiler:c11 gl meson pkgconfig xorg -USE_GITHUB= yes -USE_GL= gbm gl -USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans -GH_ACCOUNT= freedesktop -GH_PROJECT= xorg-xserver MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ - -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" -PLIST_FILES= bin/Xwayland \ - libdata/pkgconfig/xwayland.pc \ - man/man1/Xwayland.1.gz - -# 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_MESON_TRUE= xwayland_eglstream + ${NULL} -do-install: -# XXX Prevent Meson from installing unrelated files - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \ - ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig - ${INSTALL_MAN} ${BUILD_WRKSRC}/hw/xwayland/Xwayland.1 \ - ${STAGEDIR}${PREFIX}/man/man1 +post-install: +# XXX Prevent Meson from installing files conflicting with xorg-server + ${RM} -r ${STAGEDIR}${PREFIX}/include/xorg + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/xorg-server.m4 -.include +.include "${MASTERDIR}/Makefile" Index: x11-servers/xwayland-devel/distinfo =================================================================== --- x11-servers/xwayland-devel/distinfo +++ x11-servers/xwayland-devel/distinfo @@ -1,8 +1,8 @@ TIMESTAMP = 1613584413 SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-844-gc9a3b14c1_GH0.tar.gz) = 34b68a7ef6a28a7a8855027d48d36a43a8427a727e0dca050457d6e4ac35c92c SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-844-gc9a3b14c1_GH0.tar.gz) = 5120205 -SHA256 (231720f8b212.patch) = ed3db053b86e5c7492cefb9dbb3dd373609f9318a5b848382aac59da322188f0 -SIZE (231720f8b212.patch) = 10714 +SHA256 (57602ecc54e4.patch) = e5112a50da0ff8f62909fde98784bae5c45c0422d45961d689c5e94bda652518 +SIZE (57602ecc54e4.patch) = 10291 SHA256 (48a7bfeb4687.patch) = ae284622227b317085360f61553bae7fc21a57f4d2b6d4133a6ead0c93b47cee SIZE (48a7bfeb4687.patch) = 17542 SHA256 (2b3c4983f937.patch) = 9927abf281cff8d44694a883bd60e90337e9d635a3714de1a51f91c4f112c46e Index: x11-servers/xwayland/Makefile =================================================================== --- x11-servers/xwayland/Makefile +++ x11-servers/xwayland/Makefile @@ -1,38 +1,63 @@ # $FreeBSD$ PORTNAME= xwayland -PORTREVISION= 2 +DISTVERSIONPREFIX?= ${PORTNAME}- +DISTVERSION?= 21.0.99.901 +PORTEPOCH?= 1 +CATEGORIES= x11-servers -COMMENT= X Clients under Wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 57602ecc54e4.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 48a7bfeb4687.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 +PATCHFILES+= 2b3c4983f937.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 -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 +MAINTAINER= jbeich@FreeBSD.org +COMMENT= X11 server as Wayland client -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= MIT +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 +RUN_DEPENDS= xkbcomp:x11/xkbcomp \ + xkeyboard-config>0:x11/xkeyboard-config + +CONFLICTS_INSTALL= ${PORTNAME}-* + +USES= compiler:c11 gl meson pkgconfig xorg +USE_GITHUB= yes +USE_GL= gbm gl +USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans +GH_ACCOUNT= freedesktop +GH_PROJECT= xorg-xserver +MESON_ARGS+= -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" +PLIST_FILES= bin/Xwayland \ + libdata/pkgconfig/xwayland.pc \ + man/man1/Xwayland.1.gz +# XXX Prevent Meson from installing files conflicting with xorg-server +PLIST_FILES+= "@comment lib/xorg/protocol.txt" \ + "@comment man/man1/Xserver.1.gz" + +# 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/distinfo =================================================================== --- /dev/null +++ x11-servers/xwayland/distinfo @@ -0,0 +1,9 @@ +TIMESTAMP = 1613575028 +SHA256 (freedesktop-xorg-xserver-xwayland-21.0.99.901_GH0.tar.gz) = 0078c785a4351b135618524ea1e0b920d0aa97c54b9609d5306a8e12927336ee +SIZE (freedesktop-xorg-xserver-xwayland-21.0.99.901_GH0.tar.gz) = 1824609 +SHA256 (57602ecc54e4.patch) = e5112a50da0ff8f62909fde98784bae5c45c0422d45961d689c5e94bda652518 +SIZE (57602ecc54e4.patch) = 10291 +SHA256 (48a7bfeb4687.patch) = ae284622227b317085360f61553bae7fc21a57f4d2b6d4133a6ead0c93b47cee +SIZE (48a7bfeb4687.patch) = 17542 +SHA256 (2b3c4983f937.patch) = 9927abf281cff8d44694a883bd60e90337e9d635a3714de1a51f91c4f112c46e +SIZE (2b3c4983f937.patch) = 2567 Index: x11-servers/xwayland/pkg-descr =================================================================== --- x11-servers/xwayland/pkg-descr +++ x11-servers/xwayland/pkg-descr @@ -1,4 +1,10 @@ -XWayland is an X Server running as a Wayland client, thus capable of displaying -native X11 client applications in a Wayland compositor environment. +Wayland is a complete window system in itself, but even so, if we're +migrating away from X, it makes sense to have a good backwards +compatibility story. With a few changes, the Xorg server can be +modified to use wayland input devices for input and forward either the +root window or individual top-level windows as wayland surfaces. The +server still runs the same 2D driver with the same acceleration code +as it does when it runs natively. The main difference is that wayland +handles presentation of the windows instead of KMS. WWW: https://wayland.freedesktop.org/xserver.html