Attachment #250335 for bug #278495




GL_SITE=	https://gitlab.freedesktop.org
GL_ACCOUNT=	xorg
GL_PROJECT=	xserver
GL_TUPLE=	xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto
MESON_ARGS=	-D${PORTNAME}=true \
		-Dxorg=false \
		-Dxnest=false \

EI_LIB_DEPENDS=		libei.so:x11/libei
EI_MESON_OFF=		-Dxwayland_ei=false

.ifdef GL_TUPLE
post-configure:
	@${REINPLACE_CMD} 's/meson install/& \
		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
.endif

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/x11-servers/xwayland-devel/distinfo (-2 lines)
1	TIMESTAMP = 1714483110	1	TIMESTAMP = 1714483110
2	SHA256 (xserver-xorg-server-21.0.99.1-1041-gd5192ba8e.tar.bz2) = 16eeebfc8fbf51d3f5ae3181ac7d8ad3407d4f89eafdb2d90e2dcb573cc25775	2	SHA256 (xserver-xorg-server-21.0.99.1-1041-gd5192ba8e.tar.bz2) = 16eeebfc8fbf51d3f5ae3181ac7d8ad3407d4f89eafdb2d90e2dcb573cc25775
3	SIZE (xserver-xorg-server-21.0.99.1-1041-gd5192ba8e.tar.bz2) = 3712418	3	SIZE (xserver-xorg-server-21.0.99.1-1041-gd5192ba8e.tar.bz2) = 3712418
4	SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
5	SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116

Lines 1-5 Link Here

(-)b/x11/xorgproto/Makefile (-1 / +1 lines)
1	PORTNAME= xorgproto	1	PORTNAME= xorgproto
2	DISTVERSION= 2023.2	2	DISTVERSION= 2024.1
3	CATEGORIES= x11	3	CATEGORIES= x11
4		4
5	MAINTAINER= x11@FreeBSD.org	5	MAINTAINER= x11@FreeBSD.org




TIMESTAMP = 1711437392
SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500
updates
 Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI
 AUR[2] tracks Xwayland releases, so may not help with rebases
 Sway should probably adopt zero scaling from Mir/KWin/Hyprland
 Xwayland usage has reduced since 2020
--
UPDATING                         | 14 --------------
x11-servers/xwayland/Makefile    |  6 +-----
x11-servers/xwayland/distinfo    |  6 ------
x11-toolkits/wlroots/Makefile    |  4 +---
x11-toolkits/wlroots/distinfo    |  4 ----
x11-toolkits/wlroots015/Makefile |  5 +----
x11-toolkits/wlroots015/distinfo |  4 ----
x11-toolkits/wlroots016/Makefile |  5 +----
x11-toolkits/wlroots016/distinfo |  4 ----
x11-wm/sway/Makefile             |  5 +----
x11-wm/sway/distinfo             |  4 ----
x11-wm/sway/pkg-message          |  4 ----
x11-wm/swayfx/Makefile           |  5 +----
x11-wm/swayfx/distinfo           |  4 ----
x11-wm/swayfx/pkg-message        |  4 ----
x11-wm/wayfire/Makefile          |  4 +---
x11-wm/wayfire/distinfo          |  2 --
x11-wm/wayfire/pkg-message       | 12 ------------
18 files changed, 7 insertions(+), 89 deletions(-)




  See also the installation and upgrade manual for more details.
  https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/install/16.11-freebsd.md

20240409:
  AFFECTS: x11-servers/xwayland-devel
  AUTHOR: jbeich@FreeBSD.org

  xwayland-devel has dropped HiDPI patches thus currently incompatible
  with stable/legacy versions of wlroots. Only affects builds when
  /usr/local/bin/Xwayland is already installed. Doesn't affect
  hyprland and sway-devel or non-wlroots compositors.

  If you use portmaster:
    # portmaster -o x11-servers/xwayland-devel x11-servers/xwayland
  If you use portupgrade:
    # portupgrade -o x11-servers/xwayland-devel x11-servers/xwayland

20240408:
  AFFECTS: users of databases/p5-DBD-mysql
  AUTHOR: flo@FreeBSD.org




