git: ea7908699899 - main - x11/cinnamon: optionalise fallback panel

From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Wed, 10 Dec 2025 06:50:37 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ea7908699899ea30bc4473fb609f8ee928b537b9

commit ea7908699899ea30bc4473fb609f8ee928b537b9
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-12-10 06:43:59 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-12-10 06:43:59 +0000

    x11/cinnamon: optionalise fallback panel
    
    When Cinnamon fails to start, the fallback is x11-wm/metacity +
    panel, similar to MATE or GNOME Flashback. In control structure
    order, x11/mate-panel, x11/gnome-panel and x11/tint are probed for
    the presence, so expose these as OPTIONS and set x11/mate-panel as
    default.
    
    While here, restore the old BUILD_DEPENDS line for <EGL/eglmesaext.h>.
---
 x11/cinnamon/Makefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index ad80193507de..093cc7080a22 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cinnamon
 PORTVERSION=	6.4.13
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome
 
@@ -12,7 +13,8 @@ WWW=		https://github.com/linuxmint/cinnamon
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	pysassc:www/py-libsass@${PY_FLAVOR}
+BUILD_DEPENDS=	pysassc:www/py-libsass@${PY_FLAVOR} \
+		${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri
 LIB_DEPENDS=	libcjs.so:lang/cjs \
 		libmuffin.so:x11-wm/muffin \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
@@ -48,7 +50,6 @@ RUN_DEPENDS=	cinnamon-control-center:sysutils/cinnamon-control-center \
 		gnome-backgrounds>0:x11-themes/gnome-backgrounds \
 		webp-pixbuf-loader>0:graphics/webp-pixbuf-loader \
 		metacity:x11-wm/metacity \
-		tint2:x11/tint \
 		lspci:sysutils/pciutils \
 		${LOCALBASE}/libexec/polkit-gnome-authentication-agent-1:sysutils/polkit-gnome \
 		${LOCALBASE}/libexec/cups-pk-helper-mechanism:print/cups-pk-helper \
@@ -62,7 +63,7 @@ USES=		compiler:c11 cpe gettext-runtime gettext-tools:run gl gnome meson perl5 \
 CPE_VENDOR=	linuxmint
 USE_GNOME=	cairo gdkpixbuf glib20 gtk30 intltool introspection libxml2 pygobject3
 USE_XORG=	x11 xfixes
-USE_GL=		gbm gl
+USE_GL=		gl
 USE_PERL5=	build
 
 USE_GITHUB=	yes
@@ -82,20 +83,33 @@ GLIB_SCHEMAS=	org.cinnamon.gschema.xml \
 		org.cinnamon.gestures.gschema.xml
 
 OPTIONS_DEFINE=	DOCS NLS RECORDER WAYLAND
-OPTIONS_DEFAULT=	RECORDER
+OPTIONS_DEFAULT=	MATE RECORDER
 OPTIONS_SUB=	yes
 
+OPTIONS_SINGLE=	PANEL
+OPTIONS_SINGLE_PANEL=	MATE GNOME TINT
+
+GNOME_DESC=	GNOME Panel
+MATE_DESC=	MATE Panel
+PANEL_DESC=	Fallback panel
+TINT_DESC=	Tint
 RECORDER_DESC=	Build the recorder into source
 
 DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 DOCS_MESON_TRUE=	docs
 
+GNOME_RUN_DEPENDS=	gnome-panel:x11/gnome-panel
+
+MATE_RUN_DEPENDS=	mate-panel:x11/mate-panel
+
 NLS_RUN_DEPENDS=	cinnamon-translations>0:misc/cinnamon-translations
 
 RECORDER_USES=	gstreamer
 RECORDER_USE=	gstreamer=vpx
 RECORDER_MESON_TRUE=	build_recorder
 
+TINT_RUN_DEPENDS=	tint2:x11/tint
+
 WAYLAND_MESON_TRUE=	wayland
 
 post-patch: