Merge branch 'fix/wireplumber-11'

4 files changed, 28 insertions, 8 deletions

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/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);
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')