summaryrefslogtreecommitdiffstats
path: root/meta-audio-4a-framework
diff options
context:
space:
mode:
Diffstat (limited to 'meta-audio-4a-framework')
-rw-r--r--meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb4
-rw-r--r--meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb1
-rw-r--r--meta-audio-4a-framework/recipes-devtools/python/python3-websockets_4.0.1.bb16
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-alsa-core/4a-alsa-core_git.bb2
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb11
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template117
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template530
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-generic/4a-hal-generic_git.bb7
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-unicens/4a-hal-unicens_git.bb2
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-softmixer/4a-softmixer_git.bb5
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-tools/4a-tools_git.bb22
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb4
12 files changed, 53 insertions, 668 deletions
diff --git a/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
index c784ea6e..93fd1b70 100644
--- a/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
+++ b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
+SRCREV = "3c8498d95c3f89def2eb49b668fa70cd12faace7"
PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -22,4 +22,4 @@ DEPENDS += "qtquickcontrols2 \
RPROVIDES_${PN} += "virtual/mixer"
-inherit cmake_qt5 aglwgt \ No newline at end of file
+inherit cmake_qt5 aglwgt
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 aecfd824..fde5f637 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
@@ -17,4 +17,5 @@ RDEPENDS_${PN} += "\
bluez-alsa \
4a-softmixer \
4a-hal-generic \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '4a-tools', '' , d)} \
"
diff --git a/meta-audio-4a-framework/recipes-devtools/python/python3-websockets_4.0.1.bb b/meta-audio-4a-framework/recipes-devtools/python/python3-websockets_4.0.1.bb
new file mode 100644
index 00000000..414129c5
--- /dev/null
+++ b/meta-audio-4a-framework/recipes-devtools/python/python3-websockets_4.0.1.bb
@@ -0,0 +1,16 @@
+SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)"
+HOMEPAGE = "https://github.com/aaugustin/websockets"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5070256738c06d2e59adbec1f4057dac"
+
+inherit pypi setuptools3
+
+SRC_URI[md5sum] = "9e8c6b3c70def4146d75fbb0f52bdfc7"
+SRC_URI[sha256sum] = "da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9"
+
+BBCLASSEXTEND = "native nativesdk"
+
+RDEPENDS_${PN} = "\
+ ${PYTHON_PN}-asyncio \
+"
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-alsa-core/4a-alsa-core_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-alsa-core/4a-alsa-core_git.bb
index 55eb6c11..b407bd94 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-alsa-core/4a-alsa-core_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-alsa-core/4a-alsa-core_git.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/4a-alsa-core;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
+SRCREV = "ef3575fd397498a57c09c0caa3ffde8ec3040aab"
PV = "0.1+git${SRCPV}"
S = "${WORKDIR}/git"
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
index d012cb9a..fc648a1d 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
@@ -7,28 +7,17 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
SRC_URI = "file://asound.conf.template \
- file://ahl-config.json.template \
"
PV = "0.1"
RPROVIDES_${PN} += "VIRTUAL-RUNTIME_alsa-state"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-AUDIO_DEV_NAME ?= "Speakers"
-AUDIO_DEV_NAME_ID ?= "0"
-
-AUDIO_DEV_NAME_m3ulcb = "M3-Speakers"
-AUDIO_DEV_NAME_ID_m3ulcb = "rsnddai0ak4613h"
-
inherit afb-system
do_install () {
install -d ${D}/${sysconfdir}
install -m 0755 ${WORKDIR}/asound.conf.template ${D}/${sysconfdir}/asound.conf
- sed -i "s|@AUDIO_DEV_NAME@|${AUDIO_DEV_NAME}|g" ${D}/${sysconfdir}/asound.conf
- sed -i "s|@AUDIO_DEV_NAME_ID@|${AUDIO_DEV_NAME_ID}|g" ${D}/${sysconfdir}/asound.conf
sed -i "s|@INSTALL_PREFIX@|${INSTALL_PREFIX}|g" ${D}/${sysconfdir}/asound.conf
}
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template
deleted file mode 100644
index f2244b83..00000000
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/ahl-config.json.template
+++ /dev/null
@@ -1,117 +0,0 @@
-{
- "version": "0.2.0",
- "policy_module": "AudioPolicy_v1",
- "description": "High-level binding configuration file",
- "note": "Devices and routings are always listed in order of priority (for device selection rules)",
- "hal_list": ["@AUDIO_DEV_NAME_ID@"],
- "audio_roles": [
- {
- "name": "Emergency",
- "description": "to complete",
- "priority": 99,
- "output": [
- "alsa.plug:Emergency_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "Warning",
- "description": "to complete",
- "priority": 95,
- "output": [
- "alsa.plug:Warning_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "CustomHigh",
- "description": "to complete",
- "priority": 79,
- "output": [
- "alsa.plug:CustomHigh_Main"
- ],
- "interupt_behavior": "continue"
- },
- {
- "name": "Phone",
- "description": "to complete",
- "priority": 72,
- "output": [
- "alsa.plug:Phone_Main"
- ],
- "interupt_behavior": "continue"
- },
- {
- "name": "Navigation",
- "description": "Important user information where user action is expected (e.g. navigation instruction)",
- "priority": 71,
- "output": [
- "alsa.plug:Navigation_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "CustomMedium",
- "description": "to complete",
- "priority": 59,
- "output": [
- "alsa.plug:CustomMedium_Main"
- ],
- "interupt_behavior": "continue"
- },
- {
- "name": "Video",
- "description": "Video content",
- "priority": 57,
- "output": [
- "alsa.plug:Video_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "Streaming",
- "description": "Streaming content",
- "priority": 55,
- "output": [
- "alsa.plug:Streaming_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "Multimedia",
- "description": "Multimedia content",
- "priority": 53,
- "output": [
- "alsa.plug:Multimedia_Main"
- ],
- "interupt_behavior": "pause"
- },
- {
- "name": "Radio",
- "description": "Radio content",
- "priority": 51,
- "output": [
- "alsa.plug:Radio_Main"
- ],
- "interupt_behavior": "continue"
- },
- {
- "name": "CustomLow",
- "description": "to complete",
- "priority": 19,
- "output": [
- "alsa.plug:CustomLow_Main"
- ],
- "interupt_behavior": "continue"
- },
- {
- "name": "Fallback",
- "description": "to complete",
- "priority": 0,
- "output": [
- "alsa.plug:Fallback_Main"
- ],
- "interupt_behavior": "continue"
- }
- ]
-}
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
index f428ba74..5a265db0 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/files/asound.conf.template
@@ -1,531 +1,3 @@
-#AGL Audio High Level ALSA configuration
-#This define 2 sounds card with 8 audio roles each
-#The alsa soft volume control name must match with the HAL Control Name
-
-# ----------------------------------------------------
#
-# ----------------------------------------------------
-pcm.@AUDIO_DEV_NAME@ {
- type dmix
- slave {pcm "hw:@AUDIO_DEV_NAME_ID@"}
- ipc_key 1001 # ipc_key should be unique to each dmix
-}
-
-# -----------------------------------------------------
-# Register ControllerHookPlugin (ToiBeFix fullpath)
-# -----------------------------------------------------
-pcm_hook_type.CtlHookPlugin {
- install "AlsaInstallHook"
- lib "@INSTALL_PREFIX@/lib/policy_alsa_hook.so"
-}
-
-# ----------------------------------------------------
+#4A pcm configuration is now dynamic, please check hal configuration files in @INSTALL_PREFIX@/4a-hal/etc
#
-# ----------------------------------------------------
-pcm.Emergency_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Emergency_Volume"
- }
-}
-
-pcm.Warning_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Warning_Volume"
- }
-}
-
-pcm.CustomHigh_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "CustomHigh_Volume"
- }
-}
-
-pcm.Phone_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Phone_Volume"
- }
-}
-
-pcm.Navigation_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Navigation_Volume"
- }
-}
-
-pcm.CustomMedium_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "CustomMedium_Volume"
- }
-}
-
-pcm.Video_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Video_Volume"
- }
-}
-
-pcm.Streaming_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Streaming_Volume"
- }
-}
-
-pcm.Multimedia_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Multimedia_Volume"
- }
-}
-
-pcm.Radio_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Radio_Volume"
- }
-}
-
-pcm.CustomLow_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "CustomLow_Volume"
- }
-}
-
-pcm.Fallback_Main {
- type softvol
- slave.pcm "@AUDIO_DEV_NAME@"
- control{
- name "Fallback_Volume"
- }
-}
-
-# ----------------------------------------------------
-# Define one hooked PCM channel per Audio Roles
-# ----------------------------------------------------
-pcm.Emergency {
- type hooks
- slave {pcm "Emergency_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Emergency', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Warning {
- type hooks
- slave {pcm "Warning_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Warning', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.CustomHigh {
- type hooks
- slave {pcm "CustomHigh_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'CustomHigh', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Phone {
- type hooks
- slave {pcm "Phone_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Phone', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Navigation {
- type hooks
- slave {pcm "Navigation_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Navigation', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.CustomMedium {
- type hooks
- slave {pcm "CustomMedium_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'CustomMedium', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Video {
- type hooks
- slave {pcm "Video_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Video', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Streaming {
- type hooks
- slave {pcm "Streaming_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Streaming', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Multimedia {
- type hooks
- slave {pcm "Multimedia_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Multimedia', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Radio {
- type hooks
- slave {pcm "Radio_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Radio', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.CustomLow {
- type hooks
- slave {pcm "CustomLow_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'CustomLow', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
-
-pcm.Fallback {
- type hooks
- slave {pcm "Fallback_Main"}
- hooks.0 {
- comment "Defined used hook sharelib and provide arguments/config to install func"
- type "CtlHookPlugin"
- hook_args {
-
- # print few log messages (default false)
- verbose true
-
- # uri to audio-4a policy engine
- uri="unix:/run/user/0/apis/ws/ahl-4a"
-
- # timeout in ms (default 500)
- timeout 5000
-
- # force API synchronous mode
- synchronous true
-
- # api subcall to request a role
- request {
- stream_open "{'audio_role': 'Fallback', 'endpoint_type':'sink'}"
- set_stream_state "{'state':'running'}"
- }
-
- # api subcall to request a role
- release {
- stream_close "{}"
- }
- }
- }
-}
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 97dae65a..fef115f5 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
@@ -7,8 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
SRC_URI = "gitsm://github.com/iotbzh/4a-hal-generic;protocol=https;branch=${AGL_BRANCH}"
-#SRCREV = "${AGL_APP_REVISION}"
-SRCREV = "08b6e7144a87f60b86c8988c33a44dbd61026a8f"
+SRCREV = "e94909270325accdbeba7cde9f8e9e96e554dcda"
DEPENDS += "lua"
@@ -33,6 +32,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
4A_HAL_LIST_h3ulcb ?= "rcar-m3 rcar-m3kf"
4A_HAL_LIST_intel-corei7-64 ?= "intel-minnow"
4A_HAL_LIST_qemux86-64 ?= "intel-qemu"
+
+# Due to bug SPEC-1610, default hal for RPI3 is not active yet
+# 4A_HAL_LIST_raspberrypi3 ?= "raspberry-pi-3"
+
### TODO: this list should be completed for more machines
do_install_append () {
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-unicens/4a-hal-unicens_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-unicens/4a-hal-unicens_git.bb
index e555f05a..84ee6049 100644
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-unicens/4a-hal-unicens_git.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-unicens/4a-hal-unicens_git.bb
@@ -7,7 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/src/4a-hal-unicens;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
+SRCREV = "6d4cbab774c0fa632ccdf4add35b87d0828ac765"
PV = "0.1+git${SRCPV}"
S = "${WORKDIR}/git"
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 751d83b0..b1f412b2 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
@@ -7,8 +7,7 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
SRC_URI = "gitsm://github.com/iotbzh/4a-softmixer/;protocol=https;branch=${AGL_BRANCH}"
-#SRCREV = "${AGL_APP_REVISION}"
-SRCREV = "afc7d62d02c523f3d3adc29f713f5a4395ca3f58"
+SRCREV = "320d8f978d846488d41d7f6b2c47c83225cafdb7"
DEPENDS += "lua"
@@ -17,7 +16,7 @@ S = "${WORKDIR}/git"
inherit afb-system-cmake
-#FIXME:
+#FIXME :
#FILES_${PN}-dev += "${INSTALL_PREFIX}/4a-softmixer/htdocs"
#FILES_${PN} += "${INSTALL_PREFIX}/afb-aaaa"
#FILES_${PN} += "${INSTALL_PREFIX}/lib"
diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-tools/4a-tools_git.bb b/meta-audio-4a-framework/recipes-multimedia/4a-tools/4a-tools_git.bb
new file mode 100644
index 00000000..ae1117ad
--- /dev/null
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-tools/4a-tools_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "4A - Tools"
+DESCRIPTION = "Tools, utilities, scripts and data related to 4A"
+HOMEPAGE = "https://github.com/iotbzh/4a-tools/"
+SECTION = "apps"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "gitsm://github.com/iotbzh/4a-tools;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "flounder_5.99.2"
+#SRCREV = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+PV = "0.1+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+
+do_install() {
+ oe_runmake install DESTDIR=${D}${prefix}
+}
+
+RDEPENDS_${PN} += "bash python3-websockets"
+FILES_${PN} += "${datadir}/4a/media/*"
diff --git a/meta-audio-4a-framework/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb b/meta-audio-4a-framework/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb
index 82d65cd1..1e34f82a 100644
--- a/meta-audio-4a-framework/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/alsa/alsa-plugins_1.1.6.bb
@@ -60,6 +60,7 @@ do_install_append() {
if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then
mv ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf
fi
+ rm -f ${D}${datadir}/alsa/alsa.conf.d/*pulseaudio*
}
python populate_packages_prepend() {
@@ -96,8 +97,7 @@ INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so"
# 99-pulseaudio-default.conf configures the "default" device to use the
# PulseAudio plugin.
FILES_${PN}-pulseaudio-conf += "\
- ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf \
- ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf \
+ ${datadir}/alsa/alsa.conf.d \
"
RDEPENDS_${PN}-pulseaudio-conf += "\