use upstream Asterisk 16 support

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>

3 files changed, 7 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bcb9c412756..b8fd57ca9ffd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = asterisk-g729
 	pkgdesc = G.729 codec for Asterisk open source PBX
-	pkgver = 1.4.2.r2.3058c45eb60d
+	pkgver = 1.4.2.r3.1710ea938ed0
 	pkgrel = 1
 	epoch = 1
 	url = http://asterisk.hosting.lv/
@@ -8,10 +8,8 @@ pkgbase = asterisk-g729
 	license = IPP
 	depends = asterisk
 	depends = bcg729
-	source = asterisk-g72x-1.4.2.r2.3058c45eb60d.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/3058c45eb60de96e77fec4d168572fd6b9954d7c.tar.bz2
-	source = fixes-16.0.0.diff
-	sha256sums = 81954ec0e4cce2dbe1abb3f3ec74d6ccfb4b087233442a81811029bc64a27987
-	sha256sums = d6a30dfa448b389c0015385a6a7a4f5e3a649a0ceda40f1aafca48bf54a310ee
+	source = asterisk-g72x-1.4.2.r3.1710ea938ed0.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/1710ea938ed0a818747c8d662a3ecef266d170ce.tar.bz2
+	sha256sums = c3546f416451254ff37df255f3a9412c9fab189dc80b000f7c6c30caf5338e0b
 
 pkgname = asterisk-g729
 
diff --git a/PKGBUILD b/PKGBUILD
index d6e9af40eccf..a63504b6d3f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,19 @@
 
 _repouser=arkadi
 _reponame=asterisk-g72x
-_rev=3058c45eb60de96e77fec4d168572fd6b9954d7c
+_rev=1710ea938ed0a818747c8d662a3ecef266d170ce
 _shortrev=${_rev:0:12}
 pkgname=asterisk-g729
 pkgdesc="G.729 codec for Asterisk open source PBX"
 epoch=1
-pkgver=1.4.2.r2.${_shortrev}
+pkgver=1.4.2.r3.${_shortrev}
 pkgrel=1
 arch=(x86_64)
 url="http://asterisk.hosting.lv/"
 license=(IPP)
 depends=(asterisk bcg729)
-source=("${_reponame}-${pkgver}.tar.bz2"::"https://bitbucket.org/${_repouser}/${_reponame}/get/${_rev}.tar.bz2"
-		"fixes-16.0.0.diff")
-sha256sums=('81954ec0e4cce2dbe1abb3f3ec74d6ccfb4b087233442a81811029bc64a27987'
-            'd6a30dfa448b389c0015385a6a7a4f5e3a649a0ceda40f1aafca48bf54a310ee')
-
-prepare() {
-	cd "${_repouser}-${_reponame}-${_shortrev}"
-
-	patch -Np1 <../fixes-16.0.0.diff
-}
+source=("${_reponame}-${pkgver}.tar.bz2"::"https://bitbucket.org/${_repouser}/${_reponame}/get/${_rev}.tar.bz2")
+sha256sums=('c3546f416451254ff37df255f3a9412c9fab189dc80b000f7c6c30caf5338e0b')
 
 build() {
 	cd "${_repouser}-${_reponame}-${_shortrev}"
diff --git a/fixes-16.0.0.diff b/fixes-16.0.0.diff
deleted file mode 100644
index d3aa0a9cea00..000000000000
--- a/fixes-16.0.0.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/codec_g72x.c b/codec_g72x.c
-index 959436e..0a8ea45 100644
---- a/codec_g72x.c
-+++ b/codec_g72x.c
-@@ -469,8 +469,12 @@ static void g72x_destroy(struct ast_trans_pvt *pvt)
- #if !G72X_BCG729
-     ippsFree(state->coder);
-     ippsFree(state->scratch_mem);
-+#else
-+#if G72X_ASTERISK >= 160
-+    ast_std_free(state->coder);
- #else
-     free(state->coder);
-+#endif
- #endif
-     /* output the sizes of frames passed to decoder */
-     if (option_verbose > 2 && frame_sizes != NULL) {
-diff --git a/configure.ac b/configure.ac
-index d72b052..43b82f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,7 +41,7 @@ if test "${prefix}" != "/usr"; then
- fi
- #echo new prefix: "${prefix}"
- 
--ASTERISK_VERSION="150";
-+ASTERISK_VERSION="160";
- 
- AC_ARG_WITH(asterisk-includes,
-     AS_HELP_STRING([--with-asterisk-includes=PATH], [Path to Asterisk includes (defaults to PREFIX/include, so try --prefix first)]),
-@@ -65,8 +65,11 @@ AC_ARG_WITH(asterisk140,
-     AS_HELP_STRING([--with-asterisk140], [Build for Asterisk 14]),
-     [ASTERISK_VERSION="140"])
- AC_ARG_WITH(asterisk150,
--    AS_HELP_STRING([--with-asterisk150], [Build for Asterisk 15 (the default)]),
-+    AS_HELP_STRING([--with-asterisk150], [Build for Asterisk 15]),
-     [ASTERISK_VERSION="150"])
-+AC_ARG_WITH(asterisk160,
-+    AS_HELP_STRING([--with-asterisk160], [Build for Asterisk 16 (the default)]),
-+    [ASTERISK_VERSION="160"])
- 
- AC_ARG_WITH(ipp,
-     AS_HELP_STRING([--with-ipp=PATH], [Path to Intel IPP (/path/to/ipp)]),
-diff --git a/unsupported/g72x-build.sh b/unsupported/g72x-build.sh
-index e233933..1e16fec 100755
---- a/unsupported/g72x-build.sh
-+++ b/unsupported/g72x-build.sh
-@@ -180,7 +180,7 @@ mkdir -p bin/
- 
- a=ast150
- ast=/opt/asterisk
--def2=-DG72X_ASTERISK=150
-+def2=-DG72X_ASTERISK=160
- codec=g729 dir=$srcdir all &
- codec=g723 dir=$srcdir all &
-