From 69702a801f4e997dce56d8de48255d1bd20233e1 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Mon, 19 Jun 2023 23:17:47 +0300
Subject: [PATCH] Update ultimate_baresip

---
 packages/baresip-openipc/0005-aec-fix.patch   | 13 +++++
 .../general/overlay/etc/baresip/config        |  1 +
 .../overlay/etc/baresip/current_contact       |  2 -
 .../rebuild_gk7205v200_ultimate_baresip       | 52 ++++++++++++++-----
 4 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 packages/baresip-openipc/0005-aec-fix.patch

diff --git a/packages/baresip-openipc/0005-aec-fix.patch b/packages/baresip-openipc/0005-aec-fix.patch
new file mode 100644
index 0000000..c32413d
--- /dev/null
+++ b/packages/baresip-openipc/0005-aec-fix.patch
@@ -0,0 +1,13 @@
+--- a/modules/webrtc_aec/aec.h	2022-03-27 11:22:42.000000000 +0300
++++ b/modules/webrtc_aec/aec.h	2023-06-19 18:32:36.459229801 +0300
+@@ -7,8 +7,8 @@
+ #include <pthread.h>
+ 
+ #define WEBRTC_POSIX 1
+-#include <webrtc/modules/audio_processing/include/audio_processing.h>
+-#include <webrtc/system_wrappers/include/trace.h>
++#include <webrtc_audio_processing/webrtc/modules/audio_processing/include/audio_processing.h>
++#include <webrtc_audio_processing/webrtc/system_wrappers/include/trace.h>
+ 
+ 
+ #define MAX_CHANNELS         1
diff --git a/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/config b/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/config
index ffbdc09..a157fda 100644
--- a/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/config
+++ b/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/config
@@ -58,6 +58,7 @@ module_path             /usr/lib/baresip/modules
 
 # UI Modules
 module                  stdio.so
+module                  g711.so
 module                  webrtc_aec.so
 module                  rtspausrc.so
 module                  goke.so
diff --git a/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/current_contact b/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/current_contact
index 6b96b51..250e621 100644
--- a/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/current_contact
+++ b/projects/gk7205v200_ultimate_baresip/general/overlay/etc/baresip/current_contact
@@ -1,3 +1 @@
-#
 sip:good@friend.com
-#
diff --git a/workplace/scripts/rebuild_gk7205v200_ultimate_baresip b/workplace/scripts/rebuild_gk7205v200_ultimate_baresip
index a10cbe5..a404091 100755
--- a/workplace/scripts/rebuild_gk7205v200_ultimate_baresip
+++ b/workplace/scripts/rebuild_gk7205v200_ultimate_baresip
@@ -4,19 +4,45 @@ cd ../../openipc
 pwd
 
 
-rm -rf \
-    output/per-package/webrtc-audio-processing \
-    output/build/webrtc-audio-processing-*
-
-BOARD=gk7205v200_ultimate_baresip make br-webrtc-audio-processing-{dirclean,rebuild}
+webrtc() {
+    #
+    rm -rf \
+        output/per-package/webrtc-audio-processing \
+        output/build/webrtc-audio-processing-*
+    #
+    BOARD=gk7205v200_ultimate_baresip make br-webrtc-audio-processing-{dirclean,rebuild}
+}
 
 
-rm -rf \
-    output/per-package/libre-openipc \
-    output/per-package/librem-openipc \
-    output/per-package/baresip-openipc \
-    output/build/libre-openipc-* \
-    output/build/librem-openipc-* \
-    output/build/baresip-openipc-*
+libre() {
+    #
+    rm -rf \
+        output/per-package/libre-openipc \
+        output/build/libre-openipc-*
+    #
+    BOARD=gk7205v200_ultimate_baresip make br-librem-openipc-{dirclean,rebuild}
+}
 
-BOARD=gk7205v200_ultimate_baresip make br-baresip-openipc-{dirclean,rebuild}
+
+librem() {
+    #
+    rm -rf \
+        output/per-package/librem-openipc \
+        output/build/librem-openipc-*
+    #
+    BOARD=gk7205v200_ultimate_baresip make br-librem-openipc-{dirclean,rebuild}
+}
+
+
+baresip() {
+    #
+    rm -rf \
+        output/per-package/baresip-openipc \
+        output/build/baresip-openipc-*
+    #
+    BOARD=gk7205v200_ultimate_baresip make br-baresip-openipc-{dirclean,rebuild}
+}
+
+
+
+baresip