Changeset 29476


Ignore:
Timestamp:
2011-12-07T23:44:34+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.1] merge asterisk-1.8.x updates

Location:
branches/packages_10.03.1/net/asterisk-1.8.x
Files:
1 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.1/net/asterisk-1.8.x/Makefile

    r27463 r29476  
    99 
    1010PKG_NAME:=asterisk18 
    11 PKG_VERSION:=1.8.4.4 
     11PKG_VERSION:=1.8.7.1 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ 
    16 PKG_MD5SUM:=bc2a1168603815c23f204927d1e73239 
     16PKG_MD5SUM:=a732a608ce60fd523646be618e9da616 
    1717 
    1818PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) 
     
    152152endef 
    153153 
     154define Package/asterisk18-chan-skinny 
     155$(call Package/asterisk18/Default) 
     156  TITLE:=Skinny channel support 
     157  DEPENDS:= asterisk18 
     158endef 
     159 
     160define Package/asterisk18-chan-skinny/description 
     161$(call Package/asterisk18/Default/description) 
     162 This package provides the channel chan_skinny support to Asterisk. 
     163endef 
     164 
    154165define Package/asterisk18-curl 
    155166$(call Package/asterisk18/Default) 
     
    167178$(call Package/asterisk18/Default) 
    168179  TITLE:=MySQL support 
    169   DEPENDS:= asterisk18 +libmysqlclient 
     180  DEPENDS:= asterisk18 +PACKAGE_asterisk18-mysql:libmysqlclient 
    170181endef 
    171182 
     
    256267 
    257268define Build/Configure 
    258         -rm $(PKG_BUILD_DIR)/menuselect.makeopts 
    259269        $(call Build/Configure/Default,,$(SITE_VARS)) 
    260270endef 
     
    271281                ASTDATADIR="/usr/lib/asterisk" \ 
    272282                ASTKEYDIR="/usr/lib/asterisk" \ 
     283                ASTDBDIR="/usr/lib/asterisk" \ 
    273284                NOISY_BUILD="1" \ 
    274285                DEBUG="" \ 
     
    341352        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/ 
    342353        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/ 
     354        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/ 
    343355        $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ 
    344356        $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ 
     
    433445        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
    434446        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ 
     447endef 
     448 
     449define Package/asterisk18-chan-skinny/conffiles 
     450/etc/asterisk/skinny.conf 
     451endef 
     452 
     453define Package/asterisk18-chan-skinny/install 
     454        $(INSTALL_DIR) $(1)/etc/asterisk 
     455        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/ 
     456        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules 
     457        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/ 
    435458endef 
    436459 
     
    489512$(eval $(call BuildPackage,asterisk18-chan-mobile)) 
    490513$(eval $(call BuildPackage,asterisk18-chan-mgcp)) 
     514$(eval $(call BuildPackage,asterisk18-chan-skinny)) 
    491515$(eval $(call BuildPackage,asterisk18-curl)) 
    492516$(eval $(call BuildPackage,asterisk18-mysql)) 
     
    509533$(eval $(call Buildasterisk18ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) 
    510534$(eval $(call Buildasterisk18ModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs)) 
    511 $(eval $(call Buildasterisk18ModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs)) 
    512535$(eval $(call Buildasterisk18ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) 
    513536$(eval $(call Buildasterisk18ModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec)) 
     
    535558$(eval $(call Buildasterisk18ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application)) 
    536559$(eval $(call Buildasterisk18ModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings)) 
     560$(eval $(call Buildasterisk18ModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access)) 
     561$(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits)) 
     562$(eval $(call Buildasterisk18ModuleTemplate,func_cut,CUT function,CUT function)) 
     563$(eval $(call Buildasterisk18ModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI)) 
     564$(eval $(call Buildasterisk18ModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording)) 
  • branches/packages_10.03.1/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch

    r25559 r29476  
    11--- a/build_tools/menuselect-deps.in 
    22+++ b/build_tools/menuselect-deps.in 
    3 @@ -14,7 +14,7 @@ GTK2=@PBX_GTK2@ 
     3@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@ 
    44 H323=@PBX_H323@ 
    55 HOARD=@PBX_HOARD@ 
  • branches/packages_10.03.1/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch

    r25560 r29476  
    11--- a/main/utils.c 
    22+++ b/main/utils.c 
    3 @@ -1632,7 +1632,7 @@ ast_string_field __ast_string_field_allo 
     3@@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo 
    44        } 
    55  
    66        result = (*pool_head)->base + (*pool_head)->used; 
    77-#ifdef __sparc__ 
    8 +#if defined(__sparc__) || defined(__mips__) || defined(__arm__) 
     8+#if defined(__sparc__) || defined(__arm__) 
    99        /* SPARC requires that the allocation field be aligned. */ 
    1010        if ((long) result % sizeof(ast_string_field_allocation)) { 
    1111                result++; 
    12 @@ -1713,7 +1713,7 @@ void __ast_string_field_ptr_build_va(str 
     12@@ -1747,7 +1747,7 @@ void __ast_string_field_ptr_build_va(str 
    1313                } 
    1414        } else { 
    1515                target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation); 
    1616-#ifdef __sparc__ 
    17 +#if defined(__sparc__) || defined(__mips__) || defined(__arm__) 
     17+#if defined(__sparc__) || defined(__arm__) 
    1818                if ((long) target % sizeof(ast_string_field_allocation)) { 
    1919                        target++; 
Note: See TracChangeset for help on using the changeset viewer.