pipewire: 0.3.27 -> 0.3.30
(cherry picked from commit c702cc43213dce2573adb924ab9c67522616aea6)
This commit is contained in:
committed by
github-actions[bot]
parent
39c1857cd5
commit
c2628780fc
@@ -1,30 +1,30 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a27569bd..fcf18344 100644
|
||||
index b6b4553b..f21c29d8 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir')
|
||||
pipewire_localedir = prefix / get_option('localedir')
|
||||
@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir')
|
||||
pipewire_sysconfdir = prefix / get_option('sysconfdir')
|
||||
|
||||
-pipewire_configdir = pipewire_sysconfdir / 'pipewire'
|
||||
+pipewire_configdir = get_option('pipewire_config_dir')
|
||||
+if pipewire_configdir == ''
|
||||
+ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
|
||||
pipewire_configdir = pipewire_sysconfdir / 'pipewire'
|
||||
-pipewire_confdatadir = pipewire_datadir / 'pipewire'
|
||||
+pipewire_confdatadir = get_option('pipewire_confdata_dir')
|
||||
+if pipewire_confdatadir == ''
|
||||
+ pipewire_confdatadir = pipewire_datadir / 'pipewire'
|
||||
+endif
|
||||
modules_install_dir = pipewire_libdir / pipewire_name
|
||||
|
||||
if host_machine.system() == 'linux'
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 85beb86a..372e8faa 100644
|
||||
index 9bc33fcd..e4bd2dc1 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -67,6 +67,9 @@ option('jack-devel',
|
||||
@@ -61,6 +61,9 @@ option('jack-devel',
|
||||
option('libjack-path',
|
||||
description: 'Where to install the libjack.so library',
|
||||
type: 'string')
|
||||
+option('pipewire_config_dir',
|
||||
+ type : 'string',
|
||||
+ description : 'Directory for pipewire configuration (defaults to /etc/pipewire)')
|
||||
+option('pipewire_confdata_dir',
|
||||
+ type: 'string',
|
||||
+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)')
|
||||
option('spa-plugins',
|
||||
description: 'Enable spa plugins integration',
|
||||
type: 'feature',
|
||||
|
||||
Reference in New Issue
Block a user