From nobody Tue Apr 9 16:00:39 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VDVzq5pmtz5HDpP; Tue, 9 Apr 2024 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VDVzq4ygDz4SM4; Tue, 9 Apr 2024 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712678439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cDkm6J+oCdWhNWy4aRyRUcjFvO7rdDLjy2MFLUy64Y=; b=mS/GCeDFCCChcAAopYooOyUNag3vAtSFmImRe/UwljHA94eW2UN36OQr9Bp3aM2amHSH/s u3zvd2X3FnGv/jdcS4qaVCm7NIq5T3oeUEZ6HKyJQXmaAc5+LyflnaJu0T0IxqLTdooF2k 4LciPvrkyGRy+oUv1uM2X4tBUwGdxJf2V7sQVhemaAPGG2fqfNAdpUb8zSKM0iUk70jCSs 6t7GLY+MbURuV6uGX3SAnEmKSQ7dMM+JVnyakNFeyod7CZe5X0f8x+MmiuiQ+a2cszwEMr wuECVU2Mua6s3YL8EvtDraBsvCq6CYw+/eSRFe/+ro/iKzb82bNCwl8AQROPJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712678439; a=rsa-sha256; cv=none; b=JiaKtG4Ku4RMsmdkLBpxugPkRycPHdCjA9ane20A2GN/9zXpQtqu4ITR7KGcb/jU76YwRx i4cjPCUopU2GdoOJ+JavMR/iSw5rkcmu1jld5rGt7T2jSyc5OZTJ7W7nEN5iB1b79FDN7b yp+P79dq59Fia3ylQHDXj/CJnPTe77ND0qaVnd8TnNPJ9fQPfuEUiVMvThihdQHW9sIARj xFOL0xZj00thPD6Aa2gXQMUHPu1gnCGtM5+D2a3NK5I2Rc6JW3b+6XiS0EplbJPkGsK0Kr EF+eZfLyZhLcDs8WW6b5uFUyX3gP0QXTtW8nuPMe4AjEy+xAy+G11o7pW2Ob9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712678439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cDkm6J+oCdWhNWy4aRyRUcjFvO7rdDLjy2MFLUy64Y=; b=JXbmw888AaZ/tQFTYXgjdR/yr+ZcWdbMniFQ6PmBkwUL5xM86LtrWmUUKBaSfuT7fOJdaP wP5YCoJYvqub8xc5b0K+fLEbnsLW/G/K2A2z3JlAYmlb1XgBZJF2w5ZCc4ne/VII9qeHwA vUOde7Hz/4e1E0agg0IvqTWQE69jgIVR7SakW02+/BgEKk9/vP7kSyfQKJwDJzVhbrce3p BNXNjZs0JHWKv+k2qevhOC6cX5mZlApDwvcwJSqSIxpj3n73n9hv/e0zukZ8G2zkrZY8V6 Ji2Dipq/MXsxLmEuTWezXFDhvm/GfPrqoBRyi32z+/BKFqp3rtp5FLXkjqJGOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VDVzq4ZFSz11Pr; Tue, 9 Apr 2024 16:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 439G0deX033535; Tue, 9 Apr 2024 16:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439G0d3r033533; Tue, 9 Apr 2024 16:00:39 GMT (envelope-from git) Date: Tue, 9 Apr 2024 16:00:39 GMT Message-Id: <202404091600.439G0d3r033533@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 6d11475fd07b - 2024Q2 - x11-servers/xwayland: Sync options with xwayland-devel List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-branches+owner@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 6d11475fd07bbc0ffd7faeaf5295e0b5a3107dc1 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d11475fd07bbc0ffd7faeaf5295e0b5a3107dc1 commit 6d11475fd07bbc0ffd7faeaf5295e0b5a3107dc1 Author: Emmanuel Vadot AuthorDate: 2024-04-05 13:41:44 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-09 16:00:23 +0000 x11-servers/xwayland: Sync options with xwayland-devel - Provide the option to compile with libdecor for client-side decoration and enable it by default. - Provide the option to compile with libei for emulated input and enable it by default. - Enable xdmcp - Enable xcsecurity needed for X11 forwarding. - Use some meson default (dri3, ipv6, glamor, sha1 and xkb_dir) - Remove unneeded USES egl Differential Revision: https://reviews.freebsd.org/D44644 Reviewed by: bapt, jbeich Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit a26e05c85c306c92623254d13deef91e89e000a6) --- x11-servers/xwayland/Makefile | 29 ++++++++++++++++------------- x11-servers/xwayland/pkg-descr | 10 ++++++++-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 084043c848c2..0850e7cf3476 100644 --- 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+= 707c37b7ab9e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserve 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 @@ 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 + 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 @@ RUN_DEPENDS= xkbcomp:x11/xkbcomp \ 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 @@ DEFAULT_FONTPATH_LIST= \ ${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 index b7f97edf89c3..82de643f878d 100644 --- 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.