From e0768ef959bd278227bdfbf55f65b8648e6f534a Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 13 Jun 2023 16:38:11 +0200 Subject: [PATCH] build: Add a meta xorgproto.pc Currently each protocol has its own version. Also, the standalone repositories for each of those protocols is deprecated in favor of this xorgproto package. Add an xorgproto.pc that contains the actual package version, so that applications do not have to list each protocol and the version they require, but can chose to require instead just a particular version of xorgproto. Signed-off-by: Olivier Fourdan --- Makefile.am | 3 +++ configure.ac | 1 + meson.build | 2 ++ xorgproto.pc.in | 7 +++++++ 4 files changed, 13 insertions(+) create mode 100644 xorgproto.pc.in diff --git a/Makefile.am b/Makefile.am index 9af8f5a..b57d1f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -357,6 +357,9 @@ xwaylandprotopkgconfig_DATA = xwaylandproto.pc dist_doc_DATA += xwaylandproto.txt +xorgprotopkgconfigdir = $(datadir)/pkgconfig +xorgprotopkgconfig_DATA = xorgproto.pc + if LEGACY XCalibrateincludedir = $(includedir)/X11/extensions XCalibrateinclude_HEADERS = \ diff --git a/configure.ac b/configure.ac index ac6103e..f88ba3c 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ AC_CONFIG_FILES([applewmproto.pc xf86rushproto.pc xf86vidmodeproto.pc xineramaproto.pc + xorgproto.pc xproto.pc xproxymngproto.pc xwaylandproto.pc]) diff --git a/meson.build b/meson.build index 947e70b..9d84193 100644 --- a/meson.build +++ b/meson.build @@ -51,12 +51,14 @@ pcs = [ 'xf86driproto', 'xf86vidmodeproto', 'xineramaproto', + 'xorgproto', 'xproto', 'xwaylandproto', ] pc_data = configuration_data() pc_data.set('prefix', get_option('prefix')) +pc_data.set('PACKAGE_VERSION', meson.project_version()) # meson does not allow installing the includedir outside of the prefix pc_data.set('includedir', '${prefix}/' + get_option('includedir')) diff --git a/xorgproto.pc.in b/xorgproto.pc.in new file mode 100644 index 0000000..b74a2a6 --- /dev/null +++ b/xorgproto.pc.in @@ -0,0 +1,7 @@ +prefix=@prefix@ +includedir=@includedir@ + +Name: XorgProto +Description: X Window System unified protocol headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir}