mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link Weston plugins to libexec-weston.so

Browse Source 
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>
This commit is contained in:
Pekka Paalanen
2019-07-09 12:00:41 +03:00
parent d1ace4c97f
commit 8e7f9501e4
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/meson.build
+2 -1
View File
@@ -76,6 +76,7 @@ if get_option('screenshare')
fullscreen_shell_unstable_v1_protocol_c, fullscreen_shell_unstable_v1_protocol_c,
] ]
deps_screenshare = [ deps_screenshare = [
dep_libexec_weston,
dep_libshared, dep_libshared,
dep_libweston_public, dep_libweston_public,
dep_libweston_private_h, # XXX: https://gitlab.freedesktop.org/wayland/weston/issues/292 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', 'cms-static',
srcs_lcms, srcs_lcms,
include_directories: common_inc, include_directories: common_inc,
dependencies: [ dep_libweston_public, dep_lcms2 ], dependencies: [ dep_libexec_weston, dep_libweston_public, dep_lcms2 ],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston
desktop-shell/meson.build
+1
View File
@@ -12,6 +12,7 @@ if get_option('shell-desktop')
] ]
deps_shell_desktop = [ deps_shell_desktop = [
dep_libm, dep_libm,
dep_libexec_weston,
dep_libshared, dep_libshared,
dep_lib_desktop, dep_lib_desktop,
dep_libweston_public, dep_libweston_public,
ivi-shell/meson.build
+6 -1
View File
@@ -14,6 +14,7 @@ if get_option('shell-ivi')
include_directories: common_inc, include_directories: common_inc,
dependencies: [ dependencies: [
dep_libm, dep_libm,
dep_libexec_weston,
dep_lib_desktop, dep_lib_desktop,
dep_libweston_public dep_libweston_public
], ],
@@ -34,7 +35,11 @@ if get_option('shell-ivi')
'hmi-controller', 'hmi-controller',
srcs_ivi_hmi, srcs_ivi_hmi,
include_directories: common_inc, include_directories: common_inc,
dependencies: [ dep_libweston_public, dep_libshared ], dependencies: [
dep_libexec_weston,
dep_libweston_public,
dep_libshared
],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston
tests/meson.build
+3 -2
View File
@@ -45,7 +45,7 @@ exe_plugin_test = shared_library(
weston_test_server_protocol_h, weston_test_server_protocol_h,
weston_test_protocol_c, weston_test_protocol_c,
include_directories: common_inc, include_directories: common_inc,
dependencies: [ dep_libweston_private ], dependencies: [ dep_libexec_weston, dep_libweston_private ],
name_prefix: '', name_prefix: '',
install: false, install: false,
) )
@@ -205,7 +205,8 @@ if get_option('shell-ivi')
'ivi-layout-test-plugin.c', 'ivi-layout-test-plugin.c',
weston_test_server_protocol_h, weston_test_server_protocol_h,
weston_test_protocol_c, weston_test_protocol_c,
] ],
[ dep_libexec_weston ]
], ],
] ]