xorgproto: Branch 'master'

[GitLab Mirror]

 Makefile.am |   40 ++++++++++++++++++++++++++--------------
 meson.build |    4 +++-
 2 files changed, 29 insertions(+), 15 deletions(-)

New commits:
commit cf35a91fe57d4721a173d2bc428dd07dcc4674f9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Mar 16 13:15:14 2023 -0700

    Only install PM_spec when legacy protocol support is enabled
    
    PM_spec is the spec for the Proxy Management Protocol, and the other
    files for that protocol are only installed if legacy protocols
    are requested from configure or meson
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/Makefile.am b/Makefile.am
index e25650f..9af8f5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,8 @@ SUFFIXES = .$(MISC_MAN_SUFFIX) .man
 	$(MKDIR_P) man
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
+dist_doc_DATA =
+
 applewmdir = $(includedir)/X11/extensions
 applewm_HEADERS = \
         include/X11/extensions/applewmconst.h \
@@ -43,6 +45,8 @@ composite_HEADERS = \
 compositeprotopkgconfigdir = $(datadir)/pkgconfig
 compositeprotopkgconfig_DATA = compositeproto.pc
 
+dist_doc_DATA += compositeproto.txt
+
 damagedir = $(includedir)/X11/extensions
 damage_HEADERS = \
 	include/X11/extensions/damageproto.h \
@@ -51,6 +55,8 @@ damage_HEADERS = \
 damageprotopkgconfigdir = $(datadir)/pkgconfig
 damageprotopkgconfig_DATA = damageproto.pc
 
+dist_doc_DATA += damageproto.txt
+
 dmxdir = $(includedir)/X11/extensions
 dmx_HEADERS = \
 	include/X11/extensions/dmx.h \
@@ -70,6 +76,8 @@ dri2_HEADERS = \
 dri2protopkgconfigdir = $(datadir)/pkgconfig
 dri2protopkgconfig_DATA = dri2proto.pc
 
+dist_doc_DATA += dri2proto.txt
+
 dri3dir = $(includedir)/X11/extensions
 dri3_HEADERS = \
 	include/X11/extensions/dri3proto.h
@@ -77,6 +85,8 @@ dri3_HEADERS = \
 dri3protopkgconfigdir = $(datadir)/pkgconfig
 dri3protopkgconfig_DATA = dri3proto.pc
 
+dist_doc_DATA += dri3proto.txt
+
 fixesdir = $(includedir)/X11/extensions
 fixes_HEADERS = \
 	include/X11/extensions/xfixesproto.h \
@@ -85,6 +95,8 @@ fixes_HEADERS = \
 fixesprotopkgconfigdir = $(datadir)/pkgconfig
 fixesprotopkgconfig_DATA = fixesproto.pc
 
+dist_doc_DATA += fixesproto.txt
+
 fontsdir = $(includedir)/X11/fonts
 fonts_HEADERS = \
 	include/X11/fonts/font.h \
@@ -142,6 +154,8 @@ present_HEADERS = \
 presentprotopkgconfigdir = $(datadir)/pkgconfig
 presentprotopkgconfig_DATA = presentproto.pc
 
+dist_doc_DATA += presentproto.txt
+
 randrdir = $(includedir)/X11/extensions
 randr_HEADERS = \
 	include/X11/extensions/randr.h \
@@ -150,6 +164,8 @@ randr_HEADERS = \
 randrprotopkgconfigdir = $(datadir)/pkgconfig
 randrprotopkgconfig_DATA = randrproto.pc
 
+dist_doc_DATA += randrproto.txt
+
 recorddir = $(includedir)/X11/extensions
 record_HEADERS = \
 	include/X11/extensions/recordconst.h \
@@ -167,6 +183,8 @@ render_HEADERS = \
 renderprotopkgconfigdir = $(datadir)/pkgconfig
 renderprotopkgconfig_DATA = renderproto.pc
 
+dist_doc_DATA += renderproto.txt
+
 resourcedir = $(includedir)/X11/extensions
 resource_HEADERS = \
 	include/X11/extensions/XResproto.h
@@ -174,6 +192,8 @@ resource_HEADERS = \
 resourceprotopkgconfigdir = $(datadir)/pkgconfig
 resourceprotopkgconfig_DATA = resourceproto.pc
 
+dist_doc_DATA += resproto.txt
+
 scrnsaverdir = $(includedir)/X11/extensions
 scrnsaver_HEADERS = \
 	include/X11/extensions/saver.h \
@@ -195,6 +215,8 @@ endif
 videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
+dist_doc_DATA += xv-protocol-v2.txt
+
 xprotodir = $(includedir)/X11
 xproto_HEADERS = \
 	include/X11/ap_keysym.h \
@@ -333,6 +355,8 @@ xwaylandproto_HEADERS = \
 xwaylandprotopkgconfigdir = $(datadir)/pkgconfig
 xwaylandprotopkgconfig_DATA = xwaylandproto.pc
 
+dist_doc_DATA += xwaylandproto.txt
+
 if LEGACY
 XCalibrateincludedir = $(includedir)/X11/extensions
 XCalibrateinclude_HEADERS = \
@@ -374,6 +398,8 @@ xproxymng_HEADERS = \
 pmprotopkgconfigdir = $(datadir)/pkgconfig
 pmprotopkgconfig_DATA = xproxymngproto.pc
 
+dist_doc_DATA += PM_spec
+
 printdir = $(includedir)/X11/extensions
 print_HEADERS = \
 	include/X11/extensions/Print.h \
@@ -426,20 +452,6 @@ endif
 
 SUBDIRS=specs
 
-dist_doc_DATA = \
-	compositeproto.txt \
-	damageproto.txt \
-	dri2proto.txt \
-	dri3proto.txt \
-	fixesproto.txt \
-	PM_spec \
-	presentproto.txt \
-	randrproto.txt \
-	renderproto.txt \
-	resproto.txt \
-	xv-protocol-v2.txt \
-	xwaylandproto.txt
-
 EXTRA_DIST = \
     COPYING-applewmproto \
     COPYING-bigreqsproto \
diff --git a/meson.build b/meson.build
index b8d2e44..2967d8b 100644
--- a/meson.build
+++ b/meson.build
@@ -75,7 +75,6 @@ docs = files('compositeproto.txt',
              'dri2proto.txt',
              'dri3proto.txt',
              'fixesproto.txt',
-             'PM_spec',
              'presentproto.txt',
              'randrproto.txt',
              'renderproto.txt',
@@ -107,6 +106,9 @@ if get_option('legacy') == true
             configuration : pc_data,
         )
     endforeach
+    legacy_docs = files('PM_spec')
+    install_data(legacy_docs,
+                 install_dir: get_option('datadir') / 'doc' / 'xorgproto')
 endif
 
 ext_xorgproto = declare_dependency(