rtpengine: update libwebsockets dependency

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

diff --git a/net/rtpengine/Makefile b/net/rtpengine/Makefile
index 6240e0b654005e2c64b90fbef6c8afa4f8c4ba09..5b5012346ad7e7928837f5ff17617a09556e57ad 100644 (file)
--- a/net/rtpengine/Makefile
+++ b/net/rtpengine/Makefile
@@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rtpengine
-PKG_VERSION:=mr8.5.2.3
-PKG_RELEASE:=1
+PKG_VERSION:=9.5.3.2
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e2c0f94984753f321e1db0a97f81af18f3e9f7005a2ca67766ddef2b6c8d4427
+PKG_SOURCE:=$(PKG_NAME)-mr$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/mr$(PKG_VERSION)?
+PKG_HASH:=03d8da1b5efcaa17ef88f306046f49e30ca87b3998c26a13bd96df922f8e729f
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-mr$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE
@@ -27,7 +29,11 @@ PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 # errors.
 PKG_BUILD_PARALLEL:=0
 
-PKG_BUILD_DEPENDS:=gperf/host
+PKG_BUILD_DEPENDS:=gperf/host perl/host
+
+# With below variable set, $(PKG_SYMVERS_DIR)/rtpengine.symvers gets generated
+# from kernel-module/Module.symvers.
+PKG_EXTMOD_SUBDIRS:=kernel-module
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
@@ -42,6 +48,7 @@ ENGINE_DEPENDS := \
        +libopenssl \
        +libpcap \
        +libpcre \
+       +libwebsockets-openssl \
        +xmlrpc-c-client \
        +zlib
 
@@ -50,15 +57,18 @@ ENGINE_DEPENDS_TRANSCODING := \
        +bcg729 \
        +libffmpeg-full \
        +libmariadb \
-       +libspandsp
+       +libspandsp3
 
 RECORDING_DEPENDS := \
+       +bcg729 \
        +glib2 \
        +libffmpeg-full \
        +libmariadb \
        +libopenssl
 
-RTPENGINE_USERID:=$(PKG_NAME)=378:$(PKG_NAME)=378
+RTPENGINE_USERID:=378
+RTPENGINE_GROUPID:=$(RTPENGINE_USERID)
+RTPENGINE_USER:=$(PKG_NAME)=$(RTPENGINE_USERID):$(PKG_NAME)=$(RTPENGINE_GROUPID)
 
 define Package/rtpengine/Default
   URL:=https://github.com/sipwise/rtpengine
@@ -70,7 +80,7 @@ $(call Package/rtpengine/Default)
   CATEGORY:=Network
   SECTION:=net
   SUBMENU:=Telephony
-  USERID:=$(RTPENGINE_USERID)
+  USERID:=$(RTPENGINE_USER)
 endef
 
 define Package/rtpengine/description/Template
@@ -149,7 +159,7 @@ $(call Package/rtpengine/Default)
   CATEGORY:=Network
   SECTION:=net
   SUBMENU:=Telephony
-  USERID:=$(RTPENGINE_USERID)
+  USERID:=$(RTPENGINE_USER)
   DEPENDS:=$(patsubst +%,+PACKAGE_rtpengine-recording:%,$(RECORDING_DEPENDS))
 endef
 
@@ -200,11 +210,17 @@ $(call Package/rtpengine/Default)
   FILES:=$(PKG_BUILD_DIR)/kernel-module/xt_RTPENGINE.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoProbe,xt_RTPENGINE)
   DEPENDS := \
+         +PACKAGE_kmod-ipt-rtpengine:kmod-crypto-aead \
          +PACKAGE_kmod-ipt-rtpengine:kmod-crypto-hash \
          +PACKAGE_kmod-ipt-rtpengine:kmod-ipt-core
   MODPARAMS.xt_RTPENGINE := \
-         proc_uid=$(PKG_NAME) \
-         proc_gid=$(PKG_NAME)
+         proc_uid=$(RTPENGINE_USERID) \
+         proc_gid=$(RTPENGINE_GROUPID)
+  USERID:=$(RTPENGINE_USER)
+endef
+
+define KernelPackage/ipt-rtpengine/conffiles
+/etc/modules.d/ipt-rtpengine
 endef
 
 define KernelPackage/ipt-rtpengine/description
@@ -226,7 +242,9 @@ ifeq ($(QUILT),)
        cd "$(PKG_BUILD_DIR)" && \
                $(FIND) . -maxdepth 2 -name "*Makefile" | \
                xargs  -I{} $(SED) \
-               '/shell which dpkg-/s/dpkg/OpenWrt-has-no-dpkg/' {}
+               '/shell which dpkg-/s/dpkg/OpenWrt-has-no-dpkg/' {} && \
+               $(SED) 's|#!/usr/bin/perl|#!$(STAGING_DIR_HOSTPKG)/usr/bin/perl|' \
+               utils/const_str_hash
 endif
 endef
 
@@ -237,10 +255,10 @@ define Build/Compile
 
 ifneq ($(CONFIG_PACKAGE_kmod-ipt-rtpengine),)
        RTPENGINE_VERSION=$(PKG_VERSION) $(MAKE) \
+               $(PKG_JOBS) \
                -C $(PKG_BUILD_DIR)/kernel-module \
                KSRC=$(LINUX_DIR) \
-               ARCH=$(LINUX_KARCH) \
-               CROSS_COMPILE=$(TARGET_CROSS)
+               $(KERNEL_MAKE_FLAGS)
 endif
 
 ifneq ($(CONFIG_PACKAGE_iptables-mod-rtpengine),)
@@ -260,8 +278,10 @@ endef
 define Build/InstallDev
 endef
 
-$(eval $(call BuildPackage,rtpengine-no-transcode))
+# KernelPackage calls need to go first, otherwise hooks like
+# collect_module_symvers won't get added.
 $(eval $(call KernelPackage,ipt-rtpengine))
+$(eval $(call BuildPackage,rtpengine-no-transcode))
 $(eval $(call BuildPackage,iptables-mod-rtpengine))
 $(eval $(call BuildPackage,rtpengine))
 $(eval $(call BuildPackage,rtpengine-recording))