xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Module.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24c5d8f17e2afd7d4e9626ba7cdcfbab53b2fdc0
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Jan 4 11:52:37 2023 +0100

    xfree86: Fix videodrv ABI version
    
    Commit 5145742fb6 accidentally bumped the videodrv ABI version from 26.0
    to 26.6 in one go.
    
    Change it back to 26.1 as per the documented process for minor additions.
    
    Fixes: 5145742fb6 - randr: introduce rrCrtcGetInfo DDX function
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index c77eefd7e..6166e8559 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -74,7 +74,7 @@
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(26, 6)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(26, 1)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(24, 4)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(10, 0)