Update xf86-video-mga to version 2.0.1

25 files changed, 348 insertions, 223 deletions

diff --git a/driver/xf86-video-mga/COPYING b/driver/xf86-video-mga/COPYING
index 987894aff..02ac4b346 100644
--- a/driver/xf86-video-mga/COPYING
+++ b/driver/xf86-video-mga/COPYING
@@ -108,7 +108,7 @@ paragraph) shall be included in all copies or substantial portions of the
 Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
 THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
diff --git a/driver/xf86-video-mga/ChangeLog b/driver/xf86-video-mga/ChangeLog
index 5e962bd9f..a108092ee 100644
--- a/driver/xf86-video-mga/ChangeLog
+++ b/driver/xf86-video-mga/ChangeLog
@@ -1,3 +1,67 @@
+commit 37bf1be0fbaed7578f91485a00d37db3f1c84fe3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 10 17:11:22 2022 -0700
+
+    xf86-video-mga 2.0.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 638653561df767b052e372821ffd51c457591202
+Author: Raphael Isemann <teemperor@gmail.com>
+Date:   Wed Apr 13 12:14:46 2022 +0200
+
+    Fix uninitialized read in MGAEnableSecondOutPut
+    
+    `MGAGRestore` allocated `ModeInfo` without initializing its memory and then
+    passes it into `MGAEnableSecondOutPut` via `MGAEnableSecondOutPut(pScrn, &ModeInfo);`.
+    
+    `MGAEnableSecondOutPut` then reads the unitialized memory in the line
+    `if ( !(pModeInfo->flSignalMode & POS_HSYNC) )`.
+    
+    This patch just zeroes the memory to prevent those branches to be randomly
+    taken.
+    
+    Signed-off-by: Raphael Isemann <teemperor@gmail.com>
+
+commit a6ab1e08ee8c5a6dfaebe8fc331bd0811ab8d13f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Jan 22 13:06:47 2022 -0800
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1e4dbef654bd31f5706b4b860f6b34c7e5e5f440
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Jan 22 13:05:35 2022 -0800
+
+    Fix spelling/wording issues
+    
+    Found by using:
+        codespell --builtin clear,rare,usage,informal,code,names
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f74f0504156f2504294cdd9c7f068ab4745a5c4e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Jan 22 12:57:58 2022 -0800
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f227f2f286123a9ca64b567783825a2c18b87971
+Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date:   Sat May 4 20:43:26 2019 +0200
+
+    configure.ac: fix cross-compilation
+    
+    AC_CHECK_FILE can't be used when cross-compiling
+    
+    [Retrieved from:
+    https://git.buildroot.net/buildroot/tree/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch]
+    Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
 commit 924c310dfecbfb916f0e81c03f1142a401bed056
 Author: Kevin Brace <kevinbrace@gmx.com>
 Date:   Fri Dec 7 16:43:46 2018 -0800
@@ -434,8 +498,8 @@ Date:   Thu Mar 13 18:25:56 2014 -0400
     
     I've had a Xserver lockup in the mga driver, examining it with gdb showed
     this obviously broken loop:
-    	count = INREG(MGAREG_VCOUNT) + 2;
-    	while(INREG(MGAREG_VCOUNT) < count);
+            count = INREG(MGAREG_VCOUNT) + 2;
+            while(INREG(MGAREG_VCOUNT) < count);
     
     It reads the line counter and waits until the counter advances by two. The
     cause of the lockup is this - if the kernel reschedules the Xorg process
@@ -824,28 +888,28 @@ Date:   Thu Sep 15 10:29:11 2011 -0500
     Delete support for MGA's proprietary HAL: unifdef USEMGAHAL.
     
     This patch produced with:
-    	for f in `git grep -Fwl USEMGAHAL`; do
-    		unifdef -B -UUSEMGAHAL $f | sponge $f
-    	done
+            for f in `git grep -Fwl USEMGAHAL`; do
+                    unifdef -B -UUSEMGAHAL $f | sponge $f
+            done
     
     Adam Jackson wrote:
     
-    	Hey, so, remember back in the dark ages when dualhead was this
-    	insanely wild differentiating feature?  Matrox thought it was so
-    	special, in fact, that they hid most of the implementation of it
-    	(and a bunch of other stuff) in a binary-only blob called the
-    	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-    	the relevant Windows code, and then some open glue to keep it
-    	working; clientlx.c is that glue.
+            Hey, so, remember back in the dark ages when dualhead was this
+            insanely wild differentiating feature?  Matrox thought it was so
+            special, in fact, that they hid most of the implementation of it
+            (and a bunch of other stuff) in a binary-only blob called the
+            HALlib.  As you'd expect it was pretty much a cut-and-paste of
+            the relevant Windows code, and then some open glue to keep it
+            working; clientlx.c is that glue.
     
-    	I guess the theory was that if you don't tell people which
-    	registers to duplicate to implement a second pipe in their own
-    	hardware, they won't figure it out?  A pretty eyeroll-worthy
-    	idea even at the time, and definitely not something we should be
-    	condoning anymore.
+            I guess the theory was that if you don't tell people which
+            registers to duplicate to implement a second pipe in their own
+            hardware, they won't figure it out?  A pretty eyeroll-worthy
+            idea even at the time, and definitely not something we should be
+            condoning anymore.
     
-    	Kill it with fire, but while you're at it, untangle the hideous
-    	mess of MGA_HAL() macros too.
+            Kill it with fire, but while you're at it, untangle the hideous
+            mess of MGA_HAL() macros too.
     
     Signed-off-by: Jamey Sharp <jamey@minilop.net>
     Cc: Adam Jackson <ajax@redhat.com>
@@ -858,21 +922,21 @@ Date:   Tue Sep 13 16:01:57 2011 -0500
     
     Adam Jackson wrote:
     
-    	Hey, so, remember back in the dark ages when dualhead was this
-    	insanely wild differentiating feature?  Matrox thought it was so
-    	special, in fact, that they hid most of the implementation of it
-    	(and a bunch of other stuff) in a binary-only blob called the
-    	HALlib.  As you'd expect it was pretty much a cut-and-paste of
-    	the relevant Windows code, and then some open glue to keep it
-    	working; clientlx.c is that glue.
+            Hey, so, remember back in the dark ages when dualhead was this
+            insanely wild differentiating feature?  Matrox thought it was so
+            special, in fact, that they hid most of the implementation of it
+            (and a bunch of other stuff) in a binary-only blob called the
+            HALlib.  As you'd expect it was pretty much a cut-and-paste of
+            the relevant Windows code, and then some open glue to keep it
+            working; clientlx.c is that glue.
     
-    	I guess the theory was that if you don't tell people which
-    	registers to duplicate to implement a second pipe in their own
-    	hardware, they won't figure it out?  A pretty eyeroll-worthy
-    	idea even at the time, and definitely not something we should be
-    	condoning anymore.
+            I guess the theory was that if you don't tell people which
+            registers to duplicate to implement a second pipe in their own
+            hardware, they won't figure it out?  A pretty eyeroll-worthy
+            idea even at the time, and definitely not something we should be
+            condoning anymore.
     
-    	Kill it with fire ...
+            Kill it with fire ...
     
     Signed-off-by: Jamey Sharp <jamey@minilop.net>
     Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
@@ -1850,7 +1914,7 @@ Date:   Mon Dec 11 15:06:03 2006 -0800
     
     Conflicts:
     
-    	src/mga_macros.h
+            src/mga_macros.h
 
 commit 4bcfca9bcf4a2be8d49a700b1a0d529f4e5ea412
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
@@ -2645,7 +2709,7 @@ Date:   Mon Oct 17 00:09:03 2005 +0000
     Use sed & cpp to substitute variables in driver man pages
 
 commit 52497dac4be07bb5a4ca1a73ec6198851173b6c4
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Tue Sep 27 20:53:19 2005 +0000
 
     Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
@@ -2742,13 +2806,13 @@ Date:   Fri Jul 29 21:22:43 2005 +0000
     - Update modular Xorg version
 
 commit 73d19fde3b2c78693298b60252e1a67e28cb708a
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Thu Jul 28 15:48:19 2005 +0000
 
     Add missing backslash, patch from Donnie Berkholz
 
 commit 3e06876c193d945f2df0c2521a2c80ec73ce5cb8
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Wed Jul 27 21:23:29 2005 +0000
 
     Add xf86driproto to dependencies for drivers with DRI support. Patch from
@@ -2761,7 +2825,7 @@ Date:   Wed Jul 27 07:38:14 2005 +0000
     Include binding.h to fix make distcheck
 
 commit a5f5f658a9875ea2dfb01200305dab54ce4115ac
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Tue Jul 26 18:29:39 2005 +0000
 
     symlink.sh: add binding.h from mga/HALlib add nsc/gfx add nsc/panel
@@ -2769,7 +2833,7 @@ Date:   Tue Jul 26 18:29:39 2005 +0000
         include of cfb8_32.h modularizevideodriver.sh: fix typo
 
 commit efca764ce95094531baf14daf6e5e538cc1e9210
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Tue Jul 26 01:18:43 2005 +0000
 
     "Build system for `basename $PWD | sed s/xf86-video-//`"
@@ -2924,7 +2988,7 @@ Date:   Mon Aug 16 09:13:14 2004 +0000
         console.
 
 commit f29f2239d31232e152744321c447035ede658ce2
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Fri Aug 13 18:24:08 2004 +0000
 
     Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
diff --git a/driver/xf86-video-mga/Makefile.in b/driver/xf86-video-mga/Makefile.in
index ceae85e0f..76c435d5b 100644
--- a/driver/xf86-video-mga/Makefile.in
+++ b/driver/xf86-video-mga/Makefile.in
@@ -154,9 +154,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -298,6 +298,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -578,6 +579,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -585,7 +587,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
diff --git a/driver/xf86-video-mga/README.md b/driver/xf86-video-mga/README.md
index 7e3b63187..627fb103e 100644
--- a/driver/xf86-video-mga/README.md
+++ b/driver/xf86-video-mga/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
 
diff --git a/driver/xf86-video-mga/aclocal.m4 b/driver/xf86-video-mga/aclocal.m4
index 7d21af36b..cb4ccfce8 100644
--- a/driver/xf86-video-mga/aclocal.m4
+++ b/driver/xf86-video-mga/aclocal.m4
@@ -8606,32 +8606,63 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -8653,18 +8684,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -8674,8 +8706,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -8687,10 +8721,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -8698,26 +8733,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -8727,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -8748,7 +8781,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -8764,16 +8797,40 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -8784,16 +8841,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -8804,7 +8863,7 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
 dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
@@ -11797,7 +11856,7 @@ dnl
 AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include "xorg-server.h"
 #if !defined $1
diff --git a/driver/xf86-video-mga/compile b/driver/xf86-video-mga/compile
index a85b723c7..df363c8fb 100644
--- a/driver/xf86-video-mga/compile
+++ b/driver/xf86-video-mga/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/driver/xf86-video-mga/configure b/driver/xf86-video-mga/configure
index 3ed2f15a1..959f5ac2f 100644
--- a/driver/xf86-video-mga/configure
+++ b/driver/xf86-video-mga/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-mga 2.0.0.
+# Generated by GNU Autoconf 2.69 for xf86-video-mga 2.0.1.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/issues>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-video-mga'
 PACKAGE_TARNAME='xf86-video-mga'
-PACKAGE_VERSION='2.0.0'
-PACKAGE_STRING='xf86-video-mga 2.0.0'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='xf86-video-mga 2.0.1'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/issues'
 PACKAGE_URL=''
 
@@ -771,6 +771,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -866,6 +867,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1118,6 +1120,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1255,7 +1266,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1368,7 +1379,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-mga 2.0.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-mga 2.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1408,6 +1419,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1438,7 +1450,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-mga 2.0.0:";;
+     short | recursive ) echo "Configuration of xf86-video-mga 2.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1584,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-mga configure 2.0.0
+xf86-video-mga configure 2.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1987,7 +1999,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-mga $as_me 2.0.0, which was
+It was created by xf86-video-mga $as_me 2.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10493,7 +10505,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-mga'
- VERSION='2.0.0'
+ VERSION='2.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10668,29 +10680,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Initialize libtool
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -17834,7 +17823,7 @@ fi
 
 
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17869,7 +17858,7 @@ $as_echo "$_EXT_CHECK" >&6; }
 
 
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17904,7 +17893,7 @@ $as_echo "$_EXT_CHECK" >&6; }
 
 
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17939,7 +17928,7 @@ $as_echo "$_EXT_CHECK" >&6; }
 
 
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17975,8 +17964,8 @@ $as_echo "$_EXT_CHECK" >&6; }
 # Obtain compiler/linker options for the driver dependencies
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
-$as_echo_n "checking for XORG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xorg-server >= 1.1.0 xproto fontsproto $REQUIRED_MODULES" >&5
+$as_echo_n "checking for xorg-server >= 1.1.0 xproto fontsproto $REQUIRED_MODULES... " >&6; }
 
 if test -n "$XORG_CFLAGS"; then
     pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
