CVS commit: pkgsrc/x11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 15 23:35:00 UTC 2021

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile.common distinfo
        pkgsrc/x11/modular-xorg-server/patches: patch-configure
        pkgsrc/x11/modular-xorg-xwayland: Makefile

Log Message:
modular-xorg-*: update to 1.20.14

Mario Kleiner (2):
      Fix RandR leasing for more than 1 simultaneously active lease.
      modesetting: Allow Present flips with mismatched stride on atomic drivers.

Matt Turner (1):
      xserver 1.20.14

Povilas Kanapickas (4):
      record: Fix out of bounds access in SwapCreateRegister()
      xfixes: Fix out of bounds access in *ProcXFixesCreatePointerBarrier()
      Xext: Fix out of bounds access in SProcScreenSaverSuspend()
      render: Fix out of bounds access in SProcRenderCompositeGlyphs()


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.115 -r1.116 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/x11/modular-xorg-server/patches/patch-configure
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/modular-xorg-xwayland/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.46 pkgsrc/x11/modular-xorg-server/Makefile.common:1.47
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.46 Tue Nov  2 08:20:31 2021
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Wed Dec 15 23:35:00 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.46 2021/11/02 08:20:31 nia Exp $
+# $NetBSD: Makefile.common,v 1.47 2021/12/15 23:35:00 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
 
-XORG_VERSION=  1.20.13
+XORG_VERSION=  1.20.14
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.115 pkgsrc/x11/modular-xorg-server/distinfo:1.116
--- pkgsrc/x11/modular-xorg-server/distinfo:1.115       Tue Oct 26 11:34:15 2021
+++ pkgsrc/x11/modular-xorg-server/distinfo     Wed Dec 15 23:35:00 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.115 2021/10/26 11:34:15 nia Exp $
+$NetBSD: distinfo,v 1.116 2021/12/15 23:35:00 wiz Exp $
 
-BLAKE2s (xorg-server-1.20.13.tar.xz) = d5fd79e44b64fb79506673ab2a851b2bfad0ee5dd1bbb6477f645ca05237a9fc
-SHA512 (xorg-server-1.20.13.tar.xz) = 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3
-Size (xorg-server-1.20.13.tar.xz) = 5122260 bytes
-SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82
+BLAKE2s (xorg-server-1.20.14.tar.xz) = 207f7e9d968765e4ee9d916007fdd32827ed33516b2457b83002b709476e8319
+SHA512 (xorg-server-1.20.14.tar.xz) = be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
+Size (xorg-server-1.20.14.tar.xz) = 5178288 bytes
+SHA1 (patch-configure) = b1badceba5a38df6ee898fd1d103d5722986a120
 SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92

Index: pkgsrc/x11/modular-xorg-server/patches/patch-configure
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.6 pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.7
--- pkgsrc/x11/modular-xorg-server/patches/patch-configure:1.6  Sun Apr 25 07:51:27 2021
+++ pkgsrc/x11/modular-xorg-server/patches/patch-configure      Wed Dec 15 23:35:00 2021
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.6 2021/04/25 07:51:27 mrg Exp $
+$NetBSD: patch-configure,v 1.7 2021/12/15 23:35:00 wiz Exp $
 
 Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
 (c.f. patch-hw_xfree86_os-support_bsd_i386.c)
 
 for netbsd, force pass pthread configure checks (pthread not needed)
 
---- configure.orig     2020-01-13 22:57:18.000000000 +0000
+--- configure.orig     2021-12-15 19:01:32.000000000 +0000
 +++ configure
-@@ -23146,7 +23146,7 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
+@@ -24634,7 +24634,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1" 
        esac
        GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
        ;;
@@ -16,16 +16,16 @@ for netbsd, force pass pthread configure
        ARM_VIDEO=yes
        DEFAULT_INT10="stub"
        ;;
-@@ -23188,7 +23188,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
- $as_echo "#define USE_DEV_IO 1" >>confdefs.h
+@@ -24676,7 +24676,7 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
+ printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
   ;;
                *netbsd*)
--$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
-+$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h
+-printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h
++printf "%s\n" "#define USE_AMD64_IOPL 1" >>confdefs.h
  
                                SYS_LIBS=-lx86_64
                                ;;
-@@ -25010,7 +25010,8 @@ case ${host_os} in
+@@ -26605,7 +26605,8 @@ case ${host_os} in
        netbsd*)
        # use libc stubs, don't link against libpthread, to allow
        # dynamic loading

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.11 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.12
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.11      Wed Dec  8 16:07:10 2021
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Wed Dec 15 23:35:00 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2021/12/08 16:07:10 adam Exp $
+# $NetBSD: Makefile,v 1.12 2021/12/15 23:35:00 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
-PKGREVISION=   1
 
 .include "../../devel/wayland/platform.mk"