From 63b776f97dae6ec121b804743683df7cd48aa057 Mon Sep 17 00:00:00 2001
From: Yalu Zhang <yalu.zhang@iopsys.eu>
Date: Wed, 7 Dec 2022 18:18:38 +0100
Subject: [PATCH] Update packages voicemngr, libvoice-broadcom and libvoice-d2

---
 libvoice-broadcom/Makefile |  3 +-
 libvoice-d2/Makefile       | 58 ++++++++++++++++++++++++++++++++++++++
 voicemngr/Makefile         |  5 ++--
 3 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 libvoice-d2/Makefile

diff --git a/libvoice-broadcom/Makefile b/libvoice-broadcom/Makefile
index 3f414d09c..e3e7eb6c7 100644
--- a/libvoice-broadcom/Makefile
+++ b/libvoice-broadcom/Makefile
@@ -16,7 +16,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=2d3f39d517e89df0f3e80f85b7efedd3efc6705c
+PKG_SOURCE_VERSION:=b53e93ca1a2fdda56ca9caffb6020e158e684f3d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -47,7 +47,6 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	@echo "Building from the local source. TARGET_PLATFORM=$(TARGET_PLATFORM)"
 	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
 endef
 endif
diff --git a/libvoice-d2/Makefile b/libvoice-d2/Makefile
new file mode 100644
index 000000000..743c4c16a
--- /dev/null
+++ b/libvoice-d2/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-d2
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=45e7d35f97f258f5e13c3afa0542db724bf59828
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for D2 which is software DSP
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-d2 -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+
diff --git a/voicemngr/Makefile b/voicemngr/Makefile
index b9dd3d65a..9ccc383e0 100644
--- a/voicemngr/Makefile
+++ b/voicemngr/Makefile
@@ -18,7 +18,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=be0efc70203d0f8b83269711388c7990d53db851
+PKG_SOURCE_VERSION:=8cdd77393ac6a631649eac71ff33603bfc2b55b3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -38,7 +38,8 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=IOPSYS Voice Manager
 	URL:=
-	DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_brcmbca:bcmkernel +TARGET_brcmbca:libvoice-broadcom +TARGET_iopsys_qualcomm:vtsp
+	DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_brcmbca:bcmkernel +TARGET_brcmbca:libvoice-broadcom \
+		+TARGET_ipq95xx:libvoice-d2
 endef
 
 define Package/$(PKG_NAME)/description