From b0d934ca7cf4d66decaf288f4b62c2a2b9d34f83 Mon Sep 17 00:00:00 2001
From: Igor Zalatov <flyrouter@gmail.com>
Date: Mon, 15 May 2023 01:38:10 +0300
Subject: [PATCH] Fix baresip (#794)

---
 general/package/baresip-openipc/Config.in     | 20 ++++-----
 .../baresip-openipc/baresip-openipc.mk        | 38 ++++++++--------
 .../0002-dirty-plug-for-musl.patch            | 20 +++++++++
 general/package/libre-openipc/Config.in       | 11 +++--
 .../package/libre-openipc/libre-openipc.mk    | 44 ++++++++++---------
 general/package/librem-openipc/Config.in      | 12 +++--
 .../package/librem-openipc/librem-openipc.mk  | 44 +++++++++----------
 7 files changed, 105 insertions(+), 84 deletions(-)
 create mode 100644 general/package/libre-openipc/0002-dirty-plug-for-musl.patch

diff --git a/general/package/baresip-openipc/Config.in b/general/package/baresip-openipc/Config.in
index 6a4f43cd..32bae2f7 100644
--- a/general/package/baresip-openipc/Config.in
+++ b/general/package/baresip-openipc/Config.in
@@ -1,13 +1,11 @@
 config BR2_PACKAGE_BARESIP_OPENIPC
-    bool "baresip-openipc"
-    default n
-    depends on BR2_PACKAGE_LIBRE_OPENIPC
-    depends on BR2_PACKAGE_LIBREM_OPENIPC
-    select BR2_PACKAGE_LIBRE_OPENIPC
-    select BR2_PACKAGE_LIBREM_OPENIPC
-    help
-      Baresip is a portable and modular SIP User-Agent with audio
-      and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad
-      and Contributors Distributed under BSD license.
+	bool "baresip-openipc"
+	default n
+	select BR2_PACKAGE_LIBRE_OPENIPC
+	select BR2_PACKAGE_LIBREM_OPENIPC
+	help
+	  Baresip is a portable and modular SIP User-Agent with audio
+	  and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad
+	  and Contributors Distributed under BSD license.
 
-      https://github.com/baresip/baresip
+	  https://github.com/baresip/baresip
diff --git a/general/package/baresip-openipc/baresip-openipc.mk b/general/package/baresip-openipc/baresip-openipc.mk
index f516e978..d6b5be7f 100644
--- a/general/package/baresip-openipc/baresip-openipc.mk
+++ b/general/package/baresip-openipc/baresip-openipc.mk
@@ -10,19 +10,19 @@ BARESIP_OPENIPC_SITE = https://github.com/baresip/baresip/archive
 BARESIP_OPENIPC_DEPENDENCIES = libre-openipc librem-openipc zlib
 
 BARESIP_OPENIPC_MAKE_ENV = \
-        $(TARGET_CONFIGURE_OPTS) \
-        SYSROOT=$(STAGING_DIR)/usr \
-        SYSROOT_LOCAL=$(STAGING_DIR)/usr \
-        LD="$(TARGET_CC)" \
-        LFLAGS="$(TARGET_LDFLAGS)"
+		$(TARGET_CONFIGURE_OPTS) \
+		SYSROOT=$(STAGING_DIR)/usr \
+		SYSROOT_LOCAL=$(STAGING_DIR)/usr \
+		LD="$(TARGET_CC)" \
+		LFLAGS="$(TARGET_LDFLAGS)"
 
 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" \
-        LIBREM_MK="$(STAGING_DIR)/usr/share/rem/rem.mk" \
-        LIBREM_INC="$(STAGING_DIR)/usr/include/rem" \
-        LIBREM_SO="$(STAGING_DIR)/usr/lib"
+		LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \
+		LIBRE_INC="$(STAGING_DIR)/usr/include/re" \
+		LIBRE_SO="$(STAGING_DIR)/usr/lib" \
+		LIBREM_MK="$(STAGING_DIR)/usr/share/rem/rem.mk" \
+		LIBREM_INC="$(STAGING_DIR)/usr/include/rem" \
+		LIBREM_SO="$(STAGING_DIR)/usr/lib"
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 BARESIP_OPENIPC_DEPENDENCIES += alsa-lib
@@ -31,7 +31,7 @@ endif
 ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
 BARESIP_OPENIPC_DEPENDENCIES += ffmpeg
 BARESIP_OPENIPC_MAKE_ENV += \
-        CFLAGS+=-DCODEC_TYPE_VIDEO=AVMEDIA_TYPE_VIDEO
+		CFLAGS+=-DCODEC_TYPE_VIDEO=AVMEDIA_TYPE_VIDEO
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
@@ -51,22 +51,24 @@ BARESIP_OPENIPC_DEPENDENCIES += xlib_libXext
 endif
 
 define BARESIP_OPENIPC_BUILD_CMDS
-        $(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) all
+		$(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) all
 endef
 
 define BARESIP_OPENIPC_CLEAN_CMDS
-        $(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) clean
+		$(BARESIP_OPENIPC_MAKE_ENV) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) clean
 endef
 
 define BARESIP_OPENIPC_INSTALL_TARGET_CMDS
