xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit ed624544d4aef72db8dd575ad55ef5e206c54757
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jul 10 11:01:10 2020 +0200

    xfree86: Bump ABI_VIDEODRV_VERSION to 25.2
    
    This gives out of tree drivers a fighting chance to build against both
    sides of
    https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/468 .
    
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index a40ecff0f..f5496182d 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(25, 1)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(25, 2)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(24, 1)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(10, 0)