X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fasterisk-1.4.x%2FMakefile;h=1d3fa750ca22e2e7521d51c5cb0e468b17ab75dd;hb=34ba226439ca357f03fc92c5db8391c38dcd8981;hp=afc17f77a6f7284998af581182e7045637efbc29;hpb=5192eddc523c8ce33171f06e172e9b61727c5b43;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/asterisk-1.4.x/Makefile b/net/asterisk-1.4.x/Makefile
index afc17f77a6..1d3fa750ca 100644
--- a/net/asterisk-1.4.x/Makefile
+++ b/net/asterisk-1.4.x/Makefile
@@ -9,36 +9,48 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=1.4.11
+PKG_VERSION:=1.4.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://ftp.digium.com/pub/asterisk/old-releases/
-PKG_MD5SUM:=3ba9b399fedc68de4845b1c5603d167c
+PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/
+PKG_MD5SUM:=c4cf69eb6eae3105806b08d3efc28ec7
 
 PKG_BUILD_DEPENDS:= libopenh323 pwlib
 
 include $(INCLUDE_DIR)/package.mk
 
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar, \
+	CONFIG_PACKAGE_asterisk14 CONFIG_PACKAGE_asterisk14-mini \
+	CONFIG_PACKAGE_asterisk14-chan-alsa CONFIG_PACKAGE_asterisk14-chan-gtalk \
+	CONFIG_PACKAGE_asterisk14-chan-h323 CONFIG_PACKAGE_asterisk14-chan-mgcp \
+	CONFIG_PACKAGE_asterisk14-chan-skinny CONFIG_PACKAGE_asterisk14-codec-ilbc \
+	CONFIG_PACKAGE_asterisk14-codec-lpc10 CONFIG_PACKAGE_asterisk14-codec-speex \
+	CONFIG_PACKAGE_asterisk14-pbx-dundi CONFIG_PACKAGE_asterisk14-res-agi \
+	CONFIG_PACKAGE_asterisk14-res-crypto CONFIG_PACKAGE_asterisk14-pgsql \
+	CONFIG_PACKAGE_asterisk14-sqlite CONFIG_PACKAGE_asterisk14-voicemail \
+	CONFIG_PACKAGE_asterisk14-sounds \
+)
+
 define Package/asterisk14/Default
   SUBMENU:=asterisk14 (Complete Open Source PBX), v1.4.x
   SECTION:=net
   CATEGORY:=Network
+  URL:=http://www.asterisk.org/
 endef
 
 define Package/asterisk14/Default/description
- Asterisk is a complete PBX in software. It provides all of the features 
- you would expect from a PBX and more. Asterisk does voice over IP in three 
- protocols, and can interoperate with almost all standards-based telephony 
+ Asterisk is a complete PBX in software. It provides all of the features
+ you would expect from a PBX and more. Asterisk does voice over IP in three
+ protocols, and can interoperate with almost all standards-based telephony
  equipment using relatively inexpensive hardware.
-  URL:=http://www.asterisk.org/
 endef
 
 
 define Package/asterisk14
 $(call Package/asterisk14/Default)
   TITLE:=Complete open source PBX
-  DEPENDS:= +libltdl +libncurses +libpopt +libpthread
+  DEPENDS:= +libncurses +libpopt +libpthread @!TARGET_avr32
 endef
 
 define Package/asterisk14/description
@@ -49,7 +61,7 @@ endef
 define Package/asterisk14-mini
 $(call Package/asterisk14/Default)
   TITLE:=Minimal open source PBX
-  DEPENDS:=+libncurses +libpthread
+  DEPENDS:=+libncurses +libpthread @!TARGET_avr32
 endef
 
 define Package/asterisk14-mini/description
@@ -71,6 +83,58 @@ $(call Package/asterisk14/Default/description)
 endef
 
 
+define Package/asterisk14-app-meetme
+$(call Package/asterisk14/Default)
+  TITLE:=conferencing support
+  DEPENDS:= +asterisk14 +zaptel14-libtonezone
+endef
+
+define Package/asterisk14-app-meetme/description
+$(call Package/asterisk14/Default/description)
+ This package provides the MeetMe application driver Conferencing support to 
+ Asterisk.
+endef
+
+
+define Package/asterisk14-chan-oss
+$(call Package/asterisk14/Default)
+  TITLE:=OSS soundcards support
+  DEPENDS:= +asterisk14
+endef
+
+define Package/asterisk14-chan-oss/description
+$(call Package/asterisk14/Default/description)
+ This package provides the channel driver for OSS sound cards support to 
+ Asterisk.
+endef
+
+
+define Package/asterisk14-app-meetme
+$(call Package/asterisk14/Default)
+  TITLE:=conferencing support
+  DEPENDS:= +asterisk14 +zaptel14-libtonezone
+endef
+
+define Package/asterisk14-app-meetme/description
+$(call Package/asterisk14/Default/description)
+ This package provides the MeetMe application driver Conferencing support to 
+ Asterisk.
+endef
+
+
+define Package/asterisk14-chan-oss
+$(call Package/asterisk14/Default)
+  TITLE:=OSS soundcards support
+  DEPENDS:= +asterisk14
+endef
+
+define Package/asterisk14-chan-oss/description
+$(call Package/asterisk14/Default/description)
+ This package provides the channel driver for OSS sound cards support to 
+ Asterisk.
+endef
+
+
 define Package/asterisk14-chan-alsa
 $(call Package/asterisk14/Default)
   TITLE:=ALSA soundcards support
