Fix baresip (#794)

pull/795/head
Igor Zalatov 2023-05-15 01:38:10 +03:00 committed by GitHub
parent e540836324
commit b0d934ca7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 105 additions and 84 deletions

View File

@ -1,8 +1,6 @@
config BR2_PACKAGE_BARESIP_OPENIPC config BR2_PACKAGE_BARESIP_OPENIPC
bool "baresip-openipc" bool "baresip-openipc"
default n default n
depends on BR2_PACKAGE_LIBRE_OPENIPC
depends on BR2_PACKAGE_LIBREM_OPENIPC
select BR2_PACKAGE_LIBRE_OPENIPC select BR2_PACKAGE_LIBRE_OPENIPC
select BR2_PACKAGE_LIBREM_OPENIPC select BR2_PACKAGE_LIBREM_OPENIPC
help help

View File

@ -70,3 +70,5 @@ endef
$(eval $(generic-package)) $(eval $(generic-package))
$(eval $(host-generic-package)) $(eval $(host-generic-package))

View File

@ -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;

View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBRE_OPENIPC config BR2_PACKAGE_LIBRE_OPENIPC
bool "libre-openipc" bool "libre-openipc"
default n
help help
libre is a Generic library for real-time communications libre is a Generic library for real-time communications
with async IO support. with async IO support.

View File

@ -17,7 +17,7 @@ LIBRE_OPENIPC_DEPENDENCIES += zlib
endif endif
define LIBRE_OPENIPC_BUILD_CMDS define LIBRE_OPENIPC_BUILD_CMDS
$(TARGET_MAKE_ENV) \ $(TARGET_MAKE_ENV) \
$(MAKE) -C $(@D) \ $(MAKE) -C $(@D) \
LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
LIBRE_INC=$(STAGING_DIR)/usr/include/re \ LIBRE_INC=$(STAGING_DIR)/usr/include/re \
@ -34,9 +34,13 @@ define LIBRE_OPENIPC_BUILD_CMDS
all install all install
endef 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 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 endef
define LIBRE_OPENIPC_UNINSTALL_STAGING_CMDS define LIBRE_OPENIPC_UNINSTALL_STAGING_CMDS

View File

@ -1,7 +1,5 @@
config BR2_PACKAGE_LIBREM_OPENIPC config BR2_PACKAGE_LIBREM_OPENIPC
bool "librem-openipc" bool "librem-openipc"
default n
depends on BR2_PACKAGE_LIBRE_OPENIPC
select BR2_PACKAGE_LIBRE_OPENIPC select BR2_PACKAGE_LIBRE_OPENIPC
help help
librem is a Audio and video processing media library. librem is a Audio and video processing media library.

View File

@ -14,7 +14,7 @@ LIBREM_OPENIPC_DEPENDENCIES += libre-openipc
endif endif
define LIBREM_OPENIPC_BUILD_CMDS define LIBREM_OPENIPC_BUILD_CMDS
$(TARGET_MAKE_ENV) \ $(TARGET_MAKE_ENV) \
$(MAKE) -C $(@D) \ $(MAKE) -C $(@D) \
LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
LIBRE_INC=$(STAGING_DIR)/usr/include/re \ LIBRE_INC=$(STAGING_DIR)/usr/include/re \
@ -34,6 +34,7 @@ endef
define LIBREM_OPENIPC_INSTALL_TARGET_CMDS 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 endef
define LIBREM_OPENIPC_UNINSTALL_STAGING_CMDS define LIBREM_OPENIPC_UNINSTALL_STAGING_CMDS
@ -47,4 +48,3 @@ define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS
endef endef
$(eval $(generic-package)) $(eval $(generic-package))
#$(eval $(host-generic-package))