butt 0.1.17

This commit is contained in:
Josef Miegl 2018-12-27 20:53:13 +01:00
parent c0b92bfb50
commit 09e2fb2db4
3 changed files with 10 additions and 54 deletions

View File

@ -1,10 +1,11 @@
pkgbase = butt
pkgdesc = butt (broadcast using this tool) is an easy to use, multi OS streaming tool
pkgver = 0.1.16
pkgrel = 3
pkgver = 0.1.17
pkgrel = 1
url = http://butt.sourceforge.net/
arch = i686
arch = x86_64
arch = armv7h
license = GPL2
depends = fltk
depends = libpng12
@ -17,10 +18,8 @@ pkgbase = butt
depends = opus
depends = libsamplerate
optdepends = icecast
source = http://sourceforge.net/projects/butt/files/butt/butt-0.1.16/butt-0.1.16.tar.gz
source = butt-gcc6.patch
sha256sums = 50feef4fe051484a2eb897b0175cf5f7b3f94f395c34c84d917b1a41c6fb6897
sha256sums = a420be932c97ee949c18428230d8f3a1aabada07c06cd8109757aef68910b5ab
source = http://sourceforge.net/projects/butt/files/butt/butt-0.1.17/butt-0.1.17.tar.gz
sha256sums = SKIP
pkgname = butt

View File

@ -3,24 +3,16 @@
# Contributor: Kosava <kosava@gmail.com>
pkgname=butt
pkgver=0.1.16
pkgrel=3
pkgver=0.1.17
pkgrel=1
pkgdesc="butt (broadcast using this tool) is an easy to use, multi OS streaming tool"
arch=('i686' 'x86_64')
arch=('i686' 'x86_64' 'armv7h')
license=('GPL2')
url="http://butt.sourceforge.net/"
depends=('fltk' 'libpng12' 'portaudio' 'libfdk-aac' 'libvorbis' 'libogg' 'lame' 'flac' 'opus' 'libsamplerate')
optdepends=('icecast')
source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
"butt-gcc6.patch")
sha256sums=('50feef4fe051484a2eb897b0175cf5f7b3f94f395c34c84d917b1a41c6fb6897'
'a420be932c97ee949c18428230d8f3a1aabada07c06cd8109757aef68910b5ab')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i "$srcdir/butt-gcc6.patch"
}
source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
sha256sums=('SKIP')
build() {
cd "$pkgname-$pkgver"

View File

@ -1,35 +0,0 @@
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);