summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Miegl2018-12-27 20:53:13 +0100
committerJosef Miegl2018-12-27 20:53:13 +0100
commit09e2fb2db42dc888a30f98be0476b91247ec9cf4 (patch)
treeccbbf33fabc53da04fb6732959958833e85e3a08
parentc0b92bfb5055cbee9191ff3252aee84c2dea72e4 (diff)
downloadaur-09e2fb2db42dc888a30f98be0476b91247ec9cf4.tar.gz
butt 0.1.17
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD18
-rw-r--r--butt-gcc6.patch35
3 files changed, 10 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ebe9d71956..6fd011aca8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 106e3b845b0..b7ec2f05bbf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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"
diff --git a/butt-gcc6.patch b/butt-gcc6.patch
deleted file mode 100644
index 9080d2d1865..00000000000
--- a/butt-gcc6.patch
+++ /dev/null
@@ -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);