public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/files/, x11-wm/muffin/
@ 2018-11-28 19:56 Kristian Fiskerstrand
  0 siblings, 0 replies; 3+ messages in thread
From: Kristian Fiskerstrand @ 2018-11-28 19:56 UTC (permalink / raw
  To: gentoo-commits

commit:     01aad7538fe9da3548b8ff33abcf996e0b58eedc
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 24 18:24:45 2018 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 19:56:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aad753

x11-wm/muffin: New upstream version 4.0.2

Signed-off-by: Kristian Fiskerstrand <k_f <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-wm/muffin/Manifest                             |  1 +
 .../files/muffin-4.0-clutter-configure.patch       | 13 ++++
 .../muffin/files/muffin-4.0-cogl-configure.patch   | 25 +++++++
 x11-wm/muffin/muffin-4.0.3.ebuild                  | 81 ++++++++++++++++++++++
 4 files changed, 120 insertions(+)

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 5303533c197..201cd6ec872 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1,3 @@
 DIST muffin-3.6.0.tar.gz 2720809 BLAKE2B 9d1b92907d545990b409c15f9e9e3bf7b3871cc545d02234296efcb15f0082fc630c3a06849789c5e5aed4af9253e6893cc29feb7590aaaaaf2eb38843591c8d SHA512 d077f1310d7600754c9b4f77fc2a82377aec43f9a1cc0b95e28118764741922a58f2348418bee309d8c7fd1484b97ddc898d0105fa1a3fcd855d2fcc68f3679e
 DIST muffin-3.8.2.tar.gz 2723114 BLAKE2B f8218ac1f71ecfa5b74ca7ae8cf76d76e1207e3ce65f715643d477d2fb6429390671f3b05132a64f23a1853297f71563a62c052555f8a26d084469814972a64d SHA512 62dbfb602dd1164779e365e5e6f782431a491a254dcec8faef8a50f27f50cf7b0f8ab958b6df3b75d6b15edcd90c23a2fd6cc18cb11a2a513e669169f09cba05
+DIST muffin-4.0.3.tar.gz 5194156 BLAKE2B 8d58d37f8410ad5384c09a4edabd3ca5bd8a3a612825ded55bf625a9a8c2ba8aba295187e3eb727fc248716b3efe84e9a567a49f95635150c4bda5f309545ed2 SHA512 34a3f152d2701e06498f2de28639af656bd4efa6c7d5c56244fe9002cf769e929fc2360bd036509318fab9c4fe73c976605c3fdb444c9280f52e6db27867a14c

diff --git a/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
new file mode 100644
index 00000000000..f5ab1de9af2
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-clutter-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/clutter/configure.ac b/clutter/configure.ac
+index 0b3c3e5..9c0e6cd 100644
+--- a/clutter/configure.ac
++++ b/clutter/configure.ac
+@@ -231,7 +231,7 @@ AC_ARG_ENABLE(
+   [wayland-egl-server],
+   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+   [],
+-  enable_wayland_egl_server=yes
++  enable_wayland_egl_server=no
+ )
+ 
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],

