diff --git a/common/shlibs b/common/shlibs index d0d61abb990..3c9e736aa0c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2803,3 +2803,8 @@ libdouble-conversion.so.1 double-conversion-2.0.1_1 libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 libXfont2.so.2 libXfont2-2.0.1_1 +libmutter-0.so.0 mutter-3.24.0_1 +libmutter-clutter-0.so mutter-3.24.0_1 +libmutter-cogl-path-0.so mutter-3.24.0_1 +libmutter-cogl-0.so mutter-3.24.0_1 +libmutter-cogl-pango-0.so mutter-3.24.0_1 diff --git a/srcpkgs/mutter/patches/fix-includes.patch b/srcpkgs/mutter/patches/fix-includes.patch deleted file mode 100644 index 0042dca6b9f..00000000000 --- a/srcpkgs/mutter/patches/fix-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/wayland/meta-wayland-private.h.orig 2016-09-23 08:55:17.876037227 +0200 -+++ src/wayland/meta-wayland-private.h 2016-09-23 08:57:08.436042296 +0200 -@@ -27,6 +27,7 @@ - - #include "window-private.h" - #include -+#include - - #include "meta-wayland.h" - #include "meta-wayland-versions.h" diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index d28248bccdf..4b7b6c97f62 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,22 +1,21 @@ # Template file for 'mutter' pkgname=mutter -version=3.22.3 +version=3.24.1 revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-static --enable-compile-warnings=no" -# wayland is currently broken -configure_args+=" --disable-wayland" +configure_args="--disable-schemas-compile --disable-static --enable-egl-device" hostmakedepends="pkg-config zenity glib-devel gobject-introspection" makedepends="json-glib-devel upower-devel gnome-desktop-devel libinput-devel -glib-devel libcanberra-devel startup-notification-devel libSM-devel" + glib-devel libcanberra-devel startup-notification-devel libSM-devel libXtst-devel + elogind-devel libdrm-devel libinput-devel libgudev-devel" depends="zenity desktop-file-utils" short_desc="Lightweight GTK+3 window manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" -checksum=537eda8e5fdd4a70602da913b885ad745a7510678c24006b91ceba83ccab209a -shlib_provides="libmutter-clutter-1.0.so libmutter-cogl-path.so libmutter-cogl.so libmutter-cogl-pango.so" +checksum=acaa77f9705cc6ca4a3d41935524ff31ba7a4c677bdd3e1d4662bbf3ece86a24 +shlib_provides="libmutter-clutter-0.so libmutter-cogl-path-0.so libmutter-cogl-0.so libmutter-cogl-pango-0.so" nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio" @@ -33,8 +32,8 @@ pre_configure() { 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 + #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() {