butt 0.1.16

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = butt
 	pkgdesc = butt (broadcast using this tool) is an easy to use, multi OS streaming tool
-	pkgver = 0.1.14
+	pkgver = 0.1.16
 	pkgrel = 1
 	url = http://butt.sourceforge.net/
 	arch = i686
@@ -8,10 +8,13 @@ pkgbase = butt
 	license = GPL2
 	depends = fltk
 	depends = libpng12
+	depends = portaudio
+	depends = libfdk-aac
 	optdepends = icecast
-	optdepends = shoutcast
+	source = http://sourceforge.net/projects/butt/files/butt/butt-0.1.16/butt-0.1.16.tar.gz
-	source = http://sourceforge.net/projects/butt/files/butt/butt-0.1.14/butt-0.1.14.tar.gz
+	source = butt-gcc6.patch
-	sha1sums = f1dfba4f14f5584ef56790734754b4db8fa005a1
+	sha256sums = 50feef4fe051484a2eb897b0175cf5f7b3f94f395c34c84d917b1a41c6fb6897
+	sha256sums = a420be932c97ee949c18428230d8f3a1aabada07c06cd8109757aef68910b5ab
 
 pkgname = butt
 

PKGBUILD

@@ -1,17 +1,26 @@
-# Maintainer: goll <adrian.goll+aur[at]gmail>
+# Maintainer: Josef Miegl <josef@miegl.cz>
+# Contributor: goll <adrian.goll+aur[at]gmail>
 # Contributor: Kosava <kosava@gmail.com>
 
 pkgname=butt
-pkgver=0.1.14
+pkgver=0.1.16
 pkgrel=1
 pkgdesc="butt (broadcast using this tool) is an easy to use, multi OS streaming tool"
 arch=('i686' 'x86_64')
-license=("GPL2")
+license=('GPL2')
 url="http://butt.sourceforge.net/"
-depends=('fltk' 'libpng12')
+depends=('fltk' 'libpng12' 'portaudio' 'libfdk-aac')
-optdepends=('icecast' 'shoutcast')
+optdepends=('icecast')
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
-sha1sums=('f1dfba4f14f5584ef56790734754b4db8fa005a1')
+        "butt-gcc6.patch")
+sha256sums=('50feef4fe051484a2eb897b0175cf5f7b3f94f395c34c84d917b1a41c6fb6897'
+            'a420be932c97ee949c18428230d8f3a1aabada07c06cd8109757aef68910b5ab')
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -Np1 -i "$srcdir/butt-gcc6.patch"
+}
+
 
 build() {
 	cd "$pkgname-$pkgver"

butt-gcc6.patch

@@ -0,0 +1,35 @@
+Index: butt-0.1.15/src/port_audio.cpp
+===================================================================
+--- butt-0.1.15.orig/src/port_audio.cpp
++++ butt-0.1.15/src/port_audio.cpp
+@@ -551,7 +551,7 @@ int snd_callback(const void *input,
+             srconv_stream.input_frames = frameCount;
+             srconv_stream.output_frames = frameCount*cfg.audio.channel * (srconv_stream.src_ratio+1) * sizeof(float);
+ 
+-            src_short_to_float_array((short*)pa_pcm_buf, srconv_stream.data_in, frameCount*cfg.audio.channel);
++            src_short_to_float_array((short*)pa_pcm_buf, (float*)srconv_stream.data_in, frameCount*cfg.audio.channel);
+ 
+             //The actual resample process
+             src_process(srconv_state_stream, &srconv_stream);
+@@ -582,7 +582,7 @@ int snd_callback(const void *input,
+             srconv_record.input_frames = frameCount;
+             srconv_record.output_frames = frameCount*cfg.audio.channel * (srconv_record.src_ratio+1) * sizeof(float);
+ 
+-            src_short_to_float_array((short*)pa_pcm_buf, srconv_record.data_in, frameCount*cfg.audio.channel);
++            src_short_to_float_array((short*)pa_pcm_buf, (float*)srconv_record.data_in, frameCount*cfg.audio.channel);
+ 
+             //The actual resample process
+             src_process(srconv_state_record, &srconv_record);
+@@ -773,10 +773,10 @@ void snd_close(void)
+     Pa_CloseStream(stream);
+     Pa_Terminate();
+ 
+-    free(srconv_stream.data_in);
++    free((void*)srconv_stream.data_in);
+     free(srconv_stream.data_out);
+ 
+-    free(srconv_record.data_in);
++    free((void*)srconv_record.data_in);
+     free(srconv_record.data_out);
+ 
+     free(pa_pcm_buf);