xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xwin/winmultiwindowwindow.c |    2 +-
 meson.build                    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 06901e12c07691112b91b26b0c2000f8971e48b5
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Jun 4 13:25:45 2020 +0100

    meson: Also ignore kms, kms_udev, hal options on Cygwin

diff --git a/meson.build b/meson.build
index d9535fb86..136456710 100644
--- a/meson.build
+++ b/meson.build
@@ -164,7 +164,7 @@ glamor_option = get_option('glamor')
 
 build_udev = get_option('udev')
 build_udev_kms = get_option('udev_kms')
-if host_machine.system() == 'windows' or host_machine.system() == 'darwin'
+if ['windows',  'darwin', 'cygwin'].contains(host_machine.system())
     build_udev = false
     build_udev_kms = false
     hal_option = 'false'
commit 4c2d1fe0454ca2b7c13e600a31f6733705c1c7b9
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Jul 29 20:32:49 2020 +0100

    hw/xwin: Update for renames in xserver/output API
    
    Update commit ea47af87 renaming master_pixmap to primary_pixmap in
    struct PixmapRec.

diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index b3bdb6b23..5b9b74e3d 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -1070,7 +1070,7 @@ winCreatePixmapMultiwindow(ScreenPtr pScreen, int width, int height, int depth,
     pPixmap->devKind = paddedwidth;
     pPixmap->refcnt = 1;
     pPixmap->devPrivate.ptr = NULL; // later set to pbBits
-    pPixmap->master_pixmap = NULL;
+    pPixmap->primary_pixmap = NULL;
 #ifdef COMPOSITE
     pPixmap->screen_x = 0;
     pPixmap->screen_y = 0;