MAINTAINERS: update data

- Mark all projects that have been archived in gitlab as Obsolete
- Mark unarchived projects that haven't had a new release in many years
  and drivers that don't build for current Xorg as Deactivated
- Add new projects: libXpresent, libxshmfence, libxcvt, xf86-input-libinput,
  xf86-video-amdgpu, xf86-video-freedreno, xf86-video-nouveau, xf86-video-vbox,
  xorgproto
- Add new entries for old projects: fdclock, glxcompmgr, grandr, luit,
  mkfontdir, scripts, xdbedizzy, xf86dga, xfindproxy, xoo, xphelloworld,
  xplsprinters, xprehashprinterlist, Xaw3d, xf86-video-armsoc, xf86-video-avivo,
  xf86-video-impact, xf86-video-opentegra, xf86-video-vermilion,
  fonts/bitstream-speedo, tests/*, proto/*proto
- Add entries for XCB projects that merged into the xorg namespace in gitlab
- Move twm entry from libraries section to app section
- Add new subsystems of Xserver tree: Xorg, Xwayland, Xvfb, Xnest, Glamor
- Add X.Org Foundation & gitlab entries under "Developer relations & services"
- Add IRC & gitlab info to many projects
- Add subdirectory info to X server subsystem entries
- Add "all subsystems" entry for data common to all parts of the X server
- Mark DMX & XAA subsystems of the X server as Removed from the codebase
- Change SCO & USL ports from Maintained to Unmaintained

Changes to Maintainers:
- Removed @anholt from all projects per private email conversation
- List @contactshashanksharma in new entry for xf86-video-amdgpu
- Stop claiming @daniels is working on an overhaul of XKB
- List @imirkin for newly added xf86-video-nouveau
- List @keithp for newly added libXpresent & libxshmfence
- Update email addresss for @keithp from intel.com to keithp.com
- List @ofourdan in new entries for libxcvt, Xwayland
- List @whot in new entry for xf86-input-libinput
- Change website maintainer from Stuart Anderson to sitewranglers@fd.o

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 291 insertions, 98 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 098b023..bca63d3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -40,17 +40,18 @@ F: Files and directories wildcard patterns.
 X: Excluded files and directories that are NOT maintained
    One pattern per line.  Multiple F: lines acceptable.
 
+Please use gitlab to submit issue reports & merge requests for all projects
+that use gitlab.
+
 For patch submission instructions, see:
 	https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
-Send all patches for modules without a specific maintainer address listed
-to xorg-devel@lists.x.org
-
 Misc. core code
 ---------------
 DRM library
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
+C:	irc://irc.oftc.net/dri-devel
 T:	https://gitlab.freedesktop.org/mesa/drm
 S:	Maintained
 
@@ -64,17 +65,26 @@ X.Org apps
 ---------------
 
 beforelight
+fdclock
+glxcompmgr
+grandr
 S:	Obsolete
 
 lbxproxy
 S:	Obsolete - use ssh X forwarding + compression instead
 
+luit
+S:	Obsolete - use http://invisible-island.net/luit/ instead.
+
 makepsres
 S:	Obsolete - DPS support has been dropped
 
 mkcfm
 S:	Obsolete - CID font support has been dropped
 
+mkfontdir
+S:	Merged into mkfontscale
+
 pclcomp
 S:	Obsolete - only used by Xprint
 
@@ -84,6 +94,16 @@ S:	Obsolete
 rstart
 S:	Obsolete - use ssh instead
 
+scripts
+T:	https://gitlab.freedesktop.org/xorg/app/scripts
+S:	Deactivated
+
+twm
+M:	Thomas E. Dickey <dickey@his.com>
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/app/twm
+S:	Maintained
+
 xauth
 M:	Dr. Tilmann Bubeck <t.bubeck@reinform.de>
 L:	xorg-devel@lists.x.org
@@ -114,6 +134,9 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/app/xconsole
 S:	Maintained
 
+xdbedizzy
+S:	Obsolete
+
 xdm
 M:	?
 L:	xorg-devel@lists.x.org
@@ -126,6 +149,14 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/app/xedit
 S:	Maintained
 
+xf86dga
+T:	https://gitlab.freedesktop.org/xorg/app/xf86dga
+S:	Deactivated
+
+xfindproxy
+T:	https://gitlab.freedesktop.org/xorg/app/xfindproxy
+S:	Deactivated
+
 xinput
 M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
@@ -137,7 +168,6 @@ M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/app/xkbcomp
 S:	Maintained
-S:	XKB being overhauled
 S:	Please contact Daniel if you're planning to work on this
 
 xload
@@ -161,6 +191,12 @@ S:	Maintained
 xmh
 S:	Obsolete - use exmh instead
 
+xoo
+S:	Obsolete
+
+xphelloworld, xplsprinters, xprehashprinterlist
+S:	Obsolete - they require XPRINT which is obsolete
+
 xrx
 S:	Obsolete - all major browsers have dropped NSAPI plugin support now
 
@@ -177,7 +213,7 @@ T:	https://gitlab.freedesktop.org/xorg/app/xsetroot
 S:	Maintained
 
 xtrap
-S:	Obsolete
+S:	Obsolete - server side removed in xorg-server 1.6 & later
 
 all others
 M:	?
@@ -191,10 +227,11 @@ X.Org libraries
 FS
 ICE
 SM
-WindowsWM
 XRes
 XScrnSaver
 Xau
+Xaw3d
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Unmaintained
 
 AppleWM
@@ -203,15 +240,41 @@ L:	xquartz-dev@lists.macosforge.org
 W:	https://www.xquartz.org/
 L:	xorg-devel@lists.x.org
 W:	https://wiki.x.org
+T:	https://gitlab.freedesktop.org/xorg/lib/libapplewm
 S:	Maintained
 
-X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender
-M:	Keith Packard <keith.packard@intel.com>
+WindowsWM
+S:	Obsolete
+
+X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xpresent, Xrandr, Xrender, xshmfence
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Maintained
 
+XCB (libxcb, xcbproto)
+M:	?
+L:	xcb@lists.freedesktop.org
+W:	https://xcb.freedesktop.org/
+T:	https://gitlab.freedesktop.org/xorg/lib/libxcb
+T:	https://gitlab.freedesktop.org/xorg/proto/xcbproto
+S:	Maintained
+
+XCB Utils (libxcb-*)
+M:	?
+L:	xcb@lists.freedesktop.org
+W:	https://xcb.freedesktop.org/
+T:	https://gitlab.freedesktop.org/xorg/lib/
+S:	Unmaintained
+
+xcvt
+M:	Olivier Fourdan <ofourdan@redhat.com>
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/lib/libxcvt
+S:	Maintained
+
 Xdmcp
+T:	https://gitlab.freedesktop.org/xorg/lib/libxdmcp
 S:	Unmaintained
 
 Xevie
@@ -219,6 +282,7 @@ S:	Obsolete
 
 Xext
 Xfont
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Unmaintained
 
 Xfontcache
@@ -226,6 +290,7 @@ S:	Obsolete
 
 Xft
 Xinerama
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Unmaintained
 
 Xi
@@ -239,7 +304,6 @@ M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/lib/libxkbfile
 S:	Maintained
-S:	XKB being overhauled
 S:	Please contact Daniel if you're planning to work on this
 
 xkbui
@@ -247,6 +311,7 @@ S:	Obsolete
 
 Xmu
 Xpm
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Unmaintained
 
 Xp
@@ -256,7 +321,7 @@ S:	maintained solely for binary compatibility for software like Motif
 XprintAppUtil, XprintUtil
 S:	Obsolete
 
-Xt, Xaw, twm
+Xt, Xaw
 M:	Thomas E. Dickey <dickey@his.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/lib/libxt
@@ -266,6 +331,7 @@ Xtst
 Xv
 XvMC
 Xxf86dga
+T:	https://gitlab.freedesktop.org/xorg/lib
 S:	Unmaintained
 
 Xxf86misc
@@ -273,12 +339,22 @@ Xxf86rush
 S:	Obsolete
 
 Xxf86vm
+T:	https://gitlab.freedesktop.org/xorg/lib/libxxf86vm
+S:	Unmaintained
+
 dmx
+S:	Obsolete - Xdmx removed from xorg-server 21 & later releases
+
 fontenc
+T:	https://gitlab.freedesktop.org/xorg/lib/libfontenc
 S:	Unmaintained
 
 lbxutil
-S:	Obsolete
+S:	Obsolete - LBX removed from xorg-server 1.2 & later releases
+
+pthread-stubs
+T:	https://gitlab.freedesktop.org/xorg/lib/pthread-stubs
+S:	Unmaintained
 
 oldX
 S:	Obsolete - use libX11 instead
@@ -286,85 +362,98 @@ S:	Obsolete - use libX11 instead
 XTrap
 S:	Obsolete - use libXtst instead
 
+xpyb
+S:	Obsolete - use https://github.com/tych0/xcffib instead
+
 xtrans
 M:	Bill Crawford <billcrawford1970@gmail.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/lib/libxtrans
 S:	Maintained
 
-X.Org core
-----------
+Xserver core
+------------
+All subsystems
+C:	irc://irc.oftc.net/xorg-devel
+W:	https://wiki.x.org
+T:	https://gitlab.freedesktop.org/xorg/xserver
+
 Composite extension
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	composite
 
 Configuration subsystem
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 Damage extension
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	damageext
 
 Device Independent X (DIX)
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	dix
 
 DRI subsystem
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	hw/xfree86/dri*
+F:	dri3
 
 EXA subsystem
-M:	Eric Anholt <anholt@freebsd.org>
+M:	?
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	exa
+
+Glamor subsystem
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained
+F:	glamor
 
 GL subsystem
 M:	Ian Romanick <idr@us.ibm.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	GL
 
 KDrive
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	hw/kdrive
 
 Loader subsystem
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	hw/xfree86/loader
 
 Randr extension
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	randr
 
 Render extension
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	render
 
 XAA subsystem
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Despised
+S:	Removed in xorg-server 1.13 and later
 
 XACE subsystem (security policy extensions framework)
 M:	Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -373,69 +462,91 @@ W:	http://people.freedesktop.org/~ewalsh/xace_proposal.html
 S:	Maintained
 
 Xfixes extension
-M:	Keith Packard <keith.packard@intel.com>
+M:	Keith Packard <keithp@keithp.com>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
+F:	xfixes
 
 XKB
 M:	Daniel Stone <daniel@fooishbar.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Maintained, being seriously overhauled
+S:	Maintained
 S:	Please contact Daniel if you're planning to work on this
+F:	xkb
 
 Input subsystem
 M:	Daniel Stone <daniel@fooishbar.org>
 M:	Peter Hutterer <peter.hutterer@who-t.net>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Maintained, being overhauled
-S:	Please contact Daniel or Peter if you're planning to work on this
+S:	Maintained
+F:	Xi
+
+Xorg server
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Maintained, for now
+F:	hw/xfree86
+
+Xwayland server
+M:	Olivier Fourdan <ofourdan@redhat.com>
+L:	wayland-devel@lists.freedesktop.org
+W:	https://wayland.freedesktop.org/xserver.html
+S:	Maintained
+F:	hw/xwayland
+
+Xvfb server
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+F:	hw/vfb
+
+Xnest server
+M:	?
+L:	xorg-devel@lists.x.org
+S:	Unmaintained
+F:	hw/xnest
+
+Xdmx server & DMX subsystem/tools
+S:	Removed from xorg-server 21 & later releases
+F:	hw/dmx
 
 Xprint
 M:	Drew Parsons
 M:	Felix Schulte
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/xserver-xprint
-S:	Deactivated
+S:	Obsolete - use other printing APIs instead
 
 X.Org OS ports
 --------------
 FreeBSD
-M:	Eric Anholt <anholt@freebsd.org>
+M:	?
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Maintained
+S:	Unmaintained
 
 Linux/i386
 M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 Linux/x86_64
 M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ia64
 M:	Jesse Barnes <jbarnes@virtuousgeek.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ppc
 M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 Linux/sparc
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Unmaintained
 
 LynxOS
@@ -446,34 +557,29 @@ M:	Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 L:	xquartz-dev@lists.macosforge.org
 W:	https://www.xquartz.org/
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 NetBSD
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Unmaintained
 
 OpenBSD
 M:	Matthieu Herrb <matthieu.herrb@laas.fr>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Maintained
 
 SCO (OpenServer 5)
 M:	Kean Johnston <jkj@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Maintained
+S:	Unmaintained
 
 System V (other than Solaris & SCO)
 M:	?
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
 S:	Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server)
 
-Solaris (x86 & sparc)
+Solaris (x86 & sparc) & illumos
 M:	Alan Coopersmith <alan.coopersmith@oracle.com>
 M:	Niveditha Rau <niveditha.rau@oracle.com>
 L:	xorg-devel@lists.x.org
@@ -483,8 +589,7 @@ S:	Maintained
 USL (UnixWare 7.1.x, OpenServer 6)
 M:	Kean Johnston <jkj@freedesktop.org>
 L:	xorg-devel@lists.x.org
-W:	https://wiki.x.org
-S:	Maintained
+S:	Unmaintained
 
 Cygwin
 M:	Jon TURNEY <jon.turney@dronecode.org.uk>
@@ -500,7 +605,6 @@ S:	Maintained
 
 GNU/Hurd
 M:	Samuel Thibault <samuel.thibault@ens-lyon.org>
-W:	https://wiki.x.org
 L:	bug-hurd@gnu.org
 S:	Maintained
 
@@ -510,49 +614,49 @@ xf86-input-acecad
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-acecad
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-aiptek
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-aiptek
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-calcomp
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-calcomp
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-citron
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-citron
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-digitaledge
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-digitaledge
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-dmc
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dmc
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-dynapro
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-dynapro
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-elo2300
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-elo2300
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-elographics
 M:	Marc Balmer <marc.balmer@arcapos.com>
@@ -570,19 +674,19 @@ xf86-input-fpit
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-fpit
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-hyperpen
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-hyperpen
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-jamstudio
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-jamstudio
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-joystick
 M:	Sascha Hlusiak <saschahlusiak@arcor.de>
@@ -594,49 +698,55 @@ xf86-input-keyboard
 M:	Alan Coopersmith <alan.coopersmith@oracle.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard
+S:	Maintained for non-Linux systems, support removed for Linux systems
+
+xf86-input-libinput
+M:	Peter Hutterer <peter.hutterer@who-t.net>
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 S:	Maintained
 
 xf86-input-magellan
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magellan
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-magictouch
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-magictouch
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-microtouch
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-microtouch
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-mouse
 M:	Alan Coopersmith <alan.coopersmith@oracle.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse
-S:	Maintained
+S:	Maintained for non-Linux systems, unmaintained for Linux systems
 
 xf86-input-mutouch
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-mutouch
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-palmax
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-palmax
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-penmount
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-penmount
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-sample
 M:	?
@@ -648,13 +758,13 @@ xf86-input-spaceorb
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-spaceorb
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-summa
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-summa
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-synaptics
 M:	Peter Hutterer <peter.hutterer@who-t.net>
@@ -666,13 +776,13 @@ xf86-input-tek4957
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-tek4957
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-ur98
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-ur98
-S:	Deactivated
+S:	Obsolete
 
 xf86-input-vmmouse
 M:	VMware Linux Graphics Maintainer <linux-graphics-maintainer@vmware.com>
@@ -686,6 +796,12 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
 S:	Maintained
 
+xf86-video-amdgpu
+M:	Shashank Sharma
+L:	amd-gfx@lists.freedesktop.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
+S:	Maintained
+
 xf86-video-apm
 M:	?
 L:	xorg-devel@lists.x.org
@@ -698,6 +814,12 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ark
 S:	Deactivated
 
+xf86-video-armsoc
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-armsoc
+S:	Deactivated
+
 xf86-video-ast
 M:	Y.C. Chen <yc_chen@aspeedtech.com>
 L:	xorg-devel@lists.x.org
@@ -711,6 +833,12 @@ L:	xorg-driver-ati@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati
 S:	Maintained
 
+xf86-video-avivo
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-avivo
+S:	Obsolete
+
 xf86-video-chips
 M:	Egbert Eich <eich@freedesktop.org>
 L:	xorg-devel@lists.x.org
@@ -741,6 +869,12 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
 S:	Unmaintained
 
+xf86-video-freedreno
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-freedreno
+S:	Unmaintained
+
 xf86-video-geode
 M:	?
 L:	xorg-driver-geode@lists.x.org
@@ -752,13 +886,13 @@ xf86-video-glide
 M:	Guillem Jover <guillem@hadrons.org>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glide
-S:	Obsolete, yet still somehow maintained
+S:	Obsolete
 
 xf86-video-glint
 M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint
-S:	Maintained
+S:	Deactivated (does not build for xorg-server 21 or later)
 
 xf86-video-i128
 M:	Adam Jackson <ajax@nwnk.net>
@@ -772,14 +906,20 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740
 S:	Unmaintained
 
+xf86-video-impact
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-impact
+S:	Deactivated (does not build for xorg-server 1.13 and later)
+
 xf86-video-imstt
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-imstt
-S:	Deactivated
+S:	Obsolete
 
 xf86-video-intel
-M:	Eric Anholt <eric@anholt.net>
+M:	?
 L:	intel-gfx@lists.freedesktop.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
 S:	Supported
@@ -800,7 +940,7 @@ xf86-video-modesetting
 M:	Dave Airlie <airlied@redhat.com>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/xserver
-S:	Maintained
+S:	Maintained, but as part of xorg-server now
 
 xf86-video-neomagic
 M:	Egbert Eich <eich@freedesktop.org>
@@ -818,7 +958,7 @@ xf86-video-newport
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-newport
-S:	Unmaintained
+S:	Deactivated (does not build for xorg-server 1.13 and later)
 
 xf86-video-nsc
 M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
@@ -826,11 +966,18 @@ L:	xorg-driver-geode@lists.x.org
 W:	https://www.x.org/wiki/GeodeDriver
 S:	Obsolete - mostly replaced by xf86-video-geode
 
+xf86-video-nouveau
+M:	Ilia Mirkin
+L:	nouveau@lists.freedesktop.org
+C:	irc://irc.oftc.net/nouveau
+W:	https://nouveau.freedesktop.org/
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau
+S:	Maintained
+
 xf86-video-nv
 M:	Aaron Plattner <aplattner@freedesktop.org>
 L:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
-W:	https://wiki.x.org
-S:	Maintained
+S:	Unmaintained - see https://lists.freedesktop.org/archives/xorg/2010-March/049560.html
 
 xf86-video-omap
 M:	Rob Clark <robclark@freedesktop.org>
@@ -838,6 +985,12 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-omap
 S:	Maintained
 
+xf86-video-opentegra
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-opentegra
+S:	Deactivated
+
 xf86-video-qxl
 M:	?
 L:	xorg-devel@lists.x.org
@@ -868,7 +1021,7 @@ xf86-video-s3
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-s3
-S:	Unmaintained
+S:	Deactivated (does not build for xorg-server 21 or later)
 
 xf86-video-s3virge
 M:	?
@@ -904,7 +1057,7 @@ xf86-video-sunbw2
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunbw2
-S:	Deactivated
+S:	Obsolete
 
 xf86-video-suncg14
 M:	?
@@ -952,7 +1105,7 @@ xf86-video-tga
 M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tga
-S:	Maintained
+S:	Deactivated (does not build for xorg-server 21 or later)
 
 xf86-video-trident
 M:	Alan Hourihane <alanh@fairlite.demon.co.uk>
@@ -964,7 +1117,7 @@ xf86-video-tseng
 M:	Luc Verhaegen <libv@skynet.be>
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-tseng
-S:	Maintained
+S:	Deactivated
 
 xf86-video-v4l
 M:	?
@@ -972,6 +1125,18 @@ L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l
 S:	Unmaintained
 
+xf86-video-vbox
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-vbox
+S:	Unmaintained
+
+xf86-video-vermilion
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-vermilion
+S:	Obsolete
+
 xf86-video-vesa
 M:	Adam Jackson <ajax@nwnk.net>
 L:	xorg-devel@lists.x.org
@@ -982,7 +1147,7 @@ xf86-video-vga
 S:	Obsolete - use xf86-video-vesa instead
 
 xf86-video-via
-S:	Obsolete - use xf86-video-openchrome or xf86-video-unichrome instead
+S:	Obsolete - use xf86-video-openchrome instead
 
 xf86-video-vmware
 M:	VMware Linux Graphics Maintainer <linux-graphics-maintainer@vmware.com>
@@ -1012,32 +1177,60 @@ xf86-video-xgixp
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgixp
-S:	Unmaintained
+S:	Deactivated
 
 Other modules
 -------------
 
-data/bitmaps, data/cursors, doc/*, fonts/*, util/*
+fonts/bitstream-speedo
+S:	Obsolete - Speedo format support removed in libXfont 1.4.0 & later
+
+data/bitmaps, data/cursors, doc/*, fonts/*, test/*, util/*
 M:	?
 L:	xorg-devel@lists.x.org
 T:	https://gitlab.freedesktop.org/xorg/
 S:	Unmaintained
 
+proto/xorgproto
+M:	?
+L:	xorg-devel@lists.x.org
+T:	https://gitlab.freedesktop.org/xorg/proto/xorgproto
+S:	Maintained
+
+proto/*proto (everything but xorgproto & xcbproto)
+T:	https://gitlab.freedesktop.org/groups/xorg/proto/-/archived
+S:	Obsolete - rolled into xorgproto
+
 xkbdata
 S:	Obsolete - use xkeyboard-config instead
 
 Developer relations & services
 ------------------------------
 
+Foundation (funding, conference organizing, management, etc.)
+M:	https://www.x.org/wiki/BoardOfDirectors/
+C:	irc://irc.oftc.net/xf-bod
+W:	https://www.x.org/wiki/XorgFoundation/
+T:	https://gitlab.freedesktop.org/xorgfoundation
+S:	Maintained
+
+Gitlab (gitlab.freedesktop.org)
+M:	sitewranglers@lists.freedesktop.org
+C:	irc://irc.oftc.net/freedesktop
+W:	https://gitlab.freedesktop.org/freedesktop/freedesktop/-/wikis/home
+S:	Maintained
+
 Mailing lists (lists.x.org)
 M:	mailman@lists.x.org
 L:	mailman@lists.x.org
+C:	irc://irc.oftc.net/freedesktop
 W:	https://lists.x.org/mailman/listinfo/
 S:	Maintained
 
-Website (www.x.org)
-M:	Stuart Anderson <anderson@netsweng.com>
+Website (www.x.org / wiki.x.org)
+M:	sitewranglers@lists.freedesktop.org
 L:	xorg-devel@lists.x.org
+C:	irc://irc.oftc.net/freedesktop
 W:	https://www.x.org/
 S:	Maintained