OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
general/package/baresip-openipc/Config.in
View File

@ -1,13 +1,11 @@
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 select BR2_PACKAGE_LIBRE_OPENIPC
depends on BR2_PACKAGE_LIBREM_OPENIPC select BR2_PACKAGE_LIBREM_OPENIPC
select BR2_PACKAGE_LIBRE_OPENIPC help
select BR2_PACKAGE_LIBREM_OPENIPC Baresip is a portable and modular SIP User-Agent with audio
help and video support. Copyright (c) 2010 - 2022 Alfred E. Heggestad
Baresip is a portable and modular SIP User-Agent with audio and Contributors Distributed under BSD license.
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

38
general/package/baresip-openipc/baresip-openipc.mk
View File

@ -10,19 +10,19 @@ BARESIP_OPENIPC_SITE = https://github.com/baresip/baresip/archive
BARESIP_OPENIPC_DEPENDENCIES = libre-openipc librem-openipc zlib BARESIP_OPENIPC_DEPENDENCIES = libre-openipc librem-openipc zlib
BARESIP_OPENIPC_MAKE_ENV = \ BARESIP_OPENIPC_MAKE_ENV = \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
SYSROOT=$(STAGING_DIR)/usr \ SYSROOT=$(STAGING_DIR)/usr \
SYSROOT_LOCAL=$(STAGING_DIR)/usr \ SYSROOT_LOCAL=$(STAGING_DIR)/usr \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
LFLAGS="$(TARGET_LDFLAGS)" LFLAGS="$(TARGET_LDFLAGS)"
BARESIP_OPENIPC_MAKE_ARGS = \ BARESIP_OPENIPC_MAKE_ARGS = \
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" \
LIBRE_SO="$(STAGING_DIR)/usr/lib" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \
LIBREM_MK="$(STAGING_DIR)/usr/share/rem/rem.mk" \ LIBREM_MK="$(STAGING_DIR)/usr/share/rem/rem.mk" \
LIBREM_INC="$(STAGING_DIR)/usr/include/rem" \ LIBREM_INC="$(STAGING_DIR)/usr/include/rem" \
LIBREM_SO="$(STAGING_DIR)/usr/lib" LIBREM_SO="$(STAGING_DIR)/usr/lib"
ifeq ($(BR2_PACKAGE_ALSA_LIB),y) ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
BARESIP_OPENIPC_DEPENDENCIES += alsa-lib BARESIP_OPENIPC_DEPENDENCIES += alsa-lib
@ -31,7 +31,7 @@ endif
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
BARESIP_OPENIPC_DEPENDENCIES += ffmpeg BARESIP_OPENIPC_DEPENDENCIES += ffmpeg
BARESIP_OPENIPC_MAKE_ENV += \ BARESIP_OPENIPC_MAKE_ENV += \
CFLAGS+=-DCODEC_TYPE_VIDEO=AVMEDIA_TYPE_VIDEO CFLAGS+=-DCODEC_TYPE_VIDEO=AVMEDIA_TYPE_VIDEO
endif endif
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
@ -51,22 +51,24 @@ BARESIP_OPENIPC_DEPENDENCIES += xlib_libXext
endif endif
define BARESIP_OPENIPC_BUILD_CMDS 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 endef
define BARESIP_OPENIPC_CLEAN_CMDS 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 endef
define BARESIP_OPENIPC_INSTALL_TARGET_CMDS 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 endef
define BARESIP_OPENIPC_UNINSTALL_TARGET_CMDS define BARESIP_OPENIPC_UNINSTALL_TARGET_CMDS
$(RM) $(TARGET_DIR)/usr/bin/baresip $(RM) $(TARGET_DIR)/usr/bin/baresip
$(RM) -r $(TARGET_DIR)/usr/lib/baresip $(RM) -r $(TARGET_DIR)/usr/lib/baresip
$(RM) -r $(TARGET_DIR)/usr/share/baresip $(RM) -r $(TARGET_DIR)/usr/share/baresip
endef endef
$(eval $(generic-package)) $(eval $(generic-package))
$(eval $(host-generic-package)) $(eval $(host-generic-package))

