xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/meson.build |    2 +-
 meson.build            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09cd65233e0f5c04e7e3d063decf357f239a65f6
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Thu Mar 25 22:48:56 2021 +0200

    xfree86: Set appropriate install_mode for suid_wrapper

diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 18ff27c83..a6311cb12 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -146,7 +146,7 @@ if get_option('suid_wrapper')
         c_args: xorg_c_args,
         install: true,
         install_dir: get_option('libexecdir'),
-        # install_mode: ['r-sr-xr-x', 0, 0],
+        install_mode: ['r-sr-xr-x', 0, 0],
     )
 
     # meson gets confused when there are two targets of the same name
commit 88b5e1a219a16dd66be6302dbf88ec93d317f991
Author: Povilas Kanapickas <povilas at radix.lt>
Date:   Thu Mar 25 22:48:55 2021 +0200

    meson: Bump min meson version to 0.47 to get install_mode support

diff --git a/meson.build b/meson.build
index 9a1f05a8a..0f84b9e0a 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
             'c_std=gnu99',
         ],
         version: '1.20.99.1',
-        meson_version: '>= 0.46.0',
+        meson_version: '>= 0.47.0',
 )
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')