Merge ~3v1n0/ubuntu/+source/mutter:ubuntu/eoan into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/eoan

[Marco Trevisan (Treviño)]

diff --git a/NEWS b/NEWS
index da99622..38e94df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+3.34.3
+======
+* Fix window recording on HiDPI [Pascal; !976]
+* Fix top-left pixel being insensitive to clicks [Sebastian; #893]
+
+Contributors:
+  Sebastian Keller, Pascal Nowack
+
 3.34.2
 ======
 * Fix immediate screen blank after releasing inhibitor [Tim; #573]
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index c4b88b3..06eb9dd 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -486,9 +486,9 @@ is_inside_axis_aligned_rectangle (const ClutterPoint *point,
                                   const ClutterPoint *vertices)
 {
   float min_x = FLT_MAX;
-  float max_x = FLT_MIN;
+  float max_x = -FLT_MAX;
   float min_y = FLT_MAX;
-  float max_y = FLT_MIN;
+  float max_y = -FLT_MAX;
   int i;
 
   for (i = 0; i < 3; i++)
diff --git a/debian/changelog b/debian/changelog
index c5753d3..7ae3180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+mutter (3.34.3-1ubuntu1~19.10.1) UNRELEASED; urgency=medium
+
+  * Backport to eoan (LP: #1858683)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 07 Jan 2020 20:12:12 +0100
+
+mutter (3.34.3-1ubuntu1) focal; urgency=medium
+
+  * Merge with debian. Remaining changes:
+    + debian/control:
+      - Update VCS flags to point to launchpad
+    + debian/gbp.conf: update branch to point to ubuntu/master
+    + debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+      - X11: Add support for fractional scaling using Randr
+
+ -- Iain Lane <[e-mail]>  Mon, 06 Jan 2020 17:56:09 +0000
+
+mutter (3.34.3-1) unstable; urgency=medium
+
+  * New upstream release
+    + Fix window recording on HiDPI
+    + Fix top-left pixel being insensitive to clicks (LP: #1849135)
+
+ -- Iain Lane <[e-mail]>  Mon, 06 Jan 2020 13:39:48 +0000
+
+mutter (3.34.2-2ubuntu1) focal; urgency=medium
+
+  * Merge with debian. Remaining changes:
+    + debian/control:
+      - Update VCS flags to point to launchpad
+    + debian/gbp.conf: update branch to point to ubuntu/master
+    + debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+      - X11: Add support for fractional scaling using Randr
+
+ -- Iain Lane <[e-mail]>  Sun, 22 Dec 2019 17:24:36 +0000
+
+mutter (3.34.2-2) unstable; urgency=medium
+
+  * d/p/EGL-Include-EGL-eglmesaext.h.patch: Cherry pick from master. This
+    fixes the generated EGL includes for the move of exlext.h from mesa to
+    libglvnd, which has just happened in Debian.
+
+ -- Iain Lane <[e-mail]>  Sun, 22 Dec 2019 15:42:09 +0000
+
 mutter (3.34.2-1ubuntu1~19.10.1) eoan; urgency=medium
 
   * Backport to eoan.
diff --git a/debian/patches/EGL-Include-EGL-eglmesaext.h.patch b/debian/patches/EGL-Include-EGL-eglmesaext.h.patch
new file mode 100644
index 0000000..4efad61
--- /dev/null
+++ b/debian/patches/EGL-Include-EGL-eglmesaext.h.patch
@@ -0,0 +1,67 @@
+From: "Jan Alexander Steffens (heftig)" <[e-mail]>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+
+Origin: upstream, commit:a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90
+Applied-Upstream: 3.35.2
+---
+ cogl/cogl/meson.build       | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 1057ef9..9a64294 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d..db0b74f 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be9..fdeff4f 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a8164..4591e7d 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
diff --git a/debian/patches/series b/debian/patches/series
index 8590a4e..a3ecc5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+EGL-Include-EGL-eglmesaext.h.patch
 theme-use-gtk_render_icon_suface-to-paint-button-icon.patch
 theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
 meson-add-back-default_driver-option.patch
diff --git a/meson.build b/meson.build
index efea15c..036cc8d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('mutter', 'c',
-  version: '3.34.2',
+  version: '3.34.3',
   meson_version: '>= 0.50.0',
   license: 'GPLv2+'
 )
diff --git a/src/backends/meta-screen-cast-window-stream.c b/src/backends/meta-screen-cast-window-stream.c
index 50d1806..b9a732c 100644
--- a/src/backends/meta-screen-cast-window-stream.c
+++ b/src/backends/meta-screen-cast-window-stream.c
@@ -226,11 +226,15 @@ meta_screen_cast_window_stream_initable_init (GInitable     *initable,
                               G_CALLBACK (on_window_unmanaged),
                               window_stream);
 
+  if (meta_is_stage_views_scaled ())
+    scale = (int) ceilf (meta_logical_monitor_get_scale (logical_monitor));
+  else
+    scale = 1;
+
   /* We cannot set the stream size to the exact size of the window, because
    * windows can be resized, whereas streams cannot.
    * So we set a size equals to the size of the logical monitor for the window.
    */
-  scale = (int) ceil (meta_logical_monitor_get_scale (logical_monitor));
   window_stream->logical_width = logical_monitor->rect.width;
   window_stream->logical_height = logical_monitor->rect.height;
   window_stream->stream_width = logical_monitor->rect.width * scale;