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