Changeset 28664


Ignore:
Timestamp:
2011-10-29T14:45:28+02:00 (6 years ago)
Author:
mazilo
Message:

bumped to latest FreeSWITCH git commit with flite upgraded to v1.5.1

Location:
packages/net/freeswitch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/freeswitch/Makefile

    r28407 r28664  
    1010 
    1111PKG_NAME:=freeswitch 
     12PKG_DISTNAME:=$(PKG_NAME)_git 
    1213PKG_VERSION:=1.0.7 
    1314PKG_RELEASE:=1 
     
    1718# The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org 
    1819# 
    19 PKG_REV:=7b0d878925e4703278362cc5c11abff54f82ad54 
     20PKG_REV:=f8470594425d666a1000b386243df289d41c01ad 
    2021PKG_SOURCE_VERSION:=$(PKG_REV) 
    2122PKG_SOURCE_PROTO:=git 
    2223PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git 
    23 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    24 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)_git-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 
     24PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME) 
     25PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 
    2526PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    2627 
     
    3536        amrwb \ 
    3637        avmd \ 
     38        blacklist \ 
    3739        bv \ 
    38         blacklist \ 
    3940        callcenter \ 
    4041        cdr-csv \ 
     
    116117        sms \ 
    117118        snapshot \ 
    118         snmp \ 
    119119        snipe-hunt \ 
    120120        sndfile \ 
     121        snmp \ 
    121122        snom \ 
    122123        sofia \ 
     
    145146 
    146147PKG_CONFIG_DEPENDS:= \ 
    147         CONFIG_FS_SOFIA_WITH_GNUTLS \ 
    148148        CONFIG_FS_SOFIA_WITH_IPV6 \ 
     149        CONFIG_FS_SOFIA_WITH_MYSQL \ 
    149150        CONFIG_FS_SOFIA_WITH_ODBC \ 
    150151        CONFIG_FS_SOFIA_WITH_OPT \ 
    151152        CONFIG_FS_SOFIA_WITH_SCTP \ 
    152153        CONFIG_FS_SOFIA_WITH_ZRTP_GIT \ 
    153         CONFIG_FS_SOFIA_WITHOUT_MYSQL \ 
    154154        $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \ 
    155155 
     
    157157include $(INCLUDE_DIR)/package.mk 
    158158include $(INCLUDE_DIR)/nls.mk 
     159 
     160 
     161TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR) 
    159162 
    160163 
     
    197200    help 
    198201            Compile $(PKG_NAME) with optimization enabled. 
    199  
    200     config FS_SOFIA_WITHOUT_MYSQL 
    201     depends on PACKAGE_$(PKG_NAME) 
    202     bool "Compile without MySQL" 
    203     default y 
     202endef 
     203 
     204 
     205define Package/$(PKG_NAME)-mod-sofia/config 
     206    config FS_SOFIA_WITH_MYSQL 
     207    depends on PACKAGE_$(PKG_NAME)-mod-sofia 
     208    bool "Compile with MySQL" 
     209    default n 
     210    select PACKAGE_libmysqlclient 
    204211    help 
    205             Compile $(PKG_NAME) without MySQL. 
    206 endef 
    207  
    208  
    209 define Package/$(PKG_NAME)-mod-dingaling/config 
    210     config FS_SOFIA_WITH_GNUTLS 
    211     depends on PACKAGE_$(PKG_NAME)-mod-dingaling 
    212     bool "Compile with GNU TLS (Requires libgnutls-openssl)" 
    213     default y 
    214     select PACKAGE_libgnutls-openssl 
    215     help 
    216             Compile $(PKG_NAME)-mod-dingaling with GNU TLS Support (Requires libgnutls-openssl package). 
    217 endef 
    218  
    219  
    220 define Package/$(PKG_NAME)-mod-sofia/config 
     212            Compile $(PKG_NAME) with MySQL. 
     213 
    221214    config FS_SOFIA_WITH_ODBC 
    222215    depends on PACKAGE_$(PKG_NAME)-mod-sofia 
     216    depends on PACKAGE_sqliteodbc 
    223217    depends on PACKAGE_unixodbc_svn 
    224218    bool "Compile with ODBC support (Requires unixodbc_svn NOT YET AVAILABLE)" 
    225219    default n 
    226     #select PACKAGE_unixodbc_svn 
    227220    help 
    228             Compile $(PKG_NAME)-mod-sofia with ODBC Support. Since unixodbc_svn package is not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ODBC support. 
     221            Compile $(PKG_NAME)-mod-sofia with ODBC Support. Since both sqliteodbc and unixodbc_svn packages are not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ODBC support. 
    229222 
    230223    config FS_SOFIA_WITH_SCTP 
     
    232225    depends on PACKAGE_sctp 
    233226    bool "Compile with SCTP (Stream Control Transfer Protocol) support" 
    234     default n 
    235     #select PACKAGE_sctp 
     227    default y 
    236228    help 
    237229            Compile $(PKG_NAME)-mod-sofia with SCTP support. 
     
    397389 
    398390ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) 
    399  $(eval $(call Download/files,flite,flite-1.3.99-latest.tar.gz,365b60881715c5e13c0d8bc37d9be6ff,,downloads/libs/,libs/)) 
     391 $(eval $(call Download/files,flite,flite-1.5.1-current.tar.bz2,36e5d1c1307161211c8ffe9a75a623ae,,downloads/libs/,libs/)) 
    400392endif 
    401393 
     
    449441        --with-modinstdir="/usr/lib/$(PKG_NAME)" \ 
    450442        --with-random="/dev/urandom" \ 
    451         $(if $(CONFIG_FS_SOFIA_WITHOUT_MYSQL),--without-mysql) \ 
     443        $(if $(CONFIG_FS_SOFIA_WITH_MYSQL),--with-mysql,--without-mysql) \ 
    452444        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_IPV6,ipv6) \ 
    453445        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_OPT,optimization) \ 
    454446        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \ 
    455447        $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \ 
    456         $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-dingaling)|$(CONFIG_FS_SOFIA_WITH_GNUTLS),--with-libgnutls="$(STAGING_DIR)/usr") \ 
    457448        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \ 
    458449        $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ 
    459         $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_SCTP,sctp) \ 
    460450        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ZRTP_GIT,zrtp) \ 
    461451        $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ODBC,core-odbc-support) \ 
    462452        $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ 
     453        $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ 
    463454 
    464455 
     
    500491        apr_cv_tcp_nodelay_with_cork="yes" \ 
    501492        apr_cv_type_rwlock_t="yes" \ 
    502         ac_cv_path_LIBGNUTLS_CONFIG="no" \ 
    503493        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \ 
    504494        libzmq_cv_cxx_werror_flag="" \ 
     
    506496 
    507497define Build/Prepare 
    508         (cd $(PKG_BUILD_DIR); [ -h noreg ] || touch noreg) 
    509498        $(call Build/Prepare/Default) 
    510499        $(call Prepare/celt) 
     
    539528                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    540529                LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ 
    541                 spandsp-reconf all $(MAKE_INSTALL_TARGETS) 
     530                all $(MAKE_INSTALL_TARGETS) 
    542531        $(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
    543532        $(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_syslog"\(.*\) *-->\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
     
    577566define Package/$(PKG_NAME)-example-config/install 
    578567        $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf 
    579         #$(INSTALL_DIR) $(1)/var/log/$(PKG_NAME)/xml_cdr 
    580568        $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/ 
    581569endef 
  • packages/net/freeswitch/patches/002-Makefile.am.patch

    r28145 r28664  
    1010 SUBDIRS = . src 
    1111 AUTOMAKE_OPTS = foreign 
     12@@ -61,7 +66,7 @@ cd-moh-install: uhd-moh-install sounds-m 
     13 # (1) if the variable is set in `config.status', edit `config.status' 
     14 #     (which will cause the Makefiles to be regenerated when you run `make'); 
     15 # (2) otherwise, pass the desired values on the `make' command line. 
     16-all-recursive: libfreeswitch.la 
     17+all-recursive: spandsp-reconf libfreeswitch.la 
     18 clean-recusive: clean_core 
     19 install-recursive: install-libLTLIBRARIES install-binPROGRAMS 
     20 $(RECURSIVE_TARGETS): 
    1221@@ -299,7 +304,7 @@ endif 
    1322 ## 
Note: See TracChangeset for help on using the changeset viewer.