From c4076ef88ab805c54b20c07b2f08e73912fc3483 Mon Sep 17 00:00:00 2001
From: Marius Vlad <marius.vlad@collabora.com>
Date: Fri, 28 Aug 2020 16:59:36 +0300
Subject: [PATCH] plug-ins: Migrate pipewire and remoting plug-ins headers to
 public header directory

Weston is also a user of the plug-ins, so make use of it. With this
change we unconditionally install the plug-in headers even though
libweston might not be built with support for them.

Suggested-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
---
 compositor/main.c                                 | 4 ++--
 include/libweston/meson.build                     | 2 ++
 {pipewire => include/libweston}/pipewire-plugin.h | 0
 {remoting => include/libweston}/remoting-plugin.h | 0
 pipewire/meson.build                              | 1 -
 pipewire/pipewire-plugin.c                        | 2 +-
 remoting/meson.build                              | 1 -
 remoting/remoting-plugin.c                        | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename {pipewire => include/libweston}/pipewire-plugin.h (100%)
 rename {remoting => include/libweston}/remoting-plugin.h (100%)

diff --git a/compositor/main.c b/compositor/main.c
index 65da9dbc..2554b762 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -63,8 +63,8 @@
 #include <libweston/backend-wayland.h>
 #include <libweston/windowed-output-api.h>
 #include <libweston/weston-log.h>
-#include "../remoting/remoting-plugin.h"
-#include "../pipewire/pipewire-plugin.h"
+#include <libweston/remoting-plugin.h>
+#include <libweston/pipewire-plugin.h>
 
 #define WINDOW_TITLE "Weston Compositor"
 /* flight recorder size (in bytes) */
diff --git a/include/libweston/meson.build b/include/libweston/meson.build
index 2c2f7729..1ad459bb 100644
--- a/include/libweston/meson.build
+++ b/include/libweston/meson.build
@@ -6,6 +6,8 @@ install_headers(
 	'windowed-output-api.h',
 	'weston-log.h',
 	'zalloc.h',
+	'remoting-plugin.h',
+	'pipewire-plugin.h',
 	subdir: dir_include_libweston_install
 )
 
diff --git a/pipewire/pipewire-plugin.h b/include/libweston/pipewire-plugin.h
similarity index 100%
rename from pipewire/pipewire-plugin.h
rename to include/libweston/pipewire-plugin.h
diff --git a/remoting/remoting-plugin.h b/include/libweston/remoting-plugin.h
similarity index 100%
rename from remoting/remoting-plugin.h
rename to include/libweston/remoting-plugin.h
diff --git a/pipewire/meson.build b/pipewire/meson.build
index 3d3374b8..67db61f0 100644
--- a/pipewire/meson.build
+++ b/pipewire/meson.build
@@ -27,5 +27,4 @@ if get_option('pipewire')
 		install_dir: dir_module_libweston
 	)
 	env_modmap += 'pipewire-plugin.so=@0@;'.format(plugin_pipewire.full_path())
-	install_headers('pipewire-plugin.h', subdir: dir_include_libweston_install)
 endif
diff --git a/pipewire/pipewire-plugin.c b/pipewire/pipewire-plugin.c
index 6f892574..fe7eb1d6 100644
--- a/pipewire/pipewire-plugin.c
+++ b/pipewire/pipewire-plugin.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "pipewire-plugin.h"
+#include <libweston/pipewire-plugin.h>
 #include "backend.h"
 #include "libweston-internal.h"
 #include "shared/timespec-util.h"
diff --git a/remoting/meson.build b/remoting/meson.build
index ac9fa511..ed7ff479 100644
--- a/remoting/meson.build
+++ b/remoting/meson.build
@@ -29,5 +29,4 @@ if get_option('remoting')
 		install_dir: dir_module_libweston
 	)
 	env_modmap += 'remoting-plugin.so=@0@;'.format(plugin_remoting.full_path())
-	install_headers('remoting-plugin.h', subdir: dir_include_libweston_install)
 endif
diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c
index 85b6bcfd..a1d994ea 100644
--- a/remoting/remoting-plugin.c
+++ b/remoting/remoting-plugin.c
@@ -43,7 +43,7 @@
 #include <gst/video/gstvideometa.h>
 #include <drm_fourcc.h>
 
-#include "remoting-plugin.h"
+#include <libweston/remoting-plugin.h>
 #include <libweston/backend-drm.h>
 #include "shared/helpers.h"
 #include "shared/timespec-util.h"