Adapt audio packagegroup and template to use rewritten components

Now we make use of the 4a-softmixer and 4a-hal-generic to drive the backend of the audio framework.

This is the outcome of the audio F2F held in june.

Also fix the license checksums in 4a-hal-generic and 4a-softmixer.

Change-Id: Id709b0901228bdee86ab4b2bab395599365d00e0
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

4 files changed, 6 insertions, 4 deletions

diff --git a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
index 651af533..ac776100 100644
--- a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
+++ b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
@@ -10,9 +10,10 @@ PACKAGES = "\
 
 RDEPENDS_${PN} += "\
     4a-alsa-core \
-    4a-hal-reference \
     agl-service-audio-4a \
     VIRTUAL-RUNTIME_alsa-state \
     agl-service-unicens \
     4a-hal-unicens \
+    4a-softmixer \
+    4a-hal-generic \
 "
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb
index 7d799c29..e419d39c 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE    = "https://github.com/iotbzh/4a-hal-generic/"
 SECTION     = "apps"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRC_URI = "gitsm://github.com/iotbzh/4a-hal-generic;protocol=https;branch=rc1"
 
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-softmixer/4a-softmixer_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-softmixer/4a-softmixer_git.bb
index 1eece70a..2f6483af 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-softmixer/4a-softmixer_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-softmixer/4a-softmixer_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE    = "https://github.com/iotbzh/4a-softmixer/"
 SECTION     = "apps"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=89aea4e17d99a7cacdbeed46a0096b10"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
 SRC_URI = "gitsm://github.com/iotbzh/4a-softmixer/;protocol=https;branch=hal-rc1-sandbox"
 
diff --git a/templates/feature/agl-audio-4a-framework/50_local.conf.inc b/templates/feature/agl-audio-4a-framework/50_local.conf.inc
index 19889d8e..af1ea596 100644
--- a/templates/feature/agl-audio-4a-framework/50_local.conf.inc
+++ b/templates/feature/agl-audio-4a-framework/50_local.conf.inc
@@ -4,7 +4,8 @@
 DISTRO_FEATURES_append = " agl-audio-4a-framework "
 
 # asound.conf is provided by the 4a-hal-config (and not by asound.state)
-VIRTUAL-RUNTIME_alsa-state = "4a-hal-config"
+#VIRTUAL-RUNTIME_alsa-state = "4a-hal-config"
+VIRTUAL_RUNTIME_alsa-state = ""
 # additionally there is a bug in alsa-utils-alsactl where it pulls in alsa-state directly
 RRECOMMENDS_pn-alsa-utils-alsactl = "VIRTUAL-RUNTIME_alsa-state"