rtpproxy: add build fix

[feed/telephony.git] / net / rtpproxy / Makefile

diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile
index 8c8505ba6481ed900e7d8f0d2e51de83e32894be..7f64613ed0797445b06afe2ba9537d144cb69443 100644 (file)
--- a/net/rtpproxy/Makefile
+++ b/net/rtpproxy/Makefile
@@ -9,24 +9,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtpproxy
-PKG_VERSION:=2.1.0-20170914
-PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/sippy/rtpproxy.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=589cc78cb8698b49aa408c6411c8720a2a0efe3c
-PKG_MIRROR_HASH:=087b363a7e5f112fe0c601e147ac087f528a500a25340cbccc12d90935876137
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE_DATE=2019-10-02
+PKG_SOURCE_VERSION:=aa1f179e09097f467bc4726e3300014c1e35246f
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_MIRROR_HASH:=7acc5f5bf2d4be23e9a2fad0c4e7576f172191c9f1b37104aee4d05dbdcac8fd
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CHECK_FORMAT_SECURITY:=0
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=COPYING
+PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 include $(INCLUDE_DIR)/package.mk
@@ -40,7 +37,7 @@ endef
 
 define Package/rtpproxy
 $(call Package/rtpproxy/Default)
-  DEPENDS:=+libpthread +librt
+  DEPENDS:=+libatomic +libpthread +librt
   TITLE:=RTP (Realtime Transport Protocol) proxy
   MENU:=1
 endef
@@ -53,24 +50,47 @@ endef
 define Package/rtpproxy-mod-acct-csv
 $(call Package/rtpproxy/Default)
   DEPENDS:=rtpproxy
-  TITLE:=RTPproxy accounting module
+  TITLE:=RTPproxy CSV accounting module
 endef
 
-CONFIGURE_VARS += \
-        ac_cv_lib_bcg729_initBcg729EncoderChannel=no
+define Package/rtpproxy-mod-acct-rtcp-hep
+$(call Package/rtpproxy/Default)
+  DEPENDS:=rtpproxy
+  TITLE:=RTPproxy RTCP HEP accounting module
+endef
+
+CONFIGURE_ARGS += \
+       --without-xsltproc
 
 # Otherwise OpenWrt's CPPFLAGS are ignored
 TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
 
 define Package/rtpproxy/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtpproxy $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtpproxy $(1)/usr/bin
 
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/rtpproxy.init $(1)/etc/init.d/rtpproxy
 
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_CONF) ./files/rtpproxy.config $(1)/etc/config/rtpproxy
+       $(INSTALL_CONF) ./files/rtpproxy.conf $(1)/etc/config/rtpproxy
+
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+       $(INSTALL_BIN) ./files/rtpproxy.hotplug $(1)/etc/hotplug.d/iface/90-rtpproxy
+endef
+
+define Package/rtpproxy/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+  echo
+  echo "o-------------------------------------------------------------------o"
+  echo "| RTPProxy note                                                     |"
+  echo "o-------------------------------------------------------------------o"
+  echo "| Edit /etc/config/rtpproxy to change basic init configuration.     |"
+  echo "o-------------------------------------------------------------=^_^=-o"
+  echo
+fi
+exit 0
 endef
 
 define Package/rtpproxy-mod-acct-csv/install
@@ -79,5 +99,30 @@ define Package/rtpproxy-mod-acct-csv/install
                                                        $(1)/usr/lib/rtpproxy
 endef
 
+define Package/rtpproxy-mod-acct-rtcp-hep/install
+       $(INSTALL_DIR) $(1)/usr/lib/rtpproxy
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/lib/rtpproxy/rtpp_acct_rtcp_hep.so \
+                                                       $(1)/usr/lib/rtpproxy
+endef
+
+define Package/$(PKG_NAME)/Util
+  define Package/$(PKG_NAME)-util-$(1)
+    $(call Package/$(PKG_NAME)/Default)
+    DEPENDS:= $(PKG_NAME) $(patsubst +%,+PACKAGE_$(PKG_NAME)-util-$(1):%,$(2))
+    TITLE:=RTPproxy $(1) utility
+  endef
+
+  define Package/$(PKG_NAME)-util-$(1)/install
+         $$(INSTALL_DIR) $$(1)/usr/bin
+         $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin
+  endef
+
+  $$(eval $$(call BuildPackage,$(PKG_NAME)-util-$(1)))
+endef
+
 $(eval $(call BuildPackage,rtpproxy))
 $(eval $(call BuildPackage,rtpproxy-mod-acct-csv))
+$(eval $(call BuildPackage,rtpproxy-mod-acct-rtcp-hep))
+$(eval $(call Package/$(PKG_NAME)/Util,extractaudio,+bcg729 +libsndfile +libsrtp2))
+$(eval $(call Package/$(PKG_NAME)/Util,makeann,+bcg729))