- New versios amrnb-10.0.0.0 and amrwb-10.0.0.0 use new upstream code base

- change license to BSD-3 that allows 3GPP/Via Licensing contractors to distribute wrapped libraries
- see http://www.penguin.cz/~utx/amr

PR:		ports/164037
Submitted by:	Tatsuki Makino <tatsuki_makino@hotmail.com> (maintainer)
Approved by:	gabor (mentor, implicit)

8 files changed, 52 insertions, 58 deletions

diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 38f886801396..bc3073b15cb5 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libamrnb
-PORTVERSION=	7.0.0.2
+PORTVERSION=	10.0.0.0
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
@@ -18,8 +18,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP floating-point Adaptive Multi-Rate (AMR) Speech Codec
 
+LICENSE=	BSD
+
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
+LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 RESTRICTED=	license prohibits redistribution
 RESTRICTED_FILES=	${SRC3GPP}
 USE_BZIP2=	yes
@@ -32,7 +35,7 @@ CONFIGURE_ENV+=	LANG=C
 MAKE_ENV=	LANG=C
 USE_LDCONFIG=	yes
 
-SRC3GPP=	26104-700.zip
+SRC3GPP=	26104-a00.zip
 
 post-extract:
 	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
diff --git a/audio/libamrnb/distinfo b/audio/libamrnb/distinfo
index 43f92b9214db..d5d148adb359 100644
--- a/audio/libamrnb/distinfo
+++ b/audio/libamrnb/distinfo
@@ -1,4 +1,4 @@
-SHA256 (amrnb-7.0.0.2.tar.bz2) = 4a7d1411c80ca35910dbb7d2ae8ae73aaa4686afb4ef06da1e27d12a41969c7c
-SIZE (amrnb-7.0.0.2.tar.bz2) = 227194
-SHA256 (26104-700.zip) = d17e4e65b6f8138ff6243f194cefa6f2b39450075cdb2e9bb431e2dc5a43f541
-SIZE (26104-700.zip) = 303856
+SHA256 (amrnb-10.0.0.0.tar.bz2) = a5d6c03b8c6b7c912583b6cbb66da093b87a6a070a26540aae7589ab40a48509
+SIZE (amrnb-10.0.0.0.tar.bz2) = 257471
+SHA256 (26104-a00.zip) = 840ed0965f880faeae24c5f8e39fe4ddf1a192d02f0d8b5329b6938cf4e3961d
+SIZE (26104-a00.zip) = 430675
diff --git a/audio/libamrnb/files/pkg-message.in b/audio/libamrnb/files/pkg-message.in
index eed7dd4140e8..45a9bc2fcec7 100644
--- a/audio/libamrnb/files/pkg-message.in
+++ b/audio/libamrnb/files/pkg-message.in
@@ -1,17 +1,14 @@
 
-AMR codecs incorporate several patents, held by Ericsson,
-Universite de Sherbrooke (VoiceAge) and Nokia.
-VoiceAge claims to provide patent portfolio for AMR codecs. Depending on law in
-your country, manufacturers and developers may need to get a license.
-Because it is a shared library, you may need a special contract for each one
-application, which links against this library, directly or indirectly.
+AMR codecs incorporate several patents, held by Ericsson, Universite de
+Sherbrooke (VoiceAge) and Nokia. VoiceAge claims to provide patent portfolio
+for AMR codecs. Depending on law in your country, manufacturers and developers
+may need to get a license. Because it is a shared library, you may need special
+contract for each one application, which links against this library, directly
+or indirectly.
 
-* 3GPP policy on licensing and 3G Patent Platform:
-    http://www.3gpp.org/faq/faq_2005_2.htm#A3.1
-* Intellectual property in ETSI standards:
-    http://webapp.etsi.org/IPR/home.asp
-* On 3GPP legal issues:
-    http://www.3gpp.org/legal/legal.htm
-* On VoiceAge licensing:
-    http://www.voiceage.com/licensing.php
+Patent portfolio seems to be licensed by Via Licensing.
+
+Depending on law in your country, you may need a license for distribution, any
+use, commercial use or even development.
+You don't have permission to distribute the source code and attached .doc file.
 
diff --git a/audio/libamrnb/pkg-descr b/audio/libamrnb/pkg-descr
index 2c1f90e94548..c5499a57b792 100644
--- a/audio/libamrnb/pkg-descr
+++ b/audio/libamrnb/pkg-descr
@@ -1,12 +1,11 @@
-3GPP floating-point Adaptive Multi-Rate (AMR) Speech Codec
-(3GPP TS 26.104 V 6.1.0)
-http://www.3gpp.org/ftp/Specs/html-info/26104.htm
+3GPP Adaptive Multi-Rate Floating-point (AMR) Speech Codec Shared Library
+
+3GPP released reference implementation of 3GPP Adaptive Multi-Rate
+Floating-point (AMR) Speech Codec (3GPP TS 26.104).
 
-AMR is an audio data compression scheme optimized for speech coding.
-AMR was adopted as the standard speech codec by 3GPP in October 1998
-and is now widely used in GSM.
+http://www.3gpp.org/ftp/Specs/html-info/26104.htm
 
