[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/

[Mart Raudsepp]

commit:     c3e37144fe021705277a9f22484e0a07d18eb2b1
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 09:37:39 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 09:37:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e37144

x11-wm/mutter: add patches, drop USE=screencast

We don't want to bother with pipewire-0.2, so drop it for now to
make upcoming pipewire:0/0.3 subslot upgrade easier to ~arch users
(it was stable masked).
Add some upstream branch patches to make the revbump useful to
everybody.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 x11-wm/mutter/Manifest                |   1 +
 x11-wm/mutter/mutter-3.34.6-r2.ebuild | 147 ++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index be7e4c69dac..ff7d3421360 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,2 +1,3 @@
 DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
+DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
 DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b

diff --git a/x11-wm/mutter/mutter-3.34.6-r2.ebuild b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
new file mode 100644
index 00000000000..d04f56b67e4
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# 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="
+	x11-libs/libX11
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	gnome-base/gnome-desktop:3=
+	>=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
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	media-libs/mesa[X(+),egl]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.4
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[wayland]
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	wayland? ( >=sys-kernel/linux-headers-4.4
+		x11-base/xorg-server )
+"
+
+PATCHES=(
+	"${WORKDIR}"/patches/
+	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
+)
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland native_backend)
+		-Dremote_desktop=false # not bothering with pipewire-0.2; to be reintroduced in newer mutter via pipewire-0.3
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(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 wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		$(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
+	)
+	meson_src_configure
+}
+
+src_test() {
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}