-        $(BARESIP_OPENIPC_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) install
+		$(BARESIP_OPENIPC_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(MAKE) $(BARESIP_OPENIPC_MAKE_ARGS) -C $(@D) install
 endef
 
 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
+		$(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))
+
+
diff --git a/general/package/libre-openipc/0002-dirty-plug-for-musl.patch b/general/package/libre-openipc/0002-dirty-plug-for-musl.patch
new file mode 100644
index 00000000..30d6bb65
--- /dev/null
+++ b/general/package/libre-openipc/0002-dirty-plug-for-musl.patch
@@ -0,0 +1,20 @@
+--- a/src/dns/res.c.orig	2022-03-12 09:42:35.000000000 +0300
++++ b/src/dns/res.c	2023-05-15 01:02:30.147277596 +0300
+@@ -31,7 +31,7 @@
+ 	state = _res;
+ #else
+ 	memset(&state, 0, sizeof(state));
+-	ret = res_ninit(&state);
++	ret = res_init();
+ #endif
+ 	if (0 != ret)
+ 		return ENOENT;
+@@ -78,7 +78,7 @@
+  out:
+ #ifdef OPENBSD
+ #else
+-	res_nclose(&state);
++	pclose(&state);
+ #endif
+ 
+ 	return err;
diff --git a/general/package/libre-openipc/Config.in b/general/package/libre-openipc/Config.in
index 2eada33a..f81bf5bd 100644
--- a/general/package/libre-openipc/Config.in
+++ b/general/package/libre-openipc/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LIBRE_OPENIPC
-    bool "libre-openipc"
-    default n
-    help
-      libre is a Generic library for real-time communications
-      with async IO support.
+	bool "libre-openipc"
+	help
+	  libre is a Generic library for real-time communications
+	  with async IO support.
 
-      https://github.com/baresip/re
+	  https://github.com/baresip/re
diff --git a/general/package/libre-openipc/libre-openipc.mk b/general/package/libre-openipc/libre-openipc.mk
index db9557a3..ed6b3c38 100644
--- a/general/package/libre-openipc/libre-openipc.mk
+++ b/general/package/libre-openipc/libre-openipc.mk
@@ -17,36 +17,40 @@ LIBRE_OPENIPC_DEPENDENCIES += zlib
 endif
 
 define LIBRE_OPENIPC_BUILD_CMDS
-    $(TARGET_MAKE_ENV) \
-    $(MAKE) -C $(@D) \
-        LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
-        LIBRE_INC=$(STAGING_DIR)/usr/include/re \
-        LIBRE_SO=$(STAGING_DIR)/usr/lib \
-        CC="$(TARGET_CC)" \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
-        EXTRA_LFLAGS="-lm" \
-        DESTDIR="$(STAGING_DIR)" \
-        SYSROOT="$(STAGING_DIR)/usr" \
-        SYSROOT_ALT="$(STAGING_DIR)/usr" \
-        RELEASE=1 \
-        CROSS_COMPILE="$(TARGET_CROSS)" \
-        OS=linux \
-        all install
+$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) \
+		LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
+		LIBRE_INC=$(STAGING_DIR)/usr/include/re \
+		LIBRE_SO=$(STAGING_DIR)/usr/lib \
+		CC="$(TARGET_CC)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
+		EXTRA_LFLAGS="-lm" \
+		DESTDIR="$(STAGING_DIR)" \
+		SYSROOT="$(STAGING_DIR)/usr" \
+		SYSROOT_ALT="$(STAGING_DIR)/usr" \
+		RELEASE=1 \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		OS=linux \
+		all install
 endef
 
+define LIBRE_OPENIPC_INSTALL_STAGING_CMDS
+		$(INSTALL) -D -m 644 $(@D)/include/re.h $(STAGING_DIR)/usr/include/re/re.h
+endef
 
 define LIBRE_OPENIPC_INSTALL_TARGET_CMDS
