Signed-off-by: Jiri Slachta <slac...@cesnet.cz>
---
 net/kamailio3/Makefile |   57 ++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/net/kamailio3/Makefile b/net/kamailio3/Makefile
index 1702545..eb32083 100644
--- a/net/kamailio3/Makefile
+++ b/net/kamailio3/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio3
-PKG_VERSION:=3.3.0
+PKG_VERSION:=3.3.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_MD5SUM:=c5261066b5c8b617b6a9408679ad514f
+PKG_MD5SUM:=64bdb0a0b5e0227acbb04451b54e23ad
 
 INCL_MODULES:=
 KAM_MODULES:=
@@ -30,12 +30,13 @@ define Package/kamailio3/Default
   CATEGORY:=Network
   SUBMENU:=Telephony
   URL:=http://www.kamailio.org/
+  MAINTAINER:=Jiri Slachta <slac...@cesnet.cz>
   DEPENDS:=$(ICONV_DEPENDS) +libncurses +libpthread +libreadline
 endef
 
 define Package/kamailio3
 $(call Package/kamailio3/Default)
-  TITLE:=Mature and flexible open source SIP server version 3.x
+  TITLE:=Mature and flexible open source SIP server, v3.3.x
   MENU:=1
 endef
 
@@ -128,8 +129,7 @@ define BuildPlugin
 
   define Package/kamailio3-mod-$(1)/install
        [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/kamailio/$(6)
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/$(6)/$(2).so \
-                       $$(1)/usr/lib/kamailio/$(6)/ ;
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/kamailio/$(6)/$(2).so 
$$(1)/usr/lib/kamailio/$(6)/
   endef
 
   INCL_MODULES+=$(2)
@@ -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,43 +240,33 @@ $(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)" \
-       $(KAM3_EXTRA_ARGS) \
-       TLS_HOOKS=1 extra_defs="-DUSE_PTHREAD_MUTEX " \
+       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 \
-       prefix:=/usr quiet=verbose
+       CROSS_COMPILE=$(TARGET_CROSS) \
+       CC="$(TARGET_CC)" \
+       ARCH="$(ARCH)"  \
+       DESTDIR=$(PKG_INSTALL_DIR) \
+       quiet=verbose
 
 define Build/Compile
-       if ! [ -f $(PREBUILT_STAMP) ]; then echo $(MAKE) -C $(PKG_BUILD_DIR) 
$(PKG_MAKE_ARGS) \
-               CC="$(TARGET_CC)" \
-               ARCH="$(ARCH)"  \
-               EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
-               all && touch $(PREBUILT_STAMP); \
-       fi
        $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-               CC="$(TARGET_CC)" \
-               ARCH="$(ARCH)"  \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               prefix=/ \
-               install-cfg
+               EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
+               all
        $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-               CC="$(TARGET_CC)" \
-               ARCH="$(ARCH)"  \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               prefix=/usr \
-               install-bin install-modules-all install-utils
+               install
 endef
 
 $(eval $(call BuildPackage,kamailio3))
-- 
1.7.9.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to