PORTNAME=	xwayland
PORTVERSION=	23.2.6
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	cd6c9c1246af.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCHFILES+=	707c37b7ab9e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCHFILES+=	3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432

MAINTAINER=	x11@FreeBSD.org
COMMENT=	X11 server as Wayland client
WWW=		https://wayland.freedesktop.org/xserver.html

Lines 1-9 Link Here

(-)b/x11-servers/xwayland/distinfo (-6 lines)
1	TIMESTAMP = 1712666955	1	TIMESTAMP = 1712666955
2	SHA256 (xwayland-23.2.6.tar.xz) = 1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d	2	SHA256 (xwayland-23.2.6.tar.xz) = 1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d
3	SIZE (xwayland-23.2.6.tar.xz) = 1300092	3	SIZE (xwayland-23.2.6.tar.xz) = 1300092
4	SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
5	SIZE (cd6c9c1246af.patch) = 3730
6	SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425
7	SIZE (707c37b7ab9e.patch) = 18662
8	SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
9	SIZE (3b0d1a3a2296.patch) = 2513

Lines 1-10 Link Here

(-)b/x11-toolkits/wlroots/Makefile (-3 / +1 lines)
1	PORTNAME= wlroots	1	PORTNAME= wlroots
2	DISTVERSION= 0.17.3	2	DISTVERSION= 0.17.3
		3	PORTREVISION= 1
3	CATEGORIES= x11-toolkits	4	CATEGORIES= x11-toolkits
4		5
5	PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
6	PATCHFILES+= 10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
7	PATCHFILES+= 3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
8	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/	6	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
9		7
10	MAINTAINER= jbeich@FreeBSD.org	8	MAINTAINER= jbeich@FreeBSD.org

Lines 1-7 Link Here

(-)b/x11-toolkits/wlroots/distinfo (-4 lines)
1	TIMESTAMP = 1714156372	1	TIMESTAMP = 1714156372
2	SHA256 (wlroots-0.17.3.tar.bz2) = b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757	2	SHA256 (wlroots-0.17.3.tar.bz2) = b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757
3	SIZE (wlroots-0.17.3.tar.bz2) = 453887	3	SIZE (wlroots-0.17.3.tar.bz2) = 453887
4	SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
5	SIZE (10f80a8f1bb2.patch) = 6097
6	SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
7	SIZE (3196c73d487f.patch) = 4243




PORTNAME=	wlroots
DISTVERSION=	0.15.1
PORTREVISION=	4
CATEGORIES=	x11-toolkits
PKGNAMESUFFIX=	015

PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
PATCHFILES+=	7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCHFILES+=	55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCH_SITES+=	https://source.puri.sm/Librem5/${PORTNAME}/-/commit/:purism
PATCHFILES+=	21bc0ec09200.patch:-p1:purism # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3475
PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/

Lines 1-10 Link Here

(-)b/x11-toolkits/wlroots015/distinfo (-4 lines)
1	TIMESTAMP = 1643923194	1	TIMESTAMP = 1643923194
2	SHA256 (wlroots-0.15.1.tar.bz2) = 8bb791aed9405abc20253c570de1a3b7af91ad65bee2b60293fbbab27ea62c8d	2	SHA256 (wlroots-0.15.1.tar.bz2) = 8bb791aed9405abc20253c570de1a3b7af91ad65bee2b60293fbbab27ea62c8d
3	SIZE (wlroots-0.15.1.tar.bz2) = 423138	3	SIZE (wlroots-0.15.1.tar.bz2) = 423138
4	SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e
5	SIZE (7c0e2a271a4c.patch) = 5729
6	SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7
7	SIZE (55a8d225cf8c.patch) = 4209
8	SHA256 (21bc0ec09200.patch) = bb5e4727c4cce2878c353ad329ae28523d2f229f3301bee15bb4ac243742986a	4	SHA256 (21bc0ec09200.patch) = bb5e4727c4cce2878c353ad329ae28523d2f229f3301bee15bb4ac243742986a
9	SIZE (21bc0ec09200.patch) = 1188	5	SIZE (21bc0ec09200.patch) = 1188
10	SHA256 (dd03d839ab56.patch) = 458f31cf2515fb075c33a947a5ead91c9560ab9db9c76da1c42d4a5fcd7f3c02	6	SHA256 (dd03d839ab56.patch) = 458f31cf2515fb075c33a947a5ead91c9560ab9db9c76da1c42d4a5fcd7f3c02




