introduce Asterisk 15 support

3 files changed, 44 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5b979657fdb..cc734e74f740 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Apr  5 17:37:06 UTC 2017
+# Sun Oct  8 11:23:15 UTC 2017
 pkgbase = asterisk-g729
 	pkgdesc = G.729 codec for Asterisk open source PBX
-	pkgver = 1.4
+	pkgver = 1.4.1
 	pkgrel = 1
 	url = http://asterisk.hosting.lv/
 	arch = i686
@@ -10,8 +10,10 @@ pkgbase = asterisk-g729
 	license = IPP
 	depends = asterisk
 	depends = bcg729
-	source = asterisk-g72x-1.4-ea18845ad977.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/ea18845ad977.tar.bz2
-	sha256sums = ebd2b5c8ecf2feb0f7d0c1556543e418e83154b5dfa7f9f377c2a1f4cd600d68
+	source = asterisk-g72x-1.4.1-1a01e996d43b.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/1a01e996d43b.tar.bz2
+	source = asterisk-15.diff
+	sha256sums = b00a26d0acbdbb9aac3f09a3a09f4310e55cb834cf2d271ffc7b4a0f636fd1e8
+	sha256sums = cc18d4dabf762af0d64f459bcb6d4bdf19ff4a3022efa9e1620ba51b64895c48
 
 pkgname = asterisk-g729
 
diff --git a/PKGBUILD b/PKGBUILD
index a0e9f82694d8..083bf2437e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,31 @@
 # Initial PKGBUILD by: Maik Broemme <mbroemme@libmpq.org>
 _origname="asterisk-g72x"
 _dev="arkadi"
-_rev="ea18845ad977"
+_rev="1a01e996d43b"
 pkgname="asterisk-g729"
 pkgdesc="G.729 codec for Asterisk open source PBX"
-pkgver=1.4
+pkgver=1.4.1
 pkgrel=1
 arch=("i686" "x86_64")
 url="http://asterisk.hosting.lv/"
 license=("IPP")
 depends=("asterisk" "bcg729")
-source=("${_origname}-${pkgver}-${_rev}.tar.bz2"::"https://bitbucket.org/${_dev}/${_origname}/get/${_rev}.tar.bz2")
-sha256sums=('ebd2b5c8ecf2feb0f7d0c1556543e418e83154b5dfa7f9f377c2a1f4cd600d68')
+source=("${_origname}-${pkgver}-${_rev}.tar.bz2"::"https://bitbucket.org/${_dev}/${_origname}/get/${_rev}.tar.bz2"
+	"asterisk-15.diff")
+sha256sums=('b00a26d0acbdbb9aac3f09a3a09f4310e55cb834cf2d271ffc7b4a0f636fd1e8'
+            'cc18d4dabf762af0d64f459bcb6d4bdf19ff4a3022efa9e1620ba51b64895c48')
+
+prepare() {
+	cd "${srcdir}/${_dev}-${_origname}-${_rev}"
+
+	patch -p1 <../asterisk-15.diff
+}
 
 build() {
 	cd "${srcdir}/${_dev}-${_origname}-${_rev}"
 
 	./autogen.sh
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-bcg729 --with-asterisk140
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin --with-bcg729 --with-asterisk150
 
 	make -j$(nproc)
 }
diff --git a/asterisk-15.diff b/asterisk-15.diff
new file mode 100644
index 000000000000..39eb84ee1df2
--- /dev/null
+++ b/asterisk-15.diff
@@ -0,0 +1,25 @@
+diff -r 1a01e996d43b codec_g72x.c
+--- a/codec_g72x.c	Fri Jun 30 18:15:40 2017 +0300
++++ b/codec_g72x.c	Sun Oct 08 12:53:23 2017 +0200
+@@ -26,7 +26,7 @@
+     #include <asterisk/lock.h>
+     #include <asterisk/translate.h>
+     #include <asterisk/module.h>
+-    #if G72X_ASTERISK >= 110
++    #if G72X_ASTERISK >= 110 && G72X_ASTERISK < 150
+         ASTERISK_REGISTER_FILE()
+     #endif
+     #include <asterisk/logger.h>
+diff -r 1a01e996d43b configure.ac
+--- a/configure.ac	Fri Jun 30 18:15:40 2017 +0300
++++ b/configure.ac	Sun Oct 08 12:53:23 2017 +0200
+@@ -67,6 +67,9 @@
+ AC_ARG_WITH(asterisk140,
+     AS_HELP_STRING([--with-asterisk140], [Build for Asterisk 14 (the default)]),
+     [ASTERISK_VERSION="140"])
++AC_ARG_WITH(asterisk150,
++    AS_HELP_STRING([--with-asterisk150], [Build for Asterisk 15]),
++    [ASTERISK_VERSION="150"])
+ #AC_ARG_WITH(callweaver,
+ #    AS_HELP_STRING([--with-callweaver=PATH], [Build for CallWeaver (not supported yet)]),
+ #    [CALLWEAVER_CFLAGS="-DG72X_CALLWEAVER -I\"$withval\""])