From a5b99c9eb20c04d4fbfc65be4b46ff1b36efb9da Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Wed, 29 Jun 2022 19:55:37 +0300
Subject: [PATCH] [PACKAGES] Update baresip build profiles

---
 br-ext-chip-sigmastar/Config.in               |  3 ++
 br-ext-chip-sigmastar/external.mk             |  3 ++
 general/package/baresip-openipc/Config.in     |  1 +
 .../baresip-openipc/baresip-openipc.mk        | 42 +++++++++----------
 general/package/libre-openipc/Config.in       |  1 +
 .../package/libre-openipc/libre-openipc.mk    | 20 ++++-----
 general/package/librem-openipc/Config.in      |  1 +
 .../package/librem-openipc/librem-openipc.mk  | 20 ++++-----
 8 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/br-ext-chip-sigmastar/Config.in b/br-ext-chip-sigmastar/Config.in
index 35814dda..69fea177 100644
--- a/br-ext-chip-sigmastar/Config.in
+++ b/br-ext-chip-sigmastar/Config.in
@@ -1,6 +1,7 @@
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/linux/Config.ext.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/sigmastar_patcher/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/aura-httpd/Config.in"
+source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/baresip-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/dropbear-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/fdk-aac-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/fwprintenv-openipc/Config.in"
@@ -12,6 +13,8 @@ source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libcurl-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libevent-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libhv-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libogg-openipc/Config.in"
+source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libre-openipc/Config.in"
+source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/librem-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libsrt-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libwebsockets-openipc/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/linux-firmware-openipc/Config.in"
diff --git a/br-ext-chip-sigmastar/external.mk b/br-ext-chip-sigmastar/external.mk
index 0af175a5..70d6a359 100644
--- a/br-ext-chip-sigmastar/external.mk
+++ b/br-ext-chip-sigmastar/external.mk
@@ -1,6 +1,7 @@
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/linux/linux-ext-sigmastar_patcher.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar_patcher/sigmastar_patcher.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/aura-httpd/aura-httpd.mk
+include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/baresip-openipc/baresip-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/dropbear-openipc/dropbear-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/fwprintenv-openipc/fwprintenv-openipc.mk
@@ -12,6 +13,8 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libcurl-openipc/libcurl-openipc.m
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libevent-openipc/libevent-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libhv-openipc/libhv-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libogg-openipc/libogg-openipc.mk
+include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libre-openipc/libre-openipc.mk
+include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/librem-openipc/librem-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libsrt-openipc/libsrt-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk
diff --git a/general/package/baresip-openipc/Config.in b/general/package/baresip-openipc/Config.in
index 22b114e7..a21f8bc5 100644
--- a/general/package/baresip-openipc/Config.in
+++ b/general/package/baresip-openipc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BARESIP_OPENIPC
 	bool "baresip-openipc"
+	default n
 	help
 	  Baresip is a portable and modular SIP User-Agent with audio 
 	  and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad 
diff --git a/general/package/baresip-openipc/baresip-openipc.mk b/general/package/baresip-openipc/baresip-openipc.mk
index c8533fa7..a26c4343 100644
--- a/general/package/baresip-openipc/baresip-openipc.mk
+++ b/general/package/baresip-openipc/baresip-openipc.mk
@@ -4,19 +4,19 @@
 #
 #############################################################
 
-BARESIP_VERSION = 1.0.0
-BARESIP_SOURCE = v$(BARESIP_VERSION).tar.gz
-BARESIP_SITE = https://github.com/baresip/baresip/archive
-BARESIP_DEPENDENCIES = libre librem zlib
+BARESIP_OPENIPC_VERSION = 1.0.0
+BARESIP_OPENIPC_SOURCE = v$(BARESIP_OPENIPC_VERSION).tar.gz
+BARESIP_OPENIPC_SITE = https://github.com/baresip/baresip/archive
+BARESIP_OPENIPC_DEPENDENCIES = libre-openipc librem-openipc zlib
 
-BARESIP_MAKE_ENV = \
+BARESIP_OPENIPC_MAKE_ENV = \
         $(TARGET_CONFIGURE_OPTS) \
         SYSROOT=$(STAGING_DIR)/usr \
         SYSROOT_LOCAL=$(STAGING_DIR)/usr \
         LD="$(TARGET_CC)" \
         LFLAGS="$(TARGET_LDFLAGS)"
 