@@ -18016,7 +18005,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18043,7 +18032,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
 and XORG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18069,7 +18058,8 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 # Checks for libraries.
 
 if test "x$DRI" != xno; then
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
+        if test "$cross_compiling" = no; then
+               as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sdkdir}/dri.h" >&5
 $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
 if eval \${$as_ac_File+:} false; then :
@@ -18092,7 +18082,7 @@ else
   have_dri_h="no"
 fi
 
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/sarea.h" | $as_tr_sh`
+               as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/sarea.h" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sdkdir}/sarea.h" >&5
 $as_echo_n "checking for ${sdkdir}/sarea.h... " >&6; }
 if eval \${$as_ac_File+:} false; then :
@@ -18115,7 +18105,7 @@ else
   have_sarea_h="no"
 fi
 
-        as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dristruct.h" | $as_tr_sh`
+               as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dristruct.h" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sdkdir}/dristruct.h" >&5
 $as_echo_n "checking for ${sdkdir}/dristruct.h... " >&6; }
 if eval \${$as_ac_File+:} false; then :
@@ -18138,6 +18128,11 @@ else
   have_dristruct_h="no"
 fi
 
+        else
+               have_dri_h="yes"
+               have_sarea_h="yes"
+               have_dristruct_h="yes"
+        fi
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include DRI support" >&5
@@ -18165,8 +18160,8 @@ fi
 if test "x$DRI" = xyes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5