@@ -135,17 +199,17 @@ $(call Package/asterisk14/Default/description)
 endef
 
 
-define Package/asterisk14-codec-ilbc
-$(call Package/asterisk14/Default)
-  TITLE:=ILBC Translator
-  DEPENDS:= +asterisk14
-endef
+#define Package/asterisk14-codec-ilbc
+#$(call Package/asterisk14/Default)
+#  TITLE:=ILBC Translator
+#  DEPENDS:= +asterisk14
+#endef
 
-define Package/asterisk14-codec-ilbc/description
-$(call Package/asterisk14/Default/description)
- This package contains the ILBC (Internet Low Bitrate Codec) translator 
- for Asterisk.
-endef
+#define Package/asterisk14-codec-ilbc/description
+#$(call Package/asterisk14/Default/description)
+# This package contains the ILBC (Internet Low Bitrate Codec) translator 
+# for Asterisk.
+#endef
 
 
 define Package/asterisk14-codec-lpc10
@@ -164,7 +228,7 @@ endef
 define Package/asterisk14-codec-speex
 $(call Package/asterisk14/Default)
   TITLE:=Speex/PCM16 Codec Translator
-  DEPENDS:= +asterisk14 +libspeex
+  DEPENDS:= +asterisk14 +libspeex +libspeexdsp
 endef
 
 define Package/asterisk14-chan-speex/description
@@ -260,11 +324,20 @@ $(call Package/asterisk14/Default/description)
  This package contains voicemail related modules for Asterisk.
 endef
 
+define Package/asterisk14-rawplayer
+$(call Package/asterisk14/Default)
+  TITLE:=Play raw files for asterisk
+endef
+
+define Package/asterisk14-rawplayer/description
+ Contains the rawplayer utility for asterisk
+endef
+
 
 CONFIGURE_ARGS+= \
 	--without-curl \
 	--without-curses \
-	--without-gsm \
+	--with-gsm="$(STAGING_DIR)/usr" \
 	--without-imap \
 	--without-isdnnet \
 	--without-kde \
@@ -277,7 +350,6 @@ CONFIGURE_ARGS+= \
 	--without-odbc \
 	--without-ogg \
 	--without-osptk \
-	--without-oss \
 	--with-popt="$(STAGING_DIR)/usr" \
 	--without-pri \
 	--without-qt \
@@ -287,27 +359,44 @@ CONFIGURE_ARGS+= \
 	--without-tds \
 	--without-termcap \
 	--without-tinfo \
-	--without-tonezone \
 	--without-vorbis \
 	--without-vpb \
 	--with-z="$(STAGING_DIR)/usr" \
-	--without-zaptel \
 
 EXTRA_CFLAGS:= $(TARGET_CPPFLAGS)
 EXTRA_LDFLAGS:= $(TARGET_LDFLAGS)
 
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk14-app-meetme),)
+  CONFIGURE_ARGS+= \
+	--with-tonezone="$(STAGING_DIR)/usr" --with-zaptel="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+	--without-tonezone --without-zaptel
+endif
+
 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk14-chan-alsa),)
   CONFIGURE_ARGS+= \
-	--with-asound="$(STAGING_DIR)/usr"
+        --with-asound="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+        --without-asound
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk14-chan-oss),)
+  CONFIGURE_ARGS+= \
+        --with-oss
 else
   CONFIGURE_ARGS+= \
-	--without-asound
+        --without-oss
 endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk14-chan-gtalk),)
   CONFIGURE_ARGS+= \
 	--with-gnutls="$(STAGING_DIR)/usr" \
 	--with-iksemel="$(STAGING_DIR)/usr"
+  SITE_VARS+= \
+	ac_cv_lib_iksemel_iks_start_sasl=yes \
+	ac_cv_lib_gnutls_gnutls_bye=yes
 else
   CONFIGURE_ARGS+= \
 	--without-gnutls \
@@ -336,6 +425,8 @@ endif
 ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk14-codec-speex),)
   CONFIGURE_ARGS+= \
 	--with-speex="$(STAGING_DIR)/usr"
+  SITE_VARS+= \
+	ac_cv_lib_speex_speex_encode=yes
   EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex
 else
   CONFIGURE_ARGS+= \
@@ -368,8 +459,9 @@ endif
 
 
 define Build/Configure
