From 9ccf0fc8d0aefe5ed1e98c5478cf333746ab166f Mon Sep 17 00:00:00 2001 From: Caleb JA Date: Mon, 14 Oct 2019 13:18:55 -0400 Subject: [PATCH] mutter: update to 3.34.1. [skip ci] requires void-linux/void-packages/pull/15506 closes #15530 --- common/shlibs | 10 +++++----- srcpkgs/mutter/patches/meta-renderer-x11.patch | 17 ----------------- srcpkgs/mutter/template | 12 ++++++------ 3 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/mutter/patches/meta-renderer-x11.patch diff --git a/common/shlibs b/common/shlibs index 8fd29911af..dcce561fac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2781,11 +2781,11 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-4.so.0 mutter-3.32.0_1 -libmutter-clutter-4.so.0 mutter-3.32.0_1 -libmutter-cogl-path-4.so mutter-3.32.0_1 -libmutter-cogl-4.so.0 mutter-3.32.0_1 -libmutter-cogl-pango-4.so.0 mutter-3.32.0_1 +libmutter-5.so.0 mutter-3.34.1_1 +libmutter-clutter-5.so.0 mutter-3.34.1_1 +libmutter-cogl-path-5.so mutter-3.34.1_1 +libmutter-cogl-5.so.0 mutter-3.34.1_1 +libmutter-cogl-pango-5.so.0 mutter-3.34.1_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.4 slop-7.4_1 diff --git a/srcpkgs/mutter/patches/meta-renderer-x11.patch b/srcpkgs/mutter/patches/meta-renderer-x11.patch deleted file mode 100644 index 55df265e33..0000000000 --- a/srcpkgs/mutter/patches/meta-renderer-x11.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/backends/x11/meta-renderer-x11.c 2019-03-11 16:01:02.000000000 -0700 -+++ src/backends/x11/meta-renderer-x11.c 2019-03-11 23:44:53.274968331 -0700 -@@ -85,14 +85,6 @@ - cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay); - cogl_xlib_renderer_request_reset_on_video_memory_purge (cogl_renderer, TRUE); - -- /* Set up things so that if the INTEL_swap_event extension is not present, -- * but the driver is known to have good thread support, we use an extra -- * thread and call glXWaitVideoSync() in the thread. This allows idles -- * to work properly, even when Mutter is constantly redrawing new frames; -- * otherwise, without INTEL_swap_event, we'll just block in glXSwapBuffers(). -- */ -- cogl_xlib_renderer_set_threaded_swap_wait_enabled (cogl_renderer, TRUE); -- - return cogl_renderer; - } - diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index d33535d2bc..00cec68f83 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,11 +1,11 @@ # Template file for 'mutter' pkgname=mutter -version=3.32.2 +version=3.34.1 revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true - -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland" + -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland" hostmakedepends="glib-devel pkg-config zenity wayland-devel xorg-server" makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel @@ -17,9 +17,9 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6ab3ec487228d3e6a12aa5eda719608c7d6bd8960184278377b79dab443ca7c0 -shlib_provides="libmutter-clutter-4.so libmutter-cogl-4.so - libmutter-cogl-gles2-4.so libmutter-cogl-pango-4.so libmutter-cogl-path-4.so" +checksum=ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e +shlib_provides="libmutter-clutter-5.so libmutter-cogl-5.so + libmutter-cogl-pango-5.so libmutter-cogl-path-5.so" mutter-devel_package() { depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel @@ -28,7 +28,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-4/*.gir" + vmove "usr/lib/mutter-5/*.gir" vmove "usr/lib/*.so" } }