Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
Date: Sun, 30 Jun 2019 13:19:21
Message-Id: 1561900619.a03ecaf66352863145b9f6136191a67a223e830f.leio@gentoo
1 commit: a03ecaf66352863145b9f6136191a67a223e830f
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 30 13:16:36 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 30 13:16:59 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03ecaf6
7
8 x11-wm/mutter: update patchset
9
10 Includes more commits from upstream gnome-3-30 branch, a patch
11 to hopefully fix an on_monitors_changed related crash I'm
12 experiencing once in a while myself (when monitors go to sleep
13 and wake up from screen lock). Also includes some patches
14 debian/ubuntu include, more prominently support for native
15 refresh rate on wayland sessions (not hardcoded to 60Hz),
16 workaround for startup-notification problems (fixing e.g.
17 gnome-terminal appmenu spinning until a timeout, when really
18 g-t has long started), fix for limited memory old GPUs and more.
19
20 Package-Manager: Portage-2.3.62, Repoman-2.3.12
21 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
22
23 x11-wm/mutter/Manifest | 1 +
24 x11-wm/mutter/mutter-3.30.2-r2.ebuild | 147 ++++++++++++++++++++++++++++++++++
25 2 files changed, 148 insertions(+)
26
27 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
28 index 2f0f8c18519..34e0557577a 100644
29 --- a/x11-wm/mutter/Manifest
30 +++ b/x11-wm/mutter/Manifest
31 @@ -1,4 +1,5 @@
32 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
33 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
34 DIST mutter-3.30.2-r1-patchset.tar.xz 14096 BLAKE2B 83f2e975a4404b878e832a70fe7a84a2a39d291dc1f6191e5805633327d21fb0796b8b0172a35602bec9c7e879819ebdb189f324cba3f4a4aee232d5e439ba0a SHA512 f842920d6855803b8712e1736399805ecd3266a61dd7baba1f80383978d00533e34fd742103b578f9f2969ab2059f9e0c7b3812d2ea2283b6ffa91810bf6094f
35 +DIST mutter-3.30.2-r2-patchset.tar.xz 38544 BLAKE2B f4282b9220f49b38ce495939db222f1585e48b8e446d168135e643248b06c26c57c75032f130615dc6d758c44e4628c0431d88bdd2ee23eee1fb64f2929bd51f SHA512 6ceefbc4bdca9b1eb82ce1f3c0847d85922ebc86643fcde4a3bb37201ff50c1d9343ea605572d5942c984d1e87e44597a4febd058fba9fb57224dccb25a10152
36 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
37
38 diff --git a/x11-wm/mutter/mutter-3.30.2-r2.ebuild b/x11-wm/mutter/mutter-3.30.2-r2.ebuild
39 new file mode 100644
40 index 00000000000..67f779d7452
41 --- /dev/null
42 +++ b/x11-wm/mutter/mutter-3.30.2-r2.ebuild
43 @@ -0,0 +1,147 @@
44 +# Copyright 1999-2019 Gentoo Authors
45 +# Distributed under the terms of the GNU General Public License v2
46 +
47 +EAPI=6
48 +GNOME2_EAUTORECONF="yes"
49 +inherit gnome2 virtualx
50 +
51 +DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
52 +HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
53 +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
54 +
55 +LICENSE="GPL-2+"
56 +SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
57 +
58 +IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland"
59 +# native backend requires gles3 for hybrid graphics blitting support and a logind provider
60 +REQUIRED_USE="
61 + wayland? ( ^^ ( elogind systemd ) )"
62 +
63 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
64 +
65 +# libXi-1.7.4 or newer needed per:
66 +# https://bugzilla.gnome.org/show_bug.cgi?id=738944
67 +# gl.pc package is required, which is only installed by mesa if glx is enabled; pre-emptively requiring USE=X on mesa, as hopefully eventually it'll support disabling glx for wayland-only systems
68 +RDEPEND="
69 + >=dev-libs/atk-2.5.3
70 + >=x11-libs/gdk-pixbuf-2:2
71 + >=dev-libs/json-glib-0.12.0
72 + >=x11-libs/pango-1.30[introspection?]
73 + >=x11-libs/cairo-1.14[X]
74 + >=x11-libs/gtk+-3.19.8:3[X,introspection?]
75 + >=dev-libs/glib-2.53.2:2
76 + >=media-libs/libcanberra-0.26[gtk3]
77 + >=x11-libs/startup-notification-0.7
78 + >=x11-libs/libXcomposite-0.2
79 + >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?]
80 + gnome-base/gnome-desktop:3=
81 +
82 + x11-libs/libICE
83 + x11-libs/libSM
84 + x11-libs/libX11
85 + >=x11-libs/libXcomposite-0.4
86 + x11-libs/libXcursor
87 + x11-libs/libXdamage
88 + x11-libs/libXext
89 + >=x11-libs/libXfixes-3
90 + >=x11-libs/libXi-1.7.4
91 + x11-libs/libXinerama
92 + >=x11-libs/libXrandr-1.5
93 + x11-libs/libXrender
94 + x11-libs/libxcb
95 + x11-libs/libxkbfile
96 + >=x11-libs/libxkbcommon-0.4.3[X]
97 + x11-misc/xkeyboard-config
98 +
99 + gnome-extra/zenity
100 + media-libs/mesa[X(+),egl,gles2?]
101 +
102 + input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
103 + introspection? ( >=dev-libs/gobject-introspection-1.42:= )
104 + udev? ( >=virtual/libgudev-232:= )
105 + wayland? (
106 + >=dev-libs/libinput-1.4
107 + >=dev-libs/wayland-1.13.0
108 + >=dev-libs/wayland-protocols-1.16
109 + >=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
110 + systemd? ( sys-apps/systemd )
111 + elogind? ( sys-auth/elogind )
112 + >=virtual/libgudev-232:=
113 + >=virtual/libudev-136:=
114 + x11-base/xorg-server[wayland]
115 + x11-libs/libdrm:=
116 + )
117 +"
118 +DEPEND="${RDEPEND}
119 + dev-util/glib-utils
120 + >=sys-devel/gettext-0.19.6
121 + virtual/pkgconfig
122 + x11-base/xorg-proto
123 + test? ( app-text/docbook-xml-dtd:4.5 )
124 + wayland? ( >=sys-kernel/linux-headers-4.4 )
125 +"
126 +
127 +PATCHES=(
128 + # Some patches from gnome-3-30 branch on top of 3.30.2
129 + "${WORKDIR}"/patches/
130 + # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
131 + "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
132 +)
133 +
134 +src_prepare() {
135 + # Disable building of noinst_PROGRAM for tests
136 + if ! use test; then
137 + sed -e '/^noinst_PROGRAMS/d' \
138 + -i cogl/tests/conform/Makefile.{am,in} || die
139 + sed -e '/noinst_PROGRAMS += testboxes/d' \
140 + -i src/Makefile-tests.am || die
141 + sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \
142 + -i src/Makefile.in || die
143 + fi
144 +
145 + gnome2_src_prepare
146 +
147 + # Leave the damn CFLAGS alone
148 + sed -e 's/$CFLAGS -g/$CFLAGS /' \
149 + -i clutter/configure || die
150 + sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \
151 + -i cogl/configure || die
152 + sed -e 's/$CFLAGS -g -O/$CFLAGS /' \
153 + -i configure || die
154 +}
155 +
156 +src_configure() {
157 + # TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled)
158 + # TODO: nvidia EGLDevice support
159 + # TODO: elogind vs systemd is automagic in 3.28.3 - if elogind is found, it's used instead of systemd; but not a huge problem as elogind package blocks systemd package
160 + # TODO: lack of --with-xwayland-grab-default-access-rules 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)
161 + # Prefer gl driver by default
162 + # GLX is forced by mutter but optional in clutter
163 + # xlib-egl-platform required by mutter x11 backend
164 + # native backend without wayland is useless
165 + gnome2_src_configure \
166 + --disable-static \
167 + --enable-compile-warnings=minimum \
168 + --enable-gl \
169 + --enable-glx \
170 + --enable-sm \
171 + --enable-startup-notification \
172 + --enable-verbose-mode \
173 + --enable-xlib-egl-platform \
174 + --with-default-driver=gl \
175 + --with-libcanberra \
176 + $(usex debug --enable-debug=yes "") \
177 + $(use_enable gles2) \
178 + $(use_enable gles2 cogl-gles2) \
179 + $(use_enable introspection) \
180 + $(use_enable wayland) \
181 + $(use_enable wayland kms-egl-platform) \
182 + $(use_enable wayland native-backend) \
183 + $(use_enable wayland wayland-egl-server) \
184 + $(use_with input_devices_wacom libwacom) \
185 + $(use_with udev gudev)
186 +}
187 +
188 +src_test() {
189 + virtx emake check
190 +}