diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | doc/.gitignore | 4 | ||||
| -rw-r--r-- | doc/asterisk-ng-doxygen.in (renamed from contrib/asterisk-ng-doxygen) | 0 | ||||
| -rw-r--r-- | res/res_rtp_asterisk.c | 1 | ||||
| -rw-r--r-- | sounds/Makefile | 5 | ||||
| -rw-r--r-- | sounds/sounds.xml | 27 |
7 files changed, 49 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 4b19213cc..0281e107c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ menuselect-tree *.pyc *.gcno *.gcda +latex +doxygen.log + @@ -430,6 +430,8 @@ _clean: rm -f doc/core-en_US.xml rm -f doc/full-en_US.xml rm -f doc/rest-api/*.wiki + rm -f doxygen.log + rm -rf latex rm -f rest-api-templates/*.pyc @$(MAKE) -C menuselect clean cp -f .cleancount .lastclean @@ -446,6 +448,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean rm -f include/asterisk/autoconfig.h rm -f include/asterisk/buildopts.h rm -rf doc/api + rm -f doc/asterisk-ng-doxygen rm -f build_tools/menuselect-deps datafiles: _all doc/core-en_US.xml @@ -764,7 +767,8 @@ webvmail: @echo " +-------------------------------------------+" progdocs: - # Note, Makefile conditionals must not be tabbed out. Wasted hours with that. +# Note, Makefile conditionals must not be tabbed out. Wasted hours with that. + @cp doc/asterisk-ng-doxygen.in doc/asterisk-ng-doxygen ifeq ($(DOXYGEN),:) @echo "Doxygen is not installed. Please install and re-run the configuration script." else @@ -772,20 +776,20 @@ ifeq ($(DOT),:) @echo "DOT is not installed. Doxygen will not produce any diagrams. Please install and re-run the configuration script." else # Enable DOT - @echo "HAVE_DOT = YES" >> contrib/asterisk-ng-doxygen + @echo "HAVE_DOT = YES" >> doc/asterisk-ng-doxygen endif # Set Doxygen PROJECT_NUMBER variable ifneq ($(ASTERISKVERSION),UNKNOWN__and_probably_unsupported) - @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> contrib/asterisk-ng-doxygen + @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> doc/asterisk-ng-doxygen else echo "Asterisk Version is unknown, not configuring Doxygen PROJECT_NUMBER." endif - # Validate Doxygen Configuration - @doxygen -u contrib/asterisk-ng-doxygen + # Validate and auto-update local copy + @doxygen -u doc/asterisk-ng-doxygen # Run Doxygen - @doxygen contrib/asterisk-ng-doxygen + @doxygen doc/asterisk-ng-doxygen # Remove configuration backup file - @rm -f contrib/asterisk-ng-doxygen.bak + @rm -f doc/asterisk-ng-doxygen.bak endif install-logrotate: diff --git a/doc/.gitignore b/doc/.gitignore index e098ec027..3461c58c5 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,2 +1,4 @@ core-en_US.xml -rest-api
\ No newline at end of file +rest-api +api +asterisk-ng-doxygen diff --git a/contrib/asterisk-ng-doxygen b/doc/asterisk-ng-doxygen.in index 51a3f5d58..51a3f5d58 100644 --- a/contrib/asterisk-ng-doxygen +++ b/doc/asterisk-ng-doxygen.in diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 6df8a6e17..ed7dde01d 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1270,6 +1270,7 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con } if (!ast_rtp_engine_srtp_is_registered()) { + ast_log(LOG_ERROR, "SRTP support module is not loaded or available. Try loading res_srtp.so.\n"); return -1; } diff --git a/sounds/Makefile b/sounds/Makefile index 13a7184ac..a726ece15 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -19,7 +19,7 @@ CMD_PREFIX?=@ SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds SOUNDS_CACHE_DIR?= MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh -CORE_SOUNDS_VERSION:=1.4.26 +CORE_SOUNDS_VERSION:=1.4.27 EXTRA_SOUNDS_VERSION:=1.4.15 MOH_VERSION:=2.03 SOUNDS_URL:=http://downloads.asterisk.org/pub/telephony/sounds/releases @@ -31,6 +31,7 @@ MCS:=$(subst -ES-,-es-,$(MCS)) MCS:=$(subst -RU-,-ru-,$(MCS)) MCS:=$(subst -IT-,-it-,$(MCS)) MCS:=$(subst -JA-,-ja-,$(MCS)) +MCS:=$(subst -SV-,-sv-,$(MCS)) MCS:=$(subst -WAV,-wav,$(MCS)) MCS:=$(subst -ULAW,-ulaw,$(MCS)) MCS:=$(subst -ALAW,-alaw,$(MCS)) @@ -153,6 +154,8 @@ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ru,$(CORE_SOUNDS_ $(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,ja,$(CORE_SOUNDS_VERSION))) +$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,sv,$(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 5934bb34e..547be4b4a 100644 --- a/sounds/sounds.xml +++ b/sounds/sounds.xml @@ -216,6 +216,33 @@ <member name="CORE-SOUNDS-JA-SIREN14" displayname="Japanese, G.722.1C (Siren14) format"> <support_level>core</support_level> </member> + <member name="CORE-SOUNDS-SV-WAV" displayname="Swedish, WAV format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-ULAW" displayname="Swedish, mu-Law format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-ALAW" displayname="Swedish, a-Law format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-GSM" displayname="Swedish, GSM format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-G729" displayname="Swedish, G.729 format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-G722" displayname="Swedish, G.722 format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-SLN16" displayname="Swedish, Signed-linear 16kHz format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-SIREN7" displayname="Swedish, G.722.1 (Siren7) format"> + <support_level>core</support_level> + </member> + <member name="CORE-SOUNDS-SV-SIREN14" displayname="Swedish, 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" > |