Include a fix for the build (thanks c4t0!) and update the gitignore to be compression-format agnostic

4 files changed, 23 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51c7bdd87c9c..e89832abd574 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Mar  2 04:11:15 UTC 2016
 pkgbase = sbagen
 	pkgdesc = A binural brainwave generator
 	pkgver = 1.4.5
-	pkgrel = 6
+	pkgrel = 7
 	url = http://uazu.net/sbagen
 	install = sbagen.install
 	arch = i686
@@ -24,6 +22,7 @@ pkgbase = sbagen
 	source = anarange.1
 	source = downsample.1
 	source = rhybag.1
+	source = build-fix.patch
 	sha512sums = 35a8cdf0ca59cef01200a102c6f718b163006eec6c3450e7ee32bac0454be2db4d9a4df2f1a52d6cc2beda1d45bf9a7816a2c9dfae710eef14dbe5667cec9bf9
 	sha512sums = f61c9308c671dc9cef9b9e60ba37cc5a9dc6ac45b5ab34d0818e08f6006eeba0ede4756e0c5375b11963e04f4e1e801119af8df8726c867e3be399983b12bc30
 	sha512sums = 19a432b3d465881a113b0aad3f774062952b3f0229ae77e668b0c43d47c94d595cae1b7178c7a30fbc7d7f05da1cc9c0255ad0de7daba8023da2fd7fc6057e2b
@@ -31,6 +30,7 @@ pkgbase = sbagen
 	sha512sums = a14924d7b001f2e558b97d32a844dd18b54eb7ae7a1111a25dae1b3c53129cedeb546043301ee15ac33fed03ad4dc5330e534c3ab27d3f1f6a166499319cbaa7
 	sha512sums = a84e774f1a4c1f57716f3097228baebb8caf5424bd1316ce1d8f596cac44e9a16c1a56814405b48b87557108db1d4cf4fee56875b82d7390ec3c41d4e2a280a8
 	sha512sums = db30da37feb3c970f1dcc5271aa9350b3694c48fdb5585db2e6f3f178f9cd26af1fd48d238786ccac19d2f65ebcccff9622b358b2a16396696e94448e66648f5
+	sha512sums = f16fe080432c0ea1ba6e43a0f0fa78121706ad86fc8503509d7289f62459618abc0243e398eab157808c092a5c2e2dc8b1826fc3a22340cdb5896684ed6bacaa
 	depends_x86_64 = lib32-glibc
 	makedepends_x86_64 = gcc-multilib
 
diff --git a/.gitignore b/.gitignore
index bf4ebc4a5eef..12bf818acc9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.tgz
-*.pkg.tar.xz
+*.pkg.tar*
 pkg
 src
diff --git a/PKGBUILD b/PKGBUILD
index 1516c247690e..fbb39b7eed67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Kevin MacMartin <prurigro at gmail dot com>
+# Contributor: c4t0
 
 pkgname=sbagen
 pkgver=1.4.5
 _river_ver=1.4.1
 _rhybag_ver=0.1.1
 _binauralanalysis_ver=20040521
-pkgrel=6
+pkgrel=7
 pkgdesc='A binural brainwave generator'
 url='http://uazu.net/sbagen'
 license=('GPL')
@@ -25,7 +26,9 @@ source=(
   "anarange.1"
   "downsample.1"
   "rhybag.1"
+  'build-fix.patch'
 )
+
 sha512sums=(
   '35a8cdf0ca59cef01200a102c6f718b163006eec6c3450e7ee32bac0454be2db4d9a4df2f1a52d6cc2beda1d45bf9a7816a2c9dfae710eef14dbe5667cec9bf9'
   'f61c9308c671dc9cef9b9e60ba37cc5a9dc6ac45b5ab34d0818e08f6006eeba0ede4756e0c5375b11963e04f4e1e801119af8df8726c867e3be399983b12bc30'
@@ -34,10 +37,12 @@ sha512sums=(
   'a14924d7b001f2e558b97d32a844dd18b54eb7ae7a1111a25dae1b3c53129cedeb546043301ee15ac33fed03ad4dc5330e534c3ab27d3f1f6a166499319cbaa7'
   'a84e774f1a4c1f57716f3097228baebb8caf5424bd1316ce1d8f596cac44e9a16c1a56814405b48b87557108db1d4cf4fee56875b82d7390ec3c41d4e2a280a8'
   'db30da37feb3c970f1dcc5271aa9350b3694c48fdb5585db2e6f3f178f9cd26af1fd48d238786ccac19d2f65ebcccff9622b358b2a16396696e94448e66648f5'
+  'f16fe080432c0ea1ba6e43a0f0fa78121706ad86fc8503509d7289f62459618abc0243e398eab157808c092a5c2e2dc8b1826fc3a22340cdb5896684ed6bacaa'
 )
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -p1 < ../build-fix.patch
 
   while read -r file; do
       sed -i -re 's|(river[12]\.ogg)|/usr/share/sbagen/media/\1|g' "$file"
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 000000000000..c72542532347
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/sbagen.c b/sbagen.c
+index f2aeaf2..c26d261 100644
+--- a/sbagen.c
++++ b/sbagen.c
+@@ -181,7 +181,7 @@ void debug(char *fmt, ...) ;
+ void warn(char *fmt, ...) ;
+ void * Alloc(size_t len) ;
+ char * StrDup(char *str) ;
+-inline int calcNow() ;
++inline static int calcNow() ;
+ void loop() ;
+ void outChunk() ;
+ void corrVal(int ) ;