xserver: Branch 'xwayland-21.1'

[GitLab Mirror]

 include/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit efd546cd1eff8a205ecf43a318d3ec38e02eaa40
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 2 11:40:14 2021 +0100

    meson.build: Keep the protocol version looking like xserver 1.20.x did
    
    This effectively changes the versioning to be as if xserver 21.0 was
    xserver 1.21.0. This should keep any client-side version checks that
    know about the Xorg 7.0 -> xserver 1.0 epoch from getting confused.
    
    Fixes: 1e72c3ce84e2 "Bump version to 21.0.99.1"

diff --git a/include/meson.build b/include/meson.build
index 390c85027..5042f2bb4 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -8,7 +8,7 @@ else
     subpatch = 0
 endif
 
-release = major * 10000000 + minor * 100000 + patch * 1000 + subpatch
+release = 1 * 10000000 + major * 100000 + minor * 1000 + patch
 
 dri_dep = dependency('dri', required: build_glx)