xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 meson.build |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2df3a62c66272c29299f7076c0f90a4f02b4d33e
Author: Simon Ser <contact at emersion.fr>
Date:   Fri Oct 22 18:15:53 2021 +0200

    meson: add subproject fallback for libxcvt
    
    Depends on:
    https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/merge_requests/6
    
    Signed-off-by: Simon Ser <contact at emersion.fr>

diff --git a/meson.build b/meson.build
index bc6aa1b01..7cb239b6d 100644
--- a/meson.build
+++ b/meson.build
@@ -194,7 +194,7 @@ if (host_machine.system() != 'darwin' and
     endif
 endif
 xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
-libxcvt_dep = dependency('libxcvt', required: build_xorg)
+libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 
 build_xwayland = false
 if (host_machine.system() != 'darwin' and
@@ -211,7 +211,7 @@ if (host_machine.system() != 'darwin' and
         xwayland_dep = [
             dependency('wayland-client', version: wayland_req, required: xwayland_required),
             dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required),
-            dependency('libxcvt', required: xwayland_required),
+            dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required),
         ]
 
         if build_glamor
commit 43452690df733edca4512bc7bac149cc5cc49bb0
Author: Simon Ser <contact at emersion.fr>
Date:   Fri Oct 22 18:15:05 2021 +0200

    meson: use add_project_arguments instead of add_global_arguments
    
    add_global_arguments affects subprojects too. add_project_arguments
    only affects the current project.
    
    Signed-off-by: Simon Ser <contact at emersion.fr>

diff --git a/meson.build b/meson.build
index 997b07616..bc6aa1b01 100644
--- a/meson.build
+++ b/meson.build
@@ -11,10 +11,10 @@ release_date = '2021-07-05'
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')
 
-add_global_arguments('-fno-strict-aliasing', language : 'c')
-add_global_arguments('-fvisibility=hidden', language : 'c')
+add_project_arguments('-fno-strict-aliasing', language : 'c')
+add_project_arguments('-fvisibility=hidden', language : 'c')
 
-add_global_link_arguments('-fvisibility=hidden', language : 'c')
+add_project_link_arguments('-fvisibility=hidden', language : 'c')
 
 if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
     test_wflags = [
@@ -58,7 +58,7 @@ foreach wflag: test_wflags
     endif
 endforeach
 
-add_global_arguments(common_wflags, language : ['c', 'objc'])
+add_project_arguments(common_wflags, language : ['c', 'objc'])
 
 libdrm_req = '>= 2.4.89'
 libselinux_req = '>= 2.0.86'