20
general/package/libre-openipc/0002-dirty-plug-for-musl.patch 100644
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;

11
general/package/libre-openipc/Config.in
View File

@ -1,8 +1,7 @@
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.
https://github.com/baresip/re https://github.com/baresip/re

44
general/package/libre-openipc/libre-openipc.mk
View File

@ -17,36 +17,40 @@ 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 \
LIBRE_SO=$(STAGING_DIR)/usr/lib \ LIBRE_SO=$(STAGING_DIR)/usr/lib \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
EXTRA_LFLAGS="-lm" \ EXTRA_LFLAGS="-lm" \
DESTDIR="$(STAGING_DIR)" \ DESTDIR="$(STAGING_DIR)" \
SYSROOT="$(STAGING_DIR)/usr" \ SYSROOT="$(STAGING_DIR)/usr" \
SYSROOT_ALT="$(STAGING_DIR)/usr" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \
RELEASE=1 \ RELEASE=1 \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
OS=linux \ OS=linux \
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
$(RM) -r $(STAGING_DIR)/usr/include/re $(RM) -r $(STAGING_DIR)/usr/include/re
$(RM) $(STAGING_DIR)/usr/lib/libre.a $(RM) $(STAGING_DIR)/usr/lib/libre.a
$(RM) $(STAGING_DIR)/usr/lib/libre.so $(RM) $(STAGING_DIR)/usr/lib/libre.so
endef endef
define LIBRE_OPENIPC_UNINSTALL_TARGET_CMDS define LIBRE_OPENIPC_UNINSTALL_TARGET_CMDS
$(RM) $(TARGET_DIR)/usr/lib/libre.so $(RM) $(TARGET_DIR)/usr/lib/libre.so
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

12
general/package/librem-openipc/Config.in
View File

@ -1,9 +1,7 @@
config BR2_PACKAGE_LIBREM_OPENIPC config BR2_PACKAGE_LIBREM_OPENIPC
bool "librem-openipc" bool "librem-openipc"
default n select BR2_PACKAGE_LIBRE_OPENIPC
depends on BR2_PACKAGE_LIBRE_OPENIPC help
select BR2_PACKAGE_LIBRE_OPENIPC librem is a Audio and video processing media library.
help
librem is a Audio and video processing media library.
https://github.com/baresip/rem https://github.com/baresip/rem

44
general/package/librem-openipc/librem-openipc.mk
View File

@ -14,37 +14,37 @@ 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 \
LIBRE_SO=$(STAGING_DIR)/usr/lib \ LIBRE_SO=$(STAGING_DIR)/usr/lib \
HAVE_LIBRESOLV= \ HAVE_LIBRESOLV= \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
EXTRA_LFLAGS="-lm" \ EXTRA_LFLAGS="-lm" \
DESTDIR="$(STAGING_DIR)" \ DESTDIR="$(STAGING_DIR)" \
SYSROOT="$(STAGING_DIR)/usr" \ SYSROOT="$(STAGING_DIR)/usr" \
SYSROOT_ALT="$(STAGING_DIR)/usr" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \
RELEASE=1 \ RELEASE=1 \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
OS=linux \ OS=linux \
all install all install
endef 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
$(RM) -r $(STAGING_DIR)/usr/include/rem $(RM) -r $(STAGING_DIR)/usr/include/rem
$(RM) $(STAGING_DIR)/usr/lib/librem.a $(RM) $(STAGING_DIR)/usr/lib/librem.a
$(RM) $(STAGING_DIR)/usr/lib/librem.so $(RM) $(STAGING_DIR)/usr/lib/librem.so
endef endef
define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS define LIBREM_OPENIPC_UNINSTALL_TARGET_CMDS
$(RM) $(TARGET_DIR)/usr/lib/librem.so $(RM) $(TARGET_DIR)/usr/lib/librem.so
endef endef
$(eval $(generic-package)) $(eval $(generic-package))
#$(eval $(host-generic-package))