Update to baresip-0.4.20

4 files changed, 101 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4819111de3b..aec19e569204 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,36 @@
 pkgbase = baresip
 	pkgdesc = portable and modular SIP User-Agent with audio and video support
-	pkgver = 0.4.15
+	pkgver = 0.4.20
 	pkgrel = 1
 	url = http://creytiv.com/baresip.html
 	arch = i686
 	arch = x86_64
 	license = BSD
-	makedepends = alsa-lib ffmpeg cairo spandsp gsm gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gtk2 libsrtp opus spandsp mpg123 sdl sdl2 libsndfile speex speexdsp v4l-utils libvpx libx11 libx11
+	makedepends = alsa-lib
+	makedepends = cairo
+	makedepends = ffmpeg
+	makedepends = gsm
+	makedepends = gst-plugins-bad
+	makedepends = gst-plugins-base
+	makedepends = gst-plugins-good
+	makedepends = gst-plugins-ugly
+	makedepends = gtk2
+	makedepends = libsrtp
+	makedepends = libsndfile
+	makedepends = libvpx
+	makedepends = libx11
+	makedepends = mpg123
+	makedepends = opus
+	makedepends = sdl
+	makedepends = sdl2
+	makedepends = spandsp
+	makedepends = speex
+	makedepends = speexdsp
+	makedepends = v4l-utils
 	depends = rem
 	optdepends = alsa-lib: (alsa module)
-	optdepends = ffmpeg: (avcodec, avformat, h265 modules)
 	optdepends = cairo: (cairo, rst modules)
-	optdepends = spandsp: (g722, g726 modules)
+	optdepends = ffmpeg: (avcodec, avformat, h265 modules)
 	optdepends = gsm: (gsm module)
 	optdepends = gst-plugins-bad: (gst1, gst_video1 modules)
 	optdepends = gst-plugins-base: (gst1, gst_video1 modules)
@@ -19,20 +38,23 @@ pkgbase = baresip
 	optdepends = gst-plugins-ugly: (gst1, gst_video1 modules)
 	optdepends = gtk2: (gtk module)
 	optdepends = libsrtp: (libsrtp module)
-	optdepends = opus: (opus module)
-	optdepends = spandsp: (plc module)
+	optdepends = libsndfile: (sndfile module)
+	optdepends = libvpx: (vpx module)
+	optdepends = libx11: (x11, x11grab modules)
 	optdepends = mpg123: (rst module)
+	optdepends = opus: (opus module)
 	optdepends = sdl: (sdl module)
 	optdepends = sdl2: (sdl2 module)
-	optdepends = libsndfile: (sndfile module)
+	optdepends = spandsp: (g722, g726,plc modules)
 	optdepends = speex: (speex module)
 	optdepends = speexdsp: (speex_aec, speex_pp modules)
 	optdepends = v4l-utils: (v4l2 module)
-	optdepends = libvpx: (vpx module)
-	optdepends = libx11: (x11 module)
-	optdepends = libx11: (x11grab module)
-	source = http://creytiv.com/pub/baresip-0.4.15.tar.gz
-	md5sums = e304d698bb593f296793acac752685a7
+	source = http://creytiv.com/pub/baresip-0.4.20.tar.gz
+	source = patch-alsa.diff
+	source = patch-v4l2.diff
+	md5sums = b18f6560a7c4bc32ad56de1088989abf
+	md5sums = d6be41540262d1525548901d8374d972
+	md5sums = 218c383c58167f353ae228673291d0f2
 
 pkgname = baresip
 
diff --git a/PKGBUILD b/PKGBUILD
index 46d87186349b..4d9f4f2208dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dmitrij D. Czarkoff <czarkoff@gmail.com>
 pkgname=baresip
-pkgver=0.4.15
+pkgver=0.4.20
 pkgrel=1
 pkgdesc="portable and modular SIP User-Agent with audio and video support"
 arch=('i686' 'x86_64')
