xf86-video-mach64: Branch 'master'

[GitLab Mirror]

 configure.ac    |    2 +-
 src/aticonfig.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 74cc25c7c54bf2b2f036fd50f66f9071953db24f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jul 10 16:58:49 2022 -0700

    xf86-video-mach64 6.9.7
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index 9744dbd..4a9a33f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-mach64],
-        [6.9.6],
+        [6.9.7],
         [https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/issues],
         [xf86-video-mach64])
 AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/src/aticonfig.c b/src/aticonfig.c
index 6995b9a..92ebecb 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -311,6 +311,10 @@ ATIProcessOptions
 
     (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize);
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 25
+# define boolean bool
+#endif
+    
 #   define ProbeSparse   PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean
 #   define Accel         PublicOption[ATI_OPTION_ACCEL].value.boolean
 #   define BIOSDisplay   PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean