public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/, x11-wm/mutter/
Date: Tue,  8 Oct 2024 16:33:19 +0000 (UTC)	[thread overview]
Message-ID: <1728405150.437dd9ea598ac3139935539a846fbbae5920045b.asturm@gentoo> (raw)

commit:     437dd9ea598ac3139935539a846fbbae5920045b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 17:44:26 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 16:32:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437dd9ea

x11-wm/mutter: drop 45.2-r1, 45.4

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-wm/mutter/Manifest                    |   3 -
 x11-wm/mutter/files/45.2-fix-X-only.patch |  48 ------
 x11-wm/mutter/mutter-45.2-r1.ebuild       | 240 ------------------------------
 x11-wm/mutter/mutter-45.4.ebuild          | 236 -----------------------------
 4 files changed, 527 deletions(-)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index d4ca3042e49f..85d24f199538 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,3 @@
-DIST mutter-45.2-r1-patchset.tar.xz 21864 BLAKE2B c09566f75a816f6599ac4bf99879cc0e3bb78220c56cc4bd64edabf00e533a5feb4decdaa75ef5ae7ade911ec266ba6dd4641f1cbcd2c3145c10d5a8d327d653 SHA512 dd953afb97c4cdd9e24b2eab6636472e526042eb768c23e0d5bd49cd3ceb3a5cebd3ff396d014bdf168de81f810cef754efbb1739350fc09f6d196461de41ea4
-DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195f526ab88102c831df693cb8dfa5b55bb1590a54e68f41eab392e69bb833221480578a2fba4b1e4bdc5ed030d SHA512 2111ad0645d2da58dedb30d94e99b52045f38b31a9de7314a5d8b41a5525612d88d2fbaafd3658eb6f734c143ad12176367c26533237199d9a5c1ad3dea743c7
-DIST mutter-45.4.tar.xz 2886300 BLAKE2B 62fe0c08e92f8cab0bcf64a52a9d1bdf16754deae5fb00018f29c596ab2e26a5b75eee46f1c0206ae1773fe5b7ed48abc755b6070d35dc22536dcb11e8955e95 SHA512 3fdd44dfcb504a84d402065987fb8bdec84d639260c66c0cb2e88ef2deb56fadf2ae91bdeae782793728e54803a455ab38943b68693124d728b0c52ba8698e3c
 DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4b5168e863843ca5b08a6d726be9b7a94b94763e6b4c10b48355ed845accd9ae63704aefaf3f8e2bb361855b8 SHA512 15fb5589e2b971ac94b3d8f549643f2998375943c419114907c317761c8250089751dea65c35be44435350e6bb02bb238fcf2eef17bf7d6a5b41053a64ffba05
 DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738
 DIST mutter-46.4.tar.xz 6752800 BLAKE2B 330c8fd1537c6eea93af4413ec7ccf8c0ea478c5d11d8666b80c93e86eb3135782d365f5f7b449379e211f12d4172fc74b0c39026ab45064dbf18b50fe30a894 SHA512 b8d952da069230b2e10d82aaf87c7acca2a1436b0cc2e19b64012dc535690fdded931d905496dd668948330e553f863505c1aafb36b4ff4724f5ac0e9012f7db