diff --git a/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
new file mode 100644
index 00000000000..1e9721dd1bf
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.0-cogl-configure.patch
@@ -0,0 +1,25 @@
+From d3dec860b3390068321c579de85d0ebfab92481a Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <k_f@gentoo.org>
+Date: Wed, 28 Nov 2018 19:57:20 +0100
+Subject: [PATCH] Fix
+
+---
+ cogl/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index b06677a..209f449 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -700,7 +700,7 @@ AC_ARG_ENABLE(
+   [wayland-egl-server],
+   [AC_HELP_STRING([--enable-wayland-egl-server=@<:@no/yes@:>@], [Enable server side wayland support @<:@default=no@:>@])],
+   [],
+-  enable_wayland_egl_server=yes
++  enable_wayland_egl_server=no
+ )
+ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
+       [
+-- 
+2.18.1
+

diff --git a/x11-wm/muffin/muffin-4.0.3.ebuild b/x11-wm/muffin/muffin-4.0.3.ebuild
new file mode 100644
index 00000000000..1f5bf4aba31
--- /dev/null
+++ b/x11-wm/muffin/muffin-4.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2
+
+DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection test xinerama"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
+	>=x11-libs/cairo-1.14:=[X]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.9.12:3[X,introspection?]
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.4:0=[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/libXcomposite-0.3
+	>=x11-libs/startup-notification-0.7:=
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/opengl
+
+	gnome-extra/zenity
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# needs gtk-doc, not just -am, for gtk-doc.make
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!x11-misc/expocity
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/muffin-4.0-{cogl,clutter}-configure.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection) \
+		$(use_enable xinerama)
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/files/, x11-wm/muffin/
@ 2024-05-31 20:13 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-31 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b402c23fb8f7299da1a4896c28f67c4b48cad8b4
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri May 31 19:27:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 20:13:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b402c23f

x11-wm/muffin: backport fix for Modern C error

Closes: https://bugs.gentoo.org/919091
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../38919a88b2b8381f5b24b69742d1b9db32029c61.patch |  23 +++
 x11-wm/muffin/muffin-6.0.1-r2.ebuild               | 184 +++++++++++++++++++++
 2 files changed, 207 insertions(+)

diff --git a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
new file mode 100644
index 000000000000..a2472ec9f212
--- /dev/null
+++ b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
@@ -0,0 +1,23 @@
+From 38919a88b2b8381f5b24b69742d1b9db32029c61 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@fedoraproject.org>
+Date: Mon, 5 Feb 2024 16:06:14 +0000
+Subject: [PATCH] Fix compile issue (#683)
+
+(warning becomes an error due to gcc 14 changes.)
+---
+ src/core/prefs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/prefs.c b/src/core/prefs.c
+index c07359abc..3161e4be9 100644
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -2258,7 +2258,7 @@ meta_prefs_add_keybinding (const char           *name,
+         }
+       else
+         {
+-          strokes = g_strdupv (bindings);
++          strokes = g_strdupv((gchar **)bindings);
+         }
+ 
+       queue_changed (META_PREF_KEYBINDINGS);

diff --git a/x11-wm/muffin/muffin-6.0.1-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
new file mode 100644
index 000000000000..f2e2171fb1e6
--- /dev/null
+++ b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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 systemd test udev wayland video_cards_nvidia"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+REQUIRED_USE="wayland? ( udev )"
+
+# Dependencies listed in meson order
+COMDEPEND="
+	x11-libs/libX11
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/pango-1.20.0[introspection?]
+	>=x11-libs/cairo-1.10.0[X]
+	>=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.8:0=
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb:=
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	media-libs/libglvnd[X]
+	media-libs/mesa[X(+),egl(+)]
+	x11-libs/libSM
+	>=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
+	)
+	wayland? (
+		>=dev-libs/libinput-1.7:=
+		>=dev-libs/wayland-1.13.0
+		>=dev-libs/wayland-protocols-1.19
+		|| (
+			>=media-libs/mesa-24.1.0_rc1[opengl]
+			<media-libs/mesa-24.1.0_rc1[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
+"
+DEPEND="${COMDEPEND}
+	x11-base/xorg-proto
+
+	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
+	)
+"
+
+PATCHES=(
+	# -Werror=incompatible-pointer-types
+	# https://bugs.gentoo.org/919091
+	# https://github.com/linuxmint/muffin/pull/683
+	"${FILESDIR}"/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
+)
+
+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
+		$(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)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(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)
+		-Dinstalled_tests=false
+		#verbose
+	)
+
+	if use wayland; then
+		emesonargs+=(
+			$(meson_use video_cards_nvidia egl_device)
+			$(meson_use video_cards_nvidia wayland_eglstream)
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/files/, x11-wm/muffin/
@ 2024-09-27  5:57 Eli Schwartz
  0 siblings, 0 replies; 3+ messages in thread
From: Eli Schwartz @ 2024-09-27  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     79ba3fec32c1ff1a2dd6766daafea3c32752f78c
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Sep 27 00:34:53 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 05:55:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ba3fec

x11-wm/muffin: drop 6.0.1-r2

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 x11-wm/muffin/Manifest                             |   1 -
 .../38919a88b2b8381f5b24b69742d1b9db32029c61.patch |  23 ---
 x11-wm/muffin/muffin-6.0.1-r2.ebuild               | 188 ---------------------
 3 files changed, 212 deletions(-)

diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index c428d17130ec..71f919aa76ca 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,2 +1 @@
-DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af
 DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193

diff --git a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
deleted file mode 100644
index a2472ec9f212..000000000000
--- a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 38919a88b2b8381f5b24b69742d1b9db32029c61 Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@fedoraproject.org>
-Date: Mon, 5 Feb 2024 16:06:14 +0000
-Subject: [PATCH] Fix compile issue (#683)
-
-(warning becomes an error due to gcc 14 changes.)
----
- src/core/prefs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/prefs.c b/src/core/prefs.c
-index c07359abc..3161e4be9 100644
---- a/src/core/prefs.c
-+++ b/src/core/prefs.c
-@@ -2258,7 +2258,7 @@ meta_prefs_add_keybinding (const char           *name,
-         }
-       else
-         {
--          strokes = g_strdupv (bindings);
-+          strokes = g_strdupv((gchar **)bindings);
-         }
- 
-       queue_changed (META_PREF_KEYBINDINGS);

diff --git a/x11-wm/muffin/muffin-6.0.1-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild
deleted file mode 100644
index 881c52c194a2..000000000000
--- a/x11-wm/muffin/muffin-6.0.1-r2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit flag-o-matic 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"
-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 systemd test udev wayland video_cards_nvidia"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
-REQUIRED_USE="wayland? ( udev )"
-
-# Dependencies listed in meson order
-COMDEPEND="
-	x11-libs/libX11
-	>=media-libs/graphene-1.9.3[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/pango-1.20.0[introspection?]
-	>=x11-libs/cairo-1.10.0[X]
-	>=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.8:0=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb:=
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46.0:2[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/libglvnd[X]
-	media-libs/mesa[X(+),egl(+)]
-	x11-libs/libSM
-	>=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
-	)
-	wayland? (
-		>=dev-libs/libinput-1.7:=
-		>=dev-libs/wayland-1.13.0
-		>=dev-libs/wayland-protocols-1.19
-		|| (
-			>=media-libs/mesa-24.1.0_rc1[opengl]
-			<media-libs/mesa-24.1.0_rc1[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
-"
-DEPEND="${COMDEPEND}
-	x11-base/xorg-proto
-
-	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
-	)
-"
-
-PATCHES=(
-	# -Werror=incompatible-pointer-types
-	# https://bugs.gentoo.org/919091
-	# https://github.com/linuxmint/muffin/pull/683
-	"${FILESDIR}"/38919a88b2b8381f5b24b69742d1b9db32029c61.patch
-)
-
-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
-		$(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)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(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)
-		-Dinstalled_tests=false
-		#verbose
-	)
-
-	if use wayland; then
-		emesonargs+=(
-			$(meson_use video_cards_nvidia egl_device)
-			$(meson_use video_cards_nvidia wayland_eglstream)
-		)
-	fi
-
-	# -Werror=lto-type-mismatch
-	# https://bugs.gentoo.org/933879
-	use wayland && filter-lto
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-09-27  5:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-31 20:13 [gentoo-commits] repo/gentoo:master commit in: x11-wm/muffin/files/, x11-wm/muffin/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-09-27  5:57 Eli Schwartz
2018-11-28 19:56 Kristian Fiskerstrand

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox