Merge pull request #347 from micmac1/yate-uclibc-iconv

yate: upgrade to 6.1.0 and fix uclibc build issue
This commit is contained in:
micmac1 2018-08-05 11:22:49 +02:00 committed by GitHub
commit 26db4efb3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions

View file

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=yate
PKG_VERSION:=6.0.0-1
PKG_RELEASE:=9
PKG_VERSION:=6.1.0-1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/
PKG_HASH:=0ab76015651db8076031277b2003c23bd5d9eb940491801f30a6dc3c226c1817
PKG_HASH:=ed88519c8e2f63eec0d699bc6ed8831854af9b32b654b3d7e7c2697b528aa377
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_LICENSE:=GPL-2.0
@ -33,7 +33,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)-mod-ilbcwebrtc \
CONFIG_PACKAGE_$(PKG_NAME)-mod-isaccodec \
CONFIG_PACKAGE_$(PKG_NAME)-mod-pgsqldb \
CONFIG_PACKAGE_$(PKG_NAME)-mod-mysqld \
CONFIG_PACKAGE_$(PKG_NAME)-mod-mysqldb \
CONFIG_PACKAGE_$(PKG_NAME)-mod-faxchan \
CONFIG_PACKAGE_$(PKG_NAME)-mod-openssl \
CONFIG_PACKAGE_$(PKG_NAME)-mod-zlibcompress \
@ -41,6 +41,8 @@ PKG_CONFIG_DEPENDS:= \
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
# Needed for yate-mod-mysqldb to find iconv
include $(INCLUDE_DIR)/nls.mk
define Package/$(PKG_NAME)/Default
SUBMENU:=Telephony

View file

@ -1,22 +1,18 @@
--- a/libs/ysdp/parser.cpp
+++ b/libs/ysdp/parser.cpp
@@ -57,7 +57,9 @@ const TokenDict SDPParser::s_payloads[]
{ "h263", 34 },
{ "h263-1998", 111 },
@@ -59,6 +59,7 @@ const TokenDict SDPParser::s_payloads[]
{ "h263-2000", 112 },
+ { "h264", 97 },
{ "h264", 114 },
{ "vp8", 113 },
+ { "vp9", 114 },
+ { "vp9", 115 },
{ "mpv", 32 },
{ "mp2t", 33 },
{ "mp4v", 110 },
@@ -92,7 +94,9 @@ const TokenDict SDPParser::s_rtpmap[] =
{ "H263/90000", 34 },
{ "H263-1998/90000", 111 },
@@ -95,6 +96,7 @@ const TokenDict SDPParser::s_rtpmap[] =
{ "H263-2000/90000", 112 },
+ { "H264/90000", 97 },
{ "H264/90000", 114 },
{ "VP8/90000", 113 },
+ { "VP9/90000", 114 },
+ { "VP9/90000", 115 },
{ "MPV/90000", 32 },
{ "MP2T/90000", 33 },
{ "MP4V-ES/90000", 110 },
@ -28,9 +24,9 @@
{ "h263", 34 },
+ { "h263-1998", 111 },
+ { "h263-2000", 112 },
+ { "h264", 97 },
+ { "h264", 114 },
+ { "vp8", 113 },
+ { "vp9", 114 },
+ { "vp9", 115 },
{ "mpv", 32 },
{ "mp2t", 33 },
{ "mp4v", 98 },