diff options
Diffstat (limited to 'x11-wm/mutter')
| -rw-r--r-- | x11-wm/mutter/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/mutter/files/mutter-43.0-Disable-anonymous-file-test.patch | 27 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-43.0.ebuild | 206 |
3 files changed, 236 insertions, 0 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index fbf8fbbb17f7..e3419476bab2 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,9 +1,12 @@ AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164 AUX mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch 3102 BLAKE2B 8adfd306044014776bdfe46bcc45f1333af2ae5ee7ab195fed0c6f1f852723670f90aa0fd7476bd59f0b1c76a4b91521f3a19f9ba0f584f4699075b484aa0dfc SHA512 e751600b5f82ae1330f888c891f302c107fd5da1227392774e8ef2aa681c528be28c78ffd64f832e8aaf31179eeecc12575bc34e3d80d2ab638f3aae099c8cbf +AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b DIST mutter-42.3.tar.xz 2746756 BLAKE2B 818b2ac8cd264c6b8e30b6731ef2641dbcbba6dce7628d0a934c3f49a5857874d9e6a97cd53ec689c2a9ae7f52d49ed98b7cc551eafbb32b74cbebbe027d9f43 SHA512 f346d2299143ceb6c9164977df2e23655b1c204f3a2d1f713377f3cc2f3609c56914c5e8a0b940d4fdd3d040a9af210f724350bb4f74ffac293e6a82e2b0785b DIST mutter-42.4.tar.xz 2747580 BLAKE2B 8627e1de8ea93498ff0abd0605836c5b70bb9e51e50ade93b6dd332393892c167aa0cc58f45621e9838ea885834d915ecf2c75c8493fbd154930d4c7427c1010 SHA512 fad80c2c3e6674c00e35783c69886ed728c732743ec967756329c5fd3dd7c1b5695aa0dca7e5d8a3bcb72d03ec06bbdc45c14cc775d40db2852b2299c8b0df03 DIST mutter-42.5.tar.xz 2743636 BLAKE2B 87ee26ccee6c21404ac069e7b35d2b93ef38d0eda0963107c08a72599915fba56a653968fe456afa42f4eeb28aed5526d23d344f7e1f9f4fdf9cf35b5a66fca5 SHA512 cd7ef29211a1568f5f8d43182da6569db22005c0b67204a300edb4952d9c18f73def1558843a009a7475a82d7ce9754bd8741b214a931764798dbeaaecbbec49 +DIST mutter-43.0.tar.xz 2768452 BLAKE2B 4b5cddbadf0e71b26f37725cb301235e0ae33e627d95b5ef730a3787e0af4cd260cea47563ccc39d24d7baf835ae545928ee69fe30327347ffc1b476f92c6a21 SHA512 e7169dcefbc5f1d47581981ceec4d6ac47d75ed9d4ef0b18adfe1dc632645217c4546fdf004544902642b3e0dbb48f6025ab9a5ad9670765ccd972c6409e8611 EBUILD mutter-42.3.ebuild 5486 BLAKE2B 7969cc68ae159ee63076c9947054fca8b628dc32f166611cf20d2cd7f9f5e3fc2144f0b3046a0e5bc74fb5912f03760f9cab0a8ca770c4eaffcc3d27af5c7223 SHA512 17040b8714373e0947575ea133b45a5c1c7b621ead36039816c3d573310b42b68d0dc7cc12f4e2115e61de5d99eb6661bc01a92f22632b09c65f1ec3ceb2f8ab EBUILD mutter-42.4-r1.ebuild 5461 BLAKE2B 0a61cd1d21dcfa3173f00934f07feed6bbef60eb3f290a71cc960fa1f91d3fa2901685d54a5829c640a385bcdbd5674b49c7bd3d6c94e7dc189c1d88697f5bc1 SHA512 ca7fa2ca79d0763f2ebcf2a7372f302d25ffc94063cd3ba38d371aa032ea0b79fa0fb21d5239fd9f7dd60be67ced1440cde709426436db672aa9f755f30aae53 EBUILD mutter-42.5.ebuild 5470 BLAKE2B e20f8db146377f71c56b336a8ccecaa9e7fbf1b0d79eabfb451dced852934255e68f34edfcd4a5fa153b96048c460fdd175c5deeb2c501099e6264446a11327c SHA512 1d017e60926b31cc5a6836e9adcc3222e970e2fc442b255cb56285b2d5193b46790987b1b57f7f715fa77c5d1ae2c1801be2ef00ad81798c4ac77330d3460f8a +EBUILD mutter-43.0.ebuild 5780 BLAKE2B 886592ce31a257b3b34f9633b6cffcfd84b78d8f63f30ef0a1aed891b512395fdf124600fa4b10a98d7b54aab783991a48eac83d20400f293a3d61fefb9c0970 SHA512 c1468a1cda7bd194221e249d7bb98b35924be62d8dd14beb315af8cdf2641e3c139a62411fbdc0762a4abc01c7a86dc111c0dea56568fe2a68d8a97887fc310f MISC metadata.xml 485 BLAKE2B c44b289cf5592b16abd0d7a095e2c042550d6bc37a3ab8a0ac287a9c501cdd5b30e7ddba0286dbcf25845f659afa07ae92182c063fb3b549ed448829197cc2ee SHA512 16628e78b4c9b07283733038e66d9b0ec58a1964593be2aa4e81be117a26944a9d642175ab0eceb06913bb178034d4e49364ae977c60f296cbc3cb0acafdb90e diff --git a/x11-wm/mutter/files/mutter-43.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-43.0-Disable-anonymous-file-test.patch new file mode 100644 index 000000000000..98fcc4c87d10 --- /dev/null +++ b/x11-wm/mutter/files/mutter-43.0-Disable-anonymous-file-test.patch @@ -0,0 +1,27 @@ +From 8cb699dc59c64dc9f58873b3bbe2d17c3a08d2f9 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Fri, 18 Mar 2022 17:40:52 -0700 +Subject: [PATCH] Disable anonymous-file test + +It attempts to open /proc/self/fd/* (an fd created by memfd_create), +which sandbox disallows. +--- + src/tests/meson.build | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/tests/meson.build b/src/tests/meson.build +index a19703288..50027d1f8 100644 +--- a/src/tests/meson.build ++++ b/src/tests/meson.build +@@ -224,11 +224,6 @@ test_cases += [ + 'suite': 'compositor', + 'sources': [ 'stage-view-tests.c', ], + }, +- { +- 'name': 'anonymous-file', +- 'suite': 'unit', +- 'sources': [ 'anonymous-file.c', ], +- }, + { + 'name': 'edid', + 'suite': 'unit', diff --git a/x11-wm/mutter/mutter-43.0.ebuild b/x11-wm/mutter/mutter-43.0.ebuild new file mode 100644 index 000000000000..283a4e11b4e7 --- /dev/null +++ b/x11-wm/mutter/mutter-43.0.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) +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+" +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 + +IUSE="doc elogind gnome 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=" + wayland? ( ^^ ( elogind systemd ) udev ) + test? ( wayland )" +RESTRICT="!test? ( test )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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=" + >=media-libs/lcms-2.6:2 + >=x11-misc/colord-1.4.5:= + >=x11-libs/libX11-1.7.0 + >=media-libs/graphene-1.10.2[introspection?] + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + x11-libs/gdk-pixbuf:2 + >=x11-libs/pango-1.46[introspection?] + >=dev-libs/fribidi-1.0.0 + >=x11-libs/cairo-1.14[X] + >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] + >=dev-libs/glib-2.69.0:2 + gnome-base/gnome-settings-daemon + >=dev-libs/json-glib-0.12.0[introspection?] + >=x11-libs/libxkbcommon-0.4.3 + x11-libs/libICE + >=dev-libs/atk-2.5.3[introspection?] + >=media-libs/libcanberra-0.26 + sys-apps/dbus + gnome? ( gnome-base/gnome-desktop:3= ) + media-libs/mesa[X(+),egl(+)] + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) + systemd? ( sys-apps/systemd ) + wayland? ( + >=dev-libs/wayland-protocols-1.26 + >=dev-libs/wayland-1.21.0 + x11-libs/libdrm + >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] + >=dev-libs/libinput-1.18.0:= + elogind? ( sys-auth/elogind ) + x11-base/xwayland + video_cards_nvidia? ( gui-libs/egl-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 + screencast? ( >=media-video/pipewire-0.3.21:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + doc? ( >=dev-util/gi-docgen-2021.1 ) +" +# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. +# X? ( +DEPEND+=" + >=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 +" +# )" + +RDEPEND="${DEPEND} + gnome-extra/zenity + + !<gui-libs/gtk-4.6.4:4 + !<x11-libs/gtk+-3.24.34:3 +" +DEPEND="${DEPEND} + x11-base/xorg-proto + sysprof? ( >=dev-util/sysprof-common-3.38.0 ) +" +BDEPEND=" + dev-util/wayland-scanner + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + 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_prepare() { + default + + sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die +} + +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 systemd) + $(meson_use wayland native_backend) + $(meson_use screencast remote_desktop) + -Dlibgnome_desktop=true + $(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 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() { + 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 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 +} |