PORTNAME=	wlroots
DISTVERSION=	0.16.2
PORTREVISION=	2
CATEGORIES=	x11-toolkits
PKGNAMESUFFIX=	016

PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
PATCHFILES+=	fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCHFILES+=	29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
PATCHFILES+=	f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850


Lines 1-9 Link Here

(-)b/x11-toolkits/wlroots016/distinfo (-4 lines)
1	TIMESTAMP = 1676068199	1	TIMESTAMP = 1676068199
2	SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88	2	SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88
3	SIZE (wlroots-0.16.2.tar.bz2) = 437628	3	SIZE (wlroots-0.16.2.tar.bz2) = 437628
4	SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9
5	SIZE (fc0854d5f256.patch) = 6013
6	SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c
7	SIZE (29cb694655db.patch) = 4233
8	SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9	4	SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9
9	SIZE (f3ba14e49133.patch) = 1976	5	SIZE (f3ba14e49133.patch) = 1976




PORTNAME=	sway
DISTVERSION=	1.9
PORTREVISION=	1
CATEGORIES=	x11-wm wayland

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
PATCHFILES+=	1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090

MAINTAINER=	jbeich@FreeBSD.org
COMMENT=	i3-compatible Wayland compositor
WWW=		https://swaywm.org/

Lines 1-7 Link Here

(-)b/x11-wm/sway/distinfo (-4 lines)
1	TIMESTAMP = 1708781966	1	TIMESTAMP = 1708781966
2	SHA256 (swaywm-sway-1.9_GH0.tar.gz) = b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b	2	SHA256 (swaywm-sway-1.9_GH0.tar.gz) = b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
3	SIZE (swaywm-sway-1.9_GH0.tar.gz) = 5581281	3	SIZE (swaywm-sway-1.9_GH0.tar.gz) = 5581281
4	SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
5	SIZE (cd9d1038a822.patch) = 8968
6	SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
7	SIZE (1f1c83e83a1a.patch) = 2701

Lines 3-12 Link Here

(-)b/x11-wm/sway/pkg-message (-4 lines)
3	message: <<EOM	3	message: <<EOM
4	Notes:	4	Notes:
5	- sway(1) can use mac_priority(4) to avoid stutter during high load	5	- sway(1) can use mac_priority(4) to avoid stutter during high load
6
7	Experimental features:
8	- HiDPI support for X11 applications. For instructions see
9	https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855
10	EOM	6	EOM
11	}	7	}
12	]	8	]




PORTNAME=	sway
DISTVERSION=	0.4
PORTREVISION=	1
CATEGORIES=	x11-wm wayland
PKGNAMESUFFIX=	${GH_PROJECT:S/${PORTNAME}//}

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
PATCHFILES+=	1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090

MAINTAINER=	jbeich@FreeBSD.org
COMMENT=	Sway, but with eye candy!
WWW=		https://github.com/WillPower3309/swayfx

Lines 1-7 Link Here

(-)b/x11-wm/swayfx/distinfo (-4 lines)
1	TIMESTAMP = 1714368823	1	TIMESTAMP = 1714368823
2	SHA256 (WillPower3309-swayfx-0.4_GH0.tar.gz) = fa164734a7b32fd82f31e54c407b147e92247ef275de9df4a87b6198a36f20e2	2	SHA256 (WillPower3309-swayfx-0.4_GH0.tar.gz) = fa164734a7b32fd82f31e54c407b147e92247ef275de9df4a87b6198a36f20e2
3	SIZE (WillPower3309-swayfx-0.4_GH0.tar.gz) = 17603249	3	SIZE (WillPower3309-swayfx-0.4_GH0.tar.gz) = 17603249
4	SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
5	SIZE (cd9d1038a822.patch) = 8968
6	SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
7	SIZE (1f1c83e83a1a.patch) = 2701

Lines 3-12 Link Here

(-)b/x11-wm/swayfx/pkg-message (-4 lines)
3	message: <<EOM	3	message: <<EOM
4	Notes:	4	Notes:
5	- sway(1) can use mac_priority(4) to avoid stutter during high load	5	- sway(1) can use mac_priority(4) to avoid stutter during high load
6
7	Experimental features:
8	- HiDPI support for X11 applications. For instructions see
9	https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855
10	EOM	6	EOM
11	}	7	}
12	]	8	]




