diff --git a/common/shlibs b/common/shlibs index ff5a6753db7..5262ef15a0f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2768,11 +2768,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-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 +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 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/fixudev.patch b/srcpkgs/mutter/patches/fixudev.patch new file mode 100644 index 00000000000..c9bd1b8c6ce --- /dev/null +++ b/srcpkgs/mutter/patches/fixudev.patch @@ -0,0 +1,16 @@ +Apparently the version limit is only required for systemd udev, it works +just fine with our version of eudev. + +diff --git meson.build meson.build +index dc210e6..6e080ca 100644 +--- meson.build ++++ meson.build +@@ -168,7 +168,7 @@ endif + + have_libgudev = get_option('udev') + if have_libgudev +- libudev_dep = dependency('libudev', version: udev_req) ++ libudev_dep = dependency('libudev') + gudev_dep = dependency('gudev-1.0', version: gudev_req) + endif + diff --git a/srcpkgs/mutter/patches/meta-renderer-x11.patch b/srcpkgs/mutter/patches/meta-renderer-x11.patch index b6f7295a659..55df265e33d 100644 --- a/srcpkgs/mutter/patches/meta-renderer-x11.patch +++ b/srcpkgs/mutter/patches/meta-renderer-x11.patch @@ -1,8 +1,8 @@ ---- 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); +--- 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 diff --git a/srcpkgs/mutter/patches/remove-Werror.patch b/srcpkgs/mutter/patches/remove-Werror.patch deleted file mode 100644 index dd80b5cc711..00000000000 --- a/srcpkgs/mutter/patches/remove-Werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 1056301deec..01419e208b2 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,23 +1,24 @@ # Template file for 'mutter' pkgname=mutter -version=3.30.2 -revision=2 -build_style=gnu-configure +version=3.32.0 +revision=1 build_helper="gir" -configure_args="--disable-schemas-compile --disable-static --enable-egl-device - --enable-remote-desktop" -hostmakedepends="glib-devel pkg-config zenity wayland-devel" +build_style=meson +configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true + -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 - MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols" + MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols + gnome-settings-daemon-devel" depends="desktop-file-utils zenity" short_desc="Lightweight GTK+3 window manager" 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=df24dcc0b866fc6bffbfc82881a84bd7cc9c641e4124d2545c368c0b10e12363 -shlib_provides="libmutter-clutter-3.so libmutter-cogl-3.so libmutter-cogl-pango-3.so" +checksum=7668a2208cb40f0f0c3a90dd72c3ea83993dbdfc24f517c6fa95abc04a8e1f19 +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" case "$XBPS_TARGET_MACHINE" in i686-musl|x86_64-musl) ;; @@ -31,7 +32,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter/*.gir" + vmove "usr/lib/mutter-4/*.gir" vmove "usr/lib/*.so" } }