Added mutter witch patch

This commit is contained in:
Gerben Jan Dijkman 2023-03-27 15:59:02 +02:00
parent edb3ec2bbf
commit d5e710f38b
4 changed files with 262 additions and 0 deletions

4
x11-wm/mutter/Manifest Normal file
View File

@ -0,0 +1,4 @@
DIST mutter-43.2.tar.xz 2781032 BLAKE2B cb4fc05ae9b53029649e9c80c8ce450d383a41f142ff1000bca6f9c1ddc707897511b5b54e8e28b4d263d19cffdfa699cef034d667cd8f166f8274c0f237d41a SHA512 ae6afccdf6af99197072afabf0900e1a72f38acfa6c4d039e8db03d21e89513f8828f29eb292ca9dfdec64388dcc4a93db64139e3af66706aaac81461b5da96d
DIST mutter-43.3.tar.xz 2782016 BLAKE2B 9a931dba410a71e67383a453c4480622fce3333ea5d7466bf05cf20b474e3cb06288ea8015bc391a77fc3a358c60282a965428c4984006a0ea8db9a7cfee2e2f SHA512 5e9d4b213ac674889af9c15dd52f79a28a1c38af57f08a19bd6b2bf78a799aaa2f6dcb76adb9fa8d6a94e21d988befc37a696bc06801c96e1f692c80a5aff2ae
DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180d941634bf1ab673f53cd710893ccbedd16cb7bc1a09b51120b2047105a04a8eae4fbcb3803179eba89c7d73e SHA512 c7d35e797d080f90cc43b2904bb04d2328fecd13cd7d1ab12b1db735d331b2df9501668c2e0f7a10ea3ad9821048b09cbeb7149fcda3d43f37e5a1834bb04e2b
DIST mutter-44.rc.tar.xz 2837848 BLAKE2B 7590afd00f6e6e65062675fd2478a8b7f41e7199f0ea0f77ccd8e62ba6e07bdefea57f8206a1f57cef101c97abe9f621cd4bf3cabca0d2bd0249f330c104072d SHA512 1d7659f9b4bb96ea50c32f122a8e621639007d023970cfeeb2afe5351abc38b9a697163019e26c85cad611f65eccbcd9f940ff1ff5ab10509fda8122c43f9a66

View File

@ -0,0 +1,14 @@
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index d278e6a85fda8947d2c8728f749147b97f14c973..595fbd42cb851b0f1869451e76fdbffea5836de7 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -134,8 +134,8 @@ struct _MetaBackendPrivate
#endif
MetaSettings *settings;
MetaDbusSessionWatcher *dbus_session_watcher;
-#ifdef HAVE_REMOTE_DESKTOP
MetaRemoteAccessController *remote_access_controller;
+#ifdef HAVE_REMOTE_DESKTOP
MetaScreenCast *screen_cast;
MetaRemoteDesktop *remote_desktop;
#endif

View File

@ -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',

View File

@ -0,0 +1,217 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..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="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 )"
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/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
gnome? ( gnome-base/gnome-desktop:4= )
>=media-libs/libcanberra-0.26
media-libs/libglvnd[X]
wayland? (
>=dev-libs/wayland-protocols-1.31
>=dev-libs/wayland-1.21.0
x11-libs/libdrm
media-libs/mesa[gbm(+)]
>=dev-libs/libinput-1.18.0:=
elogind? ( sys-auth/elogind )
x11-base/xwayland
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.21:= )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
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-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
"
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
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
"${FILESDIR}"/2935.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() {
local emesonargs=(
--buildtype $(usex debug debug plain)
-Dopengl=true
-Dopengl_libname=libOpenGL
$(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)
-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 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() {
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
}