diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-11-18 14:36:23 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-11-19 12:28:35 +0000 |
| commit | 9c605257e22e0f28939c6b679324488b2719999d (patch) | |
| tree | 80dae6fe88cb0bb59a429d1c5b2bb865ae0ef906 | |
| parent | 16ab9c3ba0e226f384e88be67a306c8cb7cf635b (diff) | |
build/: Allow to build the compositor w/o waltham
Provides empty implementations to avoid sprinking ifdefs everywhere. The
transmitter plug-in does not expose a pkgconfig file we instead resort
to test again waltham protocol (which is used by the transmitter) and
the the remoting plug-in.
Fixes a minor deps check in the meson file.
Bug-AGL: SPEC-3691
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: Id25d21d2ef0c6e55575c2e7685cda73e401db015
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | src/shell.c | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 34f8558..bd4cb04 100644 --- a/meson.build +++ b/meson.build @@ -73,10 +73,11 @@ depnames_waltham = [ deps_waltham = [] foreach depname : depnames_waltham dep = dependency(depname, required: false) - if not dep.found() + if dep.found() + deps_waltham += dep + else message('Waltham requires @0@ which was not found. '.format(depname)) endif - deps_waltham += dep endforeach deps_waltham += deps_remoting diff --git a/src/shell.c b/src/shell.c index 2ecf4c0..f059de6 100644 --- a/src/shell.c +++ b/src/shell.c @@ -107,6 +107,7 @@ ivi_set_desktop_surface_fullscreen(struct ivi_surface *surface) agl_shell_desktop_advertise_application_id(ivi, surface); } +#ifdef HAVE_WALTHAM void ivi_destroy_waltham_destroy(struct ivi_surface *surface) { @@ -177,6 +178,17 @@ ivi_output_notify_waltham_plugin(struct ivi_surface *surface) api->surface_push_to_remote(weston_surface, app_id, trans_remote, NULL); } +#else +void +ivi_destroy_waltham_destroy(struct ivi_surface *surface) +{ +} +static void +ivi_output_notify_waltham_plugin(struct ivi_surface *surface) +{ +} +#endif + static void ivi_set_desktop_surface_remote(struct ivi_surface *surface) { |