PORTNAME=	wayfire
DISTVERSIONPREFIX=	v
DISTVERSION=	0.8.1
PORTREVISION=	1
CATEGORIES=	x11-wm wayland

PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599

MAINTAINER=	jbeich@FreeBSD.org
COMMENT=	3D Wayland compositor
WWW=		https://wayfire.org/

Lines 5-9 SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba34 Link Here

(-)b/x11-wm/wayfire/distinfo (-2 lines)
5	SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881	5	SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881
6	SHA256 (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 8f32164bb2c620252aa5ca74f03f25d808cce01809a9eddd4b13a4b83ecfa94d	6	SHA256 (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 8f32164bb2c620252aa5ca74f03f25d808cce01809a9eddd4b13a4b83ecfa94d
7	SIZE (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 48505	7	SIZE (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 48505
8	SHA256 (dd479c06bf84.patch) = c58562defa005b8b3188d8a64003f0ee5444fef7449ed0a5f899d70b1901fb6d
9	SIZE (dd479c06bf84.patch) = 2086




- wf-shell (default background/launcher/panel)
- wcm (GUI settings)
- wayfire-plugins-extra

Experimental features:
- HiDPI support for X11 applications. For instructions see
  https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855

  Instead of ~/.config/sway/config edit ~/.config/wayfire.ini either via
  wcm (General -> Core -> XWayland scale + General -> Autostart) or manually:

    [core]
    xwayland_scale = 2
    [autostart]
    xsettingsd = xsettingsd
EOM
}
]
--
x11-servers/xwayland/Makefile | 9 ++-------
x11-servers/xwayland/distinfo | 6 +++---
2 files changed, 5 insertions(+), 10 deletions(-)




PORTNAME=	xwayland
PORTVERSION=	24.0.99.902
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver

	${FONTPATH_ROOT}/75dpi/ \
	catalogue:${FONTPATHD}

OPTIONS_DEFINE=		CSD EI
OPTIONS_DEFAULT=	CSD EI

CSD_DESC=		Client-side decorations via libdecor

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
NVIDIA_MESON_TRUE=	xwayland_eglstream

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11-servers/xwayland/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1712666955	1	TIMESTAMP = 1714652079
2	SHA256 (xwayland-23.2.6.tar.xz) = 1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d	2	SHA256 (xwayland-24.0.99.902.tar.xz) = a61f88ad90aac5acdc1bf2f682d23bf297cf2fec9a71027dff3806ffd5995e03
3	SIZE (xwayland-23.2.6.tar.xz) = 1300092	3	SIZE (xwayland-24.0.99.902.tar.xz) = 1300816

Return to bug 278495

Lines 31-37 USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans Link Here

(-)b/x11-servers/xwayland-devel/Makefile (-7 lines)
31	GL_SITE= https://gitlab.freedesktop.org	31	GL_SITE= https://gitlab.freedesktop.org
32	GL_ACCOUNT= xorg	32	GL_ACCOUNT= xorg
33	GL_PROJECT= xserver	33	GL_PROJECT= xserver
34	GL_TUPLE= xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto
35	MESON_ARGS= -D${PORTNAME}=true \	34	MESON_ARGS= -D${PORTNAME}=true \
36	-Dxorg=false \	35	-Dxorg=false \
37	-Dxnest=false \	36	-Dxnest=false \
Lines 71-80 EI_DESC= Emulated input via libei Link Here
71	EI_LIB_DEPENDS= libei.so:x11/libei	70	EI_LIB_DEPENDS= libei.so:x11/libei
72	EI_MESON_OFF= -Dxwayland_ei=false	71	EI_MESON_OFF= -Dxwayland_ei=false
73		72
74	.ifdef GL_TUPLE
75	post-configure:
76	@${REINPLACE_CMD} 's/meson install/& \
77	--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
78	.endif
79
80	.include <bsd.port.mk>	73	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11/xorgproto/distinfo (-8 / +3 lines)
1	TIMESTAMP = 1698309470	1	TIMESTAMP = 1711437392
2	SHA256 (xorg/proto/xorgproto-2023.2.tar.xz) = b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c	2	SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
3	SIZE (xorg/proto/xorgproto-2023.2.tar.xz) = 759040	3	SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500
4	updates	4	updates
5	Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI
6	AUR[2] tracks Xwayland releases, so may not help with rebases
7	Sway should probably adopt zero scaling from Mir/KWin/Hyprland
8	Xwayland usage has reduced since 2020
9	--
10	UPDATING \| 14 --------------	5	UPDATING \| 14 --------------
11	x11-servers/xwayland/Makefile \| 6 +-----	6	x11-servers/xwayland/Makefile \| 6 +-----
12	x11-servers/xwayland/distinfo \| 6 ------	7	x11-servers/xwayland/distinfo \| 6 ------
13	x11-toolkits/wlroots/Makefile \| 4 +---	8	x11-toolkits/wlroots/Makefile \| 4 +---
14	x11-toolkits/wlroots/distinfo \| 4 ----	9	x11-toolkits/wlroots/distinfo \| 4 ----
15	x11-toolkits/wlroots015/Makefile \| 5 +----	10	x11-toolkits/wlroots015/Makefile \| 5 +----
16	x11-toolkits/wlroots015/distinfo \| 4 ----	11	x11-toolkits/wlroots015/distinfo \| 4 ----
17	x11-toolkits/wlroots016/Makefile \| 5 +----	12	x11-toolkits/wlroots016/Makefile \| 5 +----
18	x11-toolkits/wlroots016/distinfo \| 4 ----	13	x11-toolkits/wlroots016/distinfo \| 4 ----
19	x11-wm/sway/Makefile \| 5 +----	14	x11-wm/sway/Makefile \| 5 +----
20	x11-wm/sway/distinfo \| 4 ----	15	x11-wm/sway/distinfo \| 4 ----
21	x11-wm/sway/pkg-message \| 4 ----	16	x11-wm/sway/pkg-message \| 4 ----
22	x11-wm/swayfx/Makefile \| 5 +----	17	x11-wm/swayfx/Makefile \| 5 +----
23	x11-wm/swayfx/distinfo \| 4 ----	18	x11-wm/swayfx/distinfo \| 4 ----
24	x11-wm/swayfx/pkg-message \| 4 ----	19	x11-wm/swayfx/pkg-message \| 4 ----
25	x11-wm/wayfire/Makefile \| 4 +---	20	x11-wm/wayfire/Makefile \| 4 +---
26	x11-wm/wayfire/distinfo \| 2 --	21	x11-wm/wayfire/distinfo \| 2 --
27	x11-wm/wayfire/pkg-message \| 12 ------------	22	x11-wm/wayfire/pkg-message \| 12 ------------
28	18 files changed, 7 insertions(+), 89 deletions(-)	23	18 files changed, 7 insertions(+), 89 deletions(-)

Lines 40-59 you update your ports collection, before attempting any port upgrades. Link Here

(-)b/UPDATING (-14 lines)
40	See also the installation and upgrade manual for more details.	40	See also the installation and upgrade manual for more details.
41	https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/install/16.11-freebsd.md	41	https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/install/16.11-freebsd.md
42		42
43	20240409:
44	AFFECTS: x11-servers/xwayland-devel
45	AUTHOR: jbeich@FreeBSD.org
46
47	xwayland-devel has dropped HiDPI patches thus currently incompatible
48	with stable/legacy versions of wlroots. Only affects builds when
49	/usr/local/bin/Xwayland is already installed. Doesn't affect
50	hyprland and sway-devel or non-wlroots compositors.
51
52	If you use portmaster:
53	# portmaster -o x11-servers/xwayland-devel x11-servers/xwayland
54	If you use portupgrade:
55	# portupgrade -o x11-servers/xwayland-devel x11-servers/xwayland
56
57	20240408:	43	20240408:
58	AFFECTS: users of databases/p5-DBD-mysql	44	AFFECTS: users of databases/p5-DBD-mysql
59	AUTHOR: flo@FreeBSD.org	45	AUTHOR: flo@FreeBSD.org

Lines 1-14 Link Here

(-)b/x11-servers/xwayland/Makefile (-5 / +1 lines)
1	PORTNAME= xwayland	1	PORTNAME= xwayland
2	PORTVERSION= 23.2.6	2	PORTVERSION= 23.2.6
		3	PORTREVISION= 1
3	PORTEPOCH= 1	4	PORTEPOCH= 1
4	CATEGORIES= x11-servers	5	CATEGORIES= x11-servers
5	MASTER_SITES= XORG/individual/xserver	6	MASTER_SITES= XORG/individual/xserver
6		7
7	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
8	PATCHFILES+= cd6c9c1246af.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
9	PATCHFILES+= 707c37b7ab9e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
10	PATCHFILES+= 3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
11
12	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
13	COMMENT= X11 server as Wayland client	9	COMMENT= X11 server as Wayland client
14	WWW= https://wayland.freedesktop.org/xserver.html	10	WWW= https://wayland.freedesktop.org/xserver.html

Lines 1-12 Link Here

(-)b/x11-toolkits/wlroots015/Makefile (-4 / +1 lines)
1	PORTNAME= wlroots	1	PORTNAME= wlroots
2	DISTVERSION= 0.15.1	2	DISTVERSION= 0.15.1
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= x11-toolkits	4	CATEGORIES= x11-toolkits
5	PKGNAMESUFFIX= 015	5	PKGNAMESUFFIX= 015
6		6
7	PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
8	PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
9	PATCHFILES+= 55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
10	PATCH_SITES+= https://source.puri.sm/Librem5/${PORTNAME}/-/commit/:purism	7	PATCH_SITES+= https://source.puri.sm/Librem5/${PORTNAME}/-/commit/:purism
11	PATCHFILES+= 21bc0ec09200.patch:-p1:purism # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3475	8	PATCHFILES+= 21bc0ec09200.patch:-p1:purism # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3475
12	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/	9	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/

Lines 1-12 Link Here

(-)b/x11-toolkits/wlroots016/Makefile (-4 / +1 lines)
1	PORTNAME= wlroots	1	PORTNAME= wlroots
2	DISTVERSION= 0.16.2	2	DISTVERSION= 0.16.2
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= x11-toolkits	4	CATEGORIES= x11-toolkits
5	PKGNAMESUFFIX= 016	5	PKGNAMESUFFIX= 016
6		6
7	PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
8	PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
9	PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
10	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/	7	PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
11	PATCHFILES+= f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850	8	PATCHFILES+= f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850
12		9

Lines 1-11 Link Here

(-)b/x11-wm/sway/Makefile (-4 / +1 lines)
1	PORTNAME= sway	1	PORTNAME= sway
2	DISTVERSION= 1.9	2	DISTVERSION= 1.9
		3	PORTREVISION= 1
3	CATEGORIES= x11-wm wayland	4	CATEGORIES= x11-wm wayland
4		5
5	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
6	PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
7	PATCHFILES+= 1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090
8
9	MAINTAINER= jbeich@FreeBSD.org	6	MAINTAINER= jbeich@FreeBSD.org
10	COMMENT= i3-compatible Wayland compositor	7	COMMENT= i3-compatible Wayland compositor
11	WWW= https://swaywm.org/	8	WWW= https://swaywm.org/

Lines 1-12 Link Here

(-)b/x11-wm/swayfx/Makefile (-4 / +1 lines)
1	PORTNAME= sway	1	PORTNAME= sway
2	DISTVERSION= 0.4	2	DISTVERSION= 0.4
		3	PORTREVISION= 1
3	CATEGORIES= x11-wm wayland	4	CATEGORIES= x11-wm wayland
4	PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//}	5	PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//}
5		6
6	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
7	PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
8	PATCHFILES+= 1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090
9
10	MAINTAINER= jbeich@FreeBSD.org	7	MAINTAINER= jbeich@FreeBSD.org
11	COMMENT= Sway, but with eye candy!	8	COMMENT= Sway, but with eye candy!
12	WWW= https://github.com/WillPower3309/swayfx	9	WWW= https://github.com/WillPower3309/swayfx

Lines 1-11 Link Here

(-)b/x11-wm/wayfire/Makefile (-3 / +1 lines)
1	PORTNAME= wayfire	1	PORTNAME= wayfire
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.8.1	3	DISTVERSION= 0.8.1
		4	PORTREVISION= 1
4	CATEGORIES= x11-wm wayland	5	CATEGORIES= x11-wm wayland
5		6
6	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
7	PATCHFILES+= dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599
8
9	MAINTAINER= jbeich@FreeBSD.org	7	MAINTAINER= jbeich@FreeBSD.org
10	COMMENT= 3D Wayland compositor	8	COMMENT= 3D Wayland compositor
11	WWW= https://wayfire.org/	9	WWW= https://wayfire.org/

Lines 5-22 Additional packages recommended for new users: Link Here

(-)b/x11-wm/wayfire/pkg-message (-13 lines)
5	- wf-shell (default background/launcher/panel)	5	- wf-shell (default background/launcher/panel)
6	- wcm (GUI settings)	6	- wcm (GUI settings)
7	- wayfire-plugins-extra	7	- wayfire-plugins-extra
8
9	Experimental features:
10	- HiDPI support for X11 applications. For instructions see
11	https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855
12
13	Instead of ~/.config/sway/config edit ~/.config/wayfire.ini either via
14	wcm (General -> Core -> XWayland scale + General -> Autostart) or manually:
15
16	[core]
17	xwayland_scale = 2
18	[autostart]
19	xsettingsd = xsettingsd
20	EOM	8	EOM
21	}	9	}
22	]	10	]
23	--
24	x11-servers/xwayland/Makefile \| 9 ++-------	11	x11-servers/xwayland/Makefile \| 9 ++-------
25	x11-servers/xwayland/distinfo \| 6 +++---	12	x11-servers/xwayland/distinfo \| 6 +++---
26	2 files changed, 5 insertions(+), 10 deletions(-)	13	2 files changed, 5 insertions(+), 10 deletions(-)