-BARESIP_MAKE_ARGS = \
+BARESIP_OPENIPC_MAKE_ARGS = \
         LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
         LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
         LIBRE_SO="$(STAGING_DIR)/usr/lib" \
@@ -25,48 +25,48 @@ BARESIP_MAKE_ARGS = \
         LIBREM_SO="$(STAGING_DIR)/usr/lib"
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-BARESIP_DEPENDENCIES += alsa-lib
+BARESIP_OPENIPC_DEPENDENCIES += alsa-lib
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-BARESIP_DEPENDENCIES += ffmpeg
-BARESIP_MAKE_ENV += \
+BARESIP_OPENIPC_DEPENDENCIES += ffmpeg
+BARESIP_OPENIPC_MAKE_ENV += \
         CFLAGS+=-DCODEC_TYPE_VIDEO=AVMEDIA_TYPE_VIDEO
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
-BARESIP_DEPENDENCIES += libsndfile
+BARESIP_OPENIPC_DEPENDENCIES += libsndfile
 endif
 
 ifeq ($(BR2_PACKAGE_SPEEX),y)
-BARESIP_DEPENDENCIES += speex
+BARESIP_OPENIPC_DEPENDENCIES += speex
 endif
 
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
-BARESIP_DEPENDENCIES += util-linux
+BARESIP_OPENIPC_DEPENDENCIES += util-linux
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-BARESIP_DEPENDENCIES += xlib_libXext
+BARESIP_OPENIPC_DEPENDENCIES += xlib_libXext
 endif
 
-define BARESIP_BUILD_CMDS
-        $(BARESIP_MAKE_ENV) $(MAKE) $(BARESIP_MAKE_ARGS) -C $(@D) all
+define BARESIP_OPENIPC_BUILD_CMDS
+        $(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) all
 endef
 
-define BARESIP_CLEAN_CMDS
-        $(BARESIP_MAKE_ENV) $(MAKE) $(BARESIP_MAKE_ARGS) -C $(@D) clean
+define BARESIP_OPENIPC_CLEAN_CMDS
+        $(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) clean
 endef
 