-Note that depending on law in your country, you may need a license for
-distribution, any use, commercial use or even development.
+This package converts 3GPP TS 26.104 reference implementation of AMR-NB to a
+shared library.
 
 WWW: http://www.penguin.cz/~utx/amr
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index bbb3eeb4317b..65b07bf52d89 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libamrwb
-PORTVERSION=	7.0.0.4
+PORTVERSION=	10.0.0.0
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.penguin.cz/pub/users/utx/amr/ \
 		http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/:3GPP
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	tatsuki_makino@hotmail.com
 COMMENT=	3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
 
-LICENSE=	LGPL20
+LICENSE=	BSD
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -34,7 +34,7 @@ CONFIGURE_ENV+=	LANG=C
 MAKE_ENV=	LANG=C
 USE_LDCONFIG=	yes
 
-SRC3GPP=	26204-700.zip
+SRC3GPP=	26204-a00.zip
 
 post-extract:
 	@${CP} ${DISTDIR}/${SRC3GPP} ${WRKSRC}/
diff --git a/audio/libamrwb/distinfo b/audio/libamrwb/distinfo
index 2aa4cd770be6..f2496ca7448c 100644
--- a/audio/libamrwb/distinfo
+++ b/audio/libamrwb/distinfo
@@ -1,4 +1,4 @@
-SHA256 (amrwb-7.0.0.4.tar.bz2) = db34d75823770a244e1d03602c82a9d3916005c68219365f0e484c47c11ecb5b
-SIZE (amrwb-7.0.0.4.tar.bz2) = 215088
-SHA256 (26204-700.zip) = 1b8ba234f5ac520650cb66aee1079491681afb7dba78eb717dca9534ae3598f0
-SIZE (26204-700.zip) = 255757
+SHA256 (amrwb-10.0.0.0.tar.bz2) = 1d5209c7f8c9d4d7894e3f03a48b83a53a5630b5d43848b3730bf25ba86061bb
+SIZE (amrwb-10.0.0.0.tar.bz2) = 252042
+SHA256 (26204-a00.zip) = 45acacd40a81436d69caf532a39303141eea020f16594d91c1a81994088f73a7
+SIZE (26204-a00.zip) = 383905
diff --git a/audio/libamrwb/files/pkg-message.in b/audio/libamrwb/files/pkg-message.in
index eed7dd4140e8..45a9bc2fcec7 100644
--- a/audio/libamrwb/files/pkg-message.in
+++ b/audio/libamrwb/files/pkg-message.in
@@ -1,17 +1,14 @@
 
-AMR codecs incorporate several patents, held by Ericsson,
-Universite de Sherbrooke (VoiceAge) and Nokia.
-VoiceAge claims to provide patent portfolio for AMR codecs. Depending on law in
-your country, manufacturers and developers may need to get a license.
-Because it is a shared library, you may need a special contract for each one
-application, which links against this library, directly or indirectly.
+AMR codecs incorporate several patents, held by Ericsson, Universite de
+Sherbrooke (VoiceAge) and Nokia. VoiceAge claims to provide patent portfolio
+for AMR codecs. Depending on law in your country, manufacturers and developers
+may need to get a license. Because it is a shared library, you may need special
+contract for each one application, which links against this library, directly
+or indirectly.
 
-* 3GPP policy on licensing and 3G Patent Platform:
-    http://www.3gpp.org/faq/faq_2005_2.htm#A3.1
-* Intellectual property in ETSI standards:
-    http://webapp.etsi.org/IPR/home.asp
-* On 3GPP legal issues:
-    http://www.3gpp.org/legal/legal.htm
-* On VoiceAge licensing:
-    http://www.voiceage.com/licensing.php
+Patent portfolio seems to be licensed by Via Licensing.
+
+Depending on law in your country, you may need a license for distribution, any
+use, commercial use or even development.
+You don't have permission to distribute the source code and attached .doc file.
 
diff --git a/audio/libamrwb/pkg-descr b/audio/libamrwb/pkg-descr
index 81778201362a..296c9e1f0650 100644
--- a/audio/libamrwb/pkg-descr
+++ b/audio/libamrwb/pkg-descr
@@ -1,13 +1,11 @@
-3GPP Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec
-(3GPP TS 26.204 V7.0.0)
-http://www.3gpp.org/ftp/Specs/html-info/26204.htm
+3GPP AMR Adaptive Multi-Rate - Wideband (AMR-WB) Speech Codec Shared Library
+
+3GPP released reference implementation of 3GPP AMR Adaptive Multi-Rate -
+Wideband (AMR-WB) Speech Codec (3GPP TS 26.204).
 
-AMR-WB is a speech coding standard developed after the AMR using the same
-technology like ACELP. The codec provides better speech quality due to wider
-speech bandwidth of 50-7000 Hz compared to narrowband speech codecs.
-AMR-WB is codified as G.722.2, an ITU-T standard speech codec.
+http://www.3gpp.org/ftp/Specs/html-info/26204.htm
 
-Note that depending on law in your country, you may need a license for
-distribution, any use, commercial use or even development.
+This package converts 3GPP TS 26.204 reference implementation of AMR-WB to a
+shared library.
 
 WWW: http://www.penguin.cz/~utx/amr