Lines 1-6 Link Here

(-)b/x11-servers/xwayland/Makefile (-7 / +2 lines)
1	PORTNAME= xwayland	1	PORTNAME= xwayland
2	PORTVERSION= 23.2.6	2	PORTVERSION= 24.0.99.902
3	PORTREVISION= 1
4	PORTEPOCH= 1	3	PORTEPOCH= 1
5	CATEGORIES= x11-servers	4	CATEGORIES= x11-servers
6	MASTER_SITES= XORG/individual/xserver	5	MASTER_SITES= XORG/individual/xserver
Lines 45-51 DEFAULT_FONTPATH_LIST= \ Link Here
45	${FONTPATH_ROOT}/75dpi/ \	44	${FONTPATH_ROOT}/75dpi/ \
46	catalogue:${FONTPATHD}	45	catalogue:${FONTPATHD}
47		46
48	OPTIONS_DEFINE= CSD EI NVIDIA	47	OPTIONS_DEFINE= CSD EI
49	OPTIONS_DEFAULT= CSD EI	48	OPTIONS_DEFAULT= CSD EI
50		49
51	CSD_DESC= Client-side decorations via libdecor	50	CSD_DESC= Client-side decorations via libdecor
Lines 56-63 EI_DESC= Emulated input via libei Link Here
56	EI_LIB_DEPENDS= libei.so:x11/libei	55	EI_LIB_DEPENDS= libei.so:x11/libei
57	EI_MESON_OFF= -Dxwayland_ei=false	56	EI_MESON_OFF= -Dxwayland_ei=false
58		57
59	NVIDIA_DESC= EGLStream support for glamor on Xwayland
60	NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland
61	NVIDIA_MESON_TRUE= xwayland_eglstream
62
63	.include <bsd.port.mk>	58	.include <bsd.port.mk>