Date: Friday, November 8, 2019 @ 23:42:30 Author: heftig Revision: 367232
archrelease: copy trunk to extra-x86_64 Added: mutter/repos/extra-x86_64/918.patch (from rev 367229, mutter/trunk/918.patch) mutter/repos/extra-x86_64/PKGBUILD (from rev 367229, mutter/trunk/PKGBUILD) mutter/repos/extra-x86_64/fix-build.diff (from rev 367230, mutter/trunk/fix-build.diff) mutter/repos/extra-x86_64/mutter.install (from rev 367230, mutter/trunk/mutter.install) Deleted: mutter/repos/extra-x86_64/PKGBUILD mutter/repos/extra-x86_64/fix-build.diff mutter/repos/extra-x86_64/mutter.install ----------------+ 918.patch | 33 +++++++++++++++ PKGBUILD | 119 ++++++++++++++++++++++++++++--------------------------- fix-build.diff | 110 +++++++++++++++++++++++++------------------------- mutter.install | 14 +++--- 4 files changed, 157 insertions(+), 119 deletions(-) Copied: mutter/repos/extra-x86_64/918.patch (from rev 367229, mutter/trunk/918.patch) =================================================================== --- 918.patch (rev 0) +++ 918.patch 2019-11-08 23:42:30 UTC (rev 367232) @@ -0,0 +1,33 @@ +From 1b26e414eccc33e26c464b282739315cb24f8f38 Mon Sep 17 00:00:00 2001 +From: Robert Mader <robert.ma...@posteo.de> +Date: Mon, 4 Nov 2019 11:45:13 +0100 +Subject: [PATCH] surface-actor-wayland: Do not send frame callbacks if the + actor is obscured + +`meta_surface_actor_is_obscured` implies that the actor got successfully culled +out and nothing of it will get painted. This includes that there are no clones, +no effects etc. In this cases we don't want to send frame callbacks, thus avoiding +unnecessary client work. + +https://gitlab.gnome.org/GNOME/mutter/merge_requests/918 +--- + src/compositor/meta-surface-actor-wayland.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c +index 0b1c4ef01..e0335348f 100644 +--- a/src/compositor/meta-surface-actor-wayland.c ++++ b/src/compositor/meta-surface-actor-wayland.c +@@ -103,6 +103,9 @@ meta_surface_actor_wayland_paint (ClutterActor *actor) + { + MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (actor); + ++ if (meta_surface_actor_is_obscured (META_SURFACE_ACTOR (actor))) ++ return; ++ + if (self->surface) + { + MetaWaylandCompositor *compositor = self->surface->compositor; +-- +2.22.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-08 23:42:29 UTC (rev 367231) +++ PKGBUILD 2019-11-08 23:42:30 UTC (rev 367232) @@ -1,57 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Contributor: Michael Kanis <mkanis_at_gmx_dot_de> - -pkgname=mutter -pkgver=3.34.1+31+g51f7e8c4d -pkgrel=1 -pkgdesc="A window manager for GNOME" -url="https://gitlab.gnome.org/GNOME/mutter" -arch=(x86_64) -license=(GPL) -depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas libcanberra - startup-notification zenity libsm gnome-desktop upower libxkbcommon-x11 - gnome-settings-daemon libgudev libinput pipewire xorg-server-xwayland) -makedepends=(gobject-introspection git egl-wayland meson xorg-server sysprof) -checkdepends=(xorg-server-xvfb) -groups=(gnome) -install=mutter.install -_commit=51f7e8c4ddd8772853c3df73dd7cf4f87065dc7a # gnome-3-34 -source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit" - fix-build.diff) -sha256sums=('SKIP' - '28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd $pkgname - - # fix build with libglvnd's EGL headers - git apply -3 ../fix-build.diff -} - -build() { - arch-meson $pkgname build \ - -D egl_device=true \ - -D wayland_eglstream=true \ - -D installed_tests=false - ninja -C build -} - -check() ( - mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}" - glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/data}" - export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR - - # Unexpected passes in conform test - # Stacking test flaky - dbus-run-session xvfb-run -s '+iglx -noreset' meson test -C build --print-errorlogs || : -) - -package() { - DESTDIR="$pkgdir" meson install -C build -} Copied: mutter/repos/extra-x86_64/PKGBUILD (from rev 367229, mutter/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-08 23:42:30 UTC (rev 367232) @@ -0,0 +1,62 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Michael Kanis <mkanis_at_gmx_dot_de> + +pkgname=mutter +pkgver=3.34.1+52+g403d8fcc6 +pkgrel=1 +pkgdesc="A window manager for GNOME" +url="https://gitlab.gnome.org/GNOME/mutter" +arch=(x86_64) +license=(GPL) +depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas libcanberra + startup-notification zenity libsm gnome-desktop upower libxkbcommon-x11 + gnome-settings-daemon libgudev libinput pipewire xorg-server-xwayland) +makedepends=(gobject-introspection git egl-wayland meson xorg-server sysprof) +checkdepends=(xorg-server-xvfb) +groups=(gnome) +install=mutter.install +_commit=403d8fcc6624f5d027dd599c934411e71d248754 # gnome-3-34 +source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit" + 918.patch + fix-build.diff) +sha256sums=('SKIP' + '775fbcd209a170b6ca13326367ef62b8d35acff16019553c40eb24f0684c3495' + '28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/918 + git apply -3 ../918.patch + + # fix build with libglvnd's EGL headers + git apply -3 ../fix-build.diff +} + +build() { + arch-meson $pkgname build \ + -D egl_device=true \ + -D wayland_eglstream=true \ + -D installed_tests=false + ninja -C build +} + +check() ( + mkdir -p -m 700 "${XDG_RUNTIME_DIR:=$PWD/runtime-dir}" + glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/data}" + export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR + + # Unexpected passes in conform test + # Stacking test flaky + dbus-run-session xvfb-run -s '+iglx -noreset' meson test -C build --print-errorlogs || : +) + +package() { + DESTDIR="$pkgdir" meson install -C build +} Deleted: fix-build.diff =================================================================== --- fix-build.diff 2019-11-08 23:42:29 UTC (rev 367231) +++ fix-build.diff 2019-11-08 23:42:30 UTC (rev 367232) @@ -1,55 +0,0 @@ - cogl/cogl/meson.build | 2 +- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git c/cogl/cogl/meson.build i/cogl/cogl/meson.build -index 1057ef955..9a642947d 100644 ---- c/cogl/cogl/meson.build -+++ i/cogl/cogl/meson.build -@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' -+ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' - else - cogl_egl_includes_string = '' - endif -diff --git c/src/backends/meta-egl-ext.h i/src/backends/meta-egl-ext.h -index 8705e7d5b..db0b74f76 100644 ---- c/src/backends/meta-egl-ext.h -+++ i/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git c/src/backends/meta-egl.c i/src/backends/meta-egl.c -index 6554be935..fdeff4f77 100644 ---- c/src/backends/meta-egl.c -+++ i/src/backends/meta-egl.c -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git c/src/backends/meta-egl.h i/src/backends/meta-egl.h -index f2a816445..4591e7d85 100644 ---- c/src/backends/meta-egl.h -+++ i/src/backends/meta-egl.h -@@ -28,6 +28,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () Copied: mutter/repos/extra-x86_64/fix-build.diff (from rev 367230, mutter/trunk/fix-build.diff) =================================================================== --- fix-build.diff (rev 0) +++ fix-build.diff 2019-11-08 23:42:30 UTC (rev 367232) @@ -0,0 +1,55 @@ + cogl/cogl/meson.build | 2 +- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git c/cogl/cogl/meson.build i/cogl/cogl/meson.build +index 1057ef955..9a642947d 100644 +--- c/cogl/cogl/meson.build ++++ i/cogl/cogl/meson.build +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( + built_headers += [cogl_gl_header_h] + + if have_egl +- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' ++ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' + else + cogl_egl_includes_string = '' + endif +diff --git c/src/backends/meta-egl-ext.h i/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- c/src/backends/meta-egl-ext.h ++++ i/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + + /* + * This is a little different to the tests shipped with EGL implementations, +diff --git c/src/backends/meta-egl.c i/src/backends/meta-egl.c +index 6554be935..fdeff4f77 100644 +--- c/src/backends/meta-egl.c ++++ i/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <gio/gio.h> + #include <glib.h> + #include <glib-object.h> +diff --git c/src/backends/meta-egl.h i/src/backends/meta-egl.h +index f2a816445..4591e7d85 100644 +--- c/src/backends/meta-egl.h ++++ i/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include <EGL/egl.h> + #include <EGL/eglext.h> ++#include <EGL/eglmesaext.h> + #include <glib-object.h> + + #define META_EGL_ERROR meta_egl_error_quark () Deleted: mutter.install =================================================================== --- mutter.install 2019-11-08 23:42:29 UTC (rev 367231) +++ mutter.install 2019-11-08 23:42:30 UTC (rev 367232) @@ -1,7 +0,0 @@ -post_install() { - setcap cap_sys_nice+ep usr/bin/mutter -} - -post_upgrade() { - post_install -} Copied: mutter/repos/extra-x86_64/mutter.install (from rev 367230, mutter/trunk/mutter.install) =================================================================== --- mutter.install (rev 0) +++ mutter.install 2019-11-08 23:42:30 UTC (rev 367232) @@ -0,0 +1,7 @@ +post_install() { + setcap cap_sys_nice+ep usr/bin/mutter +} + +post_upgrade() { + post_install +}