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