[svn-commits] lmadsen: branch 1.4 r292222 - in /branches/1.4/sounds: Makefile sounds.xml

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Mon Oct 18 16:47:25 2010
New Revision: 292222

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292222
Log:
Add support for the new English (Australian Accent) sound files.


(closes issue #17426)
Reported by: camsown
Patches:
      core-sounds-en_AU.txt uploaded by camsown (license 1050)
      add_AU_sounds.patch.txt uploaded by lmadsen (license 10)
Tested by: camsown, lmadsen, jtodd, qwell

Modified:
    branches/1.4/sounds/Makefile
    branches/1.4/sounds/sounds.xml

Modified: branches/1.4/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/sounds/Makefile?view=diff&rev=292222&r1=292221&r2=292222
==============================================================================
--- branches/1.4/sounds/Makefile (original)
+++ branches/1.4/sounds/Makefile Mon Oct 18 16:47:25 2010
@@ -18,11 +18,12 @@
 PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.19
+CORE_SOUNDS_VERSION:=1.4.20
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
+MCS:=$(subst -EN_AU-,-en_AU-,$(MCS))
 MCS:=$(subst -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
@@ -70,7 +71,7 @@
 		echo "***                                            ***"; \
 		echo "*** Please install one of these, or remove any ***"; \
 		echo "*** extra sound package selections in          ***"; \
-		echo "*** menuselecct before installing Asterisk.    ***"; \
+		echo "*** menuselect before installing Asterisk.     ***"; \
 		echo "***                                            ***"; \
 		echo "**************************************************"; \
 		exit 1; \
@@ -82,6 +83,14 @@
 	if test ! -f $${PACKAGE}; then exit 1; fi; \
 	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
 	(cd $(SOUNDS_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xof -) && \
+	touch $@
+
+$(SOUNDS_DIR)/.asterisk-core-sounds-en_AU-%: have_download
+	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
+	if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
+	if test ! -f $${PACKAGE}; then exit 1; fi; \
+	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
+	(cd $(SOUNDS_DIR)/en_AU; cat $(PWD)/$${PACKAGE} | gzip -d | tar xof -) && \
 	touch $@
 
 $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download
@@ -144,10 +153,10 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
+$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
 	mkdir -p $@
 
-install: $(SOUNDS_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: $(SOUNDS_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)

Modified: branches/1.4/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/sounds/sounds.xml?view=diff&rev=292222&r1=292221&r2=292222
==============================================================================
--- branches/1.4/sounds/sounds.xml (original)
+++ branches/1.4/sounds/sounds.xml Mon Oct 18 16:47:25 2010
@@ -36,6 +36,18 @@
 		</member>
 		<member name="CORE-SOUNDS-FR-G722" displayname="French, G.722 format">
 		</member>
+		<member name="CORE-SOUNDS-EN_AU-WAV" displayname="English (Australian Accent), WAV format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-ULAW" displayname="English (Australian Accent), mu-Law format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-ALAW" displayname="English (Australian Accent), a-Law format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-GSM" displayname="English (Australian Accent), GSM format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-G729" displayname="English (Australian Accent), G.729 format">
+		</member>
+		<member name="CORE-SOUNDS-EN_AU-G722" displayname="English (Australian Accent), G.722 format">
+		</member>
 	</category>
 	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
 		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >
@@ -51,7 +63,7 @@
 		</member>
 		<member name="MOH-OPSOUND-G722" displayname="opsound.org Music On Hold Files, G.722 format" >
 		</member>
-	</category>
+		</category>
 	<category name="MENUSELECT_EXTRA_SOUNDS" displayname="Extras Sound Packages" positive_output="yes">
 		<member name="EXTRA-SOUNDS-EN-WAV" displayname="English, WAV format">
 		</member>