xorgproto: Branch 'master'

[GitLab Mirror]

 Makefile.am                        |    2 ++
 include/X11/extensions/meson.build |    4 ++--
 meson.build                        |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e0d4e02710e6d66408ecbbd2fee64ae4c6748739
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu Jun 20 16:38:30 2019 +0100

    Move windowswmproto to legacy

diff --git a/Makefile.am b/Makefile.am
index 9906ca2..40c2f67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -265,6 +265,7 @@ video_HEADERS = \
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
+if LEGACY
 windowswmdir = $(includedir)/X11/extensions
 windowswm_HEADERS = \
         include/X11/extensions/windowswm.h \
@@ -272,6 +273,7 @@ windowswm_HEADERS = \
 
 windowswmprotopkgconfigdir = $(datadir)/pkgconfig
 windowswmprotopkgconfig_DATA = windowswmproto.pc
+endif
 
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
diff --git a/include/X11/extensions/meson.build b/include/X11/extensions/meson.build
index e7e7de2..dbd70c2 100644
--- a/include/X11/extensions/meson.build
+++ b/include/X11/extensions/meson.build
@@ -54,8 +54,6 @@ install_headers(
     'syncproto.h',
     'syncstr.h',
     'vldXvMC.h',
-    'windowswm.h',
-    'windowswmstr.h',
     'xcmiscproto.h',
     'xcmiscstr.h',
     'xf86bigfont.h',
@@ -112,6 +110,8 @@ if get_option('legacy') == true
         'lgewire.h',
         'Print.h',
         'Printstr.h',
+        'windowswm.h',
+        'windowswmstr.h',
         'xcalibrateproto.h',
         'xcalibratewire.h',
         'Xeviestr.h',
diff --git a/meson.build b/meson.build
index e86c19c..e1c78b7 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,6 @@ pcs = [
         ['scrnsaverproto',      '1.2.2'],
         ['trapproto',           '3.4.3'],
         ['videoproto',          '2.3.3'],
-        ['windowswmproto',      '1.0.4'],
         ['xcmiscproto',         '1.2.2'],
         ['xextproto',           '7.3.0'],
         ['xf86bigfontproto',    '1.2.0'],
@@ -79,6 +78,7 @@ if get_option('legacy') == true
         ['fontcacheproto', '0.1.3'],
         ['lg3dproto', '5.0'],
         ['printproto', '1.0.5'],
+        ['windowswmproto', '1.0.4'],
         ['xcalibrateproto', '0.1.0'],
         ['xf86rushproto', '1.2.2'],
     ]