-        $(INSTALL) -m 644 -D $(@D)/libre.so $(TARGET_DIR)/usr/lib/libre.so
+		$(INSTALL) -m 644 -D $(@D)/libre.so $(TARGET_DIR)/usr/lib/libre.so
+		ln -sf libre.so $(TARGET_DIR)/usr/lib/libre.so.2
 endef
 
 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
+		$(RM) -r $(STAGING_DIR)/usr/include/re
+		$(RM) $(STAGING_DIR)/usr/lib/libre.a
+		$(RM) $(STAGING_DIR)/usr/lib/libre.so
 endef
 
 define LIBRE_OPENIPC_UNINSTALL_TARGET_CMDS
-        $(RM) $(TARGET_DIR)/usr/lib/libre.so
+		$(RM) $(TARGET_DIR)/usr/lib/libre.so
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/librem-openipc/Config.in b/general/package/librem-openipc/Config.in
index c804ca99..86df6664 100644
--- a/general/package/librem-openipc/Config.in
+++ b/general/package/librem-openipc/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_LIBREM_OPENIPC
-    bool "librem-openipc"
-    default n
-    depends on BR2_PACKAGE_LIBRE_OPENIPC
-    select BR2_PACKAGE_LIBRE_OPENIPC
-    help
-      librem is a Audio and video processing media library.
+	bool "librem-openipc"
+	select BR2_PACKAGE_LIBRE_OPENIPC
+	help
+	  librem is a Audio and video processing media library.
 
-      https://github.com/baresip/rem
+	  https://github.com/baresip/rem
diff --git a/general/package/librem-openipc/librem-openipc.mk b/general/package/librem-openipc/librem-openipc.mk
index 8a239a9c..722c7d81 100644
--- a/general/package/librem-openipc/librem-openipc.mk
+++ b/general/package/librem-openipc/librem-openipc.mk
@@ -14,37 +14,37 @@ LIBREM_OPENIPC_DEPENDENCIES += libre-openipc
 endif
 
 define LIBREM_OPENIPC_BUILD_CMDS
-    $(TARGET_MAKE_ENV) \
-    $(MAKE) -C $(@D) \
-        LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
-        LIBRE_INC=$(STAGING_DIR)/usr/include/re \
-        LIBRE_SO=$(STAGING_DIR)/usr/lib \
-        HAVE_LIBRESOLV= \
-        CC="$(TARGET_CC)" \
-        EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
-        EXTRA_LFLAGS="-lm" \
-        DESTDIR="$(STAGING_DIR)" \
-        SYSROOT="$(STAGING_DIR)/usr" \
-        SYSROOT_ALT="$(STAGING_DIR)/usr" \
-        RELEASE=1 \
-        CROSS_COMPILE="$(TARGET_CROSS)" \
-        OS=linux \
-        all install
+$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) \
+		LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
+		LIBRE_INC=$(STAGING_DIR)/usr/include/re \
+		LIBRE_SO=$(STAGING_DIR)/usr/lib \
+		HAVE_LIBRESOLV= \
+		CC="$(TARGET_CC)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
+		EXTRA_LFLAGS="-lm" \
+		DESTDIR="$(STAGING_DIR)" \
+		SYSROOT="$(STAGING_DIR)/usr" \
+		SYSROOT_ALT="$(STAGING_DIR)/usr" \
+		RELEASE=1 \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		OS=linux \
+		all install
 endef
 
 define LIBREM_OPENIPC_INSTALL_TARGET_CMDS
-        $(INSTALL) -m 644 -D $(@D)/librem.so $(TARGET_DIR)/usr/lib/librem.so
+		$(INSTALL) -m 644 -D $(@D)/librem.so $(TARGET_DIR)/usr/lib/librem.so
+		ln -sf librem.so $(TARGET_DIR)/usr/lib/librem.so.2
 endef
 
 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
+		$(RM) -r $(STAGING_DIR)/usr/include/rem
+		$(RM) $(STAGING_DIR)/usr/lib/librem.a
+		$(RM) $(STAGING_DIR)/usr/lib/librem.so
 endef
 
 define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS
-        $(RM) $(TARGET_DIR)/usr/lib/librem.so
+		$(RM) $(TARGET_DIR)/usr/lib/librem.so
 endef
 
 $(eval $(generic-package))
-#$(eval $(host-generic-package))