4 files changed, 8 insertions, 97 deletions
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
new file mode 100644
index 00000000..93b7b443
--- /dev/null
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-car-control/aac-module-car-control.bbappend
@@ -0,0 +1,3 @@
+# Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe
+DEPENDS_remove = "nlohmann"
+DEPENDS_append = " nlohmann-json"
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-gstreamer/aac-module-gstreamer/0001-gstreamer-implement-pipewire-integration.patch b/meta-speech-framework/meta-aac/recipes-modules/aac-module-gstreamer/aac-module-gstreamer/0001-gstreamer-implement-pipewire-integration.patch
deleted file mode 100644
index b0a5c104..00000000
--- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-gstreamer/aac-module-gstreamer/0001-gstreamer-implement-pipewire-integration.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-gstreamer: implement pipewire integration using pwaudiosrc/pwaudiosink
-
-The code path is wrapped in #ifdef USE_PIPEWIRE so that it can be toggled
-easily at compile time.
-
-The device string is abused to hold the role name, just like it was
-with 4A. In the future this may need to be reconsidered. In theory,
-we could detect the backend or make it configurable from the upper layer
-if we knew exactly what kind of data is in that device string
-(is it an ALSA device name? a pipewire role? a pipewire node id?
-a pulseaudio device name? ...)
-
-Upstream-Status: Pending
-
-Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
-[reworked for SDK 2.0]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
-diff --git a/lib/aal/CMakeLists.txt b/lib/aal/CMakeLists.txt
-index a892465..c92b2cf 100644
---- a/lib/aal/CMakeLists.txt
-+++ b/lib/aal/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- 
- add_definitions(-DUSE_GLOOP)
- add_definitions(-DUSE_FAKEMUTE)
-+add_definitions(-DUSE_PIPEWIRE)
- 
- # GStreamer
- find_package(PkgConfig)
-diff --git a/lib/aal/src/player.c b/lib/aal/src/player.c
-index 02a2881..8747854 100644
---- a/lib/aal/src/player.c
-+++ b/lib/aal/src/player.c
-@@ -120,6 +120,19 @@ aal_handle_t aal_player_create(const aal_attributes_t *attr)
- 	g_object_get(volume, "volume", &ctx->saved_volume, NULL);
- #endif
- 
-+#ifdef USE_PIPEWIRE
-+	sink = create_and_add_element(bin, "pwaudiosink", "sink");
-+	if (sink && attr->device && !IS_EMPTY_STRING(attr->device)) {
-+		g_info("Using role: %s\n", attr->device);
-+		GstStructure *s = gst_structure_new("properties",
-+						    "media.role",
-+						    G_TYPE_STRING,
-+						    attr->device,
-+						    NULL);
-+		g_object_set(G_OBJECT(sink), "stream-properties", s, NULL);
-+		gst_structure_free(s);
-+	}
-+#else
- 	if (!attr->device || IS_EMPTY_STRING(attr->device)) {
- 		sink = create_and_add_element(bin, "autoaudiosink", "sink");
- 	} else {
-@@ -128,6 +141,7 @@ aal_handle_t aal_player_create(const aal_attributes_t *attr)
- 		if (sink)
- 			g_object_set(G_OBJECT(sink), "device", attr->device, NULL);
- 	}
-+#endif
- 	if (!sink)
- 		goto exit;
- 
-diff --git a/lib/aal/src/recorder.c b/lib/aal/src/recorder.c
-index 96c9b2a..66b36e1 100644
---- a/lib/aal/src/recorder.c
-+++ b/lib/aal/src/recorder.c
-@@ -86,6 +86,19 @@ aal_handle_t aal_recorder_create(const aal_attributes_t *attr)
- 	if (!ctx)
- 		goto exit;
- 
-+#ifdef USE_PIPEWIRE
-+	source = create_and_add_element(ctx->pipeline, "pwaudiosrc", "source");
-+	if (source && attr->device && !IS_EMPTY_STRING(attr->device)) {
-+		g_info("Using role: %s\n", attr->device);
-+		GstStructure *s = gst_structure_new("properties",
-+						    "media.role",
-+						    G_TYPE_STRING,
-+						    attr->device,
-+						    NULL);
-+		g_object_set(G_OBJECT(source), "stream-properties", s, NULL);
-+		gst_structure_free(s);
-+	}
-+#else
- 	if (!attr->device || IS_EMPTY_STRING(attr->device)) {
- 		source = create_and_add_element(ctx->pipeline, "autoaudiosrc", "source");
- 	} else {
-@@ -94,6 +107,7 @@ aal_handle_t aal_recorder_create(const aal_attributes_t *attr)
- 		if (source)
- 			g_object_set(G_OBJECT(source), "device", attr->device, NULL);
- 	}
-+#endif
- 	if (!source)
- 		goto exit;
- 
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
new file mode 100644
index 00000000..93b7b443
--- /dev/null
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-messaging/aac-module-messaging.bbappend
@@ -0,0 +1,3 @@
+# Fix nlohmann dependency to pick up newer nlohmann-json recipe in meta-oe
+DEPENDS_remove = "nlohmann"
+DEPENDS_append = " nlohmann-json"
diff --git a/meta-speech-framework/meta-aac/recipes-modules/aac-module-gstreamer/aac-module-gstreamer.bbappend b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
index 1b2618e8..35847170 100644
--- a/meta-speech-framework/meta-aac/recipes-modules/aac-module-gstreamer/aac-module-gstreamer.bbappend
+++ b/meta-speech-framework/meta-aac/recipes-modules/aac-module-system-audio/aac-module-system-audio.bbappend
@@ -1,9 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
 # Needed for the required gstreamer-app-1.0 pkgconfig bits
 DEPENDS += "gstreamer1.0-plugins-base"
 
-AAC_PATCHES += "file://0001-gstreamer-implement-pipewire-integration.patch"
+# Need to enable PipeWire support
+EXTRA_OECMAKE += "-DUSE_PIPEWIRE=1"
 
 # Pull static library into appropriate package to avoid a QA error
 FILES_${PN}-staticdev += "${AAC_PREFIX}/lib/libaal.a"