Sounds/BuildSystem: Modifications to include new releases and Japanese language.

Modifying Makefile and sounds.xml to include new core 1.4.26 and extra 1.4.15
sound prompt releases, plus the new Japanese core sound prompts contributed
by QLOOG.

ASTERISK-23324
Reported by: Kevin McCoy
Tested by: Rusty Newton
........

Merged revisions 422789 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 422790 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 422791 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 422883 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@422884 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/sounds/Makefile b/sounds/Makefile
index 87b356f430f87cea1835de4fc36026a46cbd0bcf..13a7184acc0717f8b3953f6b7f6b1f6b77940411 100644 (file)
--- a/sounds/Makefile
+++ b/sounds/Makefile
@@ -19,8 +19,8 @@ CMD_PREFIX?=@
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.25
-EXTRA_SOUNDS_VERSION:=1.4.14
+CORE_SOUNDS_VERSION:=1.4.26
+EXTRA_SOUNDS_VERSION:=1.4.15
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
@@ -30,6 +30,7 @@ MCS:=$(subst -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
 MCS:=$(subst -RU-,-ru-,$(MCS))
 MCS:=$(subst -IT-,-it-,$(MCS))
+MCS:=$(subst -JA-,-ja-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
 MCS:=$(subst -ULAW,-ulaw,$(MCS))
 MCS:=$(subst -ALAW,-alaw,$(MCS))
@@ -150,6 +151,8 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,it,$(CORE_SOUNDS_
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_VERSION)))
 
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ja,$(CORE_SOUNDS_VERSION)))
+
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en,$(EXTRA_SOUNDS_VERSION)))
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),extra-sounds,en_GB,$(EXTRA_SOUNDS_VERSION)))

diff --git a/sounds/sounds.xml b/sounds/sounds.xml
index 768ddde63810f9f27820f499dba889c5f6c68856..5934bb34e1a059f8b98fdf3f9df754a56f2a30ea 100644 (file)
--- a/sounds/sounds.xml
+++ b/sounds/sounds.xml
@@ -189,6 +189,33 @@
                <member name="CORE-SOUNDS-RU-SIREN14" displayname="Russian, G.722.1C (Siren14) format">
                        <support_level>core</support_level>
                </member>
+               <member name="CORE-SOUNDS-JA-WAV" displayname="Japanese, WAV format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-ULAW" displayname="Japanese, mu-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-ALAW" displayname="Japanese, a-Law format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-GSM" displayname="Japanese, GSM format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-G729" displayname="Japanese, G.729 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-G722" displayname="Japanese, G.722 format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-SLN16" displayname="Japanese, Signed-linear 16kHz format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-SIREN7" displayname="Japanese, G.722.1 (Siren7) format">
+                       <support_level>core</support_level>
+               </member>
+               <member name="CORE-SOUNDS-JA-SIREN14" displayname="Japanese, G.722.1C (Siren14) format">
+                       <support_level>core</support_level>
+               </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" >