fix building latest git version

Also:
- add provides/conflicts
- add gitignore
- update maintainer/contributor
- create pkgver()
- set CMake options on the commandline (jack)
- fix lib64 install directory

4 files changed, 34 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 157193b1248b..8bed5e4f3615 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = libsoundio-git
 	pkgdesc = A C99 library providing cross-platform audio input and output
-	pkgver = 20150906
+	pkgver = 1.0.2.1.g0a0715e
 	pkgrel = 1
 	url = http://www.github.com/andrewrk/libsoundio
 	arch = x86_64
 	license = MIT
+	provides = libsoundio
+	conflicts = libsoundio
 	options = !buildflags
 	source = git://github.com/andrewrk/libsoundio
-	source = jack1_compat.patch
 	md5sums = SKIP
-	md5sums = e25c3e74405dfd34ed85e9e36fe52922
 
 pkgname = libsoundio-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9fc47427c5e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.tar.*
+libsoundio/
diff --git a/PKGBUILD b/PKGBUILD
index 25a05873aa29..5a910a1582d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,37 @@
-# Maintainer: Carlos Rivas <carlos (a t) twobitcoder (do t) com>
-# Contributor: Joost Bremmer <toost dot b at gmail dot com>
- 
-pkgname=libsoundio-git
-pkgver=20150906
+# Maintainer: Sahan Fernando <sahan.h.fernando@gmail.com>
+# Contributor: Christoph Gysin <christoph.gysin@gmail.com>
+
+_pkgname=libsoundio
+pkgname=${_pkgname}-git
+pkgver=1.0.2.1.g0a0715e
 pkgrel=1
-pkgdesc="A C99 library providing cross-platform audio input and output"
+pkgdesc='A C99 library providing cross-platform audio input and output'
 arch=('x86_64')
-url="http://www.github.com/andrewrk/libsoundio"
+url='http://www.github.com/andrewrk/libsoundio'
 license=('MIT')
-source=("git://github.com/andrewrk/libsoundio"
-    "jack1_compat.patch")
+source=('git://github.com/andrewrk/libsoundio')
 options=('!buildflags')
-md5sums=('SKIP'
-'e25c3e74405dfd34ed85e9e36fe52922')
-
-prepare(){
-  cd ${srcdir}/libsoundio
-
-    #  reverts to a known build of libsoundio, remove if you want the newest
-  git revert 'e2e483a4d523acab5a580b1e58a6ebc218da8f5e' --no-edit
+provides=('libsoundio')
+conflicts=('libsoundio')
+md5sums=('SKIP')
 
-    #  jack1 compatibilty for this library is currently broken, and 
-    #  as a result it won't build at all unless you disable it
-  patch CMakeLists.txt ../jack1_compat.patch
+pkgver() {
+    cd ${_pkgname}
+    git describe --long | sed -e 's/-/./g'
 }
- 
+
 build() {
-  cd ${srcdir}/libsoundio
-  mkdir -p build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH="${pkgdir}/usr/" .. && make 
+    cd ${srcdir}
+    mkdir -p build
+    cd build
+    cmake \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        -DENABLE_JACK=OFF \
+        ${srcdir}/${_pkgname}
+    make
 }
- 
+
 package() {
-  cd ${srcdir}/libsoundio/build
-  make install
+    make -C ${srcdir}/build install DESTDIR=${pkgdir}
 }
diff --git a/jack1_compat.patch b/jack1_compat.patch
deleted file mode 100644
index 139ed631f288..000000000000
--- a/jack1_compat.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-30c30
-< option(ENABLE_JACK "Enable JACK backend" ON)
----
-> option(ENABLE_JACK "Enable JACK backend" OFF)