diff options
author | Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-10-01 00:13:10 +0900 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-10-09 14:03:15 +0000 |
commit | d7d2f57df5a852d5bedd0072072183d80680e9bc (patch) | |
tree | b3f6704b2ca31f4ab241770c34c2f224e36c06be /meta-agl-ic-container/recipes-multimedia/wireplumber | |
parent | 24f2da7bfd7fa66e8a3b8ed7e5d8c09ef6956c68 (diff) |
Enable QtMultimedia sound support
The QtMultimedia is using plusaudio to support audio.
It has alsa support, but that alsa support has restriction.
And QtMulitimedia is not support pipwire.
This change enable pulseaudio as a temporary solution of Qt6 support.
Bug-AGL: SPEC-5162
Change-Id: Ic7cf20d49612feb4deaebfc501831bdbe5a00142
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container/recipes-multimedia/wireplumber')
3 files changed, 0 insertions, 74 deletions
diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend deleted file mode 100644 index fe6dab86..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber-policy-config-agl_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -do_install:append() { - config_dir="${D}${sysconfdir}/wireplumber/" - systemd_dir="${D}${sysconfdir}/systemd/system/sockets.target.wants" - - # enable additional systemd services - install -d ${systemd_dir} - ln -s ${systemd_system_unitdir}/wireplumber@.service ${systemd_dir}/wireplumber@policy.service -} diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch deleted file mode 100644 index ba400211..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber/0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 512e9ee130841e3b6c379511234afc07d66d99d7 Mon Sep 17 00:00:00 2001 -From: Ashok Sidipotu <ashok.sidipotu@collabora.com> -Date: Mon, 28 Feb 2022 06:46:19 +0530 -Subject: [PATCH] systemd: changes to run wireplumber instances in containers - -- remove the pipewire daemon dependencies so that -only wireplumber policy daemon can run in containers. -- remove pipewire user - -Upstream-Status: Inappropriate [configuration] ---- - src/systemd/system/wireplumber@.service.in | 8 +++----- - src/systemd/user/wireplumber@.service.in | 5 ++--- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/systemd/system/wireplumber@.service.in b/src/systemd/system/wireplumber@.service.in -index 0766d4e0..50ddf4c6 100644 ---- a/src/systemd/system/wireplumber@.service.in -+++ b/src/systemd/system/wireplumber@.service.in -@@ -5,8 +5,7 @@ - # wireplumber@policy.service loads the "policy" profile, etc. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -19,9 +18,8 @@ Type=simple - AmbientCapabilities=CAP_SYS_NICE - ExecStart=@WP_BINARY@ -p %i - Restart=on-failure --User=pipewire --Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire -+Environment=PIPEWIRE_RUNTIME_DIR=/var - Environment=GIO_USE_VFS=local - - [Install] --WantedBy=pipewire.service -+WantedBy=multi-user.target -diff --git a/src/systemd/user/wireplumber@.service.in b/src/systemd/user/wireplumber@.service.in -index 5c1096fc..7368f683 100644 ---- a/src/systemd/user/wireplumber@.service.in -+++ b/src/systemd/user/wireplumber@.service.in -@@ -5,8 +5,7 @@ - # wireplumber@policy.service loads the "policy" profile, etc. - [Unit] - Description=Multimedia Service Session Manager (%i) --After=pipewire.service --BindsTo=pipewire.service -+After=sockets.target - Conflicts=pipewire-media-session.service - - [Service] -@@ -22,4 +21,4 @@ Slice=session.slice - Environment=GIO_USE_VFS=local - - [Install] --WantedBy=pipewire.service -+WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend deleted file mode 100644 index 56f03a4c..00000000 --- a/meta-agl-ic-container/recipes-multimedia/wireplumber/wireplumber_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber:" - -SRC_URI += "\ - file://0001-systemd-wireplumber-to-not-depend-on-the-pipewire-de.patch \ -" |