-$as_echo_n "checking for DRI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdrm >= 2.0 xf86driproto" >&5
+$as_echo_n "checking for libdrm >= 2.0 xf86driproto... " >&6; }
 
 if test -n "$DRI_CFLAGS"; then
     pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
@@ -18206,7 +18201,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18233,7 +18228,7 @@ Alternatively, you may set the environment variables DRI_CFLAGS
 and DRI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18291,8 +18286,8 @@ CFLAGS="$save_CFLAGS"
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5
-$as_echo_n "checking for PCIACCESS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pciaccess >= 0.8.0" >&5
+$as_echo_n "checking for pciaccess >= 0.8.0... " >&6; }
 
 if test -n "$PCIACCESS_CFLAGS"; then
     pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
@@ -18332,7 +18327,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -18359,7 +18354,7 @@ Alternatively, you may set the environment variables PCIACCESS_CFLAGS
 and PCIACCESS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18660,10 +18655,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DRI_TRUE}" && test -z "${DRI_FALSE}"; then
   as_fn_error $? "conditional \"DRI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19077,7 +19068,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-mga $as_me 2.0.0, which was
+This file was extended by xf86-video-mga $as_me 2.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19143,7 +19134,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xf86-video-mga config.status 2.0.0
+xf86-video-mga config.status 2.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/driver/xf86-video-mga/configure.ac b/driver/xf86-video-mga/configure.ac
index 686a6216c..1b4b6d6f2 100644
--- a/driver/xf86-video-mga/configure.ac
+++ b/driver/xf86-video-mga/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-mga],
-        [2.0.0],
+        [2.0.1],
         [https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga/issues],
         [xf86-video-mga])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -38,8 +38,7 @@ XORG_DEFAULT_OPTIONS
 AC_CONFIG_AUX_DIR(.)
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Initialize libtool
 AC_DISABLE_STATIC
