| 1 |
commit: 07ad9d8ac5976b699ced094afc72f89560a60d42 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 20:42:49 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 20:42:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ad9d8a |
| 7 |
|
| 8 |
x11-wm/mutter: remove old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-wm/mutter/Manifest | 1 - |
| 14 |
.../3.22.4-clutter-missing-null-terminator.patch | 28 ---- |
| 15 |
.../files/3.22.4-wayland-clipboard-fix.patch | 32 ----- |
| 16 |
x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch | 31 ----- |
| 17 |
.../3.22.4-wayland-ensure-pending-geometry.patch | 47 ------- |
| 18 |
.../mutter/files/3.22.4-wayland-size-hints.patch | 56 -------- |
| 19 |
x11-wm/mutter/mutter-3.22.4-r1.ebuild | 143 --------------------- |
| 20 |
7 files changed, 338 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
| 23 |
index dfd4f2e9ed3..7563c016b1a 100644 |
| 24 |
--- a/x11-wm/mutter/Manifest |
| 25 |
+++ b/x11-wm/mutter/Manifest |
| 26 |
@@ -1,4 +1,3 @@ |
| 27 |
-DIST mutter-3.22.4.tar.xz 3536792 BLAKE2B e395dec6a8f5f46864ab5d7da3c345c20adf65f7609547d296036b0cb4be79e451387395f32d3d9a736a5b8c4be5a03a9fa56d5fbebeedaef3c35ea6e5c16302 SHA512 849e98186cecb4ffcab3da055febf72ef76fa87ecbdc506c696c2c7debd5183361c4b3b31d00d3c85e45d7f47aa5abf748d999571b147c831eb999116919023c |
| 28 |
DIST mutter-3.24.4.tar.xz 3583916 BLAKE2B 86a9e16ed96270713e400ccb4dc64b91c263125ea4a04373ed1f8364e906031ef26dc991fa13d01cf0e50895360c87be6773e3332d823c2ce1991cd57d59b292 SHA512 7ae579ab3e9df09cae37fbc1b277e382c9f610058b914b69a7bdb89f3bec510403210c0cded16a6487111507151f4d7075d161e051c0b88585d6ab6b4575b8d3 |
| 29 |
DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90 |
| 30 |
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b |
| 31 |
|
| 32 |
diff --git a/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch b/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index ed16b8c6f4b..00000000000 |
| 35 |
--- a/x11-wm/mutter/files/3.22.4-clutter-missing-null-terminator.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,28 +0,0 @@ |
| 38 |
-From f6888519ff3e20ec8f5e6064bff5707acbe13fbd Mon Sep 17 00:00:00 2001 |
| 39 |
-From: Nigel Taylor <nigel@×××××××.org> |
| 40 |
-Date: Fri, 5 May 2017 08:42:47 -0400 |
| 41 |
-Subject: [PATCH 2/5] clutter: conform/actor-graph: Add missing |
| 42 |
- null-termination |
| 43 |
- |
| 44 |
-https://bugzilla.gnome.org/show_bug.cgi?id=759085 |
| 45 |
---- |
| 46 |
- clutter/tests/conform/actor-graph.c | 3 ++- |
| 47 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 48 |
- |
| 49 |
-diff --git a/clutter/tests/conform/actor-graph.c b/clutter/tests/conform/actor-graph.c |
| 50 |
-index 0dad49b..8fbf4bc 100644 |
| 51 |
---- a/clutter/tests/conform/actor-graph.c |
| 52 |
-+++ b/clutter/tests/conform/actor-graph.c |
| 53 |
-@@ -350,7 +350,8 @@ actor_replace_child (void) |
| 54 |
- g_assert_cmpstr (clutter_actor_get_name (iter), ==, "qux"); |
| 55 |
- |
| 56 |
- clutter_actor_add_child (actor, g_object_new (CLUTTER_TYPE_ACTOR, |
| 57 |
-- "name", "foo")); |
| 58 |
-+ "name", "foo", |
| 59 |
-+ NULL)); |
| 60 |
- |
| 61 |
- clutter_actor_replace_child (actor, iter, |
| 62 |
- g_object_new (CLUTTER_TYPE_ACTOR, |
| 63 |
--- |
| 64 |
-2.10.1 |
| 65 |
- |
| 66 |
|
| 67 |
diff --git a/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch |
| 68 |
deleted file mode 100644 |
| 69 |
index 24e6fd36a30..00000000000 |
| 70 |
--- a/x11-wm/mutter/files/3.22.4-wayland-clipboard-fix.patch |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,32 +0,0 @@ |
| 73 |
-From 19f08fbdbba113883c6011e4b8ccf3ea3a6eb57e Mon Sep 17 00:00:00 2001 |
| 74 |
-From: Carlos Garnacho <carlosg@×××××.org> |
| 75 |
-Date: Wed, 10 May 2017 20:28:42 +0200 |
| 76 |
-Subject: [PATCH 5/5] xwayland: Use the right atom type for further selection |
| 77 |
- requests to X11 |
| 78 |
- |
| 79 |
-If we translate between text/plain;charset-utf-8 from the wayland side to |
| 80 |
-UTF8_STRING on the X11 side, we want to continue all further X11 selection |
| 81 |
-requests using the same translated UTF8_STRING atom than we use in the |
| 82 |
-first XConvertSelection call. |
| 83 |
- |
| 84 |
-https://bugzilla.gnome.org/show_bug.cgi?id=782472 |
| 85 |
---- |
| 86 |
- src/wayland/meta-xwayland-selection.c | 2 +- |
| 87 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 88 |
- |
| 89 |
-diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c |
| 90 |
-index a78e846..24b8cd2 100644 |
| 91 |
---- a/src/wayland/meta-xwayland-selection.c |
| 92 |
-+++ b/src/wayland/meta-xwayland-selection.c |
| 93 |
-@@ -829,7 +829,7 @@ meta_x11_source_send (MetaWaylandDataSource *source, |
| 94 |
- /* Takes ownership of fd */ |
| 95 |
- selection->x11_selection = |
| 96 |
- x11_selection_data_new (compositor->xwayland_manager.selection_data, |
| 97 |
-- fd, mime_type); |
| 98 |
-+ fd, gdk_x11_get_xatom_name (type_atom)); |
| 99 |
- |
| 100 |
- XConvertSelection (xdisplay, |
| 101 |
- selection->selection_atom, type_atom, |
| 102 |
--- |
| 103 |
-2.10.1 |
| 104 |
- |
| 105 |
|
| 106 |
diff --git a/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch b/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch |
| 107 |
deleted file mode 100644 |
| 108 |
index a6eddb1f72e..00000000000 |
| 109 |
--- a/x11-wm/mutter/files/3.22.4-wayland-crash-fix.patch |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,31 +0,0 @@ |
| 112 |
-From ba317dcd74baebfd8f8c8dd417ded71f6cc8c771 Mon Sep 17 00:00:00 2001 |
| 113 |
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@×××××.com> |
| 114 |
-Date: Mon, 17 Apr 2017 13:27:35 +0800 |
| 115 |
-Subject: [PATCH 1/5] wayland/subsurface: Handle clients committing on |
| 116 |
- destroyed subsurface |
| 117 |
- |
| 118 |
-A client can still commit state to a destroyed subsurface. It wont |
| 119 |
-update anything on the screen, since the subsurface will not be |
| 120 |
-visible, but mutter should still handle it and not crash. |
| 121 |
- |
| 122 |
-https://bugzilla.gnome.org/show_bug.cgi?id=781391 |
| 123 |
---- |
| 124 |
- src/wayland/meta-wayland-surface.c | 2 +- |
| 125 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 126 |
- |
| 127 |
-diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c |
| 128 |
-index 99e3dfd..a6079ee 100644 |
| 129 |
---- a/src/wayland/meta-wayland-surface.c |
| 130 |
-+++ b/src/wayland/meta-wayland-surface.c |
| 131 |
-@@ -605,7 +605,7 @@ subsurface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role) |
| 132 |
- meta_wayland_surface_role_get_surface (surface_role); |
| 133 |
- MetaWaylandSurface *parent = surface->sub.parent; |
| 134 |
- |
| 135 |
-- if (parent->role) |
| 136 |
-+ if (parent && parent->role) |
| 137 |
- return meta_wayland_surface_role_get_toplevel (parent->role); |
| 138 |
- else |
| 139 |
- return NULL; |
| 140 |
--- |
| 141 |
-2.10.1 |
| 142 |
- |
| 143 |
|
| 144 |
diff --git a/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch b/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch |
| 145 |
deleted file mode 100644 |
| 146 |
index 543d6edb8e7..00000000000 |
| 147 |
--- a/x11-wm/mutter/files/3.22.4-wayland-ensure-pending-geometry.patch |
| 148 |
+++ /dev/null |
| 149 |
@@ -1,47 +0,0 @@ |
| 150 |
-From ca31a94e54819b5bfeccbeef4e7c041bbef15eac Mon Sep 17 00:00:00 2001 |
| 151 |
-From: Olivier Fourdan <ofourdan@××××××.com> |
| 152 |
-Date: Fri, 5 May 2017 13:55:51 +0200 |
| 153 |
-Subject: [PATCH 3/5] wayland: Make sure we have a pending geometry |
| 154 |
- |
| 155 |
-If the client doesn't set a geometry using xdg_shell, we'll compute its |
| 156 |
-geometry based on its surface and subsurfaces. |
| 157 |
- |
| 158 |
-Yet, we translate that as a window (re)size only when there is a pending |
| 159 |
-geometry, that we don't have when we computed the geometry by ourself. |
| 160 |
- |
| 161 |
-Make sure we set the pending new geometry flag when computing the |
| 162 |
-geometry when it actually changed. |
| 163 |
- |
| 164 |
-https://bugzilla.gnome.org/show_bug.cgi?id=782213 |
| 165 |
---- |
| 166 |
- src/wayland/meta-wayland-xdg-shell.c | 10 +++++++++- |
| 167 |
- 1 file changed, 9 insertions(+), 1 deletion(-) |
| 168 |
- |
| 169 |
-diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c |
| 170 |
-index aa355da..87a8382 100644 |
| 171 |
---- a/src/wayland/meta-wayland-xdg-shell.c |
| 172 |
-+++ b/src/wayland/meta-wayland-xdg-shell.c |
| 173 |
-@@ -1263,11 +1263,19 @@ xdg_surface_role_commit (MetaWaylandSurfaceRole *surface_role, |
| 174 |
- } |
| 175 |
- else if (!priv->has_set_geometry) |
| 176 |
- { |
| 177 |
-+ MetaRectangle new_geometry = { 0 }; |
| 178 |
-+ |
| 179 |
- /* If the surface has never set any geometry, calculate |
| 180 |
- * a default one unioning the surface and all subsurfaces together. */ |
| 181 |
-+ |
| 182 |
- meta_wayland_surface_calculate_window_geometry (surface, |
| 183 |
-- &priv->geometry, |
| 184 |
-+ &new_geometry, |
| 185 |
- 0, 0); |
| 186 |
-+ if (!meta_rectangle_equal (&new_geometry, &priv->geometry)) |
| 187 |
-+ { |
| 188 |
-+ pending->has_new_geometry = TRUE; |
| 189 |
-+ priv->geometry = new_geometry; |
| 190 |
-+ } |
| 191 |
- } |
| 192 |
- } |
| 193 |
- |
| 194 |
--- |
| 195 |
-2.10.1 |
| 196 |
- |
| 197 |
|
| 198 |
diff --git a/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch b/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch |
| 199 |
deleted file mode 100644 |
| 200 |
index 03b2b22fe65..00000000000 |
| 201 |
--- a/x11-wm/mutter/files/3.22.4-wayland-size-hints.patch |
| 202 |
+++ /dev/null |
| 203 |
@@ -1,56 +0,0 @@ |
| 204 |
-From 40a3d67698dc992d084886e01b07a78d438bbf8e Mon Sep 17 00:00:00 2001 |
| 205 |
-From: Olivier Fourdan <ofourdan@××××××.com> |
| 206 |
-Date: Wed, 10 May 2017 08:59:53 +0200 |
| 207 |
-Subject: [PATCH 4/5] wayland: Apply size hints regardless of geometry |
| 208 |
- |
| 209 |
-Previously we would bail out early in xdg_toplevel_role_commit() if no |
| 210 |
-geometry change was set, ignoring the possible min/max size hints |
| 211 |
-changes. |
| 212 |
- |
| 213 |
-But setting a min/max size hint without changing the geometry is |
| 214 |
-perfectly valid, so we ought to apply the min/max changes regardless of |
| 215 |
-a geometry change. |
| 216 |
- |
| 217 |
-https://bugzilla.gnome.org/show_bug.cgi?id=782213 |
| 218 |
---- |
| 219 |
- src/wayland/meta-wayland-xdg-shell.c | 22 ++++++++++------------ |
| 220 |
- 1 file changed, 10 insertions(+), 12 deletions(-) |
| 221 |
- |
| 222 |
-diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c |
| 223 |
-index 87a8382..bd576f6 100644 |
| 224 |
---- a/src/wayland/meta-wayland-xdg-shell.c |
| 225 |
-+++ b/src/wayland/meta-wayland-xdg-shell.c |
| 226 |
-@@ -615,20 +615,18 @@ xdg_toplevel_role_commit (MetaWaylandSurfaceRole *surface_role, |
| 227 |
- if (!window) |
| 228 |
- return; |
| 229 |
- |
| 230 |
-- if (!pending->has_new_geometry) |
| 231 |
-+ if (pending->has_new_geometry) |
| 232 |
- { |
| 233 |
-- if (pending->dx != 0 || pending->dx != 0) |
| 234 |
-- { |
| 235 |
-- g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now."); |
| 236 |
-- } |
| 237 |
-- return; |
| 238 |
-+ window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface); |
| 239 |
-+ meta_window_wayland_move_resize (window, |
| 240 |
-+ &xdg_surface_priv->acked_configure_serial, |
| 241 |
-+ window_geometry, |
| 242 |
-+ pending->dx, pending->dy); |
| 243 |
-+ } |
| 244 |
-+ else if (pending->dx != 0 || pending->dx != 0) |
| 245 |
-+ { |
| 246 |
-+ g_warning ("XXX: Attach-initiated move without a new geometry. This is unimplemented right now."); |
| 247 |
- } |
| 248 |
-- |
| 249 |
-- window_geometry = meta_wayland_xdg_surface_get_window_geometry (xdg_surface); |
| 250 |
-- meta_window_wayland_move_resize (window, |
| 251 |
-- &xdg_surface_priv->acked_configure_serial, |
| 252 |
-- window_geometry, |
| 253 |
-- pending->dx, pending->dy); |
| 254 |
- |
| 255 |
- /* When we get to this point, we ought to have valid size hints */ |
| 256 |
- if (pending->has_new_min_size || pending->has_new_max_size) |
| 257 |
--- |
| 258 |
-2.10.1 |
| 259 |
- |
| 260 |
|
| 261 |
diff --git a/x11-wm/mutter/mutter-3.22.4-r1.ebuild b/x11-wm/mutter/mutter-3.22.4-r1.ebuild |
| 262 |
deleted file mode 100644 |
| 263 |
index db6c355e133..00000000000 |
| 264 |
--- a/x11-wm/mutter/mutter-3.22.4-r1.ebuild |
| 265 |
+++ /dev/null |
| 266 |
@@ -1,143 +0,0 @@ |
| 267 |
-# Copyright 1999-2018 Gentoo Authors |
| 268 |
-# Distributed under the terms of the GNU General Public License v2 |
| 269 |
- |
| 270 |
-EAPI=6 |
| 271 |
-inherit gnome2 virtualx |
| 272 |
- |
| 273 |
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter" |
| 274 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
| 275 |
- |
| 276 |
-LICENSE="GPL-2+" |
| 277 |
-SLOT="0" |
| 278 |
- |
| 279 |
-IUSE="debug gles2 input_devices_wacom +introspection test udev wayland" |
| 280 |
- |
| 281 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" |
| 282 |
- |
| 283 |
-# libXi-1.7.4 or newer needed per: |
| 284 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944 |
| 285 |
-COMMON_DEPEND=" |
| 286 |
- >=dev-libs/atk-2.5.3 |
| 287 |
- >=x11-libs/gdk-pixbuf-2:2 |
| 288 |
- >=dev-libs/json-glib-0.12.0 |
| 289 |
- >=x11-libs/pango-1.30[introspection?] |
| 290 |
- >=x11-libs/cairo-1.14[X] |
| 291 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
| 292 |
- >=dev-libs/glib-2.49.0:2[dbus] |
| 293 |
- >=media-libs/libcanberra-0.26[gtk3] |
| 294 |
- >=x11-libs/startup-notification-0.7 |
| 295 |
- >=x11-libs/libXcomposite-0.2 |
| 296 |
- >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] |
| 297 |
- gnome-base/gnome-desktop:3= |
| 298 |
- >sys-power/upower-0.99:= |
| 299 |
- |
| 300 |
- x11-libs/libICE |
| 301 |
- x11-libs/libSM |
| 302 |
- x11-libs/libX11 |
| 303 |
- >=x11-libs/libXcomposite-0.4 |
| 304 |
- x11-libs/libXcursor |
| 305 |
- x11-libs/libXdamage |
| 306 |
- x11-libs/libXext |
| 307 |
- >=x11-libs/libXfixes-3 |
| 308 |
- >=x11-libs/libXi-1.7.4 |
| 309 |
- x11-libs/libXinerama |
| 310 |
- >=x11-libs/libXrandr-1.5 |
| 311 |
- x11-libs/libXrender |
| 312 |
- x11-libs/libxcb |
| 313 |
- x11-libs/libxkbfile |
| 314 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
| 315 |
- x11-misc/xkeyboard-config |
| 316 |
- |
| 317 |
- gnome-extra/zenity |
| 318 |
- media-libs/mesa[egl] |
| 319 |
- |
| 320 |
- gles2? ( media-libs/mesa[gles2] ) |
| 321 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
| 322 |
- introspection? ( >=dev-libs/gobject-introspection-1.42:= ) |
| 323 |
- udev? ( virtual/libgudev:= ) |
| 324 |
- wayland? ( |
| 325 |
- >=dev-libs/libinput-1.4 |
| 326 |
- >=dev-libs/wayland-1.6.90 |
| 327 |
- >=dev-libs/wayland-protocols-1.7 |
| 328 |
- >=media-libs/mesa-10.3[egl,gbm,wayland] |
| 329 |
- sys-apps/systemd |
| 330 |
- virtual/libgudev:= |
| 331 |
- >=virtual/libudev-136:= |
| 332 |
- x11-base/xorg-server[wayland] |
| 333 |
- x11-libs/libdrm:= |
| 334 |
- ) |
| 335 |
-" |
| 336 |
-DEPEND="${COMMON_DEPEND} |
| 337 |
- dev-util/glib-utils |
| 338 |
- >=sys-devel/gettext-0.19.6 |
| 339 |
- virtual/pkgconfig |
| 340 |
- x11-base/xorg-proto |
| 341 |
- test? ( app-text/docbook-xml-dtd:4.5 ) |
| 342 |
- wayland? ( >=sys-kernel/linux-headers-4.4 ) |
| 343 |
-" |
| 344 |
-RDEPEND="${COMMON_DEPEND} |
| 345 |
- !x11-misc/expocity |
| 346 |
-" |
| 347 |
- |
| 348 |
-PATCHES=( |
| 349 |
- # Important fixes from gnome-3-22 branch, mostly for wayland session |
| 350 |
- "${FILESDIR}"/${PV}-wayland-crash-fix.patch # firefox wrongly using subsurfaces for popups occasional crash fix |
| 351 |
- "${FILESDIR}"/${PV}-clutter-missing-null-terminator.patch # fixes potential crashes on armhf |
| 352 |
- "${FILESDIR}"/${PV}-wayland-ensure-pending-geometry.patch # initial positioning fix for wayland for certain apps |
| 353 |
- "${FILESDIR}"/${PV}-wayland-size-hints.patch # apply min/max size hints in more cases properly |
| 354 |
- "${FILESDIR}"/${PV}-wayland-clipboard-fix.patch # Fixes utf8 clipboard with gtk+-3.22.13+ |
| 355 |
-) |
| 356 |
- |
| 357 |
-src_prepare() { |
| 358 |
- # Disable building of noinst_PROGRAM for tests |
| 359 |
- if ! use test; then |
| 360 |
- sed -e '/^noinst_PROGRAMS/d' \ |
| 361 |
- -i cogl/tests/conform/Makefile.{am,in} || die |
| 362 |
- sed -e '/noinst_PROGRAMS += testboxes/d' \ |
| 363 |
- -i src/Makefile-tests.am || die |
| 364 |
- sed -e '/noinst_PROGRAMS/ s/testboxes$(EXEEXT)//' \ |
| 365 |
- -i src/Makefile.in || die |
| 366 |
- fi |
| 367 |
- |
| 368 |
- gnome2_src_prepare |
| 369 |
- |
| 370 |
- # Leave the damn CFLAGS alone |
| 371 |
- sed -e 's/$CFLAGS -g/$CFLAGS /' \ |
| 372 |
- -i clutter/configure || die |
| 373 |
- sed -e 's/$CFLAGS -g -O0/$CFLAGS /' \ |
| 374 |
- -i cogl/configure || die |
| 375 |
- sed -e 's/$CFLAGS -g -O/$CFLAGS /' \ |
| 376 |
- -i configure || die |
| 377 |
-} |
| 378 |
- |
| 379 |
-src_configure() { |
| 380 |
- # Prefer gl driver by default |
| 381 |
- # GLX is forced by mutter but optional in clutter |
| 382 |
- # xlib-egl-platform required by mutter x11 backend |
| 383 |
- # native backend without wayland is useless |
| 384 |
- gnome2_src_configure \ |
| 385 |
- --disable-static \ |
| 386 |
- --enable-compile-warnings=minimum \ |
| 387 |
- --enable-gl \ |
| 388 |
- --enable-glx \ |
| 389 |
- --enable-sm \ |
| 390 |
- --enable-startup-notification \ |
| 391 |
- --enable-verbose-mode \ |
| 392 |
- --enable-xlib-egl-platform \ |
| 393 |
- --with-default-driver=gl \ |
| 394 |
- --with-libcanberra \ |
| 395 |
- $(usex debug --enable-debug=yes "") \ |
| 396 |
- $(use_enable gles2) \ |
| 397 |
- $(use_enable gles2 cogl-gles2) \ |
| 398 |
- $(use_enable introspection) \ |
| 399 |
- $(use_enable wayland) \ |
| 400 |
- $(use_enable wayland kms-egl-platform) \ |
| 401 |
- $(use_enable wayland native-backend) \ |
| 402 |
- $(use_enable wayland wayland-egl-server) \ |
| 403 |
- $(use_with input_devices_wacom libwacom) \ |
| 404 |
- $(use_with udev gudev) |
| 405 |
-} |
| 406 |
- |
| 407 |
-src_test() { |
| 408 |
- virtx emake check |
| 409 |
-} |
Archives