Date: Tue, 9 Apr 2024 15:07:13 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f12fd039794d - main - x11-servers/xwayland-devel: drop direct consumers after a26e05c85c30 Message-ID: <202404091507.439F7DrN040200@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f12fd039794d63cb9407ddec20b01410ceb82898 commit f12fd039794d63cb9407ddec20b01410ceb82898 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-04-09 14:35:42 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404091507.439F7DrN040200>