| 1 |
commit: 4a66f9332d11141200acb82fa4d1a39cb7b12280 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 27 22:31:20 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 27 23:57:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a66f933 |
| 7 |
|
| 8 |
x11-wm/mutter: bump to 3.28.3, support elogind for wayland |
| 9 |
|
| 10 |
Upstream added initial elogind support in 3.28, so just hook it up. |
| 11 |
This is currently only used for native KMS renderer builds, which |
| 12 |
are only enabled with USE=wayland. |
| 13 |
Includes a huge patchset from upstream gnome-3-28 branch, fixing |
| 14 |
various wayland and other issues and some performance tweaks. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 17 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 18 |
|
| 19 |
x11-wm/mutter/Manifest | 2 + |
| 20 |
x11-wm/mutter/metadata.xml | 1 + |
| 21 |
x11-wm/mutter/mutter-3.28.3.ebuild | 144 +++++++++++++++++++++++++++++++++++++ |
| 22 |
3 files changed, 147 insertions(+) |
| 23 |
|
| 24 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
| 25 |
index 7563c016b1a..64e21689d54 100644 |
| 26 |
--- a/x11-wm/mutter/Manifest |
| 27 |
+++ b/x11-wm/mutter/Manifest |
| 28 |
@@ -1,3 +1,5 @@ |
| 29 |
DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 |
| 30 |
DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 |
| 31 |
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b |
| 32 |
+DIST mutter-3.28.3-patchset.tar.xz 44308 BLAKE2B c9ecac6fc91d0f5d07be3f407332267ac6ee83d65ec7650461a990e87dd81c0b6bf37893441ebcd084730d6bbe4ecf851e5083660979aebce237d5fdd2485bb1 SHA512 3d057faf1dfbe5ea38c8207d16377c9024772fb2111f0cdc9867de63ed158534d6ae5a23413b2f258c1c85278abbf1ac0156f0322e9df717ea09ba45d5f8650f |
| 33 |
+DIST mutter-3.28.3.tar.xz 3693812 BLAKE2B 491a4cc47d54d2a72adffd808ac64d90914f5a5bd653ba2b147993ee4a0862fbe61a666a3adf322ed4fd4af99c4cf9890b7bb19f9f0451039d1d797cfd616e3b SHA512 1230e4489693188c4d9ffe5460b235cd018b16f27741451120c3acb6027901d5286d9793cc0c9ad50a2233ff20ea91e7a47c0df611bb4479f1e33af0d185f69a |
| 34 |
|
| 35 |
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml |
| 36 |
index 73abedd9cf0..bd2aac01e71 100644 |
| 37 |
--- a/x11-wm/mutter/metadata.xml |
| 38 |
+++ b/x11-wm/mutter/metadata.xml |
| 39 |
@@ -6,6 +6,7 @@ |
| 40 |
<name>Gentoo GNOME Desktop</name> |
| 41 |
</maintainer> |
| 42 |
<use> |
| 43 |
+ <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag> |
| 44 |
<flag name="gles2">Enable OpenGL ES 2.0 support</flag> |
| 45 |
</use> |
| 46 |
</pkgmetadata> |
| 47 |
|
| 48 |
diff --git a/x11-wm/mutter/mutter-3.28.3.ebuild b/x11-wm/mutter/mutter-3.28.3.ebuild |
| 49 |
new file mode 100644 |
| 50 |
index 00000000000..d57e0a9002c |
| 51 |
--- /dev/null |
| 52 |
+++ b/x11-wm/mutter/mutter-3.28.3.ebuild |
| 53 |
@@ -0,0 +1,144 @@ |
| 54 |
+# Copyright 1999-2019 Gentoo Authors |
| 55 |
+# Distributed under the terms of the GNU General Public License v2 |
| 56 |
+ |
| 57 |
+EAPI=6 |
| 58 |
+GNOME2_EAUTORECONF="yes" |
| 59 |
+inherit gnome2 virtualx |
| 60 |
+ |
| 61 |
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter" |
| 62 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
| 63 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
| 64 |
+ |
| 65 |
+LICENSE="GPL-2+" |
| 66 |
+SLOT="0/2" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot |
| 67 |
+ |
| 68 |
+IUSE="debug elogind gles2 input_devices_wacom +introspection systemd test udev wayland" |
| 69 |
+REQUIRED_USE="wayland? ( ?? ( elogind systemd ) )" |
| 70 |
+ |
| 71 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 72 |
+ |
| 73 |
+# libXi-1.7.4 or newer needed per: |
| 74 |
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944 |
| 75 |
+# 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 |
| 76 |
+RDEPEND=" |
| 77 |
+ >=dev-libs/atk-2.5.3 |
| 78 |
+ >=x11-libs/gdk-pixbuf-2:2 |
| 79 |
+ >=dev-libs/json-glib-0.12.0 |
| 80 |
+ >=x11-libs/pango-1.30[introspection?] |
| 81 |
+ >=x11-libs/cairo-1.14[X] |
| 82 |
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
| 83 |
+ >=dev-libs/glib-2.53.2:2 |
| 84 |
+ >=media-libs/libcanberra-0.26[gtk3] |
| 85 |
+ >=x11-libs/startup-notification-0.7 |
| 86 |
+ >=x11-libs/libXcomposite-0.2 |
| 87 |
+ >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] |
| 88 |
+ gnome-base/gnome-desktop:3= |
| 89 |
+ >sys-power/upower-0.99:= |
| 90 |
+ |
| 91 |
+ x11-libs/libICE |
| 92 |
+ x11-libs/libSM |
| 93 |
+ x11-libs/libX11 |
| 94 |
+ >=x11-libs/libXcomposite-0.4 |
| 95 |
+ x11-libs/libXcursor |
| 96 |
+ x11-libs/libXdamage |
| 97 |
+ x11-libs/libXext |
| 98 |
+ >=x11-libs/libXfixes-3 |
| 99 |
+ >=x11-libs/libXi-1.7.4 |
| 100 |
+ x11-libs/libXinerama |
| 101 |
+ >=x11-libs/libXrandr-1.5 |
| 102 |
+ x11-libs/libXrender |
| 103 |
+ x11-libs/libxcb |
| 104 |
+ x11-libs/libxkbfile |
| 105 |
+ >=x11-libs/libxkbcommon-0.4.3[X] |
| 106 |
+ x11-misc/xkeyboard-config |
| 107 |
+ |
| 108 |
+ gnome-extra/zenity |
| 109 |
+ media-libs/mesa[X(+),egl,gles2?] |
| 110 |
+ |
| 111 |
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
| 112 |
+ introspection? ( >=dev-libs/gobject-introspection-1.42:= ) |
| 113 |
+ udev? ( >=virtual/libgudev-232:= ) |
| 114 |
+ wayland? ( |
| 115 |
+ >=dev-libs/libinput-1.4 |
| 116 |
+ >=dev-libs/wayland-1.13.0 |
| 117 |
+ >=dev-libs/wayland-protocols-1.12 |
| 118 |
+ >=media-libs/mesa-10.3[egl,gbm,wayland] |
| 119 |
+ systemd? ( sys-apps/systemd ) |
| 120 |
+ elogind? ( sys-auth/elogind ) |
| 121 |
+ >=virtual/libgudev-232:= |
| 122 |
+ >=virtual/libudev-136:= |
| 123 |
+ x11-base/xorg-server[wayland] |
| 124 |
+ x11-libs/libdrm:= |
| 125 |
+ ) |
| 126 |
+" |
| 127 |
+DEPEND="${RDEPEND} |
| 128 |
+ dev-util/glib-utils |
| 129 |
+ >=sys-devel/gettext-0.19.6 |
| 130 |
+ virtual/pkgconfig |
| 131 |
+ x11-base/xorg-proto |
| 132 |
+ test? ( app-text/docbook-xml-dtd:4.5 ) |
| 133 |
+ wayland? ( >=sys-kernel/linux-headers-4.4 ) |
| 134 |
+" |
| 135 |
+ |
| 136 |
+PATCHES=( |
| 137 |
+ # Lots of patches from gnome-3-28 branch on top of 3.28.3 |
| 138 |
+ "${WORKDIR}"/patches/ |
| 139 |
+) |
| 140 |
+ |
| 141 |
+src_prepare() { |
| 142 |
+ # Disable building of noinst_PROGRAM for tests |
| 143 |
+ if ! use test; then |
| 144 |
+ sed -e '/^noinst_PROGRAMS/d' \ |
| 145 |
+ -i cogl/tests/conform/Makefile.{am,in} || die |
| 146 |
+ sed -e '/noinst_PROGRAMS += testboxes/d' \ |
| 147 |
+ -i src/Makefile-tests.am || die |
| 148 |
+ sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ |
| 149 |
+ -i src/Makefile.in || die |
| 150 |
+ fi |
| 151 |
+ |
| 152 |
+ gnome2_src_prepare |
| 153 |
+ |
| 154 |
+ # Leave the damn CFLAGS alone |
| 155 |
+ sed -e 's/$CFLAGS -g/$CFLAGS /' \ |
| 156 |
+ -i clutter/configure || die |
| 157 |
+ sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ |
| 158 |
+ -i cogl/configure || die |
| 159 |
+ sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ |
| 160 |
+ -i configure || die |
| 161 |
+} |
| 162 |
+ |
| 163 |
+src_configure() { |
| 164 |
+ # TODO: pipewire remote desktop support; --disable-remote-desktop actually enables it due to upstream autotools bug in 3.26.2 (omitted means disabled) |
| 165 |
+ # TODO: nvidia EGLDevice support |
| 166 |
+ # 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 |
| 167 |
+ # 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) |
| 168 |
+ # Prefer gl driver by default |
| 169 |
+ # GLX is forced by mutter but optional in clutter |
| 170 |
+ # xlib-egl-platform required by mutter x11 backend |
| 171 |
+ # native backend without wayland is useless |
| 172 |
+ gnome2_src_configure \ |
| 173 |
+ --disable-static \ |
| 174 |
+ --enable-compile-warnings=minimum \ |
| 175 |
+ --enable-gl \ |
| 176 |
+ --enable-glx \ |
| 177 |
+ --enable-sm \ |
| 178 |
+ --enable-startup-notification \ |
| 179 |
+ --enable-verbose-mode \ |
| 180 |
+ --enable-xlib-egl-platform \ |
| 181 |
+ --with-default-driver=gl \ |
| 182 |
+ --with-libcanberra \ |
| 183 |
+ $(usex debug --enable-debug=yes "") \ |
| 184 |
+ $(use_enable gles2) \ |
| 185 |
+ $(use_enable gles2 cogl-gles2) \ |
| 186 |
+ $(use_enable introspection) \ |
| 187 |
+ $(use_enable wayland) \ |
| 188 |
+ $(use_enable wayland kms-egl-platform) \ |
| 189 |
+ $(use_enable wayland native-backend) \ |
| 190 |
+ $(use_enable wayland wayland-egl-server) \ |
| 191 |
+ $(use_with input_devices_wacom libwacom) \ |
| 192 |
+ $(use_with udev gudev) |
| 193 |
+} |
| 194 |
+ |
| 195 |
+src_test() { |
| 196 |
+ virtx emake check |
| 197 |
+} |
Archives