Merge pull request #888 from dddaniel/master

baresip: Update to version 3.16.0 [v2]

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))

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 <[email protected]>
+
+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,))