update to v1.4.2

3 files changed, 8 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc734e74f740..27836c993778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Oct  8 11:23:15 UTC 2017
+# Tue Oct 10 20:02:58 UTC 2017
 pkgbase = asterisk-g729
 	pkgdesc = G.729 codec for Asterisk open source PBX
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 1
 	url = http://asterisk.hosting.lv/
 	arch = i686
@@ -10,10 +10,8 @@ pkgbase = asterisk-g729
 	license = IPP
 	depends = asterisk
 	depends = bcg729
-	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
+	source = asterisk-g72x-1.4.2-3058c45eb60d.tar.bz2::https://bitbucket.org/arkadi/asterisk-g72x/get/3058c45eb60d.tar.bz2
+	sha256sums = 81954ec0e4cce2dbe1abb3f3ec74d6ccfb4b087233442a81811029bc64a27987
 
 pkgname = asterisk-g729
 
diff --git a/PKGBUILD b/PKGBUILD
index 083bf2437e60..9ee7062bf5d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,17 @@
 # Initial PKGBUILD by: Maik Broemme <mbroemme@libmpq.org>
 _origname="asterisk-g72x"
 _dev="arkadi"
-_rev="1a01e996d43b"
+_rev="3058c45eb60d"
 pkgname="asterisk-g729"
 pkgdesc="G.729 codec for Asterisk open source PBX"
-pkgver=1.4.1
+pkgver=1.4.2
 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"
-	"asterisk-15.diff")
-sha256sums=('b00a26d0acbdbb9aac3f09a3a09f4310e55cb834cf2d271ffc7b4a0f636fd1e8'
-            'cc18d4dabf762af0d64f459bcb6d4bdf19ff4a3022efa9e1620ba51b64895c48')
-
-prepare() {
-	cd "${srcdir}/${_dev}-${_origname}-${_rev}"
-
-	patch -p1 <../asterisk-15.diff
-}
+source=("${_origname}-${pkgver}-${_rev}.tar.bz2"::"https://bitbucket.org/${_dev}/${_origname}/get/${_rev}.tar.bz2")
+sha256sums=('81954ec0e4cce2dbe1abb3f3ec74d6ccfb4b087233442a81811029bc64a27987')
 
 build() {
 	cd "${srcdir}/${_dev}-${_origname}-${_rev}"
diff --git a/asterisk-15.diff b/asterisk-15.diff
deleted file mode 100644
index 39eb84ee1df2..000000000000
--- a/asterisk-15.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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\""])