Changeset e2a97ed in freewrt


Ignore:
Timestamp:
Jul 19, 2007, 4:11:42 AM (18 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
45069d3
Parents:
d5aefa5
Message:

fix some issues of the asterisk 1.4 package, update speex, sync with upstream, remove unused codecs, activate speex and misdn, package misdn support is broken, will be fixed soon... clubmate is empty.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3280 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • package/asterisk/Config.in

    rd5aefa5 re2a97ed  
    3434          * chan_iax2.so
    3535
    36 config FWRT_PACKAGE_ASTERISK_CODEC_ILBC
    37         prompt   "asterisk-codec-ilbc............. Internet Low Bitrate Codec (ILBC) Translator"
     36config FWRT_PACKAGE_ASTERISK_CODEC_SPEEX
     37        prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
    3838        tristate
    3939        default n
    4040        depends FWRT_PACKAGE_ASTERISK
     41        select FWRT_PACKAGE_LIBSPEEX
    4142        help
    42           The Internet Low Bitrate Codec (ILBC) Translator for Asterisk
    43 
    44 config FWRT_PACKAGE_ASTERISK_CODEC_LPC10
    45         prompt   "asterisk-codec-lpc10............ LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
    46         tristate
    47         default n
    48         depends FWRT_PACKAGE_ASTERISK
    49         help
    50           The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
    51 
    52 #config FWRT_PACKAGE_ASTERISK_CODEC_SPEEX
    53 #       prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
    54 #       tristate
    55 #       default n
    56 #       depends FWRT_PACKAGE_ASTERISK
    57 #       select FWRT_PACKAGE_LIBSPEEX
    58 #       help
    59 #         The Speex speech compression codec for Asterisk
     43          The Speex speech compression codec for Asterisk
    6044
    6145config FWRT_PACKAGE_ASTERISK_CODEC_GSM
    … …  
    123107        depends FWRT_PACKAGE_ASTERISK
    124108        select FWRT_PACKAGE_ZAPTEL
    125         depends on FWRT_LINUX_2_6_RB
     109        depends on FWRT_LINUX_2_6
    126110        help
    127111          This package allows creation of conference channels.
    128112
    129 config FWRT_PACKAGE_ASTERISK_MISDN
    130         prompt   "asterisk-misdn.................... Support for mISDN"
     113config FWRT_PACKAGE_ASTERISK_CHAN_MISDN
     114        prompt   "asterisk-misdn.................. Support for mISDN"
    131115        tristate
    132116        default n
    133117        depends FWRT_PACKAGE_ASTERISK
    134118        select FWRT_PACKAGE_MISDNUSER
    135         depends on FWRT_LINUX_2_6_RB
     119        depends on FWRT_LINUX_2_6
    136120endmenu

  • package/asterisk/Makefile

    rd5aefa5 re2a97ed  
    88
    99PKG_NAME:=              asterisk
    10 PKG_VERSION:=           1.4.7.1
    11 PKG_RELEASE:=           2
    12 PKG_MD5SUM:=            8c471ff5328c08bf2dc5c6f5c6f3e048
     10PKG_VERSION:=           1.4.8
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            7263ff56ad93cbb5efb971a536ee6a51
    1313MASTER_SITES:=          http://ftp.digium.com/pub/asterisk/ \
    1414                        http://ftp.digium.com/pub/asterisk/old-releases/ \
    … …  
    2626$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    2727$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    28 $(eval $(call PKG_template,ASTERISK_CODEC_ILBC,asterisk-codec-ilbc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    29 $(eval $(call PKG_template,ASTERISK_CODEC_LPC10,asterisk-codec-lpc10,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    30 #$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
     28ifeq ($(FWRT_LINUX_2_6),y)
     29$(eval $(call PKG_template,ASTERISK_CHAN_MISDN,asterisk-chan-misdn,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     30endif
     31$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    3132$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    3233$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    … …  
    4142SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_SOUNDS}+=          asterisk-sounds-install
    4243SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CHAN_MGCP}+=       asterisk-chan-mgcp-install
     44ifeq ($(FWRT_LINUX_2_6),y)
     45SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CHAN_MISDN}+=      asterisk-chan-misdn-install
     46endif
    4347SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CHAN_SKINNY}+=     asterisk-chan-skinny-install
    4448SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CHAN_IAX2}+=       asterisk-chan-iax2-install
    45 SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CODEC_ILBC}+=      asterisk-codec-ilbc-install
    46 SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CODEC_LPC10}+=     asterisk-codec-lpc10-install
    47 #SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CODEC_SPEEX}+=    asterisk-codec-speex-install
     49SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CODEC_SPEEX}+=     asterisk-codec-speex-install
    4850SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_CODEC_GSM}+=       asterisk-codec-gsm-install
    4951SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_PBX_DUNDI}+=       asterisk-pbx-dundi-install
    … …  
    6264                        --without-isdnnet \
    6365                        --without-kde \
    64                         --without-misdn \
    6566                        --without-nbs \
    6667                        --without-netsnmp \
    … …  
    8283CONFIGURE_ARGS+=        --without-gsm
    8384endif
    84 #ifneq (${FWRT_PACKAGE_ASTERISK_CODEC_SPEEX},)
    85 #CONFIGURE_ARGS+=       --with-speex=${STAGING_DIR}/usr
    86 #EXTRA_CFLAGS+=         -I$(STAGING_DIR)/usr/include/speex
    87 #endif
     85ifneq (${FWRT_PACKAGE_ASTERISK_CODEC_SPEEX},)
     86CONFIGURE_ARGS+=        --with-speex=${STAGING_DIR}/usr
     87EXTRA_CFLAGS+=          -I$(STAGING_DIR)/usr/include/speex
     88endif
    8889ifneq (${FWRT_PACKAGE_ASTERISK_FORMAT_VORBIS},)
    8990CONFIGURE_ARGS+=        --with-ogg=${STAGING_DIR}/usr \
    … …  
    120121else
    121122CONFIGURE_ARGS+=        --without-popt
     123endif
     124ifneq (${FWRT_PACKAGE_ASTERISK_CHAN_MISDN},)
     125CONFIGURE_ARGS+=        --with-misdn=${STAGING_DIR}/usr
     126TCPPFLAGS+=             -I${LINUX_DIR}/include
     127else
     128CONFIGURE_ARGS+=        --without-misdn
    122129endif
    123130
    … …  
    235242        ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
    236243
    237 asterisk-codec-ilbc-install:
    238         ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules
    239         ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_ilbc.so $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules/
    240         ${INSTALL_BIN} $(WRKBUILD)/formats/format_ilbc.so $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules/
    241 
    242 asterisk-codec-lpc10-install:
    243         ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_LPC10)/usr/lib/asterisk/modules
    244         ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_lpc10.so $(IDIR_ASTERISK_CODEC_LPC10)/usr/lib/asterisk/modules/
    245 
    246 #asterisk-codec-speex-install:
    247 #       ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
    248 #       install -m0755 $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
     244asterisk-codec-speex-install:
     245        ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
     246        install -m0755 $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
    249247
    250248asterisk-codec-gsm-install:
    … …  
    269267        ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
    270268
     269asterisk-chan-misdn-install:
     270        install -d -m0755 ${IDIR_ASTERISK_CHAN_MISDN}/usr/lib/asterisk/modules
     271        install -d -m0755 ${IDIR_ASTERISK_CHAN_MISDN}/etc/asterisk
     272        install -m0755 ${WRKINST}/usr/lib/asterisk/modules/chan_misdn.so \
     273                ${IDIR_ASTERISK_CHAN_MISDN}/usr/lib/asterisk/modules/
     274        ${INSTALL_DATA} ${WRKBUILD}/configs/misdn.conf.sample \
     275                ${IDIR_ASTERISK_CHAN_MISDN}/etc/asterisk/misdn.conf
     276
    271277include ${TOPDIR}/mk/pkg-bottom.mk

  • package/speex/Makefile

    rd5aefa5 re2a97ed  
    88
    99PKG_NAME:=              speex
    10 PKG_VERSION:=           1.2beta1
    11 PKG_RELEASE:=           2
    12 PKG_MD5SUM:=            aac2e4ba42122b885c787ea280acb3d9
     10PKG_VERSION:=           1.2beta2
     11PKG_RELEASE:=           1
     12PKG_MD5SUM:=            5480fa53a7451603ecb57ff815c87ac0
    1313MASTER_SITES:=          http://downloads.us.xiph.org/releases/speex/
    1414
Note: See TracChangeset for help on using the changeset viewer.