r52315 - in /desktop/experimental/mutter/debian: ./ patches/
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Tue Apr 4 07:56:12 UTC 2017
Author: smcv
Date: Tue Apr 4 07:56:12 2017
New Revision: 52315
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52315
Log:
* Import 3.24 packaging from Ubuntu. Thanks to Jeremy Bicha
* New upstream translations release
* New upstream release (LP: #1670910)
* debian/rules:
- Build with --enable-egl-device (LP: #1666664)
This enables experimental support for using NVIDIA proprietary
drivers with GNOME on Wayland
* Add git_revert_call_threaded_swap.patch:
- Revert patch that caused Budgie to crash (LP: #1669584)
* New upstream release
* debian/control.in:
- Loosen dependency on -common package
* Rename gir1.2-mutter-3.0 to gir-1.2-mutter-0
* New upstream release (LP: #1662805)
* libmutter0 has been renamed upstream to libmutter-0-0
* Rename libmutter-dev to libmutter-0-dev too
* debian/control.in:
- Drop obsolete Conflicts/Replaces now that the library
uses different file names
* Drop patches applied in new release:
- git_dont_set_unavailable_scroll_methods.patch
- git_flush_all_swap_notifies_on_idle.patch
Added:
desktop/experimental/mutter/debian/gir1.2-mutter-0.install
desktop/experimental/mutter/debian/libmutter-0-0.install
desktop/experimental/mutter/debian/libmutter-0-dev.install
desktop/experimental/mutter/debian/patches/git_revert_call_threaded_swap.patch
Removed:
desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install
desktop/experimental/mutter/debian/libmutter-dev.install
desktop/experimental/mutter/debian/libmutter0i.install
desktop/experimental/mutter/debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
Modified:
desktop/experimental/mutter/debian/changelog
desktop/experimental/mutter/debian/control
desktop/experimental/mutter/debian/control.in
desktop/experimental/mutter/debian/patches/series
desktop/experimental/mutter/debian/rules
Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=52315&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Tue Apr 4 07:56:12 2017
@@ -1,17 +1,64 @@
-mutter (3.22.3-2) unstable; urgency=medium
-
- * debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch
- - Add patch from 3.22 branch to fix a gnome-shell crash when using the
- alternatetab extension. (Closes: #857290)
-
- -- Michael Biebl <biebl at debian.org> Fri, 10 Mar 2017 18:06:30 +0100
-
-mutter (3.22.3-1) unstable; urgency=medium
-
- * New upstream release.
- * Drop patches which have been merged upstream.
-
- -- Michael Biebl <biebl at debian.org> Fri, 17 Feb 2017 18:17:07 +0100
+mutter (3.24.0-1) UNRELEASED; urgency=medium
+
+ * Import 3.24 packaging from Ubuntu. Thanks to Jeremy Bicha
+
+ -- Simon McVittie <smcv at debian.org> Tue, 04 Apr 2017 08:55:20 +0100
+
+mutter (3.24.0-0ubuntu1) zesty; urgency=medium
+
+ * New upstream translations release
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 20 Mar 2017 15:08:36 -0400
+
+mutter (3.23.92-0ubuntu1) zesty; urgency=medium
+
+ * New upstream release (LP: #1670910)
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Mon, 13 Mar 2017 22:25:03 -0400
+
+mutter (3.23.91-0ubuntu2) zesty; urgency=medium
+
+ * debian/rules:
+ - Build with --enable-egl-device (LP: #1666664)
+ This enables experimental support for using NVIDIA proprietary
+ drivers with GNOME on Wayland
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Fri, 10 Mar 2017 09:59:32 -0500
+
+mutter (3.23.91-0ubuntu1.1) zesty; urgency=medium
+
+ * Add git_revert_call_threaded_swap.patch:
+ - Revert patch that caused Budgie to crash (LP: #1669584)
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 02 Mar 2017 16:09:36 -0500
+
+mutter (3.23.91-0ubuntu1) zesty; urgency=medium
+
+ * New upstream release
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Wed, 01 Mar 2017 11:21:22 -0500
+
+mutter (3.23.90-0ubuntu2) zesty; urgency=medium
+
+ * debian/control.in:
+ - Loosen dependency on -common package
+ * Rename gir1.2-mutter-3.0 to gir-1.2-mutter-0
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sun, 19 Feb 2017 20:39:33 -0500
+
+mutter (3.23.90-0ubuntu1) zesty; urgency=medium
+
+ * New upstream release (LP: #1662805)
+ * libmutter0 has been renamed upstream to libmutter-0-0
+ * Rename libmutter-dev to libmutter-0-dev too
+ * debian/control.in:
+ - Drop obsolete Conflicts/Replaces now that the library
+ uses different file names
+ * Drop patches applied in new release:
+ - git_dont_set_unavailable_scroll_methods.patch
+ - git_flush_all_swap_notifies_on_idle.patch
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Thu, 16 Feb 2017 05:14:28 -0500
mutter (3.22.2-3) unstable; urgency=medium
Modified: desktop/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control?rev=52315&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control [utf-8] (original)
+++ desktop/experimental/mutter/debian/control [utf-8] Tue Apr 4 07:56:12 2017
@@ -6,7 +6,7 @@
Section: x11
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 10),
gnome-pkg-tools (>= 0.10),
gtk-doc-tools (>= 1.15),
@@ -62,7 +62,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- mutter-common (= ${source:Version}),
+ mutter-common (>= ${source:Version}),
gsettings-desktop-schemas (>= 3.21.4),
zenity
Provides: x-window-manager
@@ -80,7 +80,7 @@
.
This package contains the core binaries.
-Package: libmutter0i
+Package: libmutter-0-0
Section: libs
Architecture: any
Multi-Arch: same
@@ -88,25 +88,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
gsettings-desktop-schemas (>= 3.15.92),
- mutter-common (= ${source:Version})
-Conflicts: libmutter0,
- libmutter0a,
- libmutter0b,
- libmutter0c,
- libmutter0d,
- libmutter0e,
- libmutter0f,
- libmutter0g,
- libmutter0h
-Replaces: libmutter0,
- libmutter0a,
- libmutter0b,
- libmutter0c,
- libmutter0d,
- libmutter0e,
- libmutter0f,
- libmutter0g,
- libmutter0h
+ mutter-common (>= ${source:Version})
Description: window manager library from the Mutter window manager
Mutter is a small window manager, using GTK+ and Clutter to do
everything.
@@ -135,13 +117,13 @@
.
This package contains the shared files.
-Package: libmutter-dev
+Package: libmutter-0-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- libmutter0i (= ${binary:Version}),
- gir1.2-mutter-3.0 (= ${binary:Version}),
+ libmutter-0-0 (= ${binary:Version}),
+ gir1.2-mutter-0 (= ${binary:Version}),
gsettings-desktop-schemas-dev,
libgtk-3-dev,
libcairo2-dev,
@@ -175,14 +157,14 @@
.
This package contains the development files.
-Package: gir1.2-mutter-3.0
+Package: gir1.2-mutter-0
Section: introspection
Architecture: any
Multi-Arch: same
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends},
- libmutter0i (= ${binary:Version})
+ libmutter-0-0 (= ${binary:Version})
Breaks: gnome-shell (<< 3.13.92~)
Description: GObject introspection data for Mutter
Mutter is a small window manager, using GTK+ and Clutter to do
Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=52315&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in [utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in [utf-8] Tue Apr 4 07:56:12 2017
@@ -58,7 +58,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- mutter-common (= ${source:Version}),
+ mutter-common (>= ${source:Version}),
gsettings-desktop-schemas (>= 3.21.4),
zenity
Provides: x-window-manager
@@ -76,7 +76,7 @@
.
This package contains the core binaries.
-Package: libmutter0i
+Package: libmutter-0-0
Section: libs
Architecture: any
Multi-Arch: same
@@ -84,25 +84,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
gsettings-desktop-schemas (>= 3.15.92),
- mutter-common (= ${source:Version})
-Conflicts: libmutter0,
- libmutter0a,
- libmutter0b,
- libmutter0c,
- libmutter0d,
- libmutter0e,
- libmutter0f,
- libmutter0g,
- libmutter0h
-Replaces: libmutter0,
- libmutter0a,
- libmutter0b,
- libmutter0c,
- libmutter0d,
- libmutter0e,
- libmutter0f,
- libmutter0g,
- libmutter0h
+ mutter-common (>= ${source:Version})
Description: window manager library from the Mutter window manager
Mutter is a small window manager, using GTK+ and Clutter to do
everything.
@@ -131,13 +113,13 @@
.
This package contains the shared files.
-Package: libmutter-dev
+Package: libmutter-0-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- libmutter0i (= ${binary:Version}),
- gir1.2-mutter-3.0 (= ${binary:Version}),
+ libmutter-0-0 (= ${binary:Version}),
+ gir1.2-mutter-0 (= ${binary:Version}),
gsettings-desktop-schemas-dev,
libgtk-3-dev,
libcairo2-dev,
@@ -171,14 +153,14 @@
.
This package contains the development files.
-Package: gir1.2-mutter-3.0
+Package: gir1.2-mutter-0
Section: introspection
Architecture: any
Multi-Arch: same
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends},
- libmutter0i (= ${binary:Version})
+ libmutter-0-0 (= ${binary:Version})
Breaks: gnome-shell (<< 3.13.92~)
Description: GObject introspection data for Mutter
Mutter is a small window manager, using GTK+ and Clutter to do
Added: desktop/experimental/mutter/debian/gir1.2-mutter-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/gir1.2-mutter-0.install?rev=52315&op=file
==============================================================================
--- desktop/experimental/mutter/debian/gir1.2-mutter-0.install (added)
+++ desktop/experimental/mutter/debian/gir1.2-mutter-0.install [utf-8] Tue Apr 4 07:56:12 2017
@@ -0,0 +1 @@
+usr/lib/*/mutter/*.typelib
Added: desktop/experimental/mutter/debian/libmutter-0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/libmutter-0-0.install?rev=52315&op=file
==============================================================================
--- desktop/experimental/mutter/debian/libmutter-0-0.install (added)
+++ desktop/experimental/mutter/debian/libmutter-0-0.install [utf-8] Tue Apr 4 07:56:12 2017
@@ -0,0 +1,2 @@
+usr/lib/*/libmutter-0.so.*
+usr/lib/*/mutter/*.so
Added: desktop/experimental/mutter/debian/libmutter-0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/libmutter-0-dev.install?rev=52315&op=file
==============================================================================
--- desktop/experimental/mutter/debian/libmutter-0-dev.install (added)
+++ desktop/experimental/mutter/debian/libmutter-0-dev.install [utf-8] Tue Apr 4 07:56:12 2017
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
+usr/lib/*/mutter/*.gir
Added: desktop/experimental/mutter/debian/patches/git_revert_call_threaded_swap.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/git_revert_call_threaded_swap.patch?rev=52315&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/git_revert_call_threaded_swap.patch (added)
+++ desktop/experimental/mutter/debian/patches/git_revert_call_threaded_swap.patch [utf-8] Tue Apr 4 07:56:12 2017
@@ -0,0 +1,49 @@
+From 383ba566bd7c2a76d0856015a66e47caedef06b6 Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor at fishsoup.net>
+Date: Tue, 21 Feb 2017 13:51:16 -0500
+Subject: Call cogl_xlib_renderer_set_threaded_swap_wait_enabled()
+
+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().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779039
+---
+ src/backends/x11/meta-backend-x11.c | 6 ------
+ src/backends/x11/meta-renderer-x11.c | 8 --------
+ 2 files changed, 14 deletions(-)
+
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -605,12 +605,6 @@ meta_backend_x11_class_init (MetaBackend
+ static void
+ meta_backend_x11_init (MetaBackendX11 *x11)
+ {
+- /* XInitThreads() is needed to use the "threaded swap wait" functionality
+- * in Cogl - see meta_renderer_x11_create_cogl_renderer(). We call it here
+- * to hopefully call it before any other use of XLib.
+- */
+- XInitThreads();
+-
+ clutter_x11_request_reset_on_video_memory_purge ();
+
+ /* We do X11 event retrieval ourselves */
+--- a/src/backends/x11/meta-renderer-x11.c
++++ b/src/backends/x11/meta-renderer-x11.c
+@@ -66,14 +66,6 @@ meta_renderer_x11_create_cogl_renderer (
+ 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;
+ }
+
Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=52315&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series [utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series [utf-8] Tue Apr 4 07:56:12 2017
@@ -1,2 +1,2 @@
bgo768531_workaround-startup-notifications.patch
-clutter-clone-Unset-source-when-source-actor-is-dest.patch
+git_revert_call_threaded_swap.patch
Modified: desktop/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/rules?rev=52315&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/rules [utf-8] (original)
+++ desktop/experimental/mutter/debian/rules [utf-8] Tue Apr 4 07:56:12 2017
@@ -12,6 +12,7 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFFLAGS = \
+ --enable-egl-device \
--enable-wayland \
--enable-native-backend
else
@@ -37,7 +38,7 @@
dh_girepository /usr/lib/$(DEB_HOST_MULTIARCH)/mutter
override_dh_makeshlibs:
- dh_makeshlibs -V'libmutter0i (>= 3.21.0)'
+ dh_makeshlibs -V'libmutter-0-0 (>= 3.23.3)'
override_dh_strip:
dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)'
More information about the pkg-gnome-commits
mailing list