xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 include/meson.build |    8 ++------
 meson.build         |    2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 689496ed657ef055869f5eda7e09ff35edff30cc
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Apr 7 21:55:03 2021 +0300

    meson: Switch project version to 20.x.y style

diff --git a/meson.build b/meson.build
index 0f84b9e0a..35770ba5e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '1.20.99.1',
+        version: '20.99.1',
         meson_version: '>= 0.47.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
commit 2df55813d0f553050ff06065a67e90f678db593a
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Wed Apr 7 21:55:02 2021 +0300

    meson: Drop version subpatch handling

diff --git a/include/meson.build b/include/meson.build
index e4e1b06ae..def96d103 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -2,11 +2,6 @@ version_split = meson.project_version().split('.')
 major = version_split[0].to_int()
 minor = version_split[1].to_int()
 patch = version_split[2].to_int()
-if version_split.length() == 4
-    subpatch = version_split[3].to_int()
-else
-    subpatch = 0
-endif
 
 # convert to the old-style 1.x.y version scheme used up to 1.20.x for backwards compatibility
 release = 1 * 10000000 + major * 100000 + minor * 1000 + patch
commit 5d3679104aaeabac585894606ad317b433b65238
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 7 21:55:01 2021 +0300

    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.

diff --git a/include/meson.build b/include/meson.build
index a58baea8e..e4e1b06ae 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -8,7 +8,8 @@ else
     subpatch = 0
 endif
 
-release = major * 10000000 + minor * 100000 + patch * 1000 + subpatch
+# convert to the old-style 1.x.y version scheme used up to 1.20.x for backwards compatibility
+release = 1 * 10000000 + major * 100000 + minor * 1000 + patch
 
 dri_dep = dependency('dri', required: build_glx)