Wed Jan 15 14:24:04 2020 UTC ()
modular-xorg-server: update to 1.20.7.

A variety of bugfixes, primarily in modesetting, glamor, and Solaris
support. This release also contains support for choosing the DRI driver
via EGL_MESA_query_driver. Thanks to all who contributed with testing
and fixes!

Aaron Plattner (1):
     modesetting: Check whether RandR was initialized before calling rrGetScrPriv

Alan Coopersmith (5):
     os-support/solaris: Drop ExtendedEnabled global variable
     Add ddxInputThread call from os layer into ddx layer
     Add xf86OSInputThreadInit call from common layer into os-support layer
     os-support/solaris: Set IOPL for input thread too
     ospoll: Fix Solaris ports implementation to build on Solaris 11.4

Kenneth Graunke (2):
     glamor: Add a function to get the driver name via EGL_MESA_query_driver
     modesetting: Use EGL_MESA_query_driver to select DRI driver if possible

Matt Turner (1):
     xserver 1.20.7

Michel Dè¾°nzer (5):
     modesetting: Call glamor_finish from drmmode_crtc_set_mode
     xfree86/modes: Call xf86RotateRedisplay from xf86CrtcRotate
     modesetting: Clear new screen pixmap storage on RandR resize
     xwayland: Do flush GPU work in xwl_present_flush
     glamor: Only use dual blending with GLSL >= 1.30

Peter Hutterer (1):
     Xi: return AlreadyGrabbed for key grabs > 255


(wiz)
diff -r1.124 -r1.125 pkgsrc/x11/modular-xorg-server/Makefile
diff -r1.32 -r1.33 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.98 -r1.99 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.21 -r1.22 pkgsrc/x11/modular-xorg-server/options.mk
cvs diff -r1.124 -r1.125 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2019/12/10 17:27:05 1.124
+++ pkgsrc/x11/modular-xorg-server/Makefile 2020/01/15 14:24:03 1.125
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.124 2019/12/10 17:27:05 nia Exp $ 1# $NetBSD: Makefile,v 1.125 2020/01/15 14:24:03 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5PKGREVISION= 1 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modular X11 server from modular X.org 7COMMENT= Modular X11 server from modular X.org
9 8
10SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
11 10
12NOT_FOR_PLATFORM= Darwin-*-* 11NOT_FOR_PLATFORM= Darwin-*-*
13 12
14.include "Makefile.common" 13.include "Makefile.common"
15 14
16CONFIGURE_ARGS+= --enable-xorg 15CONFIGURE_ARGS+= --enable-xorg
17CONFIGURE_ARGS+= --disable-xephyr 16CONFIGURE_ARGS+= --disable-xephyr
18CONFIGURE_ARGS+= --disable-xwayland 17CONFIGURE_ARGS+= --disable-xwayland
cvs diff -r1.32 -r1.33 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2019/11/26 10:02:42 1.32
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2020/01/15 14:24:03 1.33
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.32 2019/11/26 10:02:42 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.33 2020/01/15 14:24:03 wiz Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4# used by x11/modular-xorg-xwayland/Makefile 4# used by x11/modular-xorg-xwayland/Makefile
5 5
6XORG_VERSION= 1.20.6 6XORG_VERSION= 1.20.7
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
18 18
19PKGCONFIG_OVERRIDE+= xorg-server.pc.in 19PKGCONFIG_OVERRIDE+= xorg-server.pc.in
cvs diff -r1.98 -r1.99 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2019/12/10 17:27:05 1.98
+++ pkgsrc/x11/modular-xorg-server/distinfo 2020/01/15 14:24:03 1.99
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.98 2019/12/10 17:27:05 nia Exp $ 1$NetBSD: distinfo,v 1.99 2020/01/15 14:24:03 wiz Exp $
2 2
3SHA1 (xorg-server-1.20.6.tar.bz2) = 59473e72136113f3a35b1ab5a5cfcbcad955b660 3SHA1 (xorg-server-1.20.7.tar.bz2) = 11d048431dc7582898628149ca3a758008b7d50b
4RMD160 (xorg-server-1.20.6.tar.bz2) = bd0910e7ac3a346df13ef1957effea037c42d98f 4RMD160 (xorg-server-1.20.7.tar.bz2) = 6dbe9b9f29ff89a84276d76a269321baa706b23f
5SHA512 (xorg-server-1.20.6.tar.bz2) = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 5SHA512 (xorg-server-1.20.7.tar.bz2) = c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
6Size (xorg-server-1.20.6.tar.bz2) = 6298697 bytes 6Size (xorg-server-1.20.7.tar.bz2) = 6303005 bytes
7SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f 7SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f
8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
14SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 14SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
16SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 16SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
17SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 17SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
18SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 18SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
19SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0 19SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
cvs diff -r1.21 -r1.22 pkgsrc/x11/modular-xorg-server/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/options.mk 2019/08/22 19:52:29 1.21
+++ pkgsrc/x11/modular-xorg-server/options.mk 2020/01/15 14:24:03 1.22
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.21 2019/08/22 19:52:29 nia Exp $ 1# $NetBSD: options.mk,v 1.22 2020/01/15 14:24:03 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
4PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace 4PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace
5PKG_SUGGESTED_OPTIONS= inet6 dri 5PKG_SUGGESTED_OPTIONS= inet6 dri
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= dri dtrace wayland 9PLIST_VARS+= dri dtrace
10 10
11.if !empty(PKG_OPTIONS:Mdri) 11.if !empty(PKG_OPTIONS:Mdri)
12.include "../../graphics/libepoxy/buildlink3.mk" 12.include "../../graphics/libepoxy/buildlink3.mk"
13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11 13BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
14.include "../../graphics/MesaLib/buildlink3.mk" 14.include "../../graphics/MesaLib/buildlink3.mk"
15.include "../../x11/xorgproto/buildlink3.mk" 15.include "../../x11/xorgproto/buildlink3.mk"
16.include "../../x11/libdrm/buildlink3.mk" 16.include "../../x11/libdrm/buildlink3.mk"
17.include "../../x11/libxshmfence/buildlink3.mk" 17.include "../../x11/libxshmfence/buildlink3.mk"
18PLIST.dri= yes 18PLIST.dri= yes
19CONFIGURE_ARGS+= --enable-dri 19CONFIGURE_ARGS+= --enable-dri
20CONFIGURE_ARGS+= --enable-dri2 20CONFIGURE_ARGS+= --enable-dri2
21CONFIGURE_ARGS+= --enable-dri3 21CONFIGURE_ARGS+= --enable-dri3
22CONFIGURE_ARGS+= --enable-glx 22CONFIGURE_ARGS+= --enable-glx