From e79425ab7883ba08f6f707fcd323c28a546aa2d88f850e9be96b6168edbaae3c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 May 2018 15:37:24 +0000 Subject: [PATCH 1/4] Accepting request 610115 from home:hpjansson:rd Add dependency on libpipewire and build with --enable-remote-desktop. Pass --enable-gles2=yes to configure, build gles2 support in cogl, disabled by default from upstream. We already had the needed pkgconfig(glesv2) BuildRequires in place. OBS-URL: https://build.opensuse.org/request/show/610115 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=291 --- mutter.changes | 13 +++++++++++++ mutter.spec | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mutter.changes b/mutter.changes index 69df62a..f38229d 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 17 15:18:48 UTC 2018 - hpj@suse.com + +- Add dependency on libpipewire and build with + --enable-remote-desktop. + ------------------------------------------------------------------- Wed May 09 16:00:40 UTC 2018 - opensuse-packaging@opensuse.org @@ -48,6 +54,13 @@ Wed Apr 18 12:17:18 UTC 2018 - bjorn.lie@gmail.com - Following the above, add libtool BuildRequires and pass autogen.sh to bootstrap. +------------------------------------------------------------------- +Thu Apr 5 19:30:24 UTC 2018 - bjorn.lie@gmail.com + +- Pass --enable-gles2=yes to configure, build gles2 support in + cogl, disabled by default from upstream. We already had the + needed pkgconfig(glesv2) BuildRequires in place. + ------------------------------------------------------------------- Thu Mar 22 20:04:16 CET 2018 - hpj@suse.com diff --git a/mutter.spec b/mutter.spec index 31c8422..7218ea5 100644 --- a/mutter.spec +++ b/mutter.spec @@ -40,8 +40,6 @@ Patch1000: mutter-SLE-bell.patch Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch # PATCH-FIX-UPSTREAM mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj@suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes. Patch1002: mutter-SLE-bsc984738-grab-display.patch -# Not available in openSUSE yet -# BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: Mesa-libGLESv3-devel BuildRequires: fdupes BuildRequires: intltool @@ -63,6 +61,7 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) >= 136 @@ -155,13 +154,14 @@ translation-update-upstream %endif %build -# FIXME add --enable-remote-desktop when libpipewire-0.1 is available NOCONFIGURE=1 ./autogen.sh %configure \ --enable-wayland \ --enable-native-backend \ --disable-static \ --enable-egl-device \ + --enable-gles2=yes \ + --enable-remote-desktop \ --enable-compile-warnings=maximum \ %{nil} %make_build @@ -185,6 +185,7 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print # These so files are not split out since they are private to mutter %{_libdir}/mutter/libmutter-clutter-%{mutter_major}.so +%{_libdir}/mutter/libmutter-cogl-gles2-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-pango-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-path-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-%{mutter_major}.so @@ -231,6 +232,7 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %{_libdir}/pkgconfig/mutter-clutter-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-clutter-x11-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-%{mutter_major}.pc +%{_libdir}/pkgconfig/mutter-cogl-gles2-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-pango-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-path-%{mutter_major}.pc From e61864c6aaebf4b79d1a60ae4640e460179248357478336a493429a646842b39 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 May 2018 15:38:33 +0000 Subject: [PATCH 2/4] - Enable remote desktop support: + Add pkgconfig(libpipewire-1.0) BuildRequires. + Pass --enable-remote-desktop to configure. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=292 --- mutter.changes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mutter.changes b/mutter.changes index f38229d..bd33b67 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Thu May 17 15:18:48 UTC 2018 - hpj@suse.com -- Add dependency on libpipewire and build with - --enable-remote-desktop. +- Enable remote desktop support: + + Add pkgconfig(libpipewire-1.0) BuildRequires. + + Pass --enable-remote-desktop to configure. ------------------------------------------------------------------- Wed May 09 16:00:40 UTC 2018 - opensuse-packaging@opensuse.org From 6f43c5bcb8eb438bc6d9ea59178cc7207451c5c540cf1271fe8a09c04d5de3fe Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 May 2018 12:20:49 +0000 Subject: [PATCH 3/4] Accepting request 612705 from home:iznogood:branches:GNOME:Factory New bump OBS-URL: https://build.opensuse.org/request/show/612705 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=294 --- _servicedata | 2 +- mutter-3.28.2+20180507.41303bc01.tar.xz | 3 --- mutter-3.28.2+20180526.abc7ad8e9.tar.xz | 3 +++ mutter.changes | 17 ++++++++++++++++- mutter.spec | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 mutter-3.28.2+20180507.41303bc01.tar.xz create mode 100644 mutter-3.28.2+20180526.abc7ad8e9.tar.xz diff --git a/_servicedata b/_servicedata index 15420dd..b893b3c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.gnome.org/GNOME/mutter.git - 41303bc01be873e684f11a3407aa556af2922426 \ No newline at end of file + abc7ad8e9f67a720516fb739c5dfe4b49748d423 \ No newline at end of file diff --git a/mutter-3.28.2+20180507.41303bc01.tar.xz b/mutter-3.28.2+20180507.41303bc01.tar.xz deleted file mode 100644 index b707c77..0000000 --- a/mutter-3.28.2+20180507.41303bc01.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e11cf70010769a0ffed3289a8b5cdc50a7d9915163cc5af1222c92b4668aef2 -size 2871456 diff --git a/mutter-3.28.2+20180526.abc7ad8e9.tar.xz b/mutter-3.28.2+20180526.abc7ad8e9.tar.xz new file mode 100644 index 0000000..ab1fb45 --- /dev/null +++ b/mutter-3.28.2+20180526.abc7ad8e9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ae2b8e29a19c1353eca6432ecb017985adae75a0e689e16b16a3158c5a8d3f +size 2872312 diff --git a/mutter.changes b/mutter.changes index bd33b67..5882743 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon May 28 17:34:20 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 3.28.2+20180526.abc7ad8e9: + + wayland: Don't reset input focus on text commit. + + frames: Allow for unknown mouse buttons. + + wayland: update enter/leave output after effects. + + window-actor: add new signal "effects-completed". + + wayland: Compare geometries after chaining up. + + frames: Handle touch events. + + frames: Make 1st button/motion handlers take generic events. + + clutter/evdev: Don't ignore CAPS lock as modifier. + + clutter/evdev: ignore injected events from IM. + + wayland: Use cursor position in logical monitor. + ------------------------------------------------------------------- Thu May 17 15:18:48 UTC 2018 - hpj@suse.com @@ -6,7 +21,7 @@ Thu May 17 15:18:48 UTC 2018 - hpj@suse.com + Pass --enable-remote-desktop to configure. ------------------------------------------------------------------- -Wed May 09 16:00:40 UTC 2018 - opensuse-packaging@opensuse.org +Wed May 09 16:00:40 UTC 2018 - bjorn.lie@gmail.com - Update to version 3.28.2+20180507.41303bc01: + Bump version to 3.28.2 diff --git a/mutter.spec b/mutter.spec index 7218ea5..d9b2892 100644 --- a/mutter.spec +++ b/mutter.spec @@ -19,7 +19,7 @@ %define mutter_major 2 %define mutter_minor 0 Name: mutter -Version: 3.28.2+20180507.41303bc01 +Version: 3.28.2+20180526.abc7ad8e9 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0-or-later From f43cab301a187041d4d7c6b95a79d728f8105b3452dae1483934814eefc302b3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 May 2018 13:02:54 +0000 Subject: [PATCH 4/4] For now sans pipewire OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=295 --- mutter.changes | 7 ------- mutter.spec | 2 -- 2 files changed, 9 deletions(-) diff --git a/mutter.changes b/mutter.changes index 5882743..96510d7 100644 --- a/mutter.changes +++ b/mutter.changes @@ -13,13 +13,6 @@ Mon May 28 17:34:20 UTC 2018 - bjorn.lie@gmail.com + clutter/evdev: ignore injected events from IM. + wayland: Use cursor position in logical monitor. -------------------------------------------------------------------- -Thu May 17 15:18:48 UTC 2018 - hpj@suse.com - -- Enable remote desktop support: - + Add pkgconfig(libpipewire-1.0) BuildRequires. - + Pass --enable-remote-desktop to configure. - ------------------------------------------------------------------- Wed May 09 16:00:40 UTC 2018 - bjorn.lie@gmail.com diff --git a/mutter.spec b/mutter.spec index d9b2892..66fc532 100644 --- a/mutter.spec +++ b/mutter.spec @@ -61,7 +61,6 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libinput) -BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) >= 136 @@ -161,7 +160,6 @@ NOCONFIGURE=1 ./autogen.sh --disable-static \ --enable-egl-device \ --enable-gles2=yes \ - --enable-remote-desktop \ --enable-compile-warnings=maximum \ %{nil} %make_build