diff --git a/x11-wm/mutter/files/45.2-fix-X-only.patch b/x11-wm/mutter/files/45.2-fix-X-only.patch
deleted file mode 100644
index 2e76277e2607..000000000000
--- a/x11-wm/mutter/files/45.2-fix-X-only.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e2ef4e1504a40d62b45167d7cacfea0322a78134 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 25 Dec 2023 14:51:46 +0200
-Subject: [PATCH] build: Fix building without wayland headers
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3046
----
- src/backends/x11/nested/meta-backend-x11-nested.c | 2 ++
- src/core/meta-context-main.c                      | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/backends/x11/nested/meta-backend-x11-nested.c b/src/backends/x11/nested/meta-backend-x11-nested.c
-index 17e6f7e47..0d99078ea 100644
---- a/src/backends/x11/nested/meta-backend-x11-nested.c
-+++ b/src/backends/x11/nested/meta-backend-x11-nested.c
-@@ -25,7 +25,9 @@
- #include "backends/x11/nested/meta-cursor-renderer-x11-nested.h"
- #include "backends/x11/nested/meta-renderer-x11-nested.h"
- 
-+#ifdef HAVE_WAYLAND
- #include "wayland/meta-wayland.h"
-+#endif
- 
- typedef struct _MetaBackendX11NestedPrivate
- {
-diff --git a/src/core/meta-context-main.c b/src/core/meta-context-main.c
-index 9c94183b5..a0ac7c823 100644
---- a/src/core/meta-context-main.c
-+++ b/src/core/meta-context-main.c
-@@ -33,7 +33,6 @@
- #include "backends/meta-virtual-monitor.h"
- #include "backends/x11/cm/meta-backend-x11-cm.h"
- #include "meta/meta-backend.h"
--#include "wayland/meta-wayland.h"
- #include "x11/session.h"
- 
- #ifdef HAVE_NATIVE_BACKEND
-@@ -42,6 +41,7 @@
- 
- #ifdef HAVE_WAYLAND
- #include "backends/x11/nested/meta-backend-x11-nested.h"
-+#include "wayland/meta-wayland.h"
- #endif
- 
- typedef struct _MetaContextMainOptions
--- 
-2.43.0
-

diff --git a/x11-wm/mutter/mutter-45.2-r1.ebuild b/x11-wm/mutter/mutter-45.2-r1.ebuild
deleted file mode 100644
index fa99dc7a1251..000000000000
--- a/x11-wm/mutter/mutter-45.2-r1.ebuild
+++ /dev/null
@@ -1,240 +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 gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-LICENSE="GPL-2+"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
-	SRC_URI=""
-	SLOT="0/13" # This can get easily out of date, but better than 9967
-else
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-fi
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
-# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
-# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
-# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
-# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/graphene-1.10.2[introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=dev-libs/fribidi-1.0.0
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.75.1:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
-	sys-apps/dbus
-	>=x11-misc/colord-1.4.5:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/harfbuzz-2.6.0:=
-	>=dev-libs/libei-1.0.901
-
-	gnome? ( gnome-base/gnome-desktop:4= )
-
-	>=media-libs/libcanberra-0.26
-
-	media-libs/libglvnd[X]
-
-	wayland? (
-		>=dev-libs/wayland-protocols-1.32
-		>=dev-libs/wayland-1.21.0
-
-		x11-libs/libdrm
-		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.19.0:=
-
-		elogind? ( sys-auth/elogind )
-		>=x11-base/xwayland-23.2.1[libei(+)]
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? (
-		>=virtual/libudev-232-r1:=
-		>=dev-libs/libgudev-232
-	)
-	systemd? ( sys-apps/systemd )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.33:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=gui-libs/gtk-4.0.0:4[X,introspection?]
-		>=x11-libs/libX11-1.7.0
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-6
-		>=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
-"
-#	)"
-
-RDEPEND="${DEPEND}
-	!<gui-libs/gtk-4.6.4:4
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-	test? (
-		>=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland]
-		gnome-extra/zenity
-	)
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${WORKDIR}"/patches # Upstream branch up to commit 5f777c90b79a
-	"${FILESDIR}"/${PV}-fix-X-only.patch #914571, upstream #3046, !3471
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	use debug && EMESON_BUILDTYPE=debug
-
-	local emesonargs=(
-		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
-		#
-		#   -Dopengl_libname=libOpenGL.so.0
-		#
-		# while we build the x11 renderer, as we currently enable gles2 only
-		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
-		# in a configuration where wayland is disabled, as libOpenGL doesn't
-		# include them.
-		#
-		# See
-		# - https://bugs.gentoo.org/835786
-		# - https://forums.gentoo.org/viewtopic-p-8695669.html
-
-		-Dopengl=true
-		$(meson_use wayland gles2)
-		#gles2_libname
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland xwayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use gnome libgnome_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use gtk-doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/x11-wm/mutter/mutter-45.4.ebuild b/x11-wm/mutter/mutter-45.4.ebuild
deleted file mode 100644
index aeed10b04dac..000000000000
--- a/x11-wm/mutter/mutter-45.4.ebuild
+++ /dev/null
@@ -1,236 +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 gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-LICENSE="GPL-2+"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
-	SRC_URI=""
-	SLOT="0/13" # This can get easily out of date, but better than 9967
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-fi
-
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
-# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
-# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
-# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
-# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/graphene-1.10.2[introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=x11-libs/cairo-1.14[X]
-	>=dev-libs/fribidi-1.0.0
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.75.1:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
-	sys-apps/dbus
-	>=x11-misc/colord-1.4.5:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/harfbuzz-2.6.0:=
-	>=dev-libs/libei-1.0.901
-
-	gnome? ( gnome-base/gnome-desktop:4= )
-
-	>=media-libs/libcanberra-0.26
-
-	media-libs/libglvnd[X]
-
-	wayland? (
-		>=dev-libs/wayland-protocols-1.32
-		>=dev-libs/wayland-1.21.0
-
-		x11-libs/libdrm
-		media-libs/mesa[gbm(+)]
-		>=dev-libs/libinput-1.19.0:=
-
-		elogind? ( sys-auth/elogind )
-		>=x11-base/xwayland-23.2.1[libei(+)]
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? (
-		>=virtual/libudev-232-r1:=
-		>=dev-libs/libgudev-232
-	)
-	systemd? ( sys-apps/systemd )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.33:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=gui-libs/gtk-4.0.0:4[X,introspection?]
-		>=x11-libs/libX11-1.7.0
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-6
-		>=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
-"
-#	)"
-
-RDEPEND="${DEPEND}
-	!<gui-libs/gtk-4.6.4:4
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-	test? (
-		>=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland]
-		gnome-extra/zenity
-	)
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
-		#
-		#   -Dopengl_libname=libOpenGL.so.0
-		#
-		# while we build the x11 renderer, as we currently enable gles2 only
-		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
-		# in a configuration where wayland is disabled, as libOpenGL doesn't
-		# include them.
-		#
-		# See
-		# - https://bugs.gentoo.org/835786
-		# - https://forums.gentoo.org/viewtopic-p-8695669.html
-
-		-Dbuildtype=$(usex debug debug plain)
-		-Dopengl=true
-		$(meson_use wayland gles2)
-		#gles2_libname
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland xwayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use gnome libgnome_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use gtk-doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
-	gnome2_environment_reset
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}


             reply	other threads:[~2024-10-08 16:33 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-08 16:33 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-25 17:14 [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/, x11-wm/mutter/ Mart Raudsepp
2023-05-17 21:55 Matt Turner
2023-03-27 14:14 Sam James
2022-09-07  2:10 Matt Turner
2021-04-05 16:54 Matt Turner
2020-06-28  9:38 Mart Raudsepp
2020-05-17 11:32 Mart Raudsepp
2018-12-29 20:43 Mart Raudsepp
2018-09-30 20:10 Pacho Ramos
2017-05-13 16:45 Mart Raudsepp
2016-01-10 18:30 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1728405150.437dd9ea598ac3139935539a846fbbae5920045b.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox