summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshok Sidipotu <ashok.sidipotu@collabora.com>2024-04-04 02:53:32 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-04-22 08:18:45 +0000
commitb6227d3c09ff3bf02426446875557befea4608e9 (patch)
treee2aa87d00e0e56dc1a3c51f0cfeaa04e09fd6912
parent7cf570926f8fe84216cee7206fb6b9f5a3259975 (diff)
Enable ACP for HDMI on RaspberryPi4.
-HDMI dectection is broken on RaspberryPi4, Enable Pipewire-ACP to fix it. -copy the ACP config files as well. Bug-AGL: SPEC-4418 Change-Id: Ice6f2a4417df56b2c00dc067590763a2c847c152 Signed-off-by: Ashok Sidipotu <ashok.sidipotu@collabora.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29800 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> (cherry picked from commit 5bb3283028af38cba6934be0fb0dc166941504ba) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29857 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
-rw-r--r--meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb1
-rw-r--r--meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb2
-rw-r--r--meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua4
3 files changed, 4 insertions, 3 deletions
diff --git a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb
index 1d20b4705..6237dcf80 100644
--- a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb
+++ b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb
@@ -13,4 +13,5 @@ RDEPENDS:${PN} += "\
pipewire-modules-meta \
${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'pipewire-tools pipewire-spa-tools alsa-utils', '', d)} \
pipewire-alsa \
+ pipewire-alsa-card-profile \
"
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb
index 641c97e8f..6fa851caa 100644
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb
@@ -84,7 +84,7 @@ PACKAGECONFIG ??= "\
# is why these two are marked in their respective packageconfigs
# as being in conflict.
-PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev"
+PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa-card-profile"
PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc"
PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native"
PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
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,
},
},