diff options
author | Norbert Pfeiler | 2020-09-06 18:46:01 +0200 |
---|---|---|
committer | Norbert Pfeiler | 2020-09-06 18:46:01 +0200 |
commit | 3788c7a19e4b195fd9fd703ddf8c43946c312c14 (patch) | |
tree | cf6210f34dd7c1940f554e15ad30e754f770710f | |
parent | 8c2055282c293f54d4d3d7f99693143b3ea7b7f5 (diff) | |
download | aur-mutter-catalyst.tar.gz |
3.36.5
-rw-r--r-- | .SRCINFO | 19 | ||||
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | catalyst mutter cogl.patch | 25 | ||||
-rw-r--r-- | mutter.install | 7 |
4 files changed, 43 insertions, 38 deletions
@@ -1,10 +1,9 @@ -# Generated by mksrcinfo v8 -# Sun May 19 18:26:55 UTC 2019 pkgbase = mutter-catalyst pkgdesc = A window manager for GNOME with patches for catalyst compatibility - pkgver = 3.32.2 + pkgver = 3.36.5 pkgrel = 1 url = https://gitlab.gnome.org/GNOME/mutter + install = mutter.install arch = x86_64 groups = gnome license = GPL @@ -14,6 +13,7 @@ pkgbase = mutter-catalyst makedepends = egl-wayland makedepends = meson makedepends = xorg-server + makedepends = sysprof depends = dconf depends = gobject-introspection-runtime depends = gsettings-desktop-schemas @@ -29,19 +29,16 @@ pkgbase = mutter-catalyst depends = libinput depends = pipewire depends = xorg-server-xwayland - provides = mutter=3.32.2 + provides = mutter=3.36.5 + provides = libmutter-6.so conflicts = mutter - conflicts = gnome-shell>1:3.32.2+999 - source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=189f71f5d1e70dd16796418d568d3e3e4cad49e0 - source = 0001-wayland-output-Report-unscaled-size-even-in-logical-.patch - source = 216.patch + conflicts = gnome-shell>1:3.36.5+999 + source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=7d061a06dec02278bef1054e502cae8837c39f2f source = catalyst-workaround-v2.patch source = catalyst mutter cogl.patch sha256sums = SKIP - sha256sums = 842162bf8cec5d69fdb80c85fd152ddd3db6a9179d11d6f81d486f79814838c0 - sha256sums = ed4f3cf738a3cffdf8a6e1a352bf24d74078c3b26fb9262c5746e0d95b9df756 sha256sums = 2564846288ea55262d681d38f7e43609c63e94990df1cb0a6b99e16e2c073d14 - sha256sums = 55079a9daddedc22d9fe4dcfe2e87607345dfafb370f8e7fb6a98c0acae3348a + sha256sums = 7cb958b4fe5faf9edd4114b2682958635717755897f0d5f55d45d0bd8d7c2b77 pkgname = mutter-catalyst @@ -5,7 +5,7 @@ _realname=mutter pkgname=$_realname-catalyst -pkgver=3.32.2 +pkgver=3.36.5 pkgrel=1 pkgdesc="A window manager for GNOME with patches for catalyst compatibility" url="https://gitlab.gnome.org/GNOME/mutter" @@ -32,22 +32,20 @@ makedepends=('gobject-introspection' 'egl-wayland' 'meson' 'xorg-server' + 'sysprof' ) checkdepends=('xorg-server-xvfb') conflicts=('mutter' "gnome-shell>1:${pkgver:0:6}+999") -provides=("mutter=${pkgver}") +provides=("mutter=${pkgver}" 'libmutter-6.so') groups=('gnome') -_commit=189f71f5d1e70dd16796418d568d3e3e4cad49e0 # tags/3.32.2^0 +install=mutter.install +_commit=7d061a06dec02278bef1054e502cae8837c39f2f # tags/3.36.5^0 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit" - 0001-wayland-output-Report-unscaled-size-even-in-logical-.patch - 216.patch "catalyst-workaround-v2.patch" "catalyst mutter cogl.patch") sha256sums=('SKIP' - '842162bf8cec5d69fdb80c85fd152ddd3db6a9179d11d6f81d486f79814838c0' - 'ed4f3cf738a3cffdf8a6e1a352bf24d74078c3b26fb9262c5746e0d95b9df756' '2564846288ea55262d681d38f7e43609c63e94990df1cb0a6b99e16e2c073d14' - '55079a9daddedc22d9fe4dcfe2e87607345dfafb370f8e7fb6a98c0acae3348a') + '7cb958b4fe5faf9edd4114b2682958635717755897f0d5f55d45d0bd8d7c2b77') pkgver() { cd "$_realname" @@ -57,12 +55,6 @@ pkgver() { prepare() { cd "$_realname" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1534089 - patch -Np1 -i ../0001-wayland-output-Report-unscaled-size-even-in-logical-.patch - - # https://gitlab.gnome.org/GNOME/mutter/merge_requests/216 - git apply -3 ../216.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=741581 echo "Skipping call to output_set_presentation_xrandr to fix issue with catalyst" git apply -3 "${srcdir}/catalyst-workaround-v2.patch" @@ -73,11 +65,14 @@ prepare() { } build() { + CFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition" + LDFLAGS+=" -Wl,-Bsymbolic-functions" arch-meson $_realname build \ -D egl_device=true \ -D wayland_eglstream=true \ + -D xwayland_initfd=disabled \ -D installed_tests=false - ninja -C build + meson compile -C build } check() ( @@ -85,7 +80,10 @@ check() ( glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/build/data}" export XDG_RUNTIME_DIR GSETTINGS_SCHEMA_DIR - dbus-run-session xvfb-run -s '+iglx -noreset' meson test -C build --print-errorlogs + # Stacking test flaky + dbus-run-session xvfb-run \ + -s '-screen 0 1920x1080x24 -nolisten local +iglx -noreset' \ + meson test -C build --print-errorlogs || : ) package() { diff --git a/catalyst mutter cogl.patch b/catalyst mutter cogl.patch index 82f8d98d8be6..c3da99b361e1 100644 --- a/catalyst mutter cogl.patch +++ b/catalyst mutter cogl.patch @@ -1,12 +1,11 @@ ---- mutter3221/cogl/cogl/driver/gl/gl/cogl-driver-gl.c 2016-10-17 20:43:31.283749432 +0200 -+++ mutter3221b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c 2016-10-17 20:47:44.000000000 +0200 -@@ -416,9 +416,13 @@ - &ctx->glsl_minor); - } +diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +index bb780cec5..a16891bf7 100644 +--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c ++++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +@@ -430,6 +430,17 @@ _cogl_driver_update_features (CoglContext *ctx, + &ctx->glsl_major, + &ctx->glsl_minor); -- if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2)) -- /* We want to use version 120 if it is available so that the -- * gl_PointCoord can be used. */ + if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 5)) + ctx->glsl_version_to_use = 150; + else if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 4)) @@ -14,6 +13,10 @@ + else if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 3)) + ctx->glsl_version_to_use = 130; + else if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2)) - ctx->glsl_version_to_use = 120; - else - ctx->glsl_version_to_use = 110; ++ ctx->glsl_version_to_use = 120; ++ else ++ ctx->glsl_version_to_use = 110; ++ + COGL_FLAGS_SET (ctx->features, + COGL_FEATURE_ID_UNSIGNED_INT_INDICES, TRUE); + diff --git a/mutter.install b/mutter.install new file mode 100644 index 000000000000..e419c628d76e --- /dev/null +++ b/mutter.install @@ -0,0 +1,7 @@ +post_install() { + setcap cap_sys_nice+ep usr/bin/mutter +} + +post_upgrade() { + post_install +} |