git: 2cb7175c921d - main - x11-toolkits/wlroots: always add version suffix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Feb 2025 00:56:42 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2cb7175c921d3451f29d78e01acbf5360093f32d
commit 2cb7175c921d3451f29d78e01acbf5360093f32d
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-07-12 23:59:31 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-02-20 00:55:06 +0000
x11-toolkits/wlroots: always add version suffix
Prevent dependency churn (e.g., 1b744b687e87, 20de9a1b52e1) during
future minor updates. Upstream API is versioned since 0.18, so consumers
and external CI should depend on a pinned package to avoid bumps.
Inpsired by: Void Linux
---
MOVED | 1 +
x11-toolkits/Makefile | 2 +-
x11-toolkits/como/Makefile | 4 ++--
x11-toolkits/{wlroots => wlroots018}/Makefile | 5 ++++-
x11-toolkits/{wlroots => wlroots018}/distinfo | 0
x11-toolkits/{wlroots => wlroots018}/pkg-descr | 0
x11-toolkits/{wlroots => wlroots018}/pkg-plist | 0
x11-wm/cage/Makefile | 3 ++-
x11-wm/cagebreak/Makefile | 3 ++-
x11-wm/dwl/Makefile | 4 ++--
x11-wm/labwc/Makefile | 3 ++-
x11-wm/phoc/Makefile | 3 ++-
x11-wm/river/Makefile | 3 ++-
x11-wm/sway/Makefile | 3 ++-
x11-wm/theseus-ship/Makefile | 3 ++-
x11-wm/wlmaker/Makefile | 3 ++-
16 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/MOVED b/MOVED
index d710e73086e7..99d565e9ce06 100644
--- a/MOVED
+++ b/MOVED
@@ -4151,3 +4151,4 @@ lang/dotnet-runtime|lang/dotnet-host|2025-02-15|Rename to match Microsoft recomm
net-im/qxmpp@qt5||2025-02-16|Qt5 flavor is no longer needed
net-im/qxmpp@qt6|net-im/qxmpp|2025-02-16|Unflavorize; only Qt6 is supported
databases/redis70||2025-02-16|Has expired: Has already reached its EoL
+x11-toolkits/wlroots|x11-toolkits/wlroots018|2025-02-19|Renamed to match versioned API
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index b22d9271f011..1f35fc80c20e 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -258,9 +258,9 @@
SUBDIR += viewklass
SUBDIR += vte
SUBDIR += vte3
- SUBDIR += wlroots
SUBDIR += wlroots015
SUBDIR += wlroots017
+ SUBDIR += wlroots018
SUBDIR += wmapp
SUBDIR += wxgtk30
SUBDIR += wxgtk32
diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile
index f0c796cf032b..b407ac265eca 100644
--- a/x11-toolkits/como/Makefile
+++ b/x11-toolkits/como/Makefile
@@ -1,7 +1,7 @@
PORTNAME= como
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -21,7 +21,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libwayland-server.so:graphics/wayland \
libWraplandServer.so:graphics/wrapland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon \
libxcb-image.so:x11/xcb-util-image \
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots018/Makefile
similarity index 95%
rename from x11-toolkits/wlroots/Makefile
rename to x11-toolkits/wlroots018/Makefile
index 3a745414447e..313a6a84707e 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots018/Makefile
@@ -1,9 +1,10 @@
PORTNAME= wlroots
DISTVERSION= 0.18.2
CATEGORIES= x11-toolkits
+PKGNAMESUFFIX= 018
MAINTAINER= jbeich@FreeBSD.org
-COMMENT= Modular Wayland compositor library
+COMMENT= Modular Wayland compositor library (current 0.18.* series)
WWW= https://gitlab.freedesktop.org/wlroots/wlroots
LICENSE= MIT
@@ -23,6 +24,8 @@ GL_SITE= https://gitlab.freedesktop.org
MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
PLIST_SUB= SUFFIX=-${DISTVERSION:R}
+PORTSCOUT= limit:^0\.18\.
+
OPTIONS_DEFINE= DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11
OPTIONS_DEFAULT=DRM LCMS2 LIBLIFTOFF OPENGL VULKAN X11
OPTIONS_SUB= yes
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots018/distinfo
similarity index 100%
rename from x11-toolkits/wlroots/distinfo
rename to x11-toolkits/wlroots018/distinfo
diff --git a/x11-toolkits/wlroots/pkg-descr b/x11-toolkits/wlroots018/pkg-descr
similarity index 100%
rename from x11-toolkits/wlroots/pkg-descr
rename to x11-toolkits/wlroots018/pkg-descr
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots018/pkg-plist
similarity index 100%
rename from x11-toolkits/wlroots/pkg-plist
rename to x11-toolkits/wlroots018/pkg-plist
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 518019d83dde..4f6f38948bd0 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cage
DISTVERSIONPREFIX= v
DISTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols
LIB_DEPENDS= libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libxkbcommon.so:x11/libxkbcommon
USES= compiler:c11 meson pkgconfig
diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile
index e462c9c0249a..62bc9f029d41 100644
--- a/x11-wm/cagebreak/Makefile
+++ b/x11-wm/cagebreak/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cagebreak
DISTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -15,7 +16,7 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \
libudev.so:devel/libudev-devd \
libwayland-server.so:graphics/wayland \
libfontconfig.so:x11-fonts/fontconfig \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile
index e78a15c53abd..6aeb0badc1f3 100644
--- a/x11-wm/dwl/Makefile
+++ b/x11-wm/dwl/Makefile
@@ -1,7 +1,7 @@
PORTNAME= dwl
DISTVERSIONPREFIX= v
DISTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm wayland
MASTER_SITES= https://codeberg.org/${PORTNAME}/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
@@ -18,7 +18,7 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.dwm
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>0:graphics/wayland-protocols
LIB_DEPENDS= libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index 8a345373c9c4..b4921e4b2a24 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,5 +1,6 @@
PORTNAME= labwc
DISTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -12,7 +13,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.35:graphics/wayland-protocols
LIB_DEPENDS= libpng.so:graphics/png \
libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index ed1f7f8321fe..0ad360cf7111 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,6 +1,7 @@
PORTNAME= phoc
DISTVERSIONPREFIX= v
DISTVERSION= 0.45.0
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -15,7 +16,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libudev.so:devel/libudev-devd \
libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= ${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 4804d85d1748..0a58a85b8478 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,6 +1,7 @@
PORTNAME= river
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -15,7 +16,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
zig>=0.13.0:lang/zig
LIB_DEPENDS= libevdev.so:devel/libevdev \
libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 80bf377f001c..70802f141a37 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sway
DISTVERSION= 1.10.1
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -17,7 +18,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \
libpcre2-8.so:devel/pcre2 \
libdrm.so:graphics/libdrm \
libwayland-egl.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile
index 158bbba16665..eebc9e1907c9 100644
--- a/x11-wm/theseus-ship/Makefile
+++ b/x11-wm/theseus-ship/Makefile
@@ -1,6 +1,7 @@
PORTNAME= theseus-ship
DISTVERSIONPREFIX= v
DISTVERSION= 6.2.0
+PORTREVISION= 1
CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9
MAINTAINER= jbeich@FreeBSD.org
@@ -14,7 +15,7 @@ LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
libwayland-server.so:graphics/wayland \
libWraplandServer.so:graphics/wrapland \
libcomo-script.so.0:x11-toolkits/como \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libxkbcommon.so:x11/libxkbcommon \
libxcb-cursor.so:x11/xcb-util-cursor \
libxcb-keysyms.so:x11/xcb-util-keysyms \
diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile
index 8bdff51f1ee9..69030f32cbe0 100644
--- a/x11-wm/wlmaker/Makefile
+++ b/x11-wm/wlmaker/Makefile
@@ -1,6 +1,7 @@
PORTNAME= wlmaker
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -13,7 +14,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.31:graphics/wayland-protocols
LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
libwayland-server.so:graphics/wayland \
- libwlroots-0.18.so:x11-toolkits/wlroots \
+ libwlroots-0.18.so:x11-toolkits/wlroots018 \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= foot:x11/foot