@@ -8,9 +8,8 @@ url="http://creytiv.com/baresip.html"
 license=('BSD')
 depends=('rem')
 optdepends=('alsa-lib: (alsa module)'
-            'ffmpeg: (avcodec, avformat, h265 modules)'
             'cairo: (cairo, rst modules)'
-            'spandsp: (g722, g726 modules)'
+            'ffmpeg: (avcodec, avformat, h265 modules)'
             'gsm: (gsm module)'
             'gst-plugins-bad: (gst1, gst_video1 modules)'
             'gst-plugins-base: (gst1, gst_video1 modules)'
@@ -18,30 +17,38 @@ optdepends=('alsa-lib: (alsa module)'
             'gst-plugins-ugly: (gst1, gst_video1 modules)'
             'gtk2: (gtk module)'
             'libsrtp: (libsrtp module)'
-            'opus: (opus module)'
-            'spandsp: (plc module)'
+            'libsndfile: (sndfile module)'
+            'libvpx: (vpx module)'
+            'libx11: (x11, x11grab modules)'
             'mpg123: (rst module)'
+            'opus: (opus module)'
             'sdl: (sdl module)'
             'sdl2: (sdl2 module)'
-            'libsndfile: (sndfile module)'
+            'spandsp: (g722, g726,plc modules)'
             'speex: (speex module)'
             'speexdsp: (speex_aec, speex_pp modules)'
-            'v4l-utils: (v4l2 module)'
-            'libvpx: (vpx module)'
-            'libx11: (x11 module)'
-            'libx11: (x11grab module)')
-makedepends=${optdepends[@]/%:*/}
-#changelog=ChangeLog
-source=("http://creytiv.com/pub/$pkgname-$pkgver.tar.gz")
-md5sums=('e304d698bb593f296793acac752685a7')
+            'v4l-utils: (v4l2 module)')
+makedepends=(${optdepends[@]/%:*/})
+source=("http://creytiv.com/pub/$pkgname-$pkgver.tar.gz"
+	"patch-alsa.diff"
+	"patch-v4l2.diff")
+md5sums=('b18f6560a7c4bc32ad56de1088989abf'
+         'd6be41540262d1525548901d8374d972'
+         '218c383c58167f353ae228673291d0f2')
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -p1 < ${srcdir}/patch-alsa.diff
+	patch -p1 < ${srcdir}/patch-v4l2.diff
+}
 
 build() {
 	cd "$pkgname-$pkgver"
-	make EXTRA_MODULES="h265" USE_GST= USE_GST_VIDEO= PREFIX="/usr"
+	make V=1 USE_GST= USE_GST_VIDEO= PREFIX="/usr"
 }
 
 package() {
 	cd "$pkgname-$pkgver"
-	make EXTRA_MODULES="h265" USE_GST= USE_GST_VIDEO= PREFIX="/usr" \
+	make USE_GST= USE_GST_VIDEO= PREFIX="/usr" \
 		DESTDIR="$pkgdir/" install
 }
diff --git a/patch-alsa.diff b/patch-alsa.diff
new file mode 100644
index 000000000000..92a6abc6356f
--- /dev/null
+++ b/patch-alsa.diff
@@ -0,0 +1,33 @@
+diff -aur baresip-0.4.20.orig/modules/alsa/alsa.c baresip-0.4.20/modules/alsa/alsa.c
+--- baresip-0.4.20.orig/modules/alsa/alsa.c	2016-12-03 12:40:57.032560190 +0100
++++ baresip-0.4.20/modules/alsa/alsa.c	2016-12-03 12:41:12.644877089 +0100
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2010 Creytiv.com
+  */
++#define _DEFAULT_SOURCE 1
+ #define _POSIX_SOURCE 1
+ #include <sys/types.h>
+ #include <sys/time.h>
+diff -aur baresip-0.4.20.orig/modules/alsa/alsa_play.c baresip-0.4.20/modules/alsa/alsa_play.c
+--- baresip-0.4.20.orig/modules/alsa/alsa_play.c	2016-12-03 12:40:57.032560190 +0100
++++ baresip-0.4.20/modules/alsa/alsa_play.c	2016-12-03 12:41:12.644877089 +0100
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2010 Creytiv.com
+  */
++#define _DEFAULT_SOURCE 1
+ #define _POSIX_SOURCE 1
+ #include <sys/types.h>
+ #include <sys/time.h>
+diff -aur baresip-0.4.20.orig/modules/alsa/alsa_src.c baresip-0.4.20/modules/alsa/alsa_src.c
+--- baresip-0.4.20.orig/modules/alsa/alsa_src.c	2016-12-03 12:40:57.032560190 +0100
++++ baresip-0.4.20/modules/alsa/alsa_src.c	2016-12-03 12:41:12.644877089 +0100
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2010 Creytiv.com
+  */
++#define _DEFAULT_SOURCE 1
+ #define _POSIX_SOURCE 1
+ #include <sys/types.h>
+ #include <sys/time.h>
diff --git a/patch-v4l2.diff b/patch-v4l2.diff
new file mode 100644
index 000000000000..a7c2478b25b6
--- /dev/null
+++ b/patch-v4l2.diff
@@ -0,0 +1,11 @@
+diff -aur baresip-0.4.20.orig/modules/v4l2_codec/v4l2_codec.c baresip-0.4.20/modules/v4l2_codec/v4l2_codec.c
+--- baresip-0.4.20.orig/modules/v4l2_codec/v4l2_codec.c	2016-12-03 12:43:50.201286104 +0100
++++ baresip-0.4.20/modules/v4l2_codec/v4l2_codec.c	2016-12-03 12:44:30.328673626 +0100
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2010 - 2015 Creytiv.com
+  */
++#define _DEFAULT_SOURCE 1
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>