From 5dfcbd90b0b8188718a34329eefb84293dbdf72e Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 4 Sep 2018 22:22:08 +0200 Subject: [PATCH] mutter: update to 3.30.0. --- common/shlibs | 13 +++----- .../mutter/patches/meta-renderer-x11.patch | 17 ---------- srcpkgs/mutter/patches/remove-Werror.patch | 11 +++++++ srcpkgs/mutter/template | 31 ++++++------------- 4 files changed, 26 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/mutter/patches/meta-renderer-x11.patch create mode 100644 srcpkgs/mutter/patches/remove-Werror.patch diff --git a/common/shlibs b/common/shlibs index bbb25d704e9..7ad1e360e07 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2858,14 +2858,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-2.so.0 mutter-3.28.0_1 -libmutter-clutter-1.so mutter-3.28.0_1 -libmutter-cogl-path-1.so mutter-3.28.0_1 -libmutter-cogl-1.so mutter-3.28.0_1 -libmutter-cogl-pango-1.so mutter-3.28.0_1 -libmutter-clutter-2.so mutter-3.28.0_1 -libmutter-cogl-2.so mutter-3.28.0_1 -libmutter-cogl-pango-2.so mutter-3.28.0_1 +libmutter-3.so.0 mutter-3.30.0_1 +libmutter-clutter-3.so mutter-3.30.0_1 +libmutter-cogl-path-3.so mutter-3.30.0_1 +libmutter-cogl-3.so mutter-3.30.0_1 +libmutter-cogl-pango-3.so mutter-3.30.0_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 b6f7295a659..00000000000 --- a/srcpkgs/mutter/patches/meta-renderer-x11.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/backends/x11/meta-renderer-x11.c 2017-05-11 06:30:09.000000000 -0600 -+++ src/backends/x11/meta-renderer-x11.c 2017-06-05 12:14:08.090473267 -0600 -@@ -79,14 +79,6 @@ - cogl_renderer_set_custom_winsys (cogl_renderer, get_x11_cogl_winsys_vtable); - cogl_xlib_renderer_set_foreign_display (cogl_renderer, xdisplay); - -- /* 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/patches/remove-Werror.patch b/srcpkgs/mutter/patches/remove-Werror.patch new file mode 100644 index 00000000000..98c4a252fa5 --- /dev/null +++ b/srcpkgs/mutter/patches/remove-Werror.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -18616,7 +18616,7 @@ if test "$enable_compile_warnings" != no ; then + if test "$enable_compile_warnings" = error; then + case " $CFLAGS " in + *[\ \ ]-Werror[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;; ++ *) CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ;; + esac + fi + fi diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 237675cd4bc..7218d43b599 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,25 +1,24 @@ # Template file for 'mutter' pkgname=mutter -version=3.28.3 -revision=2 +version=3.30.0 +revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-static --enable-egl-device" +configure_args="--disable-schemas-compile --disable-static --enable-egl-device + --enable-remote-desktop" hostmakedepends="glib-devel gobject-introspection pkg-config zenity" -makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel - libSM-devel libXtst-devel libcanberra-devel libinput-devel - startup-notification-devel upower-devel" +makedepends="elogind-devel libglib-devel gnome-desktop-devel json-glib-devel + libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel + MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols" depends="desktop-file-utils zenity" short_desc="Lightweight GTK+3 window manager" maintainer="Enno Boland " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Projects/Mutter/" license="GPL-2.0-or-later" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8904236269295cd62c24cd1d7b64e1d0688fffe4c7386d620dcb342070cd036f +checksum=994a795bb9356e1ffaf3649a61a566a341367a4ddd1405dc851606009c9591c1 shlib_provides="libmutter-clutter-2.so libmutter-cogl-2.so libmutter-cogl-pango-2.so" nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio -CFLAGS+=' -Wno-error=sign-compare -Wno-error=format' - # Package build options build_options="gir" # Disable gir for cross builds. @@ -27,19 +26,9 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -pre_configure() { - local _arch=x86 - for i in /usr/src/kernel-headers-*/include; do - CFLAGS+=" -I$i -I$i/uapi -I$i/../arch/$_arch/include" - done - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool -} - mutter-devel_package() { depends="gsettings-desktop-schemas>=3.16 gtk+3-devel>=3.16 - clutter-devel>=1.22 libX11-devel mutter>=${version}_${revision}" + clutter-devel>=1.22 libX11-devel mutter>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include