Page MenuHomeFreeBSD
Files F156432216

D44644.id136777.diff
No OneTemporary
Actions

D44644.id136777.diff
View Options

diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,6 +1,6 @@
PORTNAME= xwayland
PORTVERSION= 23.2.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG/individual/xserver
@@ -11,7 +11,7 @@
PATCHFILES+= 3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
MAINTAINER= x11@FreeBSD.org
-COMMENT= X11 server as Wayland Client
+COMMENT= X11 server as Wayland client
WWW= https://wayland.freedesktop.org/xserver.html
LICENSE= MIT
@@ -19,7 +19,7 @@
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
+ wayland-protocols>=1.30:graphics/wayland-protocols
LIB_DEPENDS= libdrm.so:graphics/libdrm \
libepoxy.so:graphics/libepoxy \
libwayland-client.so:graphics/wayland \
@@ -30,17 +30,11 @@
CONFLICTS_INSTALL= ${PORTNAME}-devel
USES= compiler:c11 gl meson pkgconfig xorg tar:xz
-USE_GL= egl gbm gl
-USE_XORG= pixman xau xfont2 xkbfile xshmfence xtrans
+USE_GL= gbm gl
+USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
MESON_ARGS= -Dxvfb=false \
- -Dxdmcp=false \
- -Dxcsecurity=false \
- -Ddri3=true \
- -Dglamor=true \
- -Dsha1=libmd \
- -Dipv6=true \
- -Dxkb_dir=${LOCALBASE}/share/X11/xkb \
+ -Dxcsecurity=true \
-Dxkb_output_dir=/var/lib/xkb \
-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
@@ -56,7 +50,16 @@
${FONTPATH_ROOT}/75dpi/ \
catalogue:${FONTPATHD}
-OPTIONS_DEFINE= NVIDIA
+OPTIONS_DEFINE= CSD EI NVIDIA
+OPTIONS_DEFAULT= CSD EI
+
+CSD_DESC= Client-side decorations via libdecor
+CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor
+CSD_MESON_TRUE= libdecor
+
+EI_DESC= Emulated input via libei
+EI_LIB_DEPENDS= libei.so:x11/libei
+EI_MESON_OFF= -Dxwayland_ei=false
NVIDIA_DESC= EGLStream support for glamor on Xwayland
NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland
diff --git a/x11-servers/xwayland/pkg-descr b/x11-servers/xwayland/pkg-descr
--- a/x11-servers/xwayland/pkg-descr
+++ b/x11-servers/xwayland/pkg-descr
@@ -1,2 +1,8 @@
-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.

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 4:29 PM (8 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33046128
Default Alt Text
D44644.id136777.diff (2 KB)

Event Timeline