tjh.dev
1diff --git a/meson.build b/meson.build
2index 650ad189..1e1ebe1d 100644
3--- a/meson.build
4+++ b/meson.build
5@@ -18,6 +18,11 @@ plymouth_time_dir = get_option('prefix') / get_option('localstatedir') / 'lib' /
6
7 plymouth_runtime_dir = get_option('runstatedir') / 'plymouth'
8 plymouth_runtime_theme_path = plymouth_runtime_dir / 'themes/'
9+if get_option('runtime-plugins')
10+ plymouth_runtime_plugin_path = plymouth_runtime_dir / 'plugins/'
11+else
12+ plymouth_runtime_plugin_path = plymouth_plugin_path
13+endif
14
15 # Dependencies
16 cc = meson.get_compiler('c')
17@@ -76,7 +81,7 @@ conf.set('PLY_ENABLE_TRACING', get_option('tracing'))
18 conf.set_quoted('PLYMOUTH_RUNTIME_DIR', plymouth_runtime_dir)
19 conf.set_quoted('PLYMOUTH_THEME_PATH', plymouth_theme_path)
20 conf.set_quoted('PLYMOUTH_RUNTIME_THEME_PATH', plymouth_runtime_theme_path)
21-conf.set_quoted('PLYMOUTH_PLUGIN_PATH', plymouth_plugin_path)
22+conf.set_quoted('PLYMOUTH_PLUGIN_PATH', plymouth_runtime_plugin_path)
23 conf.set_quoted('PLYMOUTH_POLICY_DIR', plymouth_policy_dir)
24 conf.set_quoted('PLYMOUTH_CONF_DIR', plymouth_conf_dir)
25 conf.set_quoted('PLYMOUTH_TIME_DIRECTORY', plymouth_time_dir)
26diff --git a/meson_options.txt b/meson_options.txt
27index 4f601bb0..61fccc12 100644
28--- a/meson_options.txt
29+++ b/meson_options.txt
30@@ -28,6 +28,11 @@ option('runstatedir',
31 value: '/run',
32 description: 'runstatedir',
33 )
34+option('runtime-plugins',
35+ type: 'boolean',
36+ value: false,
37+ description: 'Use runstatedir for loading theme plugins',
38+)
39 option('boot-tty',
40 type: 'string',
41 value: '/dev/tty1',
42diff --git a/src/libply-splash-core/meson.build b/src/libply-splash-core/meson.build
43index 69636b13..02bd5cbd 100644
44--- a/src/libply-splash-core/meson.build
45+++ b/src/libply-splash-core/meson.build
46@@ -31,7 +31,7 @@ libply_splash_core_cflags = [
47 '-DPLYMOUTH_BACKGROUND_COLOR=@0@'.format(get_option('background-color')),
48 '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
49 '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
50- '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_plugin_path),
51+ '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_runtime_plugin_path),
52 ]
53
54 libply_splash_core = library('ply-splash-core',
55diff --git a/src/libply-splash-graphics/meson.build b/src/libply-splash-graphics/meson.build
56index 32fad963..02b8440b 100644
57--- a/src/libply-splash-graphics/meson.build
58+++ b/src/libply-splash-graphics/meson.build
59@@ -20,7 +20,7 @@ libply_splash_graphics_cflags = [
60 '-DPLYMOUTH_BACKGROUND_COLOR=@0@'.format(get_option('background-color')),
61 '-DPLYMOUTH_BACKGROUND_START_COLOR=@0@'.format(get_option('background-start-color-stop')),
62 '-DPLYMOUTH_BACKGROUND_END_COLOR=@0@'.format(get_option('background-end-color-stop')),
63- '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_plugin_path),
64+ '-DPLYMOUTH_PLUGIN_PATH="@0@"'.format(plymouth_runtime_plugin_path),
65 ]
66
67 libply_splash_graphics = library('ply-splash-graphics',