[arch-commits] Commit in mutter/trunk (5 files)
Jan Steffens
heftig at archlinux.org
Sun Feb 2 23:10:02 UTC 2020
Date: Sunday, February 2, 2020 @ 23:10:02
Author: heftig
Revision: 374516
3.34.3+30+g4959ae8bc-1
Modified:
mutter/trunk/0001-EGL-Include-EGL-eglmesaext.h.patch
mutter/trunk/0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
mutter/trunk/0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch
mutter/trunk/0004-background-Scale-monitor_area-after-texture-creation.patch
mutter/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-EGL-Include-EGL-eglmesaext.h.patch | 4
0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch | 4
0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch | 4
0004-background-Scale-monitor_area-after-texture-creation.patch | 65 +++++-----
PKGBUILD | 14 +-
5 files changed, 49 insertions(+), 42 deletions(-)
Modified: 0001-EGL-Include-EGL-eglmesaext.h.patch
===================================================================
--- 0001-EGL-Include-EGL-eglmesaext.h.patch 2020-02-02 21:04:13 UTC (rev 374515)
+++ 0001-EGL-Include-EGL-eglmesaext.h.patch 2020-02-02 23:10:02 UTC (rev 374516)
@@ -1,4 +1,4 @@
-From 3003ab6efa28cf22486bb44f4786316fca91cb7b Mon Sep 17 00:00:00 2001
+From 8a521c28a7d38e75478527dffb4fbeef975ea429 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
Date: Sun, 20 Oct 2019 12:04:31 +0200
Subject: [PATCH 1/4] EGL: Include EGL/eglmesaext.h
@@ -64,5 +64,5 @@
#define META_EGL_ERROR meta_egl_error_quark ()
--
-2.24.1
+2.25.0
Modified: 0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
===================================================================
--- 0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch 2020-02-02 21:04:13 UTC (rev 374515)
+++ 0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch 2020-02-02 23:10:02 UTC (rev 374516)
@@ -1,4 +1,4 @@
-From 548db532cd12082c2f98913150a5ab8a198f621d Mon Sep 17 00:00:00 2001
+From 228e0cb9b15ac014e1e33a0c41fdeca8d988664a Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader at posteo.de>
Date: Mon, 4 Nov 2019 11:45:13 +0100
Subject: [PATCH 2/4] surface-actor-wayland: Do not send frame callbacks if the
@@ -29,5 +29,5 @@
MetaWaylandCompositor *compositor = self->surface->compositor;
--
-2.24.1
+2.25.0
Modified: 0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch
===================================================================
--- 0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch 2020-02-02 21:04:13 UTC (rev 374515)
+++ 0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch 2020-02-02 23:10:02 UTC (rev 374516)
@@ -1,4 +1,4 @@
-From b5188b0032e9dad1e70030039e813273f866ab0f Mon Sep 17 00:00:00 2001
+From b063e2ceff469f7e086fe09113acbce8962899eb Mon Sep 17 00:00:00 2001
From: Robert Mader <robert.mader at posteo.de>
Date: Wed, 4 Dec 2019 18:54:42 +0100
Subject: [PATCH 3/4] xwayland: Do not queue frame callbacks unconditionally
@@ -60,5 +60,5 @@
actor_surface_class->get_geometry_scale = xwayland_surface_get_geometry_scale;
--
-2.24.1
+2.25.0
Modified: 0004-background-Scale-monitor_area-after-texture-creation.patch
===================================================================
--- 0004-background-Scale-monitor_area-after-texture-creation.patch 2020-02-02 21:04:13 UTC (rev 374515)
+++ 0004-background-Scale-monitor_area-after-texture-creation.patch 2020-02-02 23:10:02 UTC (rev 374516)
@@ -1,4 +1,4 @@
-From d662630a16b28e623ef3769c7ba9c02347f4775e Mon Sep 17 00:00:00 2001
+From a55610509dfd2f4371985678b252090fc0408548 Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt at canonical.com>
Date: Mon, 13 Jan 2020 21:02:39 +0800
Subject: [PATCH 4/4] background: Scale monitor_area after texture creation
@@ -18,8 +18,8 @@
https://gitlab.gnome.org/GNOME/mutter/merge_requests/1004
---
- src/compositor/meta-background.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
+ src/compositor/meta-background.c | 32 +++++++++++++++++++++-----------
+ 1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
index 4a1ce0396..886ae3f67 100644
@@ -39,42 +39,47 @@
gboolean bare_region_visible = FALSE;
+ int native_width = monitor_area.width;
+ int native_height = monitor_area.height;
-
-- if (self->style != G_DESKTOP_BACKGROUND_STYLE_WALLPAPER)
++
+ if (meta_is_stage_views_scaled ())
- {
-- monitor_area.x *= monitor_scale;
-- monitor_area.y *= monitor_scale;
-- monitor_area.width *= monitor_scale;
-- monitor_area.height *= monitor_scale;
++ {
+ native_width *= monitor_scale;
+ native_height *= monitor_scale;
- }
++ }
++
++ if (monitor->texture == NULL)
++ {
++ CoglOffscreen *offscreen;
++
++ monitor->texture = meta_create_texture (native_width,
++ native_height,
++ COGL_TEXTURE_COMPONENTS_RGBA,
++ META_TEXTURE_FLAGS_NONE);
++ offscreen = cogl_offscreen_new_with_texture (monitor->texture);
++ monitor->fbo = COGL_FRAMEBUFFER (offscreen);
++ }
- if (monitor->texture == NULL)
+ if (self->style != G_DESKTOP_BACKGROUND_STYLE_WALLPAPER)
{
- CoglOffscreen *offscreen;
+ monitor_area.x *= monitor_scale;
+ monitor_area.y *= monitor_scale;
+ monitor_area.width *= monitor_scale;
+ monitor_area.height *= monitor_scale;
+ }
+- if (monitor->texture == NULL)
+- {
+- CoglOffscreen *offscreen;
+-
- monitor->texture = meta_create_texture (monitor_area.width, monitor_area.height,
-+ monitor->texture = meta_create_texture (native_width,
-+ native_height,
- COGL_TEXTURE_COMPONENTS_RGBA,
- META_TEXTURE_FLAGS_NONE);
- offscreen = cogl_offscreen_new_with_texture (monitor->texture);
- monitor->fbo = COGL_FRAMEBUFFER (offscreen);
- }
-
-+ if (self->style != G_DESKTOP_BACKGROUND_STYLE_WALLPAPER)
-+ {
-+ monitor_area.x *= monitor_scale;
-+ monitor_area.y *= monitor_scale;
-+ monitor_area.width *= monitor_scale;
-+ monitor_area.height *= monitor_scale;
-+ }
-+
+- COGL_TEXTURE_COMPONENTS_RGBA,
+- META_TEXTURE_FLAGS_NONE);
+- offscreen = cogl_offscreen_new_with_texture (monitor->texture);
+- monitor->fbo = COGL_FRAMEBUFFER (offscreen);
+- }
+-
if (!cogl_framebuffer_allocate (monitor->fbo, &catch_error))
{
/* Texture or framebuffer allocation failed; it's unclear why this happened;
--
-2.24.1
+2.25.0
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-02 21:04:13 UTC (rev 374515)
+++ PKGBUILD 2020-02-02 23:10:02 UTC (rev 374516)
@@ -3,7 +3,7 @@
# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
pkgname=mutter
-pkgver=3.34.3+14+g59e9b073a
+pkgver=3.34.3+30+g4959ae8bc
pkgrel=1
pkgdesc="A window manager for GNOME"
url="https://gitlab.gnome.org/GNOME/mutter"
@@ -16,7 +16,7 @@
checkdepends=(xorg-server-xvfb)
groups=(gnome)
install=mutter.install
-_commit=59e9b073a5bf7bb7eb332b680c573a27bd019249 # gnome-3-34
+_commit=4959ae8bc4670cbd09c683d20fd07ded735e4dab # gnome-3-34
source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
0001-EGL-Include-EGL-eglmesaext.h.patch
0002-surface-actor-wayland-Do-not-send-frame-callbacks-if.patch
@@ -23,10 +23,10 @@
0003-xwayland-Do-not-queue-frame-callbacks-unconditionall.patch
0004-background-Scale-monitor_area-after-texture-creation.patch)
sha256sums=('SKIP'
- '6e23ce636916f7d33d05916910cbc97dbe20ca1e8f110cf3f65c95dd5c14962b'
- 'efdd77f91e087f85e6926127a4cc3a7132d4bc75ceb57e239869cbe06a1c67f6'
- '791090835994c992cfdb0e65f70d2e8983191eda8c4c8f096819f23d916ca1a6'
- '737dc54c7103a1830a4c4e3cfec44864dc6bce04517511ed796bc9aaaf3958b9')
+ 'fb91e659093f14fa08a0ccb61c913d4a929ab2a175179137bc118c17425a2208'
+ '010d19f500e95dd45bc2420cb88b00f48f23c5496320d9ca3d4ddb5ff5b42938'
+ 'd797497380f1d7cc8bc691935ada3c6d48dc772daaa035d8271c5f5c097eeaf1'
+ '7a8db66713c2a448c131f558ec741ebfda3c85d14b857ea0bb55a5fc7d5be480')
pkgver() {
cd $pkgname
@@ -50,6 +50,8 @@
}
build() {
+ CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
+ LDFLAGS+=" -Wl,-Bsymbolic"
arch-meson $pkgname build \
-D egl_device=true \
-D wayland_eglstream=true \
More information about the arch-commits
mailing list