summaryrefslogtreecommitdiffstats
path: root/meta-pipewire/recipes-multimedia/wireplumber
diff options
context:
space:
mode:
Diffstat (limited to 'meta-pipewire/recipes-multimedia/wireplumber')
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.conf2
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua4
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/40-device-defaults.lua2
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/90-enable-all.lua4
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/wireplumber.conf41
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb10
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/00-functions.lua27
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.conf (renamed from meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.conf)0
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.lua.d/10-default-policy.lua (renamed from meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua)18
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb41
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch63
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch136
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb30
13 files changed, 147 insertions, 231 deletions
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.conf b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.conf
index ebd0b6004..9077e3f45 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.conf
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.conf
@@ -6,7 +6,7 @@ context.properties = {
application.name = "WirePlumber Bluetooth"
log.level = 2
wireplumber.script-engine = lua-scripting
- wireplumber.export-core = false
+ wireplumber.export-core = true
#mem.mlock-all = false
#support.dbus = true
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua
index 75a169675..d07f7ab85 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua
@@ -8,7 +8,7 @@ alsa_monitor.properties = {
}
alsa_monitor.rules = {
- -- disable ACP (PulseAudio-like profiles)
+ -- enable ACP (PulseAudio-like profiles)
{
matches = {
{
@@ -16,7 +16,7 @@ alsa_monitor.rules = {
},
},
apply_properties = {
- ["api.alsa.use-acp"] = false,
+ ["api.alsa.use-acp"] = true,
},
},
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/40-device-defaults.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/40-device-defaults.lua
index 365bab59a..e0d332422 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/40-device-defaults.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/40-device-defaults.lua
@@ -14,7 +14,7 @@ function device_defaults.enable()
-- Selects appropriate default routes ("ports" in pulseaudio terminology)
-- and enables saving and restoring them together with
-- their properties (per-route/port volume levels, channel maps, etc)
- load_script("default-routes.lua", device_defaults.properties)
+ load_script("policy-device-routes.lua", device_defaults.properties)
if device_defaults.properties["use-persistent-storage"] then
-- Enables functionality to save and restore default device profiles
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/90-enable-all.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/90-enable-all.lua
index f6d73a3f1..ecb7da476 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/90-enable-all.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/90-enable-all.lua
@@ -4,7 +4,7 @@ load_module("metadata")
-- Load devices
alsa_monitor.enable()
---v4l2_monitor.enable()
+v4l2_monitor.enable()
-- Track/store/restore user choices about devices
device_defaults.enable()
@@ -13,7 +13,7 @@ device_defaults.enable()
load_script("suspend-node.lua")
-- Automatically sets device profiles to 'On'
-load_module("device-activation")
+load_script("policy-device-profile.lua")
-- Mute ALSA sinks when requested by pipewire-ic-ipc
load_module("mixer-api")
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/wireplumber.conf b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/wireplumber.conf
index 680a791f3..46ad11302 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/wireplumber.conf
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/wireplumber.conf
@@ -57,6 +57,47 @@ context.modules = [
# Provides factories to make session manager objects.
{ name = libpipewire-module-session-manager }
+
+ { name = libpipewire-module-filter-chain
+ args = {
+ node.description = "Equalizer Sink"
+ media.name = "Equalizer Sink"
+ filter.graph = {
+ nodes = [
+ {
+ type = builtin
+ name = bass
+ label = bq_lowshelf
+ # the cut off freq of the bass filter can be adjusted here.
+ control = { "Freq" = 250.0 "Q" = 1.0 "Gain" = 0.0 }
+ }
+ {
+ type = builtin
+ name = treble
+ label = bq_peaking
+ # the cut off freq of the treble filter can be adjusted here.
+ control = { "Freq" = 6000.0 "Q" = 1.0 "Gain" = 0.0 }
+ }
+ ]
+ links = [
+ { output = "bass:Out" input = "treble:In" }
+ ]
+ }
+ audio.channels = 2
+ audio.position = [ FL FR ]
+ capture.props = {
+ node.name = "eq-sink"
+ media.class = Audio/Sink
+ # select the endpoint to which the node is attached
+ target.endpoint = "endpoint.multimedia"
+ node.passive = true
+ }
+ playback.props = {
+ node.name = "eq-output-stream"
+ node.passive = true
+ }
+ }
+ }
]
wireplumber.components = [
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
index 839a15fda..22ffe5bf3 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bb
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
SRC_URI = "\
file://bluetooth.lua.d/ \
file://host.lua.d/ \
- file://policy.lua.d \
file://00-functions.lua \
file://alsa-suspend.lua \
file://bluetooth.conf \
- file://policy.conf \
file://wireplumber.conf \
file://wireplumber-bluetooth.conf \
"
@@ -35,12 +33,6 @@ do_install:append() {
install -m 0644 ${WORKDIR}/host.lua.d/*.lua ${config_dir}/host.lua.d/
install -m 0644 ${WORKDIR}/wireplumber.conf ${config_dir}
- # config of the policy instance
- install -d ${config_dir}/policy.lua.d/
- ln -s ../00-functions.lua ${config_dir}/policy.lua.d/00-functions.lua
- install -m 0644 ${WORKDIR}/policy.lua.d/*.lua ${config_dir}/policy.lua.d/
- install -m 0644 ${WORKDIR}/policy.conf ${config_dir}
-
# config of the bluetooth instance
install -d ${config_dir}/bluetooth.lua.d/
ln -s ../00-functions.lua ${config_dir}/bluetooth.lua.d/00-functions.lua
@@ -57,7 +49,6 @@ do_install:append() {
# enable additional systemd services
install -d ${systemd_dir}
- ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@policy.service
ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@bluetooth.service
}
@@ -68,4 +59,3 @@ FILES:${PN} += "\
CONFFILES:${PN} += "\
${sysconfdir}/* \
"
-RPROVIDES:${PN} += "virtual/wireplumber-config"
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/00-functions.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/00-functions.lua
new file mode 100644
index 000000000..7e1794df0
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/00-functions.lua
@@ -0,0 +1,27 @@
+components = {}
+
+function load_module(m)
+ if not components[m] then
+ components[m] = { "libwireplumber-module-" .. m, type = "module" }
+ end
+end
+
+function load_pw_module(m)
+ if not components[m] then
+ components[m] = { "libpipewire-module-" .. m, type = "pw_module" }
+ end
+end
+
+function load_script(s, a)
+ if not components[s] then
+ components[s] = { s, type = "script/lua", args = a }
+ end
+end
+
+function load_monitor(s, a)
+ load_script("monitors/" .. s .. ".lua", a)
+end
+
+function load_access(s, a)
+ load_script("access/access-" .. s .. ".lua", a)
+end
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.conf b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.conf
index 42f714849..42f714849 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.conf
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.conf
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.lua.d/10-default-policy.lua
index 82f5bb055..6814fce4d 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl/policy.lua.d/10-default-policy.lua
@@ -4,7 +4,10 @@ policy_config = {}
policy_config.endpoints = {
-- [endpoint name] = { endpoint properties }
-
+ ["endpoint.capture"] = {
+ ["media.class"] = "Audio/Source",
+ ["role"] = "Capture",
+ },
["endpoint.multimedia"] = {
["media.class"] = "Audio/Sink",
["role"] = "Multimedia",
@@ -53,10 +56,17 @@ policy_config.policy = {
["duck.level"] = 0.2,
["roles"] = {
+ ["Capture"] = {
+ ["alias"] = { "Multimedia", "Music", "Voice", "Capture" },
+ ["priority"] = 25,
+ ["action.default"] = "cork",
+ ["action.Capture"] = "mix",
+ ["media.class"] = "Audio/Source",
+ },
["Multimedia"] = {
["alias"] = { "Movie", "Music", "Game" },
["priority"] = 25,
- ["action.default"] = "cork",
+ ["action.default"] = "mix",
},
["Speech-Low"] = {
["priority"] = 30,
@@ -113,8 +123,8 @@ load_module("mixer-api")
-- Create endpoints statically at startup
load_script("static-endpoints.lua", policy_config.endpoints)
- -- Create session items for nodes that appear in the graph
- load_script("create-item.lua", default_policy.policy)
+-- Create session items for nodes that appear in the graph
+load_script("create-item.lua", policy_config.policy)
-- Link nodes to each other to make media flow in the graph
load_script("policy-node.lua", policy_config.policy)
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb
new file mode 100644
index 000000000..1a031160e
--- /dev/null
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_git.bb
@@ -0,0 +1,41 @@
+SUMMARY = "AGL configuration file for wireplumber policy"
+HOMEPAGE = "https://gitlab.freedesktop.org/gkiagia/wireplumber"
+BUGTRACKER = "https://jira.automotivelinux.org"
+AUTHOR = "Ashok Sidipotu <ashok.sidipotu@collabora.com>"
+SECTION = "multimedia"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+SRC_URI = "\
+ file://policy.lua.d \
+ file://00-functions.lua \
+ file://policy.conf \
+"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install:append() {
+ config_dir="${D}${sysconfdir}/wireplumber/"
+ systemd_dir="${D}${sysconfdir}/systemd/system/pipewire.service.wants"
+
+ install -d ${config_dir}
+ install -m 0644 ${WORKDIR}/00-functions.lua ${config_dir}
+
+ # config of the policy instance
+ install -d ${config_dir}/policy.lua.d/
+ ln -s ../00-functions.lua ${config_dir}/policy.lua.d/00-functions.lua
+ install -m 0644 ${WORKDIR}/policy.lua.d/*.lua ${config_dir}/policy.lua.d/
+ install -m 0644 ${WORKDIR}/policy.conf ${config_dir}
+
+ # enable additional systemd services
+ install -d ${systemd_dir}
+ ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@policy.service
+}
+
+FILES:${PN} += "\
+ ${sysconfdir}/* \
+ ${datadir}/wireplumber/* \
+"
+CONFFILES:${PN} += "\
+ ${sysconfdir}/* \
+"
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch
deleted file mode 100644
index 37b43571d..000000000
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1d39b68d88e967739d6beb3c9be7f4644b5d4077 Mon Sep 17 00:00:00 2001
-From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
-Date: Thu, 2 Dec 2021 16:23:09 +0530
-Subject: [PATCH] Revert "wp-uninstalled: build this script with the meson dirs
- filled in"
-
-This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
----
- meson.build | 18 ------------------
- wp-uninstalled.sh | 11 ++---------
- 2 files changed, 2 insertions(+), 27 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 1affbc1..f2ca16c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -120,21 +120,3 @@ subdir('src')
- if get_option('tests')
- subdir('tests')
- endif
--
--conf_uninstalled = configuration_data()
--conf_uninstalled.set('MESON', '')
--conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
--conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
--
--wp_uninstalled = configure_file(
-- input : 'wp-uninstalled.sh',
-- output : 'wp-uninstalled.sh.in',
-- configuration : conf_uninstalled,
--)
--
--wireplumber_uninstalled = custom_target('wp-uninstalled',
-- output : 'wp-uninstalled.sh',
-- input : wp_uninstalled,
-- build_by_default : true,
-- command : ['cp', '@INPUT@', '@OUTPUT@'],
--)
-diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
-index 79e53f2..d6279ff 100755
---- a/wp-uninstalled.sh
-+++ b/wp-uninstalled.sh
-@@ -2,15 +2,8 @@
-
- set -e
-
--# This is unset by meson
--# shellcheck disable=SC2157
--if [ -z "@MESON@" ]; then
-- SOURCEDIR="@MESON_SOURCE_ROOT@"
-- BUILDDIR="@MESON_BUILD_ROOT@"
--else
-- SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-- BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
--fi
-+SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-+BUILDDIR=${SOURCEDIR}/build
- CONFIGDIR=config
-
- while getopts ":b:c:" opt; do
---
-2.33.1
-
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch
deleted file mode 100644
index 07ddb746b..000000000
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 4ea8ddc256df636208479a5b64bf8bdc6e413aca Mon Sep 17 00:00:00 2001
-From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
-Date: Thu, 2 Dec 2021 16:57:54 +0530
-Subject: [PATCH] Revert "tests: add pipewire env variables when running tests,
- tidy up common_env"
-
-This reverts commit c24db9f3539f9b7ebe9e74c991cc3037f28ea22c.
----
- tests/meson.build | 31 -------------------------------
- tests/modules/meson.build | 9 ++++++---
- tests/wp/meson.build | 10 +++++++---
- tests/wplua/meson.build | 15 +++++++++++----
- 4 files changed, 24 insertions(+), 41 deletions(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 0e06568..9238d5b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -28,37 +28,6 @@ if valgrind.found()
- timeout_multiplier: 2)
- endif
-
--# The common test environment
--common_test_env = environment({
-- 'HOME': '/invalid',
-- 'XDG_RUNTIME_DIR': '/invalid',
-- 'PIPEWIRE_RUNTIME_DIR': '/tmp',
-- 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
-- 'XDG_STATE_HOME': meson.current_build_dir() / '.local' / 'state',
-- 'FILE_MONITOR_DIR': meson.current_build_dir() / '.local' / 'file_monitor',
-- 'WIREPLUMBER_CONFIG_DIR': '/invalid',
-- 'WIREPLUMBER_DATA_DIR': '/invalid',
-- 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / 'modules',
-- 'WIREPLUMBER_DEBUG': '7',
--})
--
--spa_plugindir = spa_dep.get_variable(
-- pkgconfig: 'plugindir', internal: 'plugindir', default_value: '')
--pipewire_moduledir = pipewire_dep.get_variable(
-- pkgconfig: 'moduledir', internal: 'moduledir', default_value: '')
--pipewire_confdatadir = pipewire_dep.get_variable(
-- pkgconfig: 'confdatadir', internal: 'confdatadir', default_value: '')
--
--if spa_plugindir != ''
-- common_test_env.set('SPA_PLUGIN_DIR', spa_plugindir)
--endif
--if pipewire_moduledir != ''
-- common_test_env.set('PIPEWIRE_MODULE_DIR', pipewire_moduledir)
--endif
--if pipewire_confdatadir != ''
-- common_test_env.set('PIPEWIRE_CONFIG_DIR', pipewire_confdatadir)
--endif
--
- subdir('wp')
- subdir('wplua')
- subdir('modules')
-diff --git a/tests/modules/meson.build b/tests/modules/meson.build
-index ffab80b..2fc46dc 100644
---- a/tests/modules/meson.build
-+++ b/tests/modules/meson.build
-@@ -1,7 +1,10 @@
- common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
--common_env = common_test_env
--common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
--common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-+common_env = environment({
-+ 'G_TEST_SRCDIR': meson.current_source_dir(),
-+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
-+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
-+ 'WIREPLUMBER_DEBUG': '7',
-+})
- common_args = [
- '-DG_LOG_USE_STRUCTURED',
- ]
-diff --git a/tests/wp/meson.build b/tests/wp/meson.build
-index adc9cef..e75640c 100644
---- a/tests/wp/meson.build
-+++ b/tests/wp/meson.build
-@@ -1,7 +1,11 @@
- common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
--common_env = common_test_env
--common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
--common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-+common_env = environment({
-+ 'G_TEST_SRCDIR': meson.current_source_dir(),
-+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
-+ 'XDG_CONFIG_HOME': meson.current_build_dir() / '.config',
-+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
-+ 'WIREPLUMBER_DEBUG': '7',
-+})
- common_args = [
- '-DG_LOG_USE_STRUCTURED',
- ]
-diff --git a/tests/wplua/meson.build b/tests/wplua/meson.build
-index 128cc30..cd45c1c 100644
---- a/tests/wplua/meson.build
-+++ b/tests/wplua/meson.build
-@@ -1,13 +1,18 @@
- common_deps = [wplua_dep, pipewire_dep, wp_dep]
--common_env = common_test_env
--common_env.set('G_TEST_SRCDIR', meson.current_source_dir())
--common_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
--common_env.set('WIREPLUMBER_DATA_DIR', meson.current_source_dir())
-+common_env = environment({
-+ 'G_TEST_SRCDIR': meson.current_source_dir(),
-+ 'G_TEST_BUILDDIR': meson.current_build_dir(),
-+ 'WIREPLUMBER_CONFIG_DIR': '/invalid',
-+ 'WIREPLUMBER_DATA_DIR': meson.current_source_dir(),
-+ 'WIREPLUMBER_MODULE_DIR': meson.current_build_dir() / '..' / '..' / 'modules',
-+ 'WIREPLUMBER_DEBUG': '7',
-+})
-
- test(
- 'test-wplua',
- executable('test-wplua', 'wplua.c', dependencies: common_deps),
- env: common_env,
-+ workdir : meson.current_source_dir(),
- )
-
- script_tester = executable('script-tester',
-@@ -20,10 +25,12 @@ test(
- script_tester,
- args: ['pod.lua'],
- env: common_env,
-+ workdir : meson.current_source_dir(),
- )
- test(
- 'test-lua-monitor-rules',
- script_tester,
- args: ['monitor-rules.lua'],
- env: common_env,
-+ workdir : meson.current_source_dir(),
- )
---
-2.33.1
-
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
index 7df199e01..a04f115c3 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
@@ -14,16 +14,14 @@ DEPENDS = "glib-2.0 glib-2.0-native pipewire lua"
SRC_URI = "\
git://gitlab.freedesktop.org/pipewire/wireplumber.git;protocol=https;branch=master \
"
-# v0.4.5
-SRCREV = "3946457a7942a179c0f61c60de8cb8fc643391dd"
+# v0.4.17
+SRCREV = "d3eb77b292655cef333a8f4cab4e861415bc37c2"
# patches to be able to compile with lower version of meson that is available in AGL.
SRC_URI += "\
- file://0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch \
- file://0002-Revert-tests-add-pipewire-env-variables-when-running.patch \
"
-PV = "0.4.5"
+PV = "0.4.17"
S = "${WORKDIR}/git"
WPAPI="0.4"
@@ -60,11 +58,10 @@ FILES:${PN} = "\
${bindir}/wpctl \
${bindir}/wpexec \
${libdir}/wireplumber-${WPAPI}/* \
- ${datadir}/wireplumber/* \
+ ${datadir}/wireplumber/scripts/* \
+ ${datadir}/zsh/* \
${systemd_system_unitdir}/* \
"
-RPROVIDES:${PN} += "virtual/pipewire-sessionmanager"
-RDEPENDS:${PN} += "virtual/wireplumber-config"
FILES:lib${PN}-${WPAPI} = "\
${libdir}/libwireplumber-${WPAPI}.so.* \
@@ -72,8 +69,17 @@ FILES:lib${PN}-${WPAPI} = "\
FILES:${PN}-config += "\
${sysconfdir}/wireplumber/* \
+ ${datadir}/wireplumber/*conf \
+ ${datadir}/wireplumber/common/* \
+ ${datadir}/wireplumber/main.lua.d/* \
+ ${datadir}/wireplumber/bluetooth.lua.d/* \
+ ${datadir}/wireplumber/policy.lua.d/* \
"
-CONFFILES:${PN}-config += "\
- ${sysconfdir}/wireplumber/* \
-"
-RPROVIDES:${PN}-config += "virtual/wireplumber-config"
+do_install:append() {
+ rm -rf ${D}${sysconfdir}/wireplumber/
+ rm -f ${D}${datadir}/wireplumber/*conf
+ rm -rf ${D}${datadir}/wireplumber/common
+ rm -rf ${D}${datadir}/wireplumber/main.lua.d
+ rm -rf ${D}${datadir}/wireplumber/bluetooth.lua.d
+ rm -rf ${D}${datadir}/wireplumber/policy.lua.d
+}