@@ -77,12 +76,18 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 # Checks for libraries.
 
 if test "x$DRI" != xno; then
-        AC_CHECK_FILE([${sdkdir}/dri.h],
-                      [have_dri_h="yes"], [have_dri_h="no"])
-        AC_CHECK_FILE([${sdkdir}/sarea.h],
-                      [have_sarea_h="yes"], [have_sarea_h="no"])
-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
+        if test "$cross_compiling" = no; then
+               AC_CHECK_FILE([${sdkdir}/dri.h],
+                             [have_dri_h="yes"], [have_dri_h="no"])
+               AC_CHECK_FILE([${sdkdir}/sarea.h],
+                             [have_sarea_h="yes"], [have_sarea_h="no"])
+               AC_CHECK_FILE([${sdkdir}/dristruct.h],
+                             [have_dristruct_h="yes"], [have_dristruct_h="no"])
+        else
+               have_dri_h="yes"
+               have_sarea_h="yes"
+               have_dristruct_h="yes"
+        fi
 fi
 
 AC_MSG_CHECKING([whether to include DRI support])
diff --git a/driver/xf86-video-mga/man/Makefile.in b/driver/xf86-video-mga/man/Makefile.in
index 915679881..04b80c9ce 100644
--- a/driver/xf86-video-mga/man/Makefile.in
+++ b/driver/xf86-video-mga/man/Makefile.in
@@ -269,6 +269,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/driver/xf86-video-mga/mga_PInS.txt b/driver/xf86-video-mga/mga_PInS.txt
index eda6cf958..16453f36c 100644
--- a/driver/xf86-video-mga/mga_PInS.txt
+++ b/driver/xf86-video-mga/mga_PInS.txt
@@ -230,7 +230,7 @@ Offset  Type      Description
                            0 = default output is secondary connector
                            1 = default output is primary connector
                   12-14    Secondary modes (see below)
