introduce Asterisk 16 support

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

3 files changed, 74 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96719dccf41d..0bcb9c412756 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = asterisk-g729
 	pkgdesc = G.729 codec for Asterisk open source PBX
-	pkgver = 1.4.2.r1.3058c45eb60d
-	pkgrel = 2
+	pkgver = 1.4.2.r2.3058c45eb60d
+	pkgrel = 1
 	epoch = 1
 	url = http://asterisk.hosting.lv/
 	arch = x86_64
 	license = IPP
 	depends = asterisk
 	depends = bcg729
-	source = asterisk-g72x-1.4.2.r1.3058c45eb60d.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/3058c45eb60de96e77fec4d168572fd6b9954d7c.tar.bz2
+	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
 
 pkgname = asterisk-g729
 
diff --git a/PKGBUILD b/PKGBUILD
index bc0df687a35f..d6e9af40eccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,22 @@ _shortrev=${_rev:0:12}
 pkgname=asterisk-g729
 pkgdesc="G.729 codec for Asterisk open source PBX"
 epoch=1
-pkgver=1.4.2.r1.${_shortrev}
-pkgrel=2
+pkgver=1.4.2.r2.${_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")
-sha256sums=('81954ec0e4cce2dbe1abb3f3ec74d6ccfb4b087233442a81811029bc64a27987')
+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
+}
 
 build() {
 	cd "${_repouser}-${_reponame}-${_shortrev}"
@@ -23,7 +31,7 @@ build() {
 	./autogen.sh
 	./configure \
 		--prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
-		--with-bcg729 --with-asterisk150
+		--with-bcg729 --with-asterisk160
 
 	make -j$(nproc)
 }
diff --git a/fixes-16.0.0.diff b/fixes-16.0.0.diff
new file mode 100644
index 000000000000..d3aa0a9cea00
--- /dev/null
+++ b/fixes-16.0.0.diff
@@ -0,0 +1,56 @@
+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 &
+