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>
dev
Marius Vlad 4 years ago committed by Daniel Stone
parent a5570695c5
commit c4076ef88a
  1. 4
      compositor/main.c
  2. 2
      include/libweston/meson.build
  3. 0
      include/libweston/pipewire-plugin.h
  4. 0
      include/libweston/remoting-plugin.h
  5. 1
      pipewire/meson.build
  6. 2
      pipewire/pipewire-plugin.c
  7. 1
      remoting/meson.build
  8. 2
      remoting/remoting-plugin.c

@ -63,8 +63,8 @@
#include <libweston/backend-wayland.h> #include <libweston/backend-wayland.h>
#include <libweston/windowed-output-api.h> #include <libweston/windowed-output-api.h>
#include <libweston/weston-log.h> #include <libweston/weston-log.h>
#include "../remoting/remoting-plugin.h" #include <libweston/remoting-plugin.h>
#include "../pipewire/pipewire-plugin.h" #include <libweston/pipewire-plugin.h>
#define WINDOW_TITLE "Weston Compositor" #define WINDOW_TITLE "Weston Compositor"
/* flight recorder size (in bytes) */ /* flight recorder size (in bytes) */

@ -6,6 +6,8 @@ install_headers(
'windowed-output-api.h', 'windowed-output-api.h',
'weston-log.h', 'weston-log.h',
'zalloc.h', 'zalloc.h',
'remoting-plugin.h',
'pipewire-plugin.h',
subdir: dir_include_libweston_install subdir: dir_include_libweston_install
) )

@ -27,5 +27,4 @@ if get_option('pipewire')
install_dir: dir_module_libweston install_dir: dir_module_libweston
) )
env_modmap += 'pipewire-plugin.so=@0@;'.format(plugin_pipewire.full_path()) env_modmap += 'pipewire-plugin.so=@0@;'.format(plugin_pipewire.full_path())
install_headers('pipewire-plugin.h', subdir: dir_include_libweston_install)
endif endif

@ -23,7 +23,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include "pipewire-plugin.h" #include <libweston/pipewire-plugin.h>
#include "backend.h" #include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"

@ -29,5 +29,4 @@ if get_option('remoting')
install_dir: dir_module_libweston install_dir: dir_module_libweston
) )
env_modmap += 'remoting-plugin.so=@0@;'.format(plugin_remoting.full_path()) env_modmap += 'remoting-plugin.so=@0@;'.format(plugin_remoting.full_path())
install_headers('remoting-plugin.h', subdir: dir_include_libweston_install)
endif endif

@ -43,7 +43,7 @@
#include <gst/video/gstvideometa.h> #include <gst/video/gstvideometa.h>
#include <drm_fourcc.h> #include <drm_fourcc.h>
#include "remoting-plugin.h" #include <libweston/remoting-plugin.h>
#include <libweston/backend-drm.h> #include <libweston/backend-drm.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"

Loading…
Cancel
Save