| 1 |
commit: 4d6e0c8fe87969bb3683e7f0e79891c54e4197a8 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 23 21:23:56 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 23 21:25:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6e0c8f |
| 7 |
|
| 8 |
x11-wm/mutter: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
| 11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-wm/mutter/Manifest | 2 - |
| 14 |
x11-wm/mutter/files/3.28.3-no-gles2-fix.patch | 43 ------ |
| 15 |
x11-wm/mutter/files/3.30-eglmesaext-include.patch | 69 ---------- |
| 16 |
x11-wm/mutter/mutter-3.30.2-r4.ebuild | 153 ---------------------- |
| 17 |
4 files changed, 267 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
| 20 |
index 2cb1435f77b..acdf8cbe590 100644 |
| 21 |
--- a/x11-wm/mutter/Manifest |
| 22 |
+++ b/x11-wm/mutter/Manifest |
| 23 |
@@ -1,6 +1,4 @@ |
| 24 |
DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 |
| 25 |
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b |
| 26 |
-DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca4374fd5b4cc5d8834dd40739e74a65280b7f00b99d61361082673f5f41e44fb40e36f0889d5ee00fbc034efe87294540fba48e SHA512 a7024b95bc56ab25cfdb27003b4b1fc39925117795c05f78b2d473fdbcf3bb6ce870ee5bc030ec4ce5e10b42d94fa0007bf5870bd2a4e94de3885c9434a39835 |
| 27 |
-DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e |
| 28 |
DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5 |
| 29 |
DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269 |
| 30 |
|
| 31 |
diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 43bb05f5245..00000000000 |
| 34 |
--- a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,43 +0,0 @@ |
| 37 |
-From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001 |
| 38 |
-From: Mart Raudsepp <leio@g.o> |
| 39 |
-Date: Fri, 1 Mar 2019 00:02:47 +0200 |
| 40 |
-Subject: [PATCH] build: Fix build without gles headers |
| 41 |
- |
| 42 |
-This is an ugly quick fix to hopefully fix non-wayland builds against |
| 43 |
-mesa[-gles2]. |
| 44 |
-It assumes gnome-shell package USE=wayland requires USE=gles2, which it |
| 45 |
-sort of does already at runtime already for hybrid graphics support, but |
| 46 |
-we ensure with REQUIRED_USE. |
| 47 |
-In meson upstream port for 3.32 this will be more properly conditional |
| 48 |
-on the gles2 option instead. |
| 49 |
---- |
| 50 |
- src/Makefile.am | 6 +++--- |
| 51 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
| 52 |
- |
| 53 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
| 54 |
-index bcb3505c7..a68661b21 100644 |
| 55 |
---- a/src/Makefile.am |
| 56 |
-+++ b/src/Makefile.am |
| 57 |
-@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \ |
| 58 |
- backends/meta-egl.c \ |
| 59 |
- backends/meta-egl.h \ |
| 60 |
- backends/meta-egl-ext.h \ |
| 61 |
-- backends/meta-gles3.c \ |
| 62 |
-- backends/meta-gles3.h \ |
| 63 |
-- backends/meta-gles3-table.h \ |
| 64 |
- backends/meta-gpu.c \ |
| 65 |
- backends/meta-gpu.h \ |
| 66 |
- backends/meta-display-config-shared.h \ |
| 67 |
-@@ -472,6 +469,9 @@ endif |
| 68 |
- |
| 69 |
- if HAVE_NATIVE_BACKEND |
| 70 |
- libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES += \ |
| 71 |
-+ backends/meta-gles3.c \ |
| 72 |
-+ backends/meta-gles3.h \ |
| 73 |
-+ backends/meta-gles3-table.h \ |
| 74 |
- backends/native/meta-backend-native.c \ |
| 75 |
- backends/native/meta-backend-native.h \ |
| 76 |
- backends/native/meta-backend-native-private.h \ |
| 77 |
--- |
| 78 |
-2.17.0 |
| 79 |
- |
| 80 |
|
| 81 |
diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch |
| 82 |
deleted file mode 100644 |
| 83 |
index 884d57cc6f0..00000000000 |
| 84 |
--- a/x11-wm/mutter/files/3.30-eglmesaext-include.patch |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,69 +0,0 @@ |
| 87 |
-From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001 |
| 88 |
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@×××××.com> |
| 89 |
-Date: Sun, 20 Oct 2019 12:04:31 +0200 |
| 90 |
-Subject: [PATCH] EGL: Include EGL/eglmesaext.h |
| 91 |
- |
| 92 |
-The eglext.h shipped by libglvnd does not include the Mesa extensions, |
| 93 |
-unlike the header shipped in Mesa. |
| 94 |
- |
| 95 |
-Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 |
| 96 |
---- |
| 97 |
- cogl/configure.ac | 3 ++- |
| 98 |
- src/backends/meta-egl-ext.h | 1 + |
| 99 |
- src/backends/meta-egl.c | 1 + |
| 100 |
- src/backends/meta-egl.h | 1 + |
| 101 |
- 4 files changed, 5 insertions(+), 1 deletion(-) |
| 102 |
- |
| 103 |
-diff --git a/cogl/configure.ac b/cogl/configure.ac |
| 104 |
-index 3be282fc2..f333b0512 100644 |
| 105 |
---- a/cogl/configure.ac |
| 106 |
-+++ b/cogl/configure.ac |
| 107 |
-@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], |
| 108 |
- ) |
| 109 |
- |
| 110 |
- COGL_EGL_INCLUDES="#include <EGL/egl.h> |
| 111 |
--#include <EGL/eglext.h>" |
| 112 |
-+#include <EGL/eglext.h> |
| 113 |
-+#include <EGL/eglmesaext.h>" |
| 114 |
- AC_SUBST([COGL_EGL_INCLUDES]) |
| 115 |
- ]) |
| 116 |
- |
| 117 |
-diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h |
| 118 |
-index 8705e7d5b..db0b74f76 100644 |
| 119 |
---- a/src/backends/meta-egl-ext.h |
| 120 |
-+++ b/src/backends/meta-egl-ext.h |
| 121 |
-@@ -29,6 +29,7 @@ |
| 122 |
- |
| 123 |
- #include <EGL/egl.h> |
| 124 |
- #include <EGL/eglext.h> |
| 125 |
-+#include <EGL/eglmesaext.h> |
| 126 |
- |
| 127 |
- /* |
| 128 |
- * This is a little different to the tests shipped with EGL implementations, |
| 129 |
-diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c |
| 130 |
-index 755ec4908..bd253c956 100644 |
| 131 |
---- a/src/backends/meta-egl.c |
| 132 |
-+++ b/src/backends/meta-egl.c |
| 133 |
-@@ -31,6 +31,7 @@ |
| 134 |
- |
| 135 |
- #include <EGL/egl.h> |
| 136 |
- #include <EGL/eglext.h> |
| 137 |
-+#include <EGL/eglmesaext.h> |
| 138 |
- #include <gio/gio.h> |
| 139 |
- #include <glib.h> |
| 140 |
- #include <glib-object.h> |
| 141 |
-diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h |
| 142 |
-index 060c7cd2d..2fef2642e 100644 |
| 143 |
---- a/src/backends/meta-egl.h |
| 144 |
-+++ b/src/backends/meta-egl.h |
| 145 |
-@@ -27,6 +27,7 @@ |
| 146 |
- |
| 147 |
- #include <EGL/egl.h> |
| 148 |
- #include <EGL/eglext.h> |
| 149 |
-+#include <EGL/eglmesaext.h> |
| 150 |
- #include <glib-object.h> |
| 151 |
- |
| 152 |
- #define META_EGL_ERROR meta_egl_error_quark () |
| 153 |
--- |
| 154 |
-2.23.0 |
| 155 |
- |
| 156 |
|
| 157 |
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild |
| 158 |
deleted file mode 100644 |
| 159 |
index 12b4bdab7b3..00000000000 |
| 160 |
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild |
| 161 |
+++ /dev/null |
| 162 |
@@ -1,153 +0,0 @@ |
| 163 |
-# Copyright 1999-2019 Gentoo Authors |
| 164 |
-# Distributed under the terms of the GNU General Public License v2 |
| 165 |
- |
| 166 |
-EAPI=6 |
| 167 |
-GNOME2_EAUTORECONF="yes" |
| 168 |
-inherit gnome2 virtualx |
| 169 |
- |
| 170 |
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter" |
| 171 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
| 172 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" |
| 173 |
- |
| 174 |
-LICENSE="GPL-2+" |
| 175 |
-SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot |
| 176 |
- |
| 177 |
-IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland" |
| 178 |
-RESTRICT="!test? ( test )" |
| 179 |
-# native backend requires gles3 for hybrid graphics blitting support and a logind provider |
| 180 |
-REQUIRED_USE=" |
| 181 |
- wayland? ( ^^ ( elogind systemd ) )" |
| 182 |
- |
| 183 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
| 184 |
- |
| 185 |
-# libXi-1.7.4 or newer needed per: |
| 186 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944 |
| 187 |
-# 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 |
| 188 |
-RDEPEND=" |
| 189 |
- >=dev-libs/atk-2.5.3 |
| 190 |
- >=x11-libs/gdk-pixbuf-2:2 |
| 191 |
- >=dev-libs/json-glib-0.12.0 |
| 192 |
- >=x11-libs/pango-1.30[introspection?] |
| 193 |
- >=x11-libs/cairo-1.14[X] |
| 194 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
| 195 |
- >=dev-libs/glib-2.53.2:2 |
| 196 |
- >=media-libs/libcanberra-0.26[gtk3] |
| 197 |
- >=x11-libs/startup-notification-0.7 |
| 198 |
- >=x11-libs/libXcomposite-0.2 |
| 199 |
- >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] |
| 200 |
- <gnome-base/gsettings-desktop-schemas-3.31 |
| 201 |
- gnome-base/gnome-desktop:3= |
| 202 |
- |
| 203 |
- x11-libs/libICE |
| 204 |
- x11-libs/libSM |
| 205 |
- x11-libs/libX11 |
| 206 |
- >=x11-libs/libXcomposite-0.4 |
| 207 |
- x11-libs/libXcursor |
| 208 |
- x11-libs/libXdamage |
| 209 |
- x11-libs/libXext |
| 210 |
- >=x11-libs/libXfixes-3 |
| 211 |
- >=x11-libs/libXi-1.7.4 |
| 212 |
- x11-libs/libXinerama |
| 213 |
- >=x11-libs/libXrandr-1.5 |
| 214 |
- x11-libs/libXrender |
| 215 |
- x11-libs/libxcb |
| 216 |
- x11-libs/libxkbfile |
| 217 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
| 218 |
- x11-misc/xkeyboard-config |
| 219 |
- |
| 220 |
- gnome-extra/zenity |
| 221 |
- media-libs/mesa[X(+),egl,gles2?] |
| 222 |
- |
| 223 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
| 224 |
- introspection? ( >=dev-libs/gobject-introspection-1.42:= ) |
| 225 |
- udev? ( >=dev-libs/libgudev-232:= ) |
| 226 |
- screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) |
| 227 |
- wayland? ( |
| 228 |
- >=dev-libs/libgudev-232:= |
| 229 |
- >=dev-libs/libinput-1.4 |
| 230 |
- >=dev-libs/wayland-1.13.0 |
| 231 |
- >=dev-libs/wayland-protocols-1.16 |
| 232 |
- >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] |
| 233 |
- systemd? ( sys-apps/systemd ) |
| 234 |
- elogind? ( sys-auth/elogind ) |
| 235 |
- >=virtual/libudev-136:= |
| 236 |
- x11-base/xorg-server[wayland] |
| 237 |
- x11-libs/libdrm:= |
| 238 |
- ) |
| 239 |
-" |
| 240 |
-DEPEND="${RDEPEND} |
| 241 |
- dev-util/glib-utils |
| 242 |
- >=sys-devel/gettext-0.19.6 |
| 243 |
- virtual/pkgconfig |
| 244 |
- x11-base/xorg-proto |
| 245 |
- test? ( app-text/docbook-xml-dtd:4.5 ) |
| 246 |
- wayland? ( >=sys-kernel/linux-headers-4.4 ) |
| 247 |
-" |
| 248 |
- |
| 249 |
-PATCHES=( |
| 250 |
- # Some patches from gnome-3-30 branch on top of 3.30.2 |
| 251 |
- "${WORKDIR}"/patches/ |
| 252 |
- # Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2] |
| 253 |
- "${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf |
| 254 |
- |
| 255 |
- "${FILESDIR}"/3.30-eglmesaext-include.patch |
| 256 |
-) |
| 257 |
- |
| 258 |
-src_prepare() { |
| 259 |
- # Disable building of noinst_PROGRAM for tests |
| 260 |
- if ! use test; then |
| 261 |
- sed -e '/^noinst_PROGRAMS/d' \ |
| 262 |
- -i cogl/tests/conform/Makefile.{am,in} || die |
| 263 |
- sed -e '/noinst_PROGRAMS += testboxes/d' \ |
| 264 |
- -i src/Makefile-tests.am || die |
| 265 |
- sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ |
| 266 |
- -i src/Makefile.in || die |
| 267 |
- fi |
| 268 |
- |
| 269 |
- gnome2_src_prepare |
| 270 |
- |
| 271 |
- # Leave the damn CFLAGS alone |
| 272 |
- sed -e 's/$CFLAGS -g/$CFLAGS /' \ |
| 273 |
- -i clutter/configure || die |
| 274 |
- sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ |
| 275 |
- -i cogl/configure || die |
| 276 |
- sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ |
| 277 |
- -i configure || die |
| 278 |
-} |
| 279 |
- |
| 280 |
-src_configure() { |
| 281 |
- # TODO: pipewire remote desktop support |
| 282 |
- # TODO: nvidia EGLDevice support |
| 283 |
- # 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 |
| 284 |
- # 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) |
| 285 |
- # Prefer gl driver by default |
| 286 |
- # GLX is forced by mutter but optional in clutter |
| 287 |
- # xlib-egl-platform required by mutter x11 backend |
| 288 |
- # native backend without wayland is useless |
| 289 |
- gnome2_src_configure \ |
| 290 |
- --disable-static \ |
| 291 |
- --enable-compile-warnings=minimum \ |
| 292 |
- --enable-gl \ |
| 293 |
- --enable-glx \ |
| 294 |
- --enable-sm \ |
| 295 |
- --enable-startup-notification \ |
| 296 |
- --enable-verbose-mode \ |
| 297 |
- --enable-xlib-egl-platform \ |
| 298 |
- --with-default-driver=gl \ |
| 299 |
- --with-libcanberra \ |
| 300 |
- $(usex debug --enable-debug=yes "") \ |
| 301 |
- $(use_enable gles2) \ |
| 302 |
- $(use_enable gles2 cogl-gles2) \ |
| 303 |
- $(use_enable introspection) \ |
| 304 |
- $(use_enable screencast remote-desktop) \ |
| 305 |
- $(use_enable wayland) \ |
| 306 |
- $(use_enable wayland kms-egl-platform) \ |
| 307 |
- $(use_enable wayland native-backend) \ |
| 308 |
- $(use_enable wayland wayland-egl-server) \ |
| 309 |
- $(use_with input_devices_wacom libwacom) \ |
| 310 |
- $(use_with udev gudev) |
| 311 |
-} |
| 312 |
- |
| 313 |
-src_test() { |
| 314 |
- virtx emake check |
| 315 |
-} |
Archives