+	-rm $(PKG_BUILD_DIR)/menuselect.makeopts
 	( cd $(PKG_BUILD_DIR); ./bootstrap.sh )
-	$(call Build/Configure/Default)
+	$(call Build/Configure/Default,,$(SITE_VARS))
 endef
 
 define Build/Compile
@@ -388,12 +480,14 @@ define Build/Compile
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install samples
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf
+
+	$(TARGET_CC) -O2 $(PKG_BUILD_DIR)/contrib/utils/rawplayer.c -o $(PKG_BUILD_DIR)/rawplayer
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(STAGING_DIR)/usr/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(STAGING_DIR)/usr/include/
+	mkdir -p $(1)/usr/include/asterisk/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/
 endef
 
 
@@ -467,9 +561,10 @@ define Package/asterisk14/install
 		cd modules; \
 		rm -rf	*adsi* *festival* *modem* *oss* *phone* *intercom* \
 			*mp3* *nbscat* *sqlite* *mysql* *postgres* *pgsql* \
-			*voicemail* *speex* *flash* *page* *zap* *jpeg* \
+			*voicemail* *speex* *flash* *page* *meetme* *zap* *jpeg* \
 			*snmp* \
 			chan_alsa.so \
+			chan_oss.so \
 			chan_gtalk.so \
 			chan_h323.so \
 			chan_mgcp.so \
@@ -541,8 +636,8 @@ define Package/asterisk14-mini/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/moh
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/default
 	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -550,6 +645,54 @@ define Package/asterisk14-mini/install
 endef
 
 
+define Package/asterisk14-app-meetme/conffiles
+/etc/asterisk/meetme.conf
+endef
+
+define Package/asterisk14-app-meetme/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/
+endef
+
+
+define Package/asterisk14-chan-oss/conffiles
+/etc/asterisk/oss.conf
+endef
+
+define Package/asterisk14-chan-oss/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/oss.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_oss.so $(1)/usr/lib/asterisk/modules/
+endef
+
+
+define Package/asterisk14-app-meetme/conffiles
+/etc/asterisk/meetme.conf
+endef
+
+define Package/asterisk14-app-meetme/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/
+endef
+
+
+define Package/asterisk14-chan-oss/conffiles
+/etc/asterisk/oss.conf
+endef
+
+define Package/asterisk14-chan-oss/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/oss.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_oss.so $(1)/usr/lib/asterisk/modules/
+endef
+
+
 define Package/asterisk14-chan-alsa/conffiles
 /etc/asterisk/alsa.conf
 endef
@@ -613,11 +756,11 @@ define Package/asterisk14-chan-skinny/install
 endef
 
 
-define Package/asterisk14-codec-ilbc/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/codec_ilbc.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/format_ilbc.so $(1)/usr/lib/asterisk/modules/
-endef
+#define Package/asterisk14-codec-ilbc/install
+#	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/codec_ilbc.so $(1)/usr/lib/asterisk/modules/
+#	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/format_ilbc.so $(1)/usr/lib/asterisk/modules/
+#endef
 
 
 define Package/asterisk14-codec-lpc10/install
@@ -700,15 +843,23 @@ define Package/asterisk14-voicemail/install
 	$(CP) $(PKG_INSTALL_DIR)//usr/lib/asterisk/sounds/vm-*.gsm $(1)/usr/lib/asterisk/sounds/
 endef
 
+define Package/asterisk14-rawplayer/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN)	$(PKG_BUILD_DIR)/rawplayer \
+			$(1)/usr/bin
+endef
+
 
 $(eval $(call BuildPackage,asterisk14))
 $(eval $(call BuildPackage,asterisk14-mini))
+$(eval $(call BuildPackage,asterisk14-app-meetme))
+$(eval $(call BuildPackage,asterisk14-chan-oss))
 $(eval $(call BuildPackage,asterisk14-chan-alsa))
 $(eval $(call BuildPackage,asterisk14-chan-gtalk))
 $(eval $(call BuildPackage,asterisk14-chan-h323))
 $(eval $(call BuildPackage,asterisk14-chan-mgcp))
 $(eval $(call BuildPackage,asterisk14-chan-skinny))
-$(eval $(call BuildPackage,asterisk14-codec-ilbc))
+#$(eval $(call BuildPackage,asterisk14-codec-ilbc))
 $(eval $(call BuildPackage,asterisk14-codec-lpc10))
 $(eval $(call BuildPackage,asterisk14-codec-speex))
 $(eval $(call BuildPackage,asterisk14-pbx-dundi))
@@ -718,3 +869,4 @@ $(eval $(call BuildPackage,asterisk14-pgsql))
 $(eval $(call BuildPackage,asterisk14-sqlite))
 $(eval $(call BuildPackage,asterisk14-voicemail))
 $(eval $(call BuildPackage,asterisk14-sounds))
+$(eval $(call BuildPackage,asterisk14-rawplayer))