xorgproto: Branch 'master' - 2 commits

[GitLab Mirror]

 include/X11/meson.build |   16 +++++++---------
 meson.build             |   17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 8f6a67d3144a8b5032e8fa19d424b0cea2e6d275
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Feb 25 10:27:08 2021 +1000

    meson.build: install the protocol .txt files in doc
    
    This now matches the autotools installation
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/meson.build b/meson.build
index feb5ae9..5f3622a 100644
--- a/meson.build
+++ b/meson.build
@@ -66,6 +66,22 @@ foreach pc : pcs
     )
 endforeach
 
+
+docs = files('compositeproto.txt',
+             'damageproto.txt',
+             'dri2proto.txt',
+             'dri3proto.txt',
+             'fixesproto.txt',
+             'PM_spec',
+             'presentproto.txt',
+             'randrproto.txt',
+             'renderproto.txt',
+             'resproto.txt',
+             'xv-protocol-v2.txt')
+install_data(docs,
+             install_dir: get_option('datadir') / 'doc' / 'xorgproto')
+
+
 if get_option('legacy') == true
     legacy_pcs = [
         'evieproto',
commit a657dd0b45121735b2f80afa1e5e4940979d89ad
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Feb 25 10:04:58 2021 +1000

    meson.build: use built-in variable substitution handling instead of sed
    
    Generated outputs are identical
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/X11/meson.build b/include/X11/meson.build
index a4b022e..556e090 100644
--- a/include/X11/meson.build
+++ b/include/X11/meson.build
@@ -18,15 +18,13 @@ elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers)
 else
     error('Your fd_set is too weird.')
 endif
-custom_target('Xpoll.h',
-              capture : true,
-              install : true,
-              install_dir : get_option('includedir') + '/X11',
-              input : 'Xpoll.h.in',
-              output : 'Xpoll.h',
-              command : [ sed,
-                          's/@USE_FDS_BITS@/' + fds_bits + '/g',
-                          '@INPUT@'])
+xpoll_config = configuration_data()
+xpoll_config.set('USE_FDS_BITS', fds_bits)
+configure_file(input : 'Xpoll.h.in',
+               output : 'Xpoll.h',
+               install : true,
+               install_dir : get_option('includedir') + '/X11',
+               configuration: xpoll_config)
 
 install_headers(
     'ap_keysym.h',
diff --git a/meson.build b/meson.build
index ce733a0..feb5ae9 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,6 @@
 
 project('xorgproto', 'c', license : 'MIT', version : '2021.3')
 cc = meson.get_compiler('c')
-sed = find_program('sed')
 
 pcs = [
         'applewmproto',