[asterisk-commits] lmadsen: branch 1.8 r315765 - in /branches/1.8/sounds: Makefile sounds.xml

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Apr 27 07:36:17 2011
New Revision: 315765

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=315765
Log:
Enable Russian core sound selection in menuselect.

(closes issue #18724)
Reported by: pbxware

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

Modified: branches/1.8/sounds/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/sounds/Makefile?view=diff&rev=315765&r1=315764&r2=315765
==============================================================================
--- branches/1.8/sounds/Makefile (original)
+++ branches/1.8/sounds/Makefile Wed Apr 27 07:36:17 2011
@@ -28,7 +28,7 @@
 SOUNDS_DIR:=$(DESTDIR)$(TMPDATADIR)/sounds
 SOUNDS_CACHE_DIR?=
 MOH_DIR:=$(DESTDIR)$(TMPDATADIR)/moh
-CORE_SOUNDS_VERSION:=1.4.20
+CORE_SOUNDS_VERSION:=1.4.21
 EXTRA_SOUNDS_VERSION:=1.4.11
 MOH_VERSION:=2.03
 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases
@@ -36,6 +36,7 @@
 MCS:=$(subst -EN_AU-,-en_AU-,$(MCS))
 MCS:=$(subst -FR-,-fr-,$(MCS))
 MCS:=$(subst -ES-,-es-,$(MCS))
+MCS:=$(subst -RU-,-ru-,$(MCS))
 MCS:=$(subst -WAV,-wav,$(MCS))
 MCS:=$(subst -ULAW,-ulaw,$(MCS))
 MCS:=$(subst -ALAW,-alaw,$(MCS))
@@ -173,6 +174,8 @@
 
 $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,fr,$(CORE_SOUNDS_VERSION)))
 
+$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(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,es,$(EXTRA_SOUNDS_VERSION)))
@@ -190,10 +193,10 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_CACHE_DIR):
+$(SOUNDS_DIR)/en $(MOH_DIR) $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(SOUNDS_CACHE_DIR):
 	mkdir -p $@
 
-install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
+install: prefixcmd $(SOUNDS_CACHE_DIR) $(SOUNDS_DIR)/en $(SOUNDS_DIR)/en_AU $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/ru $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)

Modified: branches/1.8/sounds/sounds.xml
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/sounds/sounds.xml?view=diff&rev=315765&r1=315764&r2=315765
==============================================================================
--- branches/1.8/sounds/sounds.xml (original)
+++ branches/1.8/sounds/sounds.xml Wed Apr 27 07:36:17 2011
@@ -72,6 +72,24 @@
 		</member>
 		<member name="CORE-SOUNDS-EN_AU-SIREN14" displayname="English (Australian Accent), G.722.1C (Siren14) format">
 		</member>
+		<member name="CORE-SOUNDS-RU-WAV" displayname="Russian, WAV format">
+		</member>
+		<member name="CORE-SOUNDS-RU-ULAW" displayname="Russian, mu-Law format">
+		</member>
+		<member name="CORE-SOUNDS-RU-ALAW" displayname="Russian, a-Law format">
+		</member>
+		<member name="CORE-SOUNDS-RU-GSM" displayname="Russian, GSM format" >
+		</member>
+		<member name="CORE-SOUNDS-RU-G729" displayname="Russian, G.729 format">
+		</member>
+		<member name="CORE-SOUNDS-RU-G722" displayname="Russian, G.722 format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SLN16" displayname="Russian, Signed-linear 16kHz format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SIREN7" displayname="Russian, G.722.1 (Siren7) format">
+		</member>
+		<member name="CORE-SOUNDS-RU-SIREN14" displayname="Russian, G.722.1C (Siren14) 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" >