gentoo auto-resync : 15:02:2024 - 23:36:26

3 files changed, 71 insertions, 15 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index bb65d5d458d9..9b7d16f9f76b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 090ab3463f1f..486c3d837e61 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,5 @@
-DIST muffin-5.6.4.tar.gz 4518694 BLAKE2B 25658e858939cd6046ccfeee6fefba3f62b96555703259eb4d4706eebee43466832b161a8be7b29e360fa3cc26fb0cdceb9f10f26f79177268e61eec11ab6857 SHA512 da779f12c2a3965d0e84324bcb0d96a787d95d6b441696b595f739dfa6fd0f1ecd4f700a1a4b1d6f6842594077544f145782ddddf5961132e313962f77a4150e
 DIST muffin-5.8.1.tar.gz 4519174 BLAKE2B 29269c641e28117f9dd0900dc129aca21c8834058e6b3168b2d44e0ecafba0b177ba214c82337f3120512f4433d6117781685f422a57a244edbfa8748a5ae661 SHA512 bf8e5cdc789ac8a2d1f616a751bf321209b13e3936b483d46370017c58a4b9ebd10b42a71e8691a42f013a0c44250e4a84549d9c5cf120d3382f61aa6040710b
-EBUILD muffin-5.6.4.ebuild 3069 BLAKE2B 42e04be1535ec3a093bd5a479a154838a3de98600c297f55dde0729fd86d7ca2aa15e26f6fddeab6e7727aa15fc63a612531caa9f4a6e6d589af76257831b8f4 SHA512 4d28720053d8029954357e31f458429f3f1c8b1b2f86f3f18c338675dcc04dea5b7730d70dbdae19ddd4938f93d5b475e895d9501f35105008c5bde4a6b45b0d
+DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af
 EBUILD muffin-5.8.1.ebuild 3076 BLAKE2B 3deaa21d00b8cb78f8d7c29325f683e67ba8f3c5fdd0e49a7106765ec1710f59468dada59db1b96cd9d0e8b51d986ff27eb096c5b08d0db883d717cce7427b65 SHA512 7a3c6409c4b915c42a2b67f11426e5be6762365346093e9ba99b36d4f69279156e05cf1c04a62c5a44205e13bddaeb8adea5203cd32040a3b9c06e46c98612f5
+EBUILD muffin-6.0.1.ebuild 4039 BLAKE2B ed3456724b507f89b5b031ffb31a216a722ad6ff54671d1d5f8e79a8f6547f6c6b40635421aa7a6fedc5398b4fb64a294bdebb2ea29611462719748d623e11c4 SHA512 ac01f49eafe4eb470295860060a791cb95a82c8c42c268ff998727386a31a62f2dc586b3428dd8995dbc5862babf84ccabf2a4664cf8b59085132a848c0bb7ea
 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf
diff --git a/x11-wm/muffin/muffin-5.6.4.ebuild b/x11-wm/muffin/muffin-6.0.1.ebuild
index f976dcbdb7bd..868e40c46497 100644
--- a/x11-wm/muffin/muffin-5.6.4.ebuild
+++ b/x11-wm/muffin/muffin-6.0.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit gnome2-utils meson virtualx
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome2-utils meson python-any-r1 virtualx
 
 DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin"
@@ -11,8 +13,9 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0"
 SLOT="0"
-IUSE="input_devices_wacom +introspection screencast sysprof test udev"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+REQUIRED_USE="wayland? ( udev )"
 
 # Dependencies listed in meson order
 COMDEPEND="
@@ -25,7 +28,7 @@ COMDEPEND="
 	>=dev-libs/fribidi-1.0.0
 	>=dev-libs/glib-2.61.1:2
 	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=gnome-extra/cinnamon-desktop-5.6:0=
+	>=gnome-extra/cinnamon-desktop-5.8:0=
 	>=x11-libs/libXcomposite-0.4
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -51,12 +54,40 @@ COMDEPEND="
 	>=x11-libs/startup-notification-0.7
 	media-libs/fontconfig
 
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.41.3:= )
-	screencast? ( >=media-video/pipewire-0.3.0:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
-	udev? ( >=virtual/libudev-228:=
-	        >=dev-libs/libgudev-232 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.13:=
+	)
+	introspection? (
+		>=dev-libs/gobject-introspection-1.41.3:=
+	)
+	screencast? (
+		>=media-video/pipewire-0.3.0:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.35.2:3
+	)
+	udev? (
+		>=virtual/libudev-228:=
+		>=dev-libs/libgudev-232
+	)
+	wayland? (
+		>=dev-libs/libinput-1.7:=
+		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-protocols-1.19
+		media-libs/mesa[gbm(+),gles2]
+		x11-base/xwayland
+		x11-libs/libdrm
+
+		systemd? (
+			sys-apps/systemd
+		)
+		!systemd? (
+			sys-auth/elogind
+		)
+		video_cards_nvidia? (
+			gui-libs/egl-wayland
+		)
+	)
 "
 RDEPEND="${COMDEPEND}
 	gnome-extra/zenity
@@ -64,24 +95,40 @@ RDEPEND="${COMDEPEND}
 DEPEND="${COMDEPEND}
 	x11-base/xorg-proto
 
-	sysprof? ( dev-util/sysprof-common )
+	sysprof? (
+		dev-util/sysprof-common
+	)
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	sys-devel/gettext
 	virtual/pkgconfig
+
+	wayland? (
+		dev-util/wayland-scanner
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
 "
 
+src_prepare() {
+	default
+	python_fix_shebang src/backends/native/gen-default-modes.py
+}
+
 # Wayland is not supported upstream.
 src_configure() {
 	local emesonargs=(
 		-Dopengl=true
 		#opengl_libname
 		#gles2_libname
-		-Dgles2=false # wayland
+		$(meson_use wayland gles2)
 		-Degl=true
 		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
 		$(meson_use screencast remote_desktop)
 		$(meson_use udev)
 		$(meson_use input_devices_wacom libwacom)
@@ -91,6 +138,8 @@ src_configure() {
 		$(meson_use introspection)
 		$(meson_use test cogl_tests)
 		$(meson_use test clutter_tests)
+		# Wayland/Core tests cause issues. They attempt to access video hardware
+		# and leave /tmp/.X#-lock files behind.
 		-Dcore_tests=false # wayland
 		$(meson_use test tests)
 		$(meson_use sysprof profiler)
@@ -98,6 +147,13 @@ src_configure() {
 		#verbose
 	)
 
+	if use wayland; then
+		emesonargs+=(
+			$(meson_use video_cards_nvidia egl_device)
+			$(meson_use video_cards_nvidia wayland_eglstream)
+		)
+	fi
+
 	meson_src_configure
 }