From nobody Tue Apr 9 15:07:13 2024 X-Original-To: dev-commits-ports-all@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 4VDTpB0NtKz5H91g; Tue, 9 Apr 2024 15:07:14 +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 4VDTp970nBz4JLH; Tue, 9 Apr 2024 15:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712675234; 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=YMVbgG5s/ykEAMT9OOVLE7363mDDQWG+Ec8kDbUQVhI=; b=cScZDxUbsk/hgBIcmDG08qGCJzv9Fp2N9s9ECRScO5ynR3eoeaT2qKTsW1LVO2SZKxUmmK DNcMhNMAtXZXKoDOIeARjbDVjd3iutZJfv33s9OypiY7/91XuIBz8MlqYcjtRhHLV7A8Sp YrGKa3/zNVOpcXyt0uH8P2B/2KbRHFrytSxkWXEvoF2LiBP+Ramh/ykN9ctmRIOlqvb0h6 +mbSsL81C2+xyb4unkZ7wfI6sPy2TUfEaG+XTpS3AM5olU30im/LvSXWWCZjiY1+5aYrJu 0bBKBqUpGybslC2UmcRVbyK9aP3h49F5xiWXgwcIrFNcLp83OgpYbyYR8ip6gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712675234; a=rsa-sha256; cv=none; b=Xnvp6DDsNjZDhOZrLfrwd4zWCWnRuAGfozsHZ3EV8D+/0I0T9F8zH4ki7Khs8s9l4A3kcD EnPKPa+/tYX/+rHwkIaNTLxN0tVqRPZ72MmDan6LA0TGeJJxtMLRCwqVEWbDfKaQ5IkqZO eIUp/sgiTHm/M/JloO1ODY20qOG1xU0edieLKdE+HlRZ1AnZkNptzq0xUeSnzveZGddzvZ fuGK9LEdLvMQoHk8JO1S0uCCKvYfRiMXSS3D1EWE6frBmIJ7r6n98bmkkfz+GZ5K9nyHcl qKkW4kVe9kEj4fm7kcxIt/lhWIjaIZSKSVTGvTomNQy3JgIBIY+4es64kkaAUw== 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=1712675234; 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=YMVbgG5s/ykEAMT9OOVLE7363mDDQWG+Ec8kDbUQVhI=; b=yGzoWuWKcIcGMo2pAVgYH6EzX4JiS6NpLf2ZBpzRgRTYA/BOEFR82RyRFNYCan0dRJvxaX ROtOrpfv1lHBqAeNjZcLgXb2uvvrhyD9AfeaKfXeegNjlSlax2z+k3jzway1UOrthgtfmZ LA+2YdZdC845vfTn45JWbc5UaiN2+/yO5JStPBDRlp/lr+kw0NmFknDMbi6N/F8j3JwelM DGtpSuQ28mDr+KsikywjwDXW4OTM+9S7rM/N1IIV/sNci30FOWFCEkmlAlG6SxY6mm29of qMRJ0kKjE7BtTWwmWCR0y7ky+1DPEQs67pCB2zt9UKaLdK/cMAEb+HAyF5GFeQ== 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 4VDTp96cCfz104p; Tue, 9 Apr 2024 15:07:13 +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 439F7Dn8040203; Tue, 9 Apr 2024 15:07:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439F7DrN040200; Tue, 9 Apr 2024 15:07:13 GMT (envelope-from git) Date: Tue, 9 Apr 2024 15:07:13 GMT Message-Id: <202404091507.439F7DrN040200@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f12fd039794d - main - x11-servers/xwayland-devel: drop direct consumers after a26e05c85c30 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-all+owner@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f12fd039794d63cb9407ddec20b01410ceb82898 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f12fd039794d63cb9407ddec20b01410ceb82898 commit f12fd039794d63cb9407ddec20b01410ceb82898 Author: Jan Beich AuthorDate: 2024-04-09 14:35:42 +0000 Commit: Jan Beich CommitDate: 2024-04-09 15:06:23 +0000 x11-servers/xwayland-devel: drop direct consumers after a26e05c85c30 - Upstream releases frequently and independently from xorg-server - Both ports have the same features and defaults - Newer snapshots may decrease stability or break HiDPI patches Note, wlroots-devel cannot stay on xwayland-devel without introducing package conflicts when installing hyprland + cage/gamescope. This reverts commit 4c432d12bbb40a1c91963af26986002e9c388f29. This reverts commit 09721d1275eea4199d7b39b25d962017187c82a0. --- multimedia/arcan/Makefile | 3 ++- x11-toolkits/wlroots-devel/Makefile | 5 +++-- x11-toolkits/wlroots/Makefile | 5 +++-- x11-toolkits/wlroots015/Makefile | 6 +++--- x11-toolkits/wlroots016/Makefile | 5 +++-- x11-wm/cosmic-comp/Makefile | 3 ++- x11-wm/plasma5-kwin/Makefile | 5 +++-- x11-wm/plasma6-kwin/Makefile | 5 +++-- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile index 6cf34218cbd1..0650a2a7a811 100644 --- a/multimedia/arcan/Makefile +++ b/multimedia/arcan/Makefile @@ -1,5 +1,6 @@ PORTNAME= arcan DISTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org @@ -72,7 +73,7 @@ WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libxcb-icccm.so:x11/xcb-util-wm \ libxkbcommon.so:x11/libxkbcommon -WAYLAND_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel +WAYLAND_RUN_DEPENDS= Xwayland:x11-servers/xwayland WAYLAND_USES= xorg WAYLAND_USE= XORG=xcb WAYLAND_CMAKE_BOOL_OFF= DISABLE_WAYLAND diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 41fcbec947bf..a86318aac239 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= wlroots DISTVERSION= 0.17.0-255 DISTVERSIONSUFFIX= -g50eae512d9 +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel @@ -64,8 +65,8 @@ X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - xwayland-devel>0:x11-servers/xwayland-devel -X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland +X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index af48bfd3e43f..6bc0a68d65ed 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,5 +1,6 @@ PORTNAME= wlroots DISTVERSION= 0.17.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github @@ -56,8 +57,8 @@ X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - xwayland-devel>0:x11-servers/xwayland-devel -X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland +X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 diff --git a/x11-toolkits/wlroots015/Makefile b/x11-toolkits/wlroots015/Makefile index 3dfcbc85bf4d..5eb4b693f864 100644 --- a/x11-toolkits/wlroots015/Makefile +++ b/x11-toolkits/wlroots015/Makefile @@ -1,6 +1,6 @@ PORTNAME= wlroots DISTVERSION= 0.15.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMESUFFIX= 015 @@ -74,8 +74,8 @@ X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - xwayland-devel>0:x11-servers/xwayland-devel -X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland +X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 diff --git a/x11-toolkits/wlroots016/Makefile b/x11-toolkits/wlroots016/Makefile index 6fea3a011a08..798a3a7b070a 100644 --- a/x11-toolkits/wlroots016/Makefile +++ b/x11-toolkits/wlroots016/Makefile @@ -1,5 +1,6 @@ PORTNAME= wlroots DISTVERSION= 0.16.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMESUFFIX= 016 @@ -61,8 +62,8 @@ X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - xwayland-devel>0:x11-servers/xwayland-devel -X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland +X11_RUN_DEPENDS= Xwayland:x11-servers/xwayland X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index e431932e9394..eda58b380acd 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -1,5 +1,6 @@ PORTNAME= cosmic-comp PORTVERSION= s20240405 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -15,7 +16,7 @@ LIB_DEPENDS= libudev.so:devel/libudev-devd \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri \ vulkan-loader>0:graphics/vulkan-loader \ - xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland USES= cargo gl USE_GITHUB= yes diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 2d6830b7666b..f7e06668cabe 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -24,10 +25,10 @@ LIB_DEPENDS= libdrm.so:graphics/libdrm \ libxkbcommon.so:x11/libxkbcommon \ libxcvt.so:x11/libxcvt BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ - xwayland-devel>0:x11-servers/xwayland-devel \ + Xwayland:x11-servers/xwayland \ wayland-protocols>0:graphics/wayland-protocols \ hwdata>0:misc/hwdata -RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel \ +RUN_DEPENDS= Xwayland:x11-servers/xwayland \ hwdata>0:misc/hwdata CONFLICTS_INSTALL= kwinft # bin/kwin_wayland diff --git a/x11-wm/plasma6-kwin/Makefile b/x11-wm/plasma6-kwin/Makefile index b0a1d46a4a6b..5604ed9b8074 100644 --- a/x11-wm/plasma6-kwin/Makefile +++ b/x11-wm/plasma6-kwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma COMMENT= Easy to use, but flexible, X Window Manager and Wayland Compositor @@ -8,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ hwdata>0:misc/hwdata \ wayland-protocols>0:graphics/wayland-protocols \ - xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland LIB_DEPENDS= libdisplay-info.so:sysutils/libdisplay-info \ libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ @@ -26,7 +27,7 @@ LIB_DEPENDS= libdisplay-info.so:sysutils/libdisplay-info \ libxcvt.so:x11/libxcvt \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata \ - xwayland-devel>0:x11-servers/xwayland-devel + Xwayland:x11-servers/xwayland USES= cmake gettext gl kde:6 pkgconfig python qt:6 shebangfix tar:xz \ xorg