-                  15       Primary hardware dectect
+                  15       Primary hardware detect
                            0 = hardware detection is off
                            1 = use hardware detection to determine main output
                            
diff --git a/driver/xf86-video-mga/src/Makefile.in b/driver/xf86-video-mga/src/Makefile.in
index 7f0e3ae18..952e9414e 100644
--- a/driver/xf86-video-mga/src/Makefile.in
+++ b/driver/xf86-video-mga/src/Makefile.in
@@ -325,6 +325,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/driver/xf86-video-mga/src/mga.h b/driver/xf86-video-mga/src/mga.h
index 1a7cb473a..52a4eae54 100644
--- a/driver/xf86-video-mga/src/mga.h
+++ b/driver/xf86-video-mga/src/mga.h
@@ -387,7 +387,7 @@ typedef enum {
 } mga_host_t;
 
 /**
- * Card information derrived from BIOS PInS data.
+ * Card information derived from BIOS PInS data.
  */
 struct mga_bios_values {
     /**
@@ -430,7 +430,7 @@ struct mga_bios_values {
 
 
 /**
- * Attributes that of an MGA device that can be derrived purely from its
+ * Attributes that of an MGA device that can be derived purely from its
  * PCI ID.
  */
 struct mga_device_attributes {
diff --git a/driver/xf86-video-mga/src/mga_bios.c b/driver/xf86-video-mga/src/mga_bios.c
index f4198d0fe..e5aa45c3b 100644
--- a/driver/xf86-video-mga/src/mga_bios.c
+++ b/driver/xf86-video-mga/src/mga_bios.c
@@ -94,7 +94,7 @@ static __inline__ CARD32 get_u32( const CARD8 * data )
 /**
  * Parse version 0x01XX of the BIOS PInS structure.
  * 
- * Version 0x01XX of the BIOS PInS structure is only found in Millenium cards.
+ * Version 0x01XX of the BIOS PInS structure is only found in Millennium cards.
  *
  * \todo
  * There used to be an "OverclockMem" option that would scale the memory clock
@@ -140,7 +140,7 @@ static void mga_parse_bios_ver_1( struct mga_bios_values * bios,
 /**
  * Parse version 0x02XX of the BIOS PInS structure.
  * 
- * Version 0x02XX of the BIOS PInS structure is only found in Millenium II
+ * Version 0x02XX of the BIOS PInS structure is only found in Millennium II
  * and Mystique cards.
  */
 static void mga_parse_bios_ver_2( struct mga_bios_values * bios, 
diff --git a/driver/xf86-video-mga/src/mga_dac3026.c b/driver/xf86-video-mga/src/mga_dac3026.c
index 09fb548b2..085c772d2 100644
--- a/driver/xf86-video-mga/src/mga_dac3026.c
+++ b/driver/xf86-video-mga/src/mga_dac3026.c
@@ -679,7 +679,7 @@ MGA3026Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	  pReg->Option &= ~0x1000;
 
 	/* must always have the pci retries on but rely on 
-	   polling to keep them from occuring */
+	   polling to keep them from occurring */
 	pReg->Option &= ~0x20000000;
 
 	pVga->MiscOutReg |= 0x0C; 
diff --git a/driver/xf86-video-mga/src/mga_dacG.c b/driver/xf86-video-mga/src/mga_dacG.c
index 4e2459504..ce0f0aa73 100644
--- a/driver/xf86-video-mga/src/mga_dacG.c
+++ b/driver/xf86-video-mga/src/mga_dacG.c
@@ -1324,7 +1324,7 @@ MGAGInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 
 	MGA_NOT_HAL(
 	/* must always have the pci retries on but rely on 
-	   polling to keep them from occuring */
+	   polling to keep them from occurring */
 	pReg->Option &= ~0x20000000;
 
 	switch(pLayout->bitsPerPixel)
@@ -1754,6 +1754,7 @@ MGA_NOT_HAL(
 	} else {
 	   /* Second Crtc */
 	   xMODEINFO ModeInfo;
+	   memset( &ModeInfo, 0, sizeof(ModeInfo) );
 
 MGA_NOT_HAL(
 	   /* Enable Dual Head */
diff --git a/driver/xf86-video-mga/src/mga_dh.c b/driver/xf86-video-mga/src/mga_dh.c
index 2b597b58d..c0d79708b 100644
--- a/driver/xf86-video-mga/src/mga_dh.c
+++ b/driver/xf86-video-mga/src/mga_dh.c
@@ -229,7 +229,7 @@ void MGAEnableSecondOutPut(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
 
     /*--- Disable Pixel clock oscillations On Crtc1 */
     OUTREG( MGAREG_C2CTL, ulC2CTL | MGAREG_C2CTL_PIXCLKDIS_MASK);
-    /*--- Have to wait minimum time (2 acces will be ok) */
+    /*--- Have to wait minimum time (2 access will be ok) */
     (void) INREG( MGAREG_Status);
     (void) INREG( MGAREG_Status);
     
diff --git a/driver/xf86-video-mga/src/mga_dri.c b/driver/xf86-video-mga/src/mga_dri.c
index 6867d8ffc..3070b6087 100644
--- a/driver/xf86-video-mga/src/mga_dri.c
+++ b/driver/xf86-video-mga/src/mga_dri.c
@@ -216,7 +216,7 @@ static void MGASwapContextShared( ScreenPtr pScreen )
  * This is really only called from validate/postvalidate as we
  * override the dri lock/unlock.  Want to remove validate/postvalidate
  * processing, but need to remove all client-side use of drawable lock
- * first (otherwise there is noone recover when a client dies holding
+ * first (otherwise there is no one recover when a client dies holding
  * the drawable lock).
  *
  * What does this mean?
diff --git a/driver/xf86-video-mga/src/mga_driver.c b/driver/xf86-video-mga/src/mga_driver.c
index 94183dbdc..f4b8f12af 100644
--- a/driver/xf86-video-mga/src/mga_driver.c
+++ b/driver/xf86-video-mga/src/mga_driver.c
@@ -535,7 +535,7 @@ static PciChipsets MGAPciChipsets[] = {
 /*
  * This contains the functions needed by the server after loading the
  * driver module.  It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case.  In the static case a
+ * the Module Setup function in the dynamic case.  In the static case a
  * reference to this is compiled in, and this requires that the name of
  * this DriverRec be an upper-case version of the driver name.
  */
@@ -755,7 +755,7 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
 
 	/*
 	 * For cards that can do dual head per entity, mark the entity
-	 * as sharable. 
+	 * as shareable.
 	 */
 	if (pMga->chip_attribs->dual_head_possible) {
 	    MGAEntPtr pMgaEnt = NULL;
@@ -894,7 +894,7 @@ MGAProbe(DriverPtr drv, int flags)
 
 	    /*
 	     * For cards that can do dual head per entity, mark the entity
-	     * as sharable. 
+	     * as shareable.
 	     */
 	    pEnt = xf86GetEntityInfo(usedChips[i]);
 
@@ -1672,7 +1672,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
             pScrn->AdjustFrame = MGAAdjustFrameCrtc2;
 	    /*
 	     * Fail initialization of second head if we are in MergeFB mode,
-	     * since we do it ourselfs.
+	     * since we do it ourselves.
              */
             if(pMgaEnt->pScrn_1 && MGAPTR(pMgaEnt->pScrn_1)->MergedFB) {
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2950,13 +2950,13 @@ MGAModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
     /* 
      This function optimize the Priority Request control
      Higher HiPriLvl will reduce drawing performance
-     We need to give enough bandwith to crtc to avoid visual artifact
+     We need to give enough bandwidth to crtc to avoid visual artifact
     */
 	if (pMga->is_G200SE) 
     {
         if (pMga->reg_1e24 >= 0x02)
         {
-            /* Calulate CRTC Priority value */
+            /* Calculate CRTC Priority value */
             CARD8  ucHiPriLvl;
             CARD32 ulBitsPerPixel;
             CARD32 ulMemoryBandwidth;
@@ -3050,7 +3050,7 @@ void MGARestoreSecondCrtc(ScrnInfoPtr pScrn)
             /* Do this branch if 
              * SecondOutput 
              * and not Unshared Primary 
-             * and not Merged Mode (usualy means Unshared Primary) 
+             * and not Merged Mode (usually means Unshared Primary)
              */
             CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL);
             
diff --git a/driver/xf86-video-mga/src/mga_exa.c b/driver/xf86-video-mga/src/mga_exa.c
index 03c5229e3..64d1e2746 100644
--- a/driver/xf86-video-mga/src/mga_exa.c
+++ b/driver/xf86-video-mga/src/mga_exa.c
@@ -13,7 +13,7 @@
  * Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
  * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
  * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
diff --git a/driver/xf86-video-mga/src/mga_merge.c b/driver/xf86-video-mga/src/mga_merge.c
index 64c85b438..3f858657f 100644
--- a/driver/xf86-video-mga/src/mga_merge.c
+++ b/driver/xf86-video-mga/src/mga_merge.c
@@ -37,7 +37,7 @@ StrToRanges(range* r, const char* s) {
                 break;
             case '-':
             case ' ': case 0:
-                if(strnum == NULL) break; /*is extra seperator */
+                if(strnum == NULL) break; /*is extra separator */
                 if(strnum != NULL) sscanf(strnum,"%f",&num);
                 if(gotdash) /*if wasn't singlet: correct. */
                     r[rangenum-1].hi = num;
@@ -59,7 +59,7 @@ StrToRanges(range* r, const char* s) {
 }            
 
 
-/* Copys mode i, links the result to dest, and returns it.
+/* Copies mode i, links the result to dest, and returns it.
  * Links i and j in Private record.
  * if dest is NULL, return value is copy of i linked to itself.
  */
@@ -190,7 +190,7 @@ GenerateModeList(ScrnInfoPtr pScrn, const char* str,
                 strmode = str+1; /* number starts on next char */
                 gotdash |= (*str == '-' || *str == ',');
                 
-                if(*str != 0) break; /* if end of string, we wont get a chance to catch a char and run the
+                if(*str != 0) break; /* if end of string, we won't get a chance to catch a char and run the
                                         default case. do it now */
                 
             default:
@@ -220,7 +220,7 @@ GenerateModeList(ScrnInfoPtr pScrn, const char* str,
 }
     
 
-/* second CRTC init funcitons. Used to check monitor timings and refreshes. 
+/* second CRTC init functions. Used to check monitor timings and refreshes.
  * this function looses lots of maintainability points due to redundancy, 
  * but it still was the cleanest and least-intrusive way I found. */
 
@@ -257,7 +257,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
     pMga->device = pMga1->device;
     
     if (flags & PROBE_DETECT) {
-	MGAProbeDDC(pScrn, pMga->pEnt->index); /*FIXME make shure this probes second monitor */
+	MGAProbeDDC(pScrn, pMga->pEnt->index); /*FIXME make sure this probes second monitor */
 	return TRUE;
     }
 
@@ -703,8 +703,8 @@ MGAMergePointerMoved(SCRN_ARG_TYPE arg, int x, int y)
   out.y1 = pScrn->frameY1+1;
 
   /* 
-   * specify inner sliding window. beeing outsize both frames, and inside 
-   * the outer cliping window, causes corresponding frame to slide
+   * specify inner sliding window. being outsize both frames, and inside
+   * the outer clipping window, causes corresponding frame to slide
    */
   in1 = out;
   in2 = out;
@@ -849,7 +849,7 @@ MGAAdjustMergeFrames(ADJUST_FRAME_ARGS_DECL) {
             BOUND(pScrn2->frameY0,y,y + VMax - MDMPTR(pScrn1)->Monitor2->VDisplay);
             break;
     }
-    /* sanity checks. Make shure were not out of bounds */
+    /* sanity checks. Make sure were not out of bounds */
     BOUND(pMga->M1frameX0,0,pScrn1->virtualX -MDMPTR(pScrn1)->Monitor1->HDisplay);
     BOUND(pMga->M1frameY0,0,pScrn1->virtualY -MDMPTR(pScrn1)->Monitor1->VDisplay);
     BOUND(pScrn2->frameX0,0,pScrn2->virtualX -MDMPTR(pScrn1)->Monitor2->HDisplay);
diff --git a/driver/xf86-video-mga/src/mga_sarea.h b/driver/xf86-video-mga/src/mga_sarea.h
index 16fc9ce62..b07db11ab 100644
--- a/driver/xf86-video-mga/src/mga_sarea.h
+++ b/driver/xf86-video-mga/src/mga_sarea.h
@@ -95,7 +95,7 @@
  */
 #define MGA_NR_SAREA_CLIPRECTS	8
 
-/* 2 heaps (1 for card, 1 for agp), each divided into upto 128
+/* 2 heaps (1 for card, 1 for agp), each divided into up to 128
  * regions, subject to a minimum region size of (1<<16) == 64k.
  *
  * Clients may subdivide regions internally, but when sharing between
diff --git a/driver/xf86-video-mga/src/mga_vga.c b/driver/xf86-video-mga/src/mga_vga.c
index 8f529517f..b187b7048 100644
--- a/driver/xf86-video-mga/src/mga_vga.c
+++ b/driver/xf86-video-mga/src/mga_vga.c
@@ -360,14 +360,14 @@ MGAG200SEHWProtect(ScrnInfoPtr pScrn, Bool on)
       hwp->enablePalette(hwp);
     } else {
       /*
-       * Reenable sequencer, then turn on screen.
+       * Re-enable sequencer, then turn on screen.
        */
   
       tmp = hwp->readSeq(hwp, 0x01);
 
       MGAWAITVSYNC();
       MGAWAITBUSY();
-      hwp->writeSeq(hwp, 0x01, tmp & ~0x20);    /* reenable display */
+      hwp->writeSeq(hwp, 0x01, tmp & ~0x20);    /* re-enable display */
       usleep(20000);
       vgaHWSeqReset(hwp, FALSE);        /* clear synchronousreset */
 
diff --git a/driver/xf86-video-mga/src/mgareg_flags.h b/driver/xf86-video-mga/src/mgareg_flags.h
index 548af86e6..3811eb0e3 100644
--- a/driver/xf86-video-mga/src/mgareg_flags.h
+++ b/driver/xf86-video-mga/src/mgareg_flags.h
@@ -23,7 +23,7 @@
 #ifndef _MGAREGS_H_
 #define _MGAREGS_H_
 
-/*************** (START) AUTOMATICLY GENERATED REGISTER FILE *****************/
+/*************** (START) AUTOMATICALLY GENERATED REGISTER FILE ***************/
 /*
  * Generated on Sat Nov 20 21:25:36 CST 1999
  */
@@ -924,7 +924,7 @@
 
 
 
-/**************** (END) AUTOMATICLY GENERATED REGISTER FILE ******************/
+/**************** (END) AUTOMATICALLY GENERATED REGISTER FILE ****************/
 
 #endif 	/* _MGAREGS_H_ */
 
diff --git a/driver/xf86-video-mga/util/Makefile.in b/driver/xf86-video-mga/util/Makefile.in
index 6a2cb9fcf..3a7a679fd 100644
--- a/driver/xf86-video-mga/util/Makefile.in
+++ b/driver/xf86-video-mga/util/Makefile.in
@@ -253,6 +253,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/driver/xf86-video-mga/util/README b/driver/xf86-video-mga/util/README
index 9a87e5314..4fcd1cf89 100644
--- a/driver/xf86-video-mga/util/README
+++ b/driver/xf86-video-mga/util/README
@@ -12,7 +12,7 @@ usage:		stormdwg hexval
 hexval will then be decomposed into it's constituent parts and displayed in human
 readable format. 
 
-BUGS:		none known except that it needs to kept upto date if the storms
+BUGS:		none known except that it needs to kept up to date if the storms
 		spec is changed
 
 NOTE:		This is not by itself a very usable utility.