kamailio3: fix build procedure and add rtpproxy module

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

diff --git a/net/kamailio-3.3.x/Makefile b/net/kamailio-3.3.x/Makefile
index 3eb8281393f966ab95e27f2e2c9f94eec808e4a9..30643b0dae7361ca48ffdd00a28c7bf0ea4a4d16 100644 (file)
--- a/net/kamailio-3.3.x/Makefile
+++ b/net/kamailio-3.3.x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio3
 PKG_VERSION:=3.3.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
@@ -212,6 +212,7 @@ $(eval $(call BuildPlugin,registrar,registrar,SIP Registrar,usrloc,,modules_k))
 $(eval $(call BuildPlugin,rls,rls,Resource List Server,presence pua tm,+libxml2,modules_k))
 $(eval $(call BuildPlugin,rr,rr,Record-Route and Route,,,modules_k))
 $(eval $(call BuildPlugin,rtimer,rtimer,Routing Timer,,,modules_k))
+$(eval $(call BuildPlugin,rtpproxy,rtpproxy,RTP proxy,tm,,modules))
 $(eval $(call BuildPlugin,sanity,sanity,SIP sanity checks,sl,,modules))
 #$(eval $(call BuildPlugin,seas,seas,SIP Express Application Server,tm,,modules_k))
 $(eval $(call BuildPlugin,sipcapture,sipcapture,SIP capture module,,,modules))
@@ -239,22 +240,21 @@ $(eval $(call BuildPlugin,xlog,xlog,Advanced logger,,,modules_k))
 $(eval $(call BuildPlugin,xmpp,xmpp,SIP-to-XMPP Gateway,tm,+libexpat,modules_k))
 
 PKG_MAKE_ARGS:= \
-       cfg-dir="/etc/kamailio/" \
-       bin-dir="/usr/sbin/" \
-       data-dir="/var/lib/kamailio/" \
-       lib-dir="/usr/lib/kamailio/" \
-       modules-dir="/usr/lib/kamailio/modules/" \
+       prefix=/ \
+       cfg_dir=/etc/kamailio/ \
+       bin_dir=/usr/sbin/ \
+       data_dir=/var/lib/kamailio/ \
+       lib_dir=/usr/lib/kamailio/ \
+       modules_dir=/usr/lib/kamailio/ \
        include_modules="$(INCL_MODULES)" \
+       cfg_target:=/etc/kamailio/ \
        TLS_HOOKS=1 \
        extra_defs="-DUSE_PTHREAD_MUTEX " \
        CFLAGS="$(TARGET_CFLAGS)" \
-       ISSMP="no" \
        LOCALBASE="$(STAGING_DIR)/usr" \
        SYSBASE="$(STAGING_DIR)/usr" \
        PCREDEFS:="$(TARGET_CPPFLAGS)" \
        PCRELIBS:="$(TARGET_LDFLAGS)" \
-       cfg_target:=/etc/kamailio/ \
-       PREFIX:=/usr \
        CROSS_COMPILE=$(TARGET_CROSS) \
        CC="$(TARGET_CC)" \
        ARCH="$(ARCH)"  \
@@ -262,15 +262,11 @@ PKG_MAKE_ARGS:= \
        quiet=verbose
 
 define Build/Compile
-       if ! [ -f $(PREBUILT_STAMP) ]; then \
-               echo $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-               EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ prefix:=/usr \
-               all && touch $(PREBUILT_STAMP); \
-       fi
-       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) prefix=/ \
-               install-cfg
-       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) prefix=/usr \
-               install-bin install-modules-all install-utils
+       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+               EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
+               all
+       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
+               install
 endef
 
 $(eval $(call BuildPackage,kamailio3))