-define BARESIP_INSTALL_TARGET_CMDS       
-        $(BARESIP_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(MAKE) $(BARESIP_MAKE_ARGS) -C $(@D) install
+define BARESIP_OPENIPC_INSTALL_TARGET_CMDS
+        $(BARESIP_OPENIPC_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) install
 endef
 
-define BARESIP_UNINSTALL_TARGET_CMDS
+define BARESIP_OPENIPC_UNINSTALL_TARGET_CMDS
         $(RM) $(TARGET_DIR)/usr/bin/baresip
         $(RM) -r $(TARGET_DIR)/usr/lib/baresip
         $(RM) -r $(TARGET_DIR)/usr/share/baresip
 endef
 
 $(eval $(generic-package))
-$(eval $(host-generic-package)
+$(eval $(host-generic-package))
diff --git a/general/package/libre-openipc/Config.in b/general/package/libre-openipc/Config.in
index 2d2f4c46..16da442f 100644
--- a/general/package/libre-openipc/Config.in
+++ b/general/package/libre-openipc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBRE_OPENIPC
 	bool "libre-openipc"
+	default n
 	help
 	  libre is a Generic library for real-time communications 
 	  with async IO support.
diff --git a/general/package/libre-openipc/libre-openipc.mk b/general/package/libre-openipc/libre-openipc.mk
index fa425f40..e7e46915 100644
--- a/general/package/libre-openipc/libre-openipc.mk
+++ b/general/package/libre-openipc/libre-openipc.mk
@@ -4,19 +4,19 @@
 #
 ###########################################################################
 
-LIBRE_VERSION = 1.1.0
-LIBRE_SOURCE = v$(LIBRE_VERSION).tar.gz
-LIBRE_SITE = https://github.com/baresip/re/archive
-LIBRE_INSTALL_STAGING = YES
+LIBRE_OPENIPC_VERSION = 1.1.0
+LIBRE_OPENIPC_SOURCE = v$(LIBRE_OPENIPC_VERSION).tar.gz
+LIBRE_OPENIPC_SITE = https://github.com/baresip/re/archive
+LIBRE_OPENIPC_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBRE_DEPENDENCIES += openssl
+LIBRE_OPENIPC_DEPENDENCIES += openssl
 endif
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-LIBRE_DEPENDENCIES += zlib
+LIBRE_OPENIPC_DEPENDENCIES += zlib
 endif
 
-define LIBRE_BUILD_CMDS
+define LIBRE_OPENIPC_BUILD_CMDS
     $(TARGET_MAKE_ENV) \
 	$(MAKE) -C $(@D) \
 	    LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
@@ -35,17 +35,17 @@ define LIBRE_BUILD_CMDS
 endef
 
 
-define LIBRE_INSTALL_TARGET_CMDS
+define LIBRE_OPENIPC_INSTALL_TARGET_CMDS
         $(INSTALL) -m 644 -D $(@D)/libre.so $(TARGET_DIR)/usr/lib/libre.so
 endef
 
-define LIBRE_UNINSTALL_STAGING_CMDS
+define LIBRE_OPENIPC_UNINSTALL_STAGING_CMDS
         $(RM) -r $(STAGING_DIR)/usr/include/re
         $(RM) $(STAGING_DIR)/usr/lib/libre.a
         $(RM) $(STAGING_DIR)/usr/lib/libre.so
 endef
 
-define LIBRE_UNINSTALL_TARGET_CMDS
+define LIBRE_OPENIPC_UNINSTALL_TARGET_CMDS
         $(RM) $(TARGET_DIR)/usr/lib/libre.so
 endef
 
diff --git a/general/package/librem-openipc/Config.in b/general/package/librem-openipc/Config.in
index 50531ecd..d376c1c2 100644
--- a/general/package/librem-openipc/Config.in
+++ b/general/package/librem-openipc/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBREM_OPENIPC
 	bool "librem-openipc"
+	default n
 	help
 	  librem is a Audio and video processing media library.
 
diff --git a/general/package/librem-openipc/librem-openipc.mk b/general/package/librem-openipc/librem-openipc.mk
index 76bb254c..0c002b61 100644
--- a/general/package/librem-openipc/librem-openipc.mk
+++ b/general/package/librem-openipc/librem-openipc.mk
@@ -4,16 +4,16 @@
 #
 #############################################################
 
-LIBREM_VERSION = 0.6.0
-LIBREM_SOURCE = v$(LIBREM_VERSION).tar.gz
-LIBREM_SITE = https://github.com/baresip/rem/archive
-LIBREM_INSTALL_STAGING = YES
+LIBREM_OPENIPC_VERSION = 0.6.0
+LIBREM_OPENIPC_SOURCE = v$(LIBREM_OPENIPC_VERSION).tar.gz
+LIBREM_OPENIPC_SITE = https://github.com/baresip/rem/archive
+LIBREM_OPENIPC_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_LIBRE),y)
-LIBREM_DEPENDENCIES += libre
+ifeq ($(BR2_PACKAGE_LIBRE_OPENIPC),y)
+LIBREM_OPENIPC_DEPENDENCIES += libre
 endif
 
-define LIBREM_BUILD_CMDS
+define LIBREM_OPENIPC_BUILD_CMDS
     $(TARGET_MAKE_ENV) \
 	$(MAKE) -C $(@D) \
 	    LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
@@ -32,17 +32,17 @@ define LIBREM_BUILD_CMDS
 	    all install
 endef
 
-define LIBREM_INSTALL_TARGET_CMDS
+define LIBREM_OPENIPC_INSTALL_TARGET_CMDS
         $(INSTALL) -m 644 -D $(@D)/librem.so $(TARGET_DIR)/usr/lib/librem.so
 endef
 
-define LIBREM_UNINSTALL_STAGING_CMDS
+define LIBREM_OPENIPC_UNINSTALL_STAGING_CMDS
         $(RM) -r $(STAGING_DIR)/usr/include/rem
         $(RM) $(STAGING_DIR)/usr/lib/librem.a
         $(RM) $(STAGING_DIR)/usr/lib/librem.so
 endef
 
-define LIBREM_UNINSTALL_TARGET_CMDS
+define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS
         $(RM) $(TARGET_DIR)/usr/lib/librem.so
 endef