From 8e7f9501e4525e6726a2d947467272fcbb5ed34e Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Tue, 9 Jul 2019 12:00:41 +0300
Subject: [PATCH] Link Weston plugins to libexec-weston.so

All these plugins use symbols that were exported by the weston executable and
are now exported by libexec-weston.so. Linking these to libexec-weston.so fixes
unresolved symbols.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 compositor/meson.build    | 3 ++-
 desktop-shell/meson.build | 1 +
 ivi-shell/meson.build     | 7 ++++++-
 tests/meson.build         | 5 +++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/compositor/meson.build b/compositor/meson.build
index d29e43ab..e1334d6a 100644
--- a/compositor/meson.build
+++ b/compositor/meson.build
@@ -76,6 +76,7 @@ if get_option('screenshare')
 		fullscreen_shell_unstable_v1_protocol_c,
 	]
 	deps_screenshare = [
+		dep_libexec_weston,
 		dep_libshared,
 		dep_libweston_public,
 		dep_libweston_private_h, # XXX: https://gitlab.freedesktop.org/wayland/weston/issues/292
@@ -110,7 +111,7 @@ if get_option('color-management-lcms')
 		'cms-static',
 		srcs_lcms,
 		include_directories: common_inc,
-		dependencies: [ dep_libweston_public, dep_lcms2 ],
+		dependencies: [ dep_libexec_weston, dep_libweston_public, dep_lcms2 ],
 		name_prefix: '',
 		install: true,
 		install_dir: dir_module_weston
diff --git a/desktop-shell/meson.build b/desktop-shell/meson.build
index afe96635..c4f6b0da 100644
--- a/desktop-shell/meson.build
+++ b/desktop-shell/meson.build
@@ -12,6 +12,7 @@ if get_option('shell-desktop')
 	]
 	deps_shell_desktop = [
 		dep_libm,
+		dep_libexec_weston,
 		dep_libshared,
 		dep_lib_desktop,
 		dep_libweston_public,
diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build
index 074fc176..8364fa57 100644
--- a/ivi-shell/meson.build
+++ b/ivi-shell/meson.build
@@ -14,6 +14,7 @@ if get_option('shell-ivi')
 		include_directories: common_inc,
 		dependencies: [
 			dep_libm,
+			dep_libexec_weston,
 			dep_lib_desktop,
 			dep_libweston_public
 		],
@@ -34,7 +35,11 @@ if get_option('shell-ivi')
 		'hmi-controller',
 		srcs_ivi_hmi,
 		include_directories: common_inc,
-		dependencies: [ dep_libweston_public, dep_libshared ],
+		dependencies: [
+			dep_libexec_weston,
+			dep_libweston_public,
+			dep_libshared
+		],
 		name_prefix: '',
 		install: true,
 		install_dir: dir_module_weston
diff --git a/tests/meson.build b/tests/meson.build
index 041c3b51..5a5b2e6d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -45,7 +45,7 @@ exe_plugin_test = shared_library(
 	weston_test_server_protocol_h,
 	weston_test_protocol_c,
 	include_directories: common_inc,
-	dependencies: [ dep_libweston_private ],
+	dependencies: [ dep_libexec_weston, dep_libweston_private ],
 	name_prefix: '',
 	install: false,
 )
@@ -205,7 +205,8 @@ if get_option('shell-ivi')
 				'ivi-layout-test-plugin.c',
 				weston_test_server_protocol_h,
 				weston_test_protocol_c,
-			]
+			],
+			[ dep_libexec_weston ]
 		],
 	]