Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
Date: Wed, 16 Jun 2021 01:12:16
Message-Id: 1623805908.240a5326114dd7f4c9b8d4d99444f39d27bc8364.mattst88@gentoo
1 commit: 240a5326114dd7f4c9b8d4d99444f39d27bc8364
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 16 01:06:04 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 16 01:11:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240a5326
7
8 x11-wm/mutter: Version bump to 40.2.1
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 x11-wm/mutter/Manifest | 1 +
13 x11-wm/mutter/mutter-40.2.1.ebuild | 149 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 150 insertions(+)
15
16 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
17 index 0732f149a14..dcdef6f61a8 100644
18 --- a/x11-wm/mutter/Manifest
19 +++ b/x11-wm/mutter/Manifest
20 @@ -2,4 +2,5 @@ DIST mutter-3.36.7-patchset.tar.xz 14232 BLAKE2B 90a289f7012e28607d487fd635b7368
21 DIST mutter-3.36.7.tar.xz 2689176 BLAKE2B a3849b254dbe2029736ef760fe4225e63bf1d87bf2856a87682574904bd047822916485a3e00d2760118132466414b68764731ea4af9add5d734fd7ce3eac730 SHA512 6061cc8a3bdefe57049f9da757b9a33321b28ff7bc9543bc1db3abd75c7261bf233180fb1e8a2f76145dd67ebda91c48981f6e844a866ef6cbb66203af4b7ef7
22 DIST mutter-40.1-r1-patchset.tar.xz 25312 BLAKE2B bcb58a50d63076ec012a2866dcbabaf417c094c3d7811f59e58273f7966f132fd51587b9374cee49b10e02207edc89bc0a4176de236330f4d9d9467f23a1d997 SHA512 511c9a315e29175109a8341ff608c94535579bc7e3145990405286fb47ee050a9ad90977ac18cd69f9baeeac283d3b94b1a0d4324ba3cc73fbb405443d82eb4d
23 DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e96ab3c6ccbe3d54da5f431e386f9c2f8f060dc9cd066c7414a2bb90a05760fa3413c6805cd8b73cb5d3aed90 SHA512 c2b6603e1d55492916f742f9cb8e15588cb30e78c37de987404ac40d3befa65e417184305ad87fdffc41052a094790f9e324a1ea7482e5de4f0439dceefed118
24 +DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
25 DIST mutter-40.2.tar.xz 2681840 BLAKE2B 7785086a9aff9f273735e0a0716a8535a7e69b35c5b4312d8a363b4058e84e499a15c1d9b085c40d1303e69e661fd74c286da89a83a27d86e1a56c537f7e2e18 SHA512 9582004efde7a4b2ad21c390f4a4558c99709e21bdcac3f161f185612de9aaeb60cbfcf5dd1684726ae18244540aa4b6bcd2b9f362b92eb8c74304c43c9e1113
26
27 diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
28 new file mode 100644
29 index 00000000000..36f6f75bc57
30 --- /dev/null
31 +++ b/x11-wm/mutter/mutter-40.2.1.ebuild
32 @@ -0,0 +1,149 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +inherit gnome.org gnome2-utils meson udev virtualx xdg
38 +
39 +DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
40 +HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
41 +
42 +LICENSE="GPL-2+"
43 +SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
44 +
45 +IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
46 +# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
47 +REQUIRED_USE="
48 + wayland? ( ^^ ( elogind systemd ) udev )
49 + test? ( wayland )"
50 +RESTRICT="!test? ( test )"
51 +
52 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
53 +
54 +# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
55 +# xorg-server is needed at build and runtime with USE=wayland for Xwayland
56 +# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
57 +DEPEND="
58 + >=x11-libs/libX11-1.7.0
59 + >=media-libs/graphene-1.10.2[introspection?]
60 + >=x11-libs/gtk+-3.19.8:3[X,introspection?]
61 + x11-libs/gdk-pixbuf:2
62 + >=x11-libs/pango-1.46[introspection?]
63 + >=dev-libs/fribidi-1.0.0
64 + >=x11-libs/cairo-1.14[X]
65 + >=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
66 + >=dev-libs/glib-2.67.3:2
67 + gnome-base/gnome-settings-daemon
68 + >=dev-libs/json-glib-0.12.0[introspection?]
69 + gnome-base/gnome-desktop:3=
70 + >=x11-libs/libXcomposite-0.4
71 + x11-libs/libXcursor
72 + x11-libs/libXdamage
73 + x11-libs/libXext
74 + >=x11-libs/libXfixes-3
75 + >=x11-libs/libXi-1.7.4
76 + x11-libs/libXtst
77 + x11-libs/libxkbfile
78 + x11-misc/xkeyboard-config
79 + >=x11-libs/libxkbcommon-0.4.3[X]
80 + x11-libs/libXrender
81 + >=x11-libs/libXrandr-1.5.0
82 + x11-libs/libxcb
83 + x11-libs/libXinerama
84 + x11-libs/libXau
85 + x11-libs/libICE
86 + >=dev-libs/atk-2.5.3[introspection?]
87 + >=media-libs/libcanberra-0.26
88 + sys-apps/dbus
89 + media-libs/mesa[X(+),egl]
90 + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
91 + wayland? (
92 + >=dev-libs/wayland-protocols-1.19
93 + >=dev-libs/wayland-1.18.0
94 + x11-libs/libdrm:=
95 + >=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
96 + >=dev-libs/libinput-1.15.0
97 + systemd? ( sys-apps/systemd )
98 + elogind? ( sys-auth/elogind )
99 + x11-base/xorg-server[wayland]
100 + )
101 + udev? ( >=dev-libs/libgudev-232:=
102 + >=virtual/libudev-232-r1:= )
103 + x11-libs/libSM
104 + input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
105 + >=x11-libs/startup-notification-0.7
106 + screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
107 + introspection? ( >=dev-libs/gobject-introspection-1.54:= )
108 +"
109 +RDEPEND="${DEPEND}
110 + gnome-extra/zenity
111 +"
112 +DEPEND="${DEPEND}
113 + x11-base/xorg-proto
114 + sysprof? ( >=dev-util/sysprof-common-3.38.0 )
115 +"
116 +# wayland bdepend for wayland-scanner, xorg-server for cvt utility
117 +BDEPEND="
118 + dev-libs/wayland
119 + dev-util/gdbus-codegen
120 + dev-util/glib-utils
121 + >=sys-devel/gettext-0.19.8
122 + virtual/pkgconfig
123 + test? ( app-text/docbook-xml-dtd:4.5 )
124 + wayland? ( >=sys-kernel/linux-headers-4.4
125 + x11-base/xorg-server )
126 +"
127 +
128 +PATCHES=(
129 + "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
130 +)
131 +
132 +src_configure() {
133 + # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
134 + local emesonargs=(
135 + -Dopengl=true
136 + #opengl_libname
137 + #gles2_libname
138 + $(meson_use wayland gles2)
139 + -Degl=true
140 + -Dglx=true
141 + $(meson_use wayland)
142 + $(meson_use wayland native_backend)
143 + $(meson_use screencast remote_desktop)
144 + -Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
145 + -Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
146 + $(meson_use udev)
147 + -Dudev_dir=$(get_udevdir)
148 + $(meson_use input_devices_wacom libwacom)
149 + -Dpango_ft2=true
150 + -Dstartup_notification=true
151 + -Dsm=true
152 + $(meson_use introspection)
153 + $(meson_use test cogl_tests)
154 + $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
155 + -Dnative_tests=false
156 + $(meson_use test clutter_tests)
157 + $(meson_use test tests)
158 + $(meson_use sysprof profiler)
159 + -Dinstalled_tests=false
160 + #verbose # Let upstream choose default for verbose mode
161 + #xwayland_path
162 + # 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)
163 + #xwayland_grab_default_access_rules
164 + )
165 + meson_src_configure
166 +}
167 +
168 +src_test() {
169 + glib-compile-schemas "${BUILD_DIR}"/data
170 + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
171 +}
172 +
173 +pkg_postinst() {
174 + xdg_pkg_postinst
175 + gnome2_schemas_update
176 +}
177 +
178 +pkg_postrm() {
179 + xdg_pkg_postrm
180 + gnome2_schemas_update
181 +}