Changeset 1823

Timestamp:

02/01/07 11:53:28 (2 years ago)

Author:

n0-1

Message:

* disabled codecs ilbc and lpc10 (not essential and non-working)
* reenabled speex (non-working, but should be fixed soon)
* reviewed the Makefile

Files:

• trunk/freewrt/package/asterisk-12/Config.in (modified) (1 diff)
• trunk/freewrt/package/asterisk-12/Makefile (modified) (5 diffs)

trunk/freewrt/package/asterisk-12/Config.in

@@ -38 +38 @@
-          IAX2 allows trunking communication channels together.
-
-ILBC
-ilbc............. Internet Low Bitrate Codec (ILBC)
+SPEEX
+speex............ Speex/PCM16 Codec
-        tristate
-        default n
-        depends FWRT_PACKAGE_ASTERISK_12
+        select FWRT_PACKAGE_LIBSPEEX
-        help
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-config FWRT_PACKAGE_ASTERISK_12_PBX_DUNDI

trunk/freewrt/package/asterisk-12/Makefile

@@ -26 +26 @@
-$(eval $(call PKG_template,ASTERISK_12_CHAN_SKINNY,asterisk-12-chan-skinny,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_CHAN_IAX2,asterisk-12-chan-iax2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_CODEC_ILBC,asterisk-12-codec-ilbc,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_CODEC_LPC10,asterisk-12-codec-lpc10,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_CODEC_SPEEX,asterisk-12-codec-speex,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_PBX_DUNDI,asterisk-12-pbx-dundi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
@@ -48 +46 @@
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_SKINNY}+=          asterisk-chan-skinny-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_IAX2}+=            asterisk-chan-iax2-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CODEC_ILBC}+=           asterisk-codec-ilbc-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CODEC_LPC10}+=          asterisk-codec-lpc10-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CODEC_SPEEX}+=          asterisk-codec-speex-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_PBX_DUNDI}+=            asterisk-pbx-dundi-install
@@ -64 +60 @@
-MAKE_FLAGS+=            DEBUG=
-MAKE_FLAGS+=            ASTVARLIBDIR="/usr/lib/asterisk"
-
-
+
-INSTALL_STYLE:=         auto
-INSTALL_TARGET:=        install samples
-TCFLAGS+=               ${TCPPFLAGS}
-
-#do-build:
-#       ${MAKE} -C "${WRKBUILD}" \
-#               CC=${TARGET_CC} \
-#               CROSS_ARCH="Linux" \
-#               CROSS_COMPILE="${TARGET_CROSS}" \
-#               ${TARGET_CONFIGURE_OPTS} \
-#               EXTRA_CFLAGS="${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS} -I${WRKBUILD}/include" \
-#               EXTRA_CPPFLAGS="${TCPPFLAGS}" \
-#               EXTRA_LDFLAGS="${TLDFLAGS}" \
-#               PROC="${KERNEL_ARCH}" \
-#               DEBUG="" \
-#               OPTIONS="-DLOW_MEMORY -Dlinux" \
-#               NOCRYPTO="yes" \
-#               INCLUDE="${TCPPFLAGS}" \
-#               EXTRA_APP_MODULES="${EXTRA_APP_MODULES}" \
-#               EXTRA_CDR_MODULES="${EXTRA_CDR_MODULES}" \
-#               EXTRA_CHAN_MODULES="${EXTRA_CHAN_MODULES}" \
-#               EXTRA_CODEC_MODULES="${EXTRA_CODEC_MODULES}" \
-#               EXTRA_RES_MODULES="${EXTRA_RES_MODULES}" \
-#               DESTDIR="${WRKINST}" \
-#               ${EXTRA_DEFINES} \
-#               all install samples
-#       rm -f ${WRKINST}/etc/asterisk/*.old
-
-#do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
-#       ${CP} ${WRKINST}/* ${IDIR_ASTERISK_12}
-#       rm -rf ${IDIR_ASTERISK_12}/usr/sbin/astgenkey
-#       rm -rf ${IDIR_ASTERISK_12}/usr/bin
-#       rm -rf ${IDIR_ASTERISK_12}/usr/share
-#       rm -rf ${IDIR_ASTERISK_12}/usr/include
-#       rm -rf ${IDIR_ASTERISK_12}/var
-#       (cd ${IDIR_ASTERISK_12}/usr/lib/asterisk; \
-#               rm -rf agi-bin; \
-#               rm -rf images; \
-#               rm -rf keys/*; \
-#               rm -rf mohmp3/*.mp3; \
-#               rm -rf sounds/*; \
-#               cd modules; \
-#               rm -rf  *adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
-#                       *mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
-#                       *zapateller* *jpeg*; \
-#               rm -f chan_bluetooth.so ; \
-#               rm -f chan_h323.so ; \
-#               rm -f chan_mgcp.so ; \
-#               rm -f chan_skinny.so ; \
-#               rm -f {codec,format}_ilbc.so ; \
-#               rm -f codec_lpc10.so ; \
-#               rm -f pbx_dundi.so ; \
-#               rm -f res_agi.so ; \
-#       )
-#       (cd ${IDIR_ASTERISK_12}/etc/asterisk; \
-#               rm -f   *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
-#                       *festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
-#                       *zapata*; \
-#               rm -f bluetooth.conf ; \
-#               rm -f mgcp.conf ; \
-#               rm -f skinny.conf ; \
-#               rm -f dundi.conf ; \
-#       )
-#       install -m0644 ./files/modules.conf ${IDIR_ASTERISK_12}/etc/asterisk/
-#       ${SED} 's|/var/lib/asterisk|/usr/lib/asterisk|g' ${WRKINST}/etc/asterisk/musiconhold.conf
-#       install -d -m0755 ${IDIR_ASTERISK_12}/etc/init.d
-#       install -m0755  ./files/asterisk.init ${IDIR_ASTERISK_12}/etc/init.d/S${PKG_INIT}asterisk
-
-post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
-asterisk
+{asterisk,init.d}
-        ${INSTALL_DIR} ${IDIR_ASTERISK_12}/usr/lib/asterisk/
-        ${INSTALL_DIR} ${IDIR_ASTERISK_12}/usr/sbin
@@ -142 +73 @@
-        ${CP} ${WRKINST}/usr/lib/asterisk/modules/ ${IDIR_ASTERISK_12}/usr/lib/asterisk
-        (cd ${IDIR_ASTERISK_12}/usr/lib/asterisk/modules ; \
-
-
+
+
+
-        )
-        (cd ${IDIR_ASTERISK_12}/etc/asterisk ; \
-                rm -f *iax* *voicemail* *skinny* *mgcp* *dundi* ; \
-        )
+        ${INSTALL_DATA} ./files/modules.conf ${IDIR_ASTERISK_12}/etc/asterisk/
+        ${SED} 's|/var/lib/asterisk|/usr/lib/asterisk|g' ${WRKINST}/etc/asterisk/musiconhold.conf
+        ${INSTALL_BIN} ./files/asterisk.init ${IDIR_ASTERISK_12}/etc/init.d/S${PKG_INIT}asterisk
+
-
-asterisk-sqlite-install:
@@ -194 +130 @@
-        install -m0755 ${WRKBUILD}/channels/chan_skinny.so ${IDIR_ASTERISK_12_CHAN_SKINNY}/usr/lib/asterisk/modules/
-
-asterisk-codec-ilbc-install:
-        install -d -m0755 ${IDIR_ASTERISK_12_CODEC_ILBC}/usr/lib/asterisk/modules
-        install -m0755 ${WRKBUILD}/codecs/codec_ilbc.so ${IDIR_ASTERISK_12_CODEC_ILBC}/usr/lib/asterisk/modules/
-        install -m0755 ${WRKBUILD}/formats/format_ilbc.so ${IDIR_ASTERISK_12_CODEC_ILBC}/usr/lib/asterisk/modules/
-
-asterisk-codec-lpc10-install:
-        install -d -m0755 ${IDIR_ASTERISK_12_CODEC_LPC10}/usr/lib/asterisk/modules
-        install -m0755 ${WRKBUILD}/codecs/codec_lpc10.so ${IDIR_ASTERISK_12_CODEC_LPC10}/usr/lib/asterisk/modules/
-
-asterisk-codec-speex-install:
-        install -d -m0755 ${IDIR_ASTERISK_12_CODEC_SPEEX}/usr/lib/asterisk/modules