From 5578908054a6f4bf2f6f704e87b48bc619e78fa3 Mon Sep 17 00:00:00 2001 From: Daniel Danzberger Date: Fri, 8 Nov 2024 11:36:42 +0100 Subject: [PATCH 1/4] re: Bump to version 3.16.0 The previous version 2.0.1 is about 7 years old now and a lot has changed. Various fixes, improvements and features have been added. The build system has moved to cmake and pkg-config is used, which makes it a lot easier to build from the openwrt buildroot. Therefore a lot of the extra code is removed from it's Makefile Librem is now integrated into libre. No more patches are required. Signed-off-by: Daniel Danzberger --- libs/re/Makefile | 46 +++---------------- .../001-extend-ninit-nclose-check.patch | 20 -------- .../re/patches/002-fix-redefine-ssize_t.patch | 11 ----- .../004-prevent-optimization-meddling.patch | 10 ---- .../005-fix-builds-for-mipsel-targets.patch | 14 ------ 5 files changed, 7 insertions(+), 94 deletions(-) delete mode 100644 libs/re/patches/001-extend-ninit-nclose-check.patch delete mode 100644 libs/re/patches/002-fix-redefine-ssize_t.patch delete mode 100644 libs/re/patches/004-prevent-optimization-meddling.patch delete mode 100644 libs/re/patches/005-fix-builds-for-mipsel-targets.patch diff --git a/libs/re/Makefile b/libs/re/Makefile index cdf9c8850..d01e1947d 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -5,16 +5,15 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # - include $(TOPDIR)/rules.mk PKG_NAME:=re -PKG_VERSION:=2.0.1 +PKG_VERSION:=3.16.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/baresip/re/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed +PKG_HASH:=11b3215064b6ef5a11b0f4645d6d4834f8ba899d5b65c66477f9c4afbd32e1ed PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING @@ -24,6 +23,7 @@ PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/libre SUBMENU:=Telephony @@ -32,49 +32,17 @@ define Package/libre DEPENDS:=+libopenssl +zlib TITLE:=Generic library for real-time communications with async IO support URL:=https://github.com/baresip/re - ABI_VERSION:=1 + ABI_VERSION:=2 endef -# re.mk is used for this and all related packages (rem, restund and baresip). -# It relies on SYSROOT and SYSROOT_ALT being set. SYSROOT is used for finding -# toolchain headers (like pthread.h). SYSROOT_ALT is used for finding headers -# from other packages, like openssl etc. -# -# CFLAGS are picked up from the environment, as well as CPPFLAGS (and LD etc.). -# But LDFLAGS aren't picked up, so they need to be handed over via -# EXTRA_LFLAGS. -# -# LD is changed to TARGET_CC to fix build failures on x86 32bit. Without this -# there's no linking to ssp, which results in undefined references. - -# used by 001-extend-ninit-nclose-check.patch -TARGET_CFLAGS+=-DOPENWRT - -ifneq ($(CONFIG_USE_GLIBC)$(CONFIG_USE_MUSL),) -TARGET_CFLAGS+=-D_GNU_SOURCE -endif - -MAKE_FLAGS+= \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ - LD="$(TARGET_CC)" \ - OS=linux \ - RELEASE=1 \ - SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" - define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/share/re - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/re/re.mk $(1)/usr/share/re - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr + $(CP) $(PKG_INSTALL_DIR)/usr/* $(1)/usr endef define Package/libre/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so.$(ABI_VERSION)* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so.* $(1)/usr/lib endef $(eval $(call BuildPackage,libre)) diff --git a/libs/re/patches/001-extend-ninit-nclose-check.patch b/libs/re/patches/001-extend-ninit-nclose-check.patch deleted file mode 100644 index 9a227595a..000000000 --- a/libs/re/patches/001-extend-ninit-nclose-check.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/dns/res.c -+++ b/src/dns/res.c -@@ -26,7 +26,7 @@ int get_resolv_dns(char *domain, size_t - uint32_t i; - int ret, err; - --#ifdef OPENBSD -+#if defined(OPENBSD) || defined(OPENWRT) - ret = res_init(); - state = _res; - #else -@@ -76,7 +76,7 @@ int get_resolv_dns(char *domain, size_t - *n = i; - - out: --#ifdef OPENBSD -+#if defined(OPENBSD) || defined(OPENWRT) - #else - res_nclose(&state); - #endif diff --git a/libs/re/patches/002-fix-redefine-ssize_t.patch b/libs/re/patches/002-fix-redefine-ssize_t.patch deleted file mode 100644 index 5a9e35431..000000000 --- a/libs/re/patches/002-fix-redefine-ssize_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/re_types.h -+++ b/include/re_types.h -@@ -47,7 +47,7 @@ typedef unsigned long long int uint64 - #endif /* __BIT_TYPES_DEFINED__ */ - - #endif /* __int8_t_defined */ --#ifndef __ssize_t_defined -+#if !defined(__ssize_t_defined) && !defined(__DEFINED_ssize_t) - typedef long ssize_t; - #define __ssize_t_defined - #endif diff --git a/libs/re/patches/004-prevent-optimization-meddling.patch b/libs/re/patches/004-prevent-optimization-meddling.patch deleted file mode 100644 index 97caed3ec..000000000 --- a/libs/re/patches/004-prevent-optimization-meddling.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/mk/re.mk -+++ b/mk/re.mk -@@ -47,7 +47,6 @@ - - ifneq ($(RELEASE),) - CFLAGS += -DRELEASE --OPT_SPEED=1 - endif - - ifneq ($(TRACE_ERR),) diff --git a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch b/libs/re/patches/005-fix-builds-for-mipsel-targets.patch deleted file mode 100644 index c50a463a5..000000000 --- a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/mk/re.mk -+++ b/mk/re.mk -@@ -412,11 +412,6 @@ endif - - CFLAGS += -DARCH=\"$(ARCH)\" - --ifeq ($(ARCH),mipsel) --CFLAGS += -march=mips32 --endif -- -- - ############################################################################## - # - # External libraries section From 0218f1e7ed6d757302402a2bccce5b1fef47bfbe Mon Sep 17 00:00:00 2001 From: Daniel Danzberger Date: Fri, 8 Nov 2024 11:48:15 +0100 Subject: [PATCH 2/4] rem: Remove library package All librem features are now part of libre and the only package that depended on it (baresip) now uses libre. It can therefore be removed. Signed-off-by: Daniel Danzberger --- libs/rem/Makefile | 61 ----------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 libs/rem/Makefile diff --git a/libs/rem/Makefile b/libs/rem/Makefile deleted file mode 100644 index a87a4ce2b..000000000 --- a/libs/rem/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2010-2017 OpenWrt.org -# Copyright (C) 2010 Alfred E. Heggestad -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rem -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/baresip/rem/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=docs/COPYING -PKG_MAINTAINER:=Jiri Slachta - -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/librem - SUBMENU:=Telephony - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libre - TITLE:=Audio and video processing media library - URL:=https://github.com/baresip/rem -endef - -MAKE_FLAGS+= \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ - LD="$(TARGET_CC)" \ - LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ - LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ - LIBRE_SO="$(STAGING_DIR)/usr/lib" \ - OS=linux \ - RELEASE=1 \ - SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/rem $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.{a,so} $(1)/usr/lib -endef - -define Package/librem/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.so $(1)/usr/lib -endef - -$(eval $(call BuildPackage,librem)) From e578742207ec66921c183cac042b02e09669e487 Mon Sep 17 00:00:00 2001 From: Daniel Danzberger Date: Tue, 12 Nov 2024 17:20:11 +0100 Subject: [PATCH 3/4] baresip-apps: New Package This package contains some of the modules that have previously been part of the main baresip repo. Signed-off-by: Daniel Danzberger --- net/baresip-apps/Makefile | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 net/baresip-apps/Makefile diff --git a/net/baresip-apps/Makefile b/net/baresip-apps/Makefile new file mode 100644 index 000000000..35312e1dd --- /dev/null +++ b/net/baresip-apps/Makefile @@ -0,0 +1,71 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=baresip-apps +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/baresip/baresip-apps.git +PKG_SOURCE_VERSION:=0b25d61247f3e8d15071b09223e35f8806dacad8 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MIRROR_HASH:=35599fa7d081640a86a0ae91e1b46209fa1ddd41295332948ec29fa5a15c2b65 + +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=docs/COPYING +PKG_MAINTAINER:=Daniel Danzberger + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/baresip-app/Default + SECTION:=net + CATEGORY:=Network + SUBMENU:=Telephony + URL:=https://github.com/baresip/baresip-apps +endef + +baresip-apps:= \ + auloop \ + autotest \ + b2bua \ + intercom \ + kaoptions \ + multicast \ + parcall \ + qualify \ + vidloop + +empty:= +space:= $(empty) $(empty) + +MODULES:=$(foreach m,$(baresip-apps),$(if $(CONFIG_PACKAGE_baresip-app-$(m)),$(m))) +MODULES:=$(strip $(MODULES)) +MODULES:=$(subst $(space),;,$(MODULES)) + +CMAKE_OPTIONS += -DMODULES="$(MODULES)" + +define BuildPlugin + define Package/baresip-app-$(1) + $$(call Package/baresip-app/Default) + TITLE:=$(2) + DEPENDS:=+baresip $(patsubst +%,+PACKAGE_$(PKG_NAME)-app-$(1):%,$(3)) + endef + define Package/baresip-app-$(1)/install + $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$(1).so \ + $$(1)/usr/lib/baresip/modules + endef + $$(eval $$(call BuildPackage,baresip-app-$(1))) +endef + +$(eval $(call BuildPlugin,auloop,Audio Looping,)) +$(eval $(call BuildPlugin,autotest,Auto Test Module,)) +$(eval $(call BuildPlugin,b2bua,Back-to-Back User-Agent,)) +$(eval $(call BuildPlugin,intercom,Intercom Module,)) +$(eval $(call BuildPlugin,kaoptions,Keepalive via SIP OPTIONS message,)) +$(eval $(call BuildPlugin,multicast,Mulitcast Support,)) +$(eval $(call BuildPlugin,parcall,Parallel call module,)) +$(eval $(call BuildPlugin,qualify,Pinging of peer in CALL_STATE_INCOMING via SIP OPTIONS,)) +$(eval $(call BuildPlugin,vidloop,Video Loop,)) From 819fec7195b941aaeb6038db86c537a4505f6ce0 Mon Sep 17 00:00:00 2001 From: Daniel Danzberger Date: Fri, 8 Nov 2024 11:40:59 +0100 Subject: [PATCH 4/4] baresip: Bump to version 3.16.0 The previous version 1.1.0 is about 7 years old now and a lot has changed. Various fixes, improvements and features have been added. The build system has moved to cmake and pkg-config is used, which makes it a lot easier to build from the openwrt buildroot. Therefore a lot of the extra code is removed from it's Makefile. The librem dependency has been removed, since newer versions of libre contain all the librem features. The parallel build patch is no longer required. Signed-off-by: Daniel Danzberger --- net/baresip/Makefile | 303 ++++++++---------- .../patches/010-fix-parallel-build.patch | 23 -- 2 files changed, 139 insertions(+), 187 deletions(-) delete mode 100644 net/baresip/patches/010-fix-parallel-build.patch diff --git a/net/baresip/Makefile b/net/baresip/Makefile index 097627a02..00028839c 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -5,16 +5,15 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # - include $(TOPDIR)/rules.mk PKG_NAME:=baresip -PKG_VERSION:=1.1.0 -PKG_RELEASE:=6 +PKG_VERSION:=3.16.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/baresip/baresip/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e +PKG_HASH:=95338c4e4dd6931c94d425d69089b66d32c173e48cb992344e856ead7ba9393b PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING @@ -24,136 +23,121 @@ PKG_BUILD_DEPENDS:=glib2/host PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/baresip/Default + SECTION:=net + CATEGORY:=Network + SUBMENU:=Telephony + URL:=https://github.com/baresip/baresip +endef + +define Package/baresip +$(call Package/baresip/Default) + TITLE:=Portable and modular SIP User-Agent with A/V support + DEPENDS:=+libre + USERID:=$(PKG_NAME)=374:$(PKG_NAME)=374 + MENU:=1 + FILE_MODES:= \ + /etc/baresip:baresip:baresip:0750 \ + /etc/baresip/accounts:baresip:baresip:0640 \ + /etc/baresip/config:baresip:baresip:0640 \ + /etc/baresip/contacts:baresip:baresip:0640 +endef + baresip-mods:= \ aac \ alsa \ - amr \ + aubridge \ + auconv \ + aufile \ + auresamp \ + ausine \ avcodec \ avfilter \ avformat \ cons \ - ctrl-dbus \ + ctrl_dbus \ + ctrl_tcp \ + debug_cmd \ + dtls_srtp \ + ebuacip \ + echo \ evdev \ + fakevideo \ g711 \ g722 \ g726 \ gst \ - gst-video \ + httpd \ httpreq \ + in_band_dtmf \ l16 \ + mixausrc \ + mixminus \ mqtt \ + mwi \ + natpmp \ + netroam \ opus \ opus_multistream \ - oss \ + pcp \ plc \ portaudio \ + presence \ pulse \ + rtcpsummary \ + selfview \ + serreg \ snapshot \ sndfile \ - speex-pp \ srtp \ stdio \ + swscale \ syslog \ + uuid \ v4l2 \ + vidbridge \ + vidinfo \ vp8 \ - vp9 + vp9 \ + vumeter -PKG_CONFIG_DEPENDS:= \ - $(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(subst _,-,$(baresip-mods))) +empty:= +space:= $(empty) $(empty) -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk +MODULES:=stun;turn;menu;ice;contact;account +MODULES+=$(foreach m,$(baresip-mods),$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),$(m))) +MODULES:=$(strip $(MODULES)) +MODULES:=$(subst $(space),;,$(MODULES)) -define Package/baresip/Default - SECTION:=net - CATEGORY:=Network - SUBMENU:=Telephony - URL:=https://github.com/baresip/baresip -endef +CMAKE_OPTIONS += -DMODULES="$(MODULES)" \ + -DGST_INCLUDE_DIRS="$(STAGING_DIR)/usr/include/gstreamer-1.0" \ + -DGL_INCLUDE_DIRS="$(STAGING_DIR)/usr/include/glib-2.0" -define Package/baresip -$(call Package/baresip/Default) - TITLE:=Portable and modular SIP User-Agent with A/V support - DEPENDS:=+libre +librem - USERID:=$(PKG_NAME)=374:$(PKG_NAME)=374 - MENU:=1 - FILE_MODES:= \ - /etc/baresip:baresip:baresip:0750 \ - /etc/baresip/accounts:baresip:baresip:0640 \ - /etc/baresip/config:baresip:baresip:0640 \ - /etc/baresip/contacts:baresip:baresip:0640 +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr + $(CP) $(PKG_INSTALL_DIR)/usr/* $(1)/usr endef -baresip-mod-aac := USE_AAC -baresip-mod-alsa := USE_ALSA -baresip-mod-amr := USE_AMR -baresip-mod-avcodec := USE_AVCODEC -baresip-mod-avfilter := USE_AVFILTER -baresip-mod-avformat := USE_AVFORMAT -baresip-mod-cons := USE_CONS -baresip-mod-ctrl-dbus := HAVE_GLIB USE_DBUS -baresip-mod-evdev := USE_EVDEV -baresip-mod-g711 := USE_G711 -baresip-mod-g722 := USE_G722 -baresip-mod-g726 := USE_G726 -baresip-mod-gst := USE_GST -baresip-mod-gst-video := USE_GST_VIDEO -baresip-mod-httpreq := USE_HTTPREQ -baresip-mod-l16 := USE_L16 -baresip-mod-mqtt := USE_MQTT -baresip-mod-opus := USE_OPUS -baresip-mod-opus_multistream := USE_OPUS_MS -baresip-mod-oss := USE_OSS -baresip-mod-plc := USE_PLC -baresip-mod-portaudio := USE_PORTAUDIO -baresip-mod-pulse := USE_PULSE -baresip-mod-snapshot := USE_SNAPSHOT -baresip-mod-sndfile := USE_SNDFILE -baresip-mod-speex-pp := USE_SPEEX_PP -baresip-mod-srtp := USE_SRTP -baresip-mod-stdio := USE_STDIO -baresip-mod-syslog := USE_SYSLOG -baresip-mod-vp8 := USE_VPX -baresip-mod-vp9 := USE_VPX -baresip-mod-v4l2 := USE_V4L2 - -BARESIP_MOD_OPTIONS:= \ - MOD_AUTODETECT= \ - $(foreach m,$(baresip-mods),$(foreach v,$(baresip-mod-$(m)),$(v)=$(if $(CONFIG_PACKAGE_baresip-mod-$(subst _,-,$(m))),1))) - -MAKE_FLAGS+= \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ - LD="$(TARGET_CC)" \ - LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ - LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ - LIBRE_SO="$(STAGING_DIR)/usr/lib" \ - LIBREM_PATH="$(STAGING_DIR)/usr" \ - OS=linux \ - RELEASE=1 \ - SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" \ - $(BARESIP_MOD_OPTIONS) - -TARGET_CFLAGS+=-D_GNU_SOURCE - define Package/baresip/install - $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/bin \ + $(1)/usr/lib/baresip/modules \ + $(1)/usr/share/baresip \ + $(1)/etc/baresip \ + $(1)/etc/init.d \ + $(1)/etc/default $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/lib/baresip/modules + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libbaresip.so* $(1)/usr/lib $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/{account,auloop,contact,ice,menu,stun,turn}.so \ + $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/{account,contact,ice,menu,stun,turn}.so \ $(1)/usr/lib/baresip/modules - $(INSTALL_DIR) $(1)/usr/share/baresip $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/baresip/* $(1)/usr/share/baresip - $(INSTALL_DIR) $(1)/etc/baresip $(SED) '/^#/!s/^/#/' $(PKG_BUILD_DIR)/docs/examples/accounts $(SED) '/^#module_path/s|^#||;s|/local||' $(PKG_BUILD_DIR)/docs/examples/config $(INSTALL_DATA) $(PKG_BUILD_DIR)/docs/examples/{accounts,config,contacts} $(1)/etc/baresip - $(INSTALL_DIR) $(1)/etc/default $(INSTALL_CONF) ./files/baresip.default $(1)/etc/default/baresip - $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip endef @@ -162,92 +146,83 @@ define Package/baresip/conffiles /etc/baresip/config /etc/baresip/contacts /etc/default/baresip -/etc/init.d/baresip endef ################## # bareSIP modules # 1. Name # 2. Title -# 3. Files -# 4. Dependencies +# 3. Dependencies ################## define BuildPlugin - - define Package/baresip-mod-$(subst _,-,$(1)) + define Package/baresip-mod-$(1) $$(call Package/baresip/Default) TITLE:=$(2) - DEPENDS:=baresip $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(subst _,-,$(1)):%,$(4)) + DEPENDS:=baresip $(patsubst +%,+PACKAGE_$(PKG_NAME)-mod-$(1):%,$(3)) endef - - define Package/baresip-mod-$(subst _,-,$(1))/install - [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules - for f in $(3); do \ - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$$$$$$$${f}.so \ - $$(1)/usr/lib/baresip/modules; \ - done + define Package/baresip-mod-$(1)/install + $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$(1).so \ + $$(1)/usr/lib/baresip/modules endef - - $$(eval $$(call BuildPackage,baresip-mod-$(subst _,-,$(1)))) + $$(eval $$(call BuildPackage,baresip-mod-$(1))) endef $(eval $(call BuildPackage,baresip)) -$(eval $(call BuildPlugin,aac,MPEG-4 AAC Audio Codec,aac,+fdk-aac)) -$(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+alsa-lib)) -$(eval $(call BuildPlugin,amr,Adaptive Multi-Rate [AMR] audio codec,amr,)) -$(eval $(call BuildPlugin,aubridge,Audio bridge module,aubridge,)) -$(eval $(call BuildPlugin,aufile,Audio module for using a WAV-file as audio input,aufile,)) -$(eval $(call BuildPlugin,ausine,Sine Audio Source,ausine,)) -$(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,avcodec,+libffmpeg-full)) -$(eval $(call BuildPlugin,avformat,Video source using FFmpeg,avformat,baresip-mod-avcodec)) -$(eval $(call BuildPlugin,b2bua,Back-to-Back User-Agent module,b2bua,)) -$(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,cons,)) -$(eval $(call BuildPlugin,ctrl_dbus,DBus control interface,ctrl_dbus,+glib2)) -$(eval $(call BuildPlugin,ctrl_tcp,TCP control interface,ctrl_tcp,)) -$(eval $(call BuildPlugin,debug_cmd,Debug commands,debug_cmd,)) -$(eval $(call BuildPlugin,dtls_srtp,DTLS-SRTP end-to-end encryption,dtls_srtp,)) -$(eval $(call BuildPlugin,ebuacip,EBU ACIP [Audio Contribution over IP] Profile,ebuacip,)) -$(eval $(call BuildPlugin,echo,Echo server module,echo,)) -$(eval $(call BuildPlugin,evdev,Linux input driver,evdev,)) -$(eval $(call BuildPlugin,fakevideo,Fake video input/output driver,fakevideo,)) -$(eval $(call BuildPlugin,g711,G.711 audio codec,g711,)) -$(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+libspandsp)) -$(eval $(call BuildPlugin,g726,G.726 audio codec,g726,+libspandsp)) -$(eval $(call BuildPlugin,gst,Gstreamer 1.0 playbin pipeline,gst,@AUDIO_SUPPORT +glib2 +libgstreamer1)) -$(eval $(call BuildPlugin,gst_video,Video codecs using Gstreamer 1.0,gst_video,@AUDIO_SUPPORT +glib2 +libgst1app +libgstreamer1)) -$(eval $(call BuildPlugin,httpd,HTTP webserver UI-module,httpd,)) -$(eval $(call BuildPlugin,httpreq,HTTP request module,httpreq,)) -$(eval $(call BuildPlugin,l16,16-bit linear codec,l16,)) -$(eval $(call BuildPlugin,mixausrc,Mixes another audio source into audio stream,mixausrc,)) -$(eval $(call BuildPlugin,mqtt,Message Queue Telemetry Transport [MQTT] client,mqtt,+libmosquitto)) -$(eval $(call BuildPlugin,multicast,Multicast support,multicast,)) -$(eval $(call BuildPlugin,mwi,Message Waiting Indication,mwi,)) -$(eval $(call BuildPlugin,natpmp,NAT Port Mapping Protocol module,natpmp,)) -$(eval $(call BuildPlugin,opus,OPUS Interactive audio codec,opus,+libopus)) -$(eval $(call BuildPlugin,opus_multistream,Opus Multistream Audio Codec,opus_multistream,+libopus)) -$(eval $(call BuildPlugin,oss,OSS audio driver,oss,)) -$(eval $(call BuildPlugin,plc,Packet Loss Concealment,plc,+libspandsp)) -$(eval $(call BuildPlugin,portaudio,Portaudio audio driver,portaudio,+portaudio)) -$(eval $(call BuildPlugin,presence,Presence module,presence,)) -$(eval $(call BuildPlugin,pulse,Pulseaudio audio driver,pulse,PACKAGE_$(PKG_NAME)-mod-pulse:pulseaudio)) -$(eval $(call BuildPlugin,rtcpsummary,RTCP summary module,rtcpsummary,)) -$(eval $(call BuildPlugin,selfview,Video selfview module,selfview,)) -$(eval $(call BuildPlugin,serreg,Serial registration mode,serreg,)) -$(eval $(call BuildPlugin,snapshot,Snapshot video module,snapshot,+libpng)) -$(eval $(call BuildPlugin,sndfile,Audio dumper using libsndfile,sndfile,+libsndfile)) -$(eval $(call BuildPlugin,speex_pp,Speex Pre-processor,speex_pp,+libspeexdsp)) -$(eval $(call BuildPlugin,srtp,Secure RTP module using libre,srtp,)) -$(eval $(call BuildPlugin,stdio,Standard input/output UI driver,stdio,)) -$(eval $(call BuildPlugin,syslog,Syslog module,syslog,)) -$(eval $(call BuildPlugin,uuid,UUID generator and loader,uuid,)) -$(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+libv4l)) -$(eval $(call BuildPlugin,v4l2_codec,Video4Linux2 video codec module,v4l2_codec,)) -$(eval $(call BuildPlugin,vidbridge,Video bridge module,vidbridge,)) -$(eval $(call BuildPlugin,vidinfo,Video-info filter,vidinfo,)) -$(eval $(call BuildPlugin,vidloop,Video-loop test module,vidloop,)) -$(eval $(call BuildPlugin,vumeter,Display audio levels in console,vumeter,)) -$(eval $(call BuildPlugin,vp8,VP8 video codec,vp8,+libvpx)) -$(eval $(call BuildPlugin,vp9,VP9 video codec,vp9,+libvpx)) +$(eval $(call BuildPlugin,aac,MPEG-4 AAC Audio Codec,+fdk-aac)) +$(eval $(call BuildPlugin,alsa,ALSA audio driver,+alsa-lib)) +$(eval $(call BuildPlugin,aubridge,Audio bridge module,)) +$(eval $(call BuildPlugin,aufile,Audio module for using a WAV-file as audio input,)) +$(eval $(call BuildPlugin,ausine,Sine Audio Source,)) +$(eval $(call BuildPlugin,auconv,Audio format conversion,)) +$(eval $(call BuildPlugin,auresamp,Audio resampler,)) +$(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,+libffmpeg-full)) +$(eval $(call BuildPlugin,avfilter,Video filter using FFmpeg,+libffmpeg-full)) +$(eval $(call BuildPlugin,avformat,Video source using FFmpeg,+baresip-mod-avcodec)) +$(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,)) +$(eval $(call BuildPlugin,ctrl_dbus,DBus control interface,+glib2)) +$(eval $(call BuildPlugin,ctrl_tcp,TCP control interface,)) +$(eval $(call BuildPlugin,debug_cmd,Debug commands,)) +$(eval $(call BuildPlugin,dtls_srtp,DTLS-SRTP end-to-end encryption,)) +$(eval $(call BuildPlugin,ebuacip,EBU ACIP [Audio Contribution over IP] Profile,)) +$(eval $(call BuildPlugin,echo,Echo server module,)) +$(eval $(call BuildPlugin,evdev,Linux input driver,)) +$(eval $(call BuildPlugin,fakevideo,Fake video input/output driver,)) +$(eval $(call BuildPlugin,g711,G.711 audio codec,)) +$(eval $(call BuildPlugin,g722,G.722 audio codec,+libspandsp)) +$(eval $(call BuildPlugin,g726,G.726 audio codec,+libspandsp)) +$(eval $(call BuildPlugin,gst,Gstreamer 1.0 playbin pipeline,@AUDIO_SUPPORT +glib2 +libgstreamer1)) +$(eval $(call BuildPlugin,httpd,HTTP webserver UI-module,)) +$(eval $(call BuildPlugin,httpreq,HTTP request module,)) +$(eval $(call BuildPlugin,l16,16-bit linear codec,)) +$(eval $(call BuildPlugin,mixausrc,Mixes another audio source into audio stream,)) +$(eval $(call BuildPlugin,mixminus,Mixes N-1 audio streams for conferencing,)) +$(eval $(call BuildPlugin,mqtt,Message Queue Telemetry Transport [MQTT] client,+libmosquitto)) +$(eval $(call BuildPlugin,mwi,Message Waiting Indication,)) +$(eval $(call BuildPlugin,natpmp,NAT Port Mapping Protocol module,)) +$(eval $(call BuildPlugin,netroam,Network roaming module,)) +$(eval $(call BuildPlugin,opus,OPUS Interactive audio codec,+libopus)) +$(eval $(call BuildPlugin,opus_multistream,Opus Multistream Audio Codec,+libopus)) +$(eval $(call BuildPlugin,plc,Packet Loss Concealment,+libspandsp)) +$(eval $(call BuildPlugin,pcp,Port Control Protocol for Media NAT-traversal,)) +$(eval $(call BuildPlugin,portaudio,Portaudio audio driver,+portaudio)) +$(eval $(call BuildPlugin,presence,Presence module,)) +$(eval $(call BuildPlugin,pulse,Pulseaudio audio driver,PACKAGE_$(PKG_NAME)-mod-pulse:pulseaudio)) +$(eval $(call BuildPlugin,rtcpsummary,RTCP summary module,)) +$(eval $(call BuildPlugin,selfview,Video selfview module,)) +$(eval $(call BuildPlugin,serreg,Serial registration mode,)) +$(eval $(call BuildPlugin,snapshot,Snapshot video module,+libpng)) +$(eval $(call BuildPlugin,sndfile,Audio dumper using libsndfile,+libsndfile)) +$(eval $(call BuildPlugin,srtp,Secure RTP module using libre,)) +$(eval $(call BuildPlugin,stdio,Standard input/output UI driver,)) +$(eval $(call BuildPlugin,syslog,Syslog module,)) +$(eval $(call BuildPlugin,swscale,Video filter for scaling by FFmpeg,+libffmpeg-full)) +$(eval $(call BuildPlugin,uuid,UUID generator and loader,)) +$(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,+libv4l)) +$(eval $(call BuildPlugin,vidbridge,Video bridge module,)) +$(eval $(call BuildPlugin,vidinfo,Video-info filter,)) +$(eval $(call BuildPlugin,vumeter,Display audio levels in console,)) +$(eval $(call BuildPlugin,vp8,VP8 video codec,+libvpx)) +$(eval $(call BuildPlugin,vp9,VP9 video codec,+libvpx)) diff --git a/net/baresip/patches/010-fix-parallel-build.patch b/net/baresip/patches/010-fix-parallel-build.patch deleted file mode 100644 index 25f901315..000000000 --- a/net/baresip/patches/010-fix-parallel-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d7aeb9393876af3746dacdbacd70c4a5d6dfcf39 Mon Sep 17 00:00:00 2001 -From: Christian Spielberger -Date: Sun, 23 May 2021 10:01:04 +0200 -Subject: [PATCH] ctrl_dbus: add dependency to baresipbus.h (#1447) (#1457) - ---- - modules/ctrl_dbus/module.mk | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/modules/ctrl_dbus/module.mk -+++ b/modules/ctrl_dbus/module.mk -@@ -16,7 +16,10 @@ $(MOD)_CFLAGS += -Wno-unused-parameter - - - $(MOD)_CCHECK_OPT = -e baresipbus.h -e baresipbus.c - --modules/ctrl_dbus/baresipbus.h modules/ctrl_dbus/baresipbus.c: \ -+modules/$(MOD)/baresipbus.o : modules/$(MOD)/baresipbus.h -+modules/$(MOD)/ctrl_dbus.o : modules/$(MOD)/baresipbus.h -+ -+modules/$(MOD)/baresipbus.h modules/$(MOD)/baresipbus.c: \ - modules/ctrl_dbus/com.github.Baresip.xml - @cd $(dir $@) && ./gen.sh -