From de096e16da8a76c60b97ca0238a1cd1b545fa295 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 18 Sep 2024 12:55:40 +0200 Subject: wireplumber: rename get_default_wp to get_default --- lib/wireplumber/include/astal/wireplumber/wp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/wireplumber/include') diff --git a/lib/wireplumber/include/astal/wireplumber/wp.h b/lib/wireplumber/include/astal/wireplumber/wp.h index 1ff341c..8d1ea83 100644 --- a/lib/wireplumber/include/astal/wireplumber/wp.h +++ b/lib/wireplumber/include/astal/wireplumber/wp.h @@ -22,7 +22,7 @@ typedef enum { G_DECLARE_FINAL_TYPE(AstalWpWp, astal_wp_wp, ASTAL_WP, WP, GObject) AstalWpWp* astal_wp_wp_get_default(); -AstalWpWp* astal_wp_get_default_wp(); +AstalWpWp* astal_wp_get_default(); AstalWpAudio* astal_wp_wp_get_audio(AstalWpWp* self); AstalWpVideo* astal_wp_wp_get_video(AstalWpWp* self); -- cgit v1.2.3 From 10b9cde328947d038029f2496f43da75138abb3d Mon Sep 17 00:00:00 2001 From: kotontrion Date: Wed, 18 Sep 2024 20:29:21 +0200 Subject: add version constants to auth, river and wireplumber libs --- lib/wireplumber/include/astal-wp.h | 4 ---- lib/wireplumber/include/astal-wp.h.in | 14 ++++++++++++++ lib/wireplumber/include/meson.build | 16 +++++++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 lib/wireplumber/include/astal-wp.h create mode 100644 lib/wireplumber/include/astal-wp.h.in (limited to 'lib/wireplumber/include') diff --git a/lib/wireplumber/include/astal-wp.h b/lib/wireplumber/include/astal-wp.h deleted file mode 100644 index 6c48211..0000000 --- a/lib/wireplumber/include/astal-wp.h +++ /dev/null @@ -1,4 +0,0 @@ - -#include "astal/wireplumber/audio.h" -#include "astal/wireplumber/endpoint.h" -#include "astal/wireplumber/wp.h" diff --git a/lib/wireplumber/include/astal-wp.h.in b/lib/wireplumber/include/astal-wp.h.in new file mode 100644 index 0000000..7d9d997 --- /dev/null +++ b/lib/wireplumber/include/astal-wp.h.in @@ -0,0 +1,14 @@ + +#ifndef WP_H +#define WP_H + +#include "astal/wireplumber/audio.h" +#include "astal/wireplumber/endpoint.h" +#include "astal/wireplumber/wp.h" + +#define ASTAL_WP_MAJOR_VERSION @MAJOR_VERSION@ +#define ASTAL_WP_MINOR_VERSION @MINOR_VERSION@ +#define ASTAL_WP_MICRO_VERSION @MICRO_VERSION@ +#define ASTAL_WP_VERSION "@VERSION@" + +#endif // WP_H diff --git a/lib/wireplumber/include/meson.build b/lib/wireplumber/include/meson.build index afe00eb..cae0d6e 100644 --- a/lib/wireplumber/include/meson.build +++ b/lib/wireplumber/include/meson.build @@ -1,8 +1,18 @@ -astal_wireplumber_inc = include_directories('.', 'astal/wireplumber', 'private') -astal_wireplumber_headers = files( - 'astal-wp.h', + +config = configure_file( + input: 'astal-wp.h.in', + output: 'astal-wp.h', + configuration: { + 'VERSION': meson.project_version(), + 'MAJOR_VERSION': version_split[0], + 'MINOR_VERSION': version_split[1], + 'MICRO_VERSION': version_split[2], + }, ) +astal_wireplumber_inc = include_directories('.', 'astal/wireplumber', 'private') +astal_wireplumber_headers = config + install_headers(astal_wireplumber_headers) subdir('astal/wireplumber') -- cgit v1.2.3