From a9f5e8e41273f51a7f87c7e1a1982aad44dafae3fa6110f0d1749f175871c0d1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 31 Aug 2017 07:45:10 +0000 Subject: [PATCH 1/3] Accepting request 519448 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/519448 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=250 --- mutter-3.24.4.tar.xz | 3 - mutter-3.25.91.tar.xz | 3 + mutter-bell.patch => mutter-SLE-bell.patch | 0 ...=> mutter-SLE-bsc984738-grab-display.patch | 0 ...elax-some-constraints-on-CSD-windows.patch | 0 ...o-mandatory-eglGetPlatformDisplayEXT.patch | 43 ++++++ mutter.changes | 135 +++++++++++++++++ mutter.spec | 139 +++++++++--------- 8 files changed, 247 insertions(+), 76 deletions(-) delete mode 100644 mutter-3.24.4.tar.xz create mode 100644 mutter-3.25.91.tar.xz rename mutter-bell.patch => mutter-SLE-bell.patch (100%) rename mutter-bsc984738-grab-display.patch => mutter-SLE-bsc984738-grab-display.patch (100%) rename relax-some-constraints-on-CSD-windows-in-sle-classic.patch => mutter-SLE-relax-some-constraints-on-CSD-windows.patch (100%) create mode 100644 mutter-no-mandatory-eglGetPlatformDisplayEXT.patch diff --git a/mutter-3.24.4.tar.xz b/mutter-3.24.4.tar.xz deleted file mode 100644 index cdcfb88..0000000 --- a/mutter-3.24.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea -size 3583916 diff --git a/mutter-3.25.91.tar.xz b/mutter-3.25.91.tar.xz new file mode 100644 index 0000000..e10901d --- /dev/null +++ b/mutter-3.25.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd9d67ae8a30bee0b6d4ff3157a7fb12192eb271cbbc6001faca9f58b8324a3c +size 3596868 diff --git a/mutter-bell.patch b/mutter-SLE-bell.patch similarity index 100% rename from mutter-bell.patch rename to mutter-SLE-bell.patch diff --git a/mutter-bsc984738-grab-display.patch b/mutter-SLE-bsc984738-grab-display.patch similarity index 100% rename from mutter-bsc984738-grab-display.patch rename to mutter-SLE-bsc984738-grab-display.patch diff --git a/relax-some-constraints-on-CSD-windows-in-sle-classic.patch b/mutter-SLE-relax-some-constraints-on-CSD-windows.patch similarity index 100% rename from relax-some-constraints-on-CSD-windows-in-sle-classic.patch rename to mutter-SLE-relax-some-constraints-on-CSD-windows.patch diff --git a/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch b/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch new file mode 100644 index 0000000..da505d6 --- /dev/null +++ b/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch @@ -0,0 +1,43 @@ +From e07524280199f3befee4f28729daf64b65b119e6 Mon Sep 17 00:00:00 2001 +From: Mario Sanchez Prada +Date: Tue, 22 Aug 2017 17:45:19 +0200 +Subject: egl: Don't require eglGetPlatformDisplayEXT + +Trying to unilaterally require eglGetPlatformDisplayEXT causes problems in +scenarios where this method is not available. Besides, this should only be +required on Wayland, so we can stop requiring it always and simply let the +eglGetPlatformDisplay() function error accordingly when needed. + +https://bugzilla.gnome.org/show_bug.cgi?id=786619 +--- + src/backends/meta-egl.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c +index ec5a025..abf38c8 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -762,19 +762,12 @@ meta_egl_query_dma_buf_modifiers (MetaEgl *egl, + #define GET_EGL_PROC_ADDR(proc) \ + egl->proc = (void *) eglGetProcAddress (#proc); + +-#define GET_EGL_PROC_ADDR_REQUIRED(proc) \ +- GET_EGL_PROC_ADDR(proc) \ +- if (!egl->proc) \ +- { \ +- meta_fatal ("Failed to get proc address for '%s'\n", #proc); \ +- } +- + static void + meta_egl_constructed (GObject *object) + { + MetaEgl *egl = META_EGL (object); + +- GET_EGL_PROC_ADDR_REQUIRED (eglGetPlatformDisplayEXT); ++ GET_EGL_PROC_ADDR (eglGetPlatformDisplayEXT); + + GET_EGL_PROC_ADDR (eglCreateImageKHR); + GET_EGL_PROC_ADDR (eglDestroyImageKHR); +-- +cgit v0.12 + diff --git a/mutter.changes b/mutter.changes index 3631167..58b3781 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,9 +1,144 @@ +------------------------------------------------------------------- +Thu Aug 24 07:59:06 UTC 2017 - zaitor@opensuse.org + +- Add mutter-no-mandatory-eglGetPlatformDisplayEXT.patch: egl: + Don't require eglGetPlatformDisplayEXT. Trying to unilaterally + require eglGetPlatformDisplayEXT causes problems in scenarios + where this method is not available. Besides, this should only be + required on Wayland, so we can stop requiring it always and + simply let the eglGetPlatformDisplay() function error accordingly + when needed (bgo#786619). + +------------------------------------------------------------------- +Tue Aug 22 08:20:16 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.91: + + Reduce memory use of suspended instances (bgo#786299). + + Make supported scales determination saner (bgo#786474). + + Fix crash on inhibit-shortcuts dialog reponse (bgo#786385). + + Support libinput's tag-and-drag setting (bgo#775755). + + Avoid overlapping keybindings with multiple layouts + (bgo#786408). + + Fix non-transformed cursor on rotated monitors (bgo#786023). + + Avoid unnecessary work during background painting (bgo#783512). + + Misc. bug fixes: bgo#691611, bgo#786300, bgo#777732, + bgo#786568. + + Updated translations. + +------------------------------------------------------------------- +Mon Aug 21 12:40:17 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.25.90: + + Add zwp_linux_dmabuf_v1 support (bgo#785262). + + Add (x)wayland shortcut inhibitor support (bgo#783342). + + Misc. bug fixes: bgo#785263, bgo#785347, bgo#767805. + + Updated translations. +- Rename libmutter-0-0 subpackage to libmutter-1-0, following + upstreams soname change. + ------------------------------------------------------------------- Tue Aug 8 18:34:12 UTC 2017 - coolo@suse.com - libinput is needed also without wayland, so buildrequire it unconditionally +------------------------------------------------------------------- +Thu Jul 20 13:25:04 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.4: + + Do not throttle motion events on tablet tools (bgo#783535). + + Handle left-handed mode on pen/eraser devices (bgo#782027). + + Add wl_surface.damage_buffer() support (bgo#784080). + + Fix crash when moving across on-adjacent monitors (bgo#783630). + + Fix window moving/resizing via tablet tools (bgo#777333). + + Support fractional monitor scaling (bgo#765011). + + Keep override-redirect windows stacked on top (bgo#780485). + + Implement tablet rings/strips configuration (bgo#782033). + + Support tablet wheel events on wayland (bgo#783716). + + Move g-s-d xrandr functionality into mutter (bgo#781906). + + Misc. bug fixes: bgo#783502, bgo#784009, bgo#784223, + bgo#784272, bgo#784402, bgo#784881, bgo#762083, bgo#784867, + bgo#781723. +- Drop desktop_database_post(un) and + glib2_gsettings_schema_post(un) from post(un), no longer needed + as we have file-triggers to take care of this for us now. + +------------------------------------------------------------------- +Thu Jul 20 13:25:04 UTC 2017 - dimstar@opensuse.org + +- Update to version 3.25.3: + + Ignore hotplug-mode-update value on startup (bgo#783073). + + Implement configurable monitor scales on X11 (bgo#777732). + + Fix handling of tiled monitors (bgo#781723). + + Handle multiple keycodes for keysym (bgo#781223). + + Consider subsurfaces when grabbing (bgo#781811). + + Fix logic for HiPDPI scaling of TV outputs (bgo#777347). + + Fix handling of left-handed mode on pen/eraser devices + (bgo#782027). + + Fix output cycling in non-display-attached tablets (bgo#782032). + + Fix wacom cursor offset on wayland (bgo#784009). + + Handle EXIF orientation of backgrounds (bgo#783125). + + Misc. bug fixes: bgo#772218, bgo#783161, bgo#780407, + bgo#783113, bgo#783293, bgo#783505, bgo#781703. + + Updated translations. + +------------------------------------------------------------------- +Thu Jul 20 13:25:03 UTC 2017 - zaitor@opensuse.org + +- Move SLE only patches to patch number 1000 and above. +- Rename mutter-bell.patch to mutter-SLE-bell.patch, + mutter-bsc984738-grab-display.patch to + mutter-SLE-bsc984738-grab-display.patch and + relax-some-constraints-on-CSD-windows-in-sle-classic.patch to + mutter-SLE-relax-some-constraints-on-CSD-windows.patch. + +------------------------------------------------------------------- +Thu Jul 20 13:25:02 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.2: + + Fix frame updates on hide-titlebar-when-maximized changes + (bgo#781862). + + Fix accessible screen coordinates on X11 (bgo#781902). + + Use less CPU when rendering fast-updating windows (bgo#782344). + + Compute geometry of clients that don't set one explicitly + (bgo#782213). + + Fix copy+paste of UTF8 strings between X11 and wayland + (bgo#782472). + + Fix non-wayland builds (bgo#780533). + + Add plugin vfunc to implement a custom force-quit dialog + (bgo#711619). + + Fix swapped red and blue channels in CoglTexture data + (bgo#779234). + + Fix build where libtool's link_all_deplibs defaults to 'no' + (bgo#782821). + + Fix glitches when opening a window maximized (bgo#781353, + bgo#782183). + + Fix wrong cursor after window underneath the pointer changed + (bgo#755164). + + Implement support for disable-while-typing option (bgo#764852). + + Emit size-change signal when tiling (bgo#782968). + + Misc. bug fixes: bgo#759085, bgo#780215, bgo#782156, + bgo#782152. + + Updated translations. +- Drop mutter-monitor-fixes.patch and mutter-wayland-fixes.patch: + Fixed upstream. + +------------------------------------------------------------------- +Thu Jul 20 13:25:01 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.1: + + Always sync window geometry on state changes (bgo#780292). + + Use EGL instead of GLX when drawing using GLES (bgo#771636). + + Scale relative motion deltas with monitor scale (bgo#778119). + + Use texture fallback when setting hardware cursor fails + (bgo#770020). + + Fix lock-up when using additional theme variants (bgo#780254). + + Rework low-level monitor configuration (bgo#777732). + + Fix building with GLES2 instead of GL (bgo#781398). + + Misc. bug fixes: bgo#780304, bgo#772218, bgo#781242, + bgo#781391. + + Updated translations. + ------------------------------------------------------------------- Thu Jul 20 08:24:20 UTC 2017 - zaitor@opensuse.org diff --git a/mutter.spec b/mutter.spec index b3329fa..a582aae 100644 --- a/mutter.spec +++ b/mutter.spec @@ -21,45 +21,46 @@ %else %bcond_without wayland %endif - Name: mutter -Version: 3.24.4 +Version: 3.25.91 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/mutter/3.24/%{name}-%{version}.tar.xz -# PATCH-FEATURE-SLE mutter-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. -Patch1: mutter-bell.patch -# PATCH-FIX-SLE relax-some-constraints-on-CSD-windows-in-sle-classic.patch bnc#883491 cxiong@suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor. -Patch2: relax-some-constraints-on-CSD-windows-in-sle-classic.patch -# PATCH-FIX-UPSTREAM mutter-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. -Patch3: mutter-bsc984738-grab-display.patch +Source: https://download.gnome.org/sources/mutter/3.25/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland -Patch6: mutter-fix-startup.patch +Patch0: mutter-fix-startup.patch # PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions -Patch7: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch +Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch +# PATCH-FIX-UPSTREAM mutter-no-mandatory-eglGetPlatformDisplayEXT.patch bgo#786619 zaitor@opensuse.org -- egl: Don't require eglGetPlatformDisplayEXT +Patch2: mutter-no-mandatory-eglGetPlatformDisplayEXT.patch +# SLE only patches start at 1000 +# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. +Patch1000: mutter-SLE-bell.patch +# PATCH-FIX-SLE mutter-SLE-relax-some-constraints-on-CSD-windows.patch bnc#883491 cxiong@suse.com -- Relax some constraints on window positioning for CSD windows s.t. they can be placed at the very top of the monitor. +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 BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: libSM-devel BuildRequires: libX11-devel BuildRequires: libXinerama-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: zenity BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.25.10 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.2 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.19.3 BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.7 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwacom) @@ -80,27 +81,28 @@ BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xrandr) >= 1.5.0 BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xtst) -%if %{with wayland} -BuildRequires: pkgconfig(gbm) >= 10.3 -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(wayland-protocols) >= 1.7 -BuildRequires: pkgconfig(wayland-server) >= 1.1.90 -%endif -BuildRequires: pkgconfig(libinput) Requires: zenity Recommends: %{name}-lang Provides: windowmanager # Obsolete the now private typelib. Obsoletes: typelib-1_0-Meta-3_0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif +%if %{with wayland} +BuildRequires: pkgconfig(gbm) >= 10.3 +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(wayland-protocols) >= 1.9 +BuildRequires: pkgconfig(wayland-server) >= 1.13.0 +%endif %description Mutter is a window and compositing manager based on Clutter, forked from Metacity. -%package -n libmutter-0-0 +%package -n libmutter-1-0 Summary: Window and compositing manager based on Clutter # we need the gsettings schema; hopefully, they'll stay backwards compatible # (since we can't require = version, to not break SLPP) @@ -108,7 +110,7 @@ Group: System/Libraries Requires: %{name}-data >= %{version} Obsoletes: libmutter0 -%description -n libmutter-0-0 +%description -n libmutter-1-0 Mutter is a window and compositing manager based on Clutter, forked from Metacity. @@ -130,23 +132,26 @@ This package contains data files needed by mutter and its library. Summary: Development files for mutter, a window and compositing manager Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: libmutter-0-0 = %{version} +Requires: libmutter-1-0 = %{version} %description devel This subpackage contains libraries and header files for developing applications that want to make use of the mutter library. %lang_package + %prep %setup -q -%if !0%{?is_opensuse} -translation-update-upstream +%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 +# SLE only patches and translations. +%if !0%{?is_opensuse} +translation-update-upstream +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 %endif -%patch6 -p1 -%patch7 -p1 %build %configure \ @@ -169,50 +174,38 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%post -%desktop_database_post +%post -n libmutter-1-0 -p /sbin/ldconfig -%postun -%desktop_database_postun - -%post -n libmutter-0-0 -p /sbin/ldconfig - -%postun -n libmutter-0-0 -p /sbin/ldconfig - -%post data -%glib2_gsettings_schema_post - -%postun data -%glib2_gsettings_schema_postun +%postun -n libmutter-1-0 -p /sbin/ldconfig %files %defattr (-, root, root) %doc COPYING NEWS -%doc %{_mandir}/man1/mutter.1%{?ext_man} +%{_mandir}/man1/mutter.1%{?ext_man} %{_bindir}/mutter # These so files are not split out since they are private to mutter -%{_libdir}/mutter/libmutter-clutter-0.so -%{_libdir}/mutter/libmutter-cogl-pango-0.so -%{_libdir}/mutter/libmutter-cogl-path-0.so -%{_libdir}/mutter/libmutter-cogl-0.so +%{_libdir}/mutter/libmutter-clutter-1.so +%{_libdir}/mutter/libmutter-cogl-pango-1.so +%{_libdir}/mutter/libmutter-cogl-path-1.so +%{_libdir}/mutter/libmutter-cogl-1.so %{_libdir}/mutter/plugins/default.so # %{_libexecdir}/mutter-restart-helper %{_datadir}/applications/mutter.desktop # These typelibs are not split out since they are private to mutter -%{_libdir}/mutter/Cally-0.typelib -%{_libdir}/mutter/Clutter-0.typelib -%{_libdir}/mutter/ClutterX11-0.typelib -%{_libdir}/mutter/Cogl-0.typelib +%{_libdir}/mutter/Cally-1.typelib +%{_libdir}/mutter/Clutter-1.typelib +%{_libdir}/mutter/ClutterX11-1.typelib +%{_libdir}/mutter/Cogl-1.typelib #{_libdir}/mutter/Cogl-2.0.typelib -%{_libdir}/mutter/CoglPango-0.typelib +%{_libdir}/mutter/CoglPango-1.typelib #{_libdir}/mutter/CoglPango-2.0.typelib -%{_libdir}/mutter/Meta-0.typelib +%{_libdir}/mutter/Meta-1.typelib # -%files -n libmutter-0-0 +%files -n libmutter-1-0 %defattr(-,root,root) -%{_libdir}/libmutter-0.so.* +%{_libdir}/libmutter-1.so.* %dir %{_libdir}/mutter/ # users of libmutter need this directory %dir %{_libdir}/mutter/plugins/ @@ -234,20 +227,20 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %files devel %defattr(-,root,root) %{_includedir}/mutter/ -%{_libdir}/libmutter-0.so -%{_libdir}/mutter/Meta-0.gir -%{_libdir}/mutter/Cally-0.gir -%{_libdir}/mutter/Clutter-0.gir -%{_libdir}/mutter/ClutterX11-0.gir -%{_libdir}/mutter/Cogl-0.gir +%{_libdir}/libmutter-1.so +%{_libdir}/mutter/Meta-1.gir +%{_libdir}/mutter/Cally-1.gir +%{_libdir}/mutter/Clutter-1.gir +%{_libdir}/mutter/ClutterX11-1.gir +%{_libdir}/mutter/Cogl-1.gir #{_libdir}/mutter/Cogl-2.0.gir -%{_libdir}/mutter/CoglPango-0.gir +%{_libdir}/mutter/CoglPango-1.gir #{_libdir}/mutter/CoglPango-2.0.gir -%{_libdir}/pkgconfig/libmutter-0.pc -%{_libdir}/pkgconfig/mutter-clutter-0.pc -%{_libdir}/pkgconfig/mutter-clutter-x11-0.pc -%{_libdir}/pkgconfig/mutter-cogl-0.pc -%{_libdir}/pkgconfig/mutter-cogl-pango-0.pc -%{_libdir}/pkgconfig/mutter-cogl-path-0.pc +%{_libdir}/pkgconfig/libmutter-1.pc +%{_libdir}/pkgconfig/mutter-clutter-1.pc +%{_libdir}/pkgconfig/mutter-clutter-x11-1.pc +%{_libdir}/pkgconfig/mutter-cogl-1.pc +%{_libdir}/pkgconfig/mutter-cogl-pango-1.pc +%{_libdir}/pkgconfig/mutter-cogl-path-1.pc %changelog From 72ccf65bd0072f2eabc21a2a014b22182b547887649a04d44fcfba1f621bb916 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 Sep 2017 19:21:06 +0000 Subject: [PATCH 2/3] Accepting request 522122 from GNOME:Next Since upstream called .92 without releasing mutter and gnome-shell .92, make patch official, fix build in G:F and :G OBS-URL: https://build.opensuse.org/request/show/522122 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=251 --- mutter-new-libgudev.patch | 31 +++++++++++++++++++++++++++++++ mutter.changes | 6 ++++++ mutter.spec | 5 ++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 mutter-new-libgudev.patch diff --git a/mutter-new-libgudev.patch b/mutter-new-libgudev.patch new file mode 100644 index 0000000..950d201 --- /dev/null +++ b/mutter-new-libgudev.patch @@ -0,0 +1,31 @@ +From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 1 Sep 2017 02:06:38 +0200 +Subject: build: Require libgudev >= 232 + +And remove the g_autoptr implementations in mutter itself. + +https://bugzilla.gnome.org/show_bug.cgi?id=760670 +--- + configure.ac | 4 ++-- + src/backends/native/meta-launcher.c | 4 ---- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c +index 90b4b98..eb35f88 100644 +--- a/src/backends/native/meta-launcher.c ++++ b/src/backends/native/meta-launcher.c +@@ -49,10 +49,6 @@ + + #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor" + +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref) +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref) +-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref) +- + struct _MetaLauncher + { + Login1Session *session_proxy; +-- +cgit v0.12 + diff --git a/mutter.changes b/mutter.changes index 58b3781..482c3ef 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 7 18:09:43 UTC 2017 - zaitor@opensuse.org + +- Add mutter-new-libgudev.patch: Fix build with new libgudev + (bgo#760670). + ------------------------------------------------------------------- Thu Aug 24 07:59:06 UTC 2017 - zaitor@opensuse.org diff --git a/mutter.spec b/mutter.spec index a582aae..9c93f41 100644 --- a/mutter.spec +++ b/mutter.spec @@ -35,6 +35,8 @@ Patch0: mutter-fix-startup.patch Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch # PATCH-FIX-UPSTREAM mutter-no-mandatory-eglGetPlatformDisplayEXT.patch bgo#786619 zaitor@opensuse.org -- egl: Don't require eglGetPlatformDisplayEXT Patch2: mutter-no-mandatory-eglGetPlatformDisplayEXT.patch +# PATCH-FIX-UPSTREAM mutter-new-libgudev.patch bgo#760670 zaitor@opensuse.org -- Fix build with new libgudev +Patch3: mutter-new-libgudev.patch # SLE only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. Patch1000: mutter-SLE-bell.patch @@ -91,7 +93,7 @@ BuildRequires: translation-update-upstream %endif %if %{with wayland} BuildRequires: pkgconfig(gbm) >= 10.3 -BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(wayland-protocols) >= 1.9 @@ -145,6 +147,7 @@ applications that want to make use of the mutter library. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # SLE only patches and translations. %if !0%{?is_opensuse} translation-update-upstream From c19cadadda0d90589b1d45ef2580c4f1ec19dade134bb9b2dd110a2c6106220d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 12 Sep 2017 21:41:48 +0000 Subject: [PATCH 3/3] Accepting request 523831 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/523831 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=252 --- mutter-3.25.91.tar.xz | 3 -- mutter-3.26.0.tar.xz | 3 ++ ...t-RGB16_565-format-for-16-bit-color-.patch | 13 +++--- mutter-new-libgudev.patch | 31 ------------- ...o-mandatory-eglGetPlatformDisplayEXT.patch | 43 ------------------- mutter.changes | 15 +++++++ mutter.spec | 10 +---- 7 files changed, 25 insertions(+), 93 deletions(-) delete mode 100644 mutter-3.25.91.tar.xz create mode 100644 mutter-3.26.0.tar.xz delete mode 100644 mutter-new-libgudev.patch delete mode 100644 mutter-no-mandatory-eglGetPlatformDisplayEXT.patch diff --git a/mutter-3.25.91.tar.xz b/mutter-3.25.91.tar.xz deleted file mode 100644 index e10901d..0000000 --- a/mutter-3.25.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd9d67ae8a30bee0b6d4ff3157a7fb12192eb271cbbc6001faca9f58b8324a3c -size 3596868 diff --git a/mutter-3.26.0.tar.xz b/mutter-3.26.0.tar.xz new file mode 100644 index 0000000..708d9f4 --- /dev/null +++ b/mutter-3.26.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a62933a11632830c430570b0f8d762fd9f76a2eb955d54cc14f73274d06e577 +size 3618704 diff --git a/mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch b/mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch index 7587de7..f0a30a2 100644 --- a/mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch +++ b/mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch @@ -12,11 +12,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=781704 src/x11/iconcache.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) -diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c -index 508dd82b1..f77783a05 100644 ---- a/src/x11/iconcache.c -+++ b/src/x11/iconcache.c -@@ -304,10 +304,43 @@ standard_pict_format_for_depth (int depth) +Index: mutter-3.26.0/src/x11/iconcache.c +=================================================================== +--- mutter-3.26.0.orig/src/x11/iconcache.c ++++ mutter-3.26.0/src/x11/iconcache.c +@@ -304,10 +304,43 @@ standard_pict_format_for_depth (int dept } } @@ -61,6 +61,3 @@ index 508dd82b1..f77783a05 100644 } static cairo_surface_t * --- -2.12.0 - diff --git a/mutter-new-libgudev.patch b/mutter-new-libgudev.patch deleted file mode 100644 index 950d201..0000000 --- a/mutter-new-libgudev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 1 Sep 2017 02:06:38 +0200 -Subject: build: Require libgudev >= 232 - -And remove the g_autoptr implementations in mutter itself. - -https://bugzilla.gnome.org/show_bug.cgi?id=760670 ---- - configure.ac | 4 ++-- - src/backends/native/meta-launcher.c | 4 ---- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c -index 90b4b98..eb35f88 100644 ---- a/src/backends/native/meta-launcher.c -+++ b/src/backends/native/meta-launcher.c -@@ -49,10 +49,6 @@ - - #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor" - --G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref) --G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref) --G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref) -- - struct _MetaLauncher - { - Login1Session *session_proxy; --- -cgit v0.12 - diff --git a/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch b/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch deleted file mode 100644 index da505d6..0000000 --- a/mutter-no-mandatory-eglGetPlatformDisplayEXT.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e07524280199f3befee4f28729daf64b65b119e6 Mon Sep 17 00:00:00 2001 -From: Mario Sanchez Prada -Date: Tue, 22 Aug 2017 17:45:19 +0200 -Subject: egl: Don't require eglGetPlatformDisplayEXT - -Trying to unilaterally require eglGetPlatformDisplayEXT causes problems in -scenarios where this method is not available. Besides, this should only be -required on Wayland, so we can stop requiring it always and simply let the -eglGetPlatformDisplay() function error accordingly when needed. - -https://bugzilla.gnome.org/show_bug.cgi?id=786619 ---- - src/backends/meta-egl.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index ec5a025..abf38c8 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -762,19 +762,12 @@ meta_egl_query_dma_buf_modifiers (MetaEgl *egl, - #define GET_EGL_PROC_ADDR(proc) \ - egl->proc = (void *) eglGetProcAddress (#proc); - --#define GET_EGL_PROC_ADDR_REQUIRED(proc) \ -- GET_EGL_PROC_ADDR(proc) \ -- if (!egl->proc) \ -- { \ -- meta_fatal ("Failed to get proc address for '%s'\n", #proc); \ -- } -- - static void - meta_egl_constructed (GObject *object) - { - MetaEgl *egl = META_EGL (object); - -- GET_EGL_PROC_ADDR_REQUIRED (eglGetPlatformDisplayEXT); -+ GET_EGL_PROC_ADDR (eglGetPlatformDisplayEXT); - - GET_EGL_PROC_ADDR (eglCreateImageKHR); - GET_EGL_PROC_ADDR (eglDestroyImageKHR); --- -cgit v0.12 - diff --git a/mutter.changes b/mutter.changes index 482c3ef..a5d8d5d 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Sep 12 19:33:28 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 3.26.0: + + Updated translations. +- Changes from version 3.25.92: + + Add screencast and remote desktop support (bgo#784199). + + Support running with no attached monitors (bgo#730551). + + Add a vertical gradient effect to background actor (bgo#786618). + + Misc. bug fixes: bgo#786619, bgo#786677, bgo#772218, bgo#786918, + bgo#760670. + + Updated translations. +- Drop mutter-no-mandatory-eglGetPlatformDisplayEXT.patch and + mutter-new-libgudev.patch, fixed upstream. + ------------------------------------------------------------------- Thu Sep 7 18:09:43 UTC 2017 - zaitor@opensuse.org diff --git a/mutter.spec b/mutter.spec index 9c93f41..f8c85d8 100644 --- a/mutter.spec +++ b/mutter.spec @@ -22,21 +22,17 @@ %bcond_without wayland %endif Name: mutter -Version: 3.25.91 +Version: 3.26.0 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: https://download.gnome.org/sources/mutter/3.25/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/mutter/3.26/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland Patch0: mutter-fix-startup.patch # PATCH-FEATURE-UPSTREAM mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch FATE#323412 bgo#781704 bsc#1024748 vliaskovitis@suse.com -- iconcache: Support RGB16_565 format for 16-bit sessions Patch1: mutter-iconcache-Support-RGB16_565-format-for-16-bit-color-.patch -# PATCH-FIX-UPSTREAM mutter-no-mandatory-eglGetPlatformDisplayEXT.patch bgo#786619 zaitor@opensuse.org -- egl: Don't require eglGetPlatformDisplayEXT -Patch2: mutter-no-mandatory-eglGetPlatformDisplayEXT.patch -# PATCH-FIX-UPSTREAM mutter-new-libgudev.patch bgo#760670 zaitor@opensuse.org -- Fix build with new libgudev -Patch3: mutter-new-libgudev.patch # SLE only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. Patch1000: mutter-SLE-bell.patch @@ -146,8 +142,6 @@ applications that want to make use of the mutter library. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 # SLE only patches and translations. %if !0%{?is_opensuse} translation-update-upstream