lib32-lash 0.6.0~rc2-3: Various fixes and improvements

- Update dbus dependency
- Install pkg-config file
- Enable python bindings

2 files changed, 31 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3ca2c2f8bc0..899d3d77c4af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 # Generated by mksrcinfo v8
-# Sun Nov  6 02:59:30 UTC 2016
+# Sun Nov  6 03:00:54 UTC 2016
 pkgbase = lib32-lash
-	pkgdesc = A session management system for JACK and ALSA. Multilib.
+	pkgdesc = A session management system for JACK and ALSA (32-bit)
 	pkgver = 0.6.0~rc2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://lash.nongnu.org
 	arch = x86_64
 	license = GPL
 	makedepends = gcc-multilib
 	makedepends = libtool-multilib
+	makedepends = lib32-python2
 	depends = lash
-	depends = lib32-dbus-core
+	depends = lib32-dbus
+	depends = jack
 	depends = lib32-util-linux
-	depends = lib32-jack
-	depends = jackdbus
-	options = !libtool
+	optdepends = lib32-python2: Python bindings
 	source = http://download.savannah.gnu.org/releases/lash/lash-0.6.0~rc2.tar.bz2
 	md5sums = af1dc4f4ceb284b1b0845de4f4c2fe47
 
diff --git a/PKGBUILD b/PKGBUILD
index 8fd0a6f6f8fc..56a3d3c95b6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,43 @@
-# Maintainer : speps <speps at aur dot archlinux dot org>
+# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
+# Contributor: speps <speps at aur dot archlinux dot org>
 # Contributor: Marco Süß <m_a_r_c_o.suess at gmx.de>
 
-_name=lash
-pkgname=lib32-$_name
+_pkgname=lash
+pkgname=lib32-$_pkgname
 pkgver=0.6.0~rc2
 _relver=0.6.0.594
-pkgrel=2
-pkgdesc="A session management system for JACK and ALSA. Multilib."
+pkgrel=3
+pkgdesc="A session management system for JACK and ALSA (32-bit)"
 arch=('x86_64')
-options=('!libtool')
 url="http://lash.nongnu.org"
 license=('GPL')
-depends=('lash' 'lib32-dbus-core' 'lib32-util-linux' 'lib32-jack' 'jackdbus')
-makedepends=('gcc-multilib' 'libtool-multilib')
-source=("http://download.savannah.gnu.org/releases/lash/$_name-$pkgver.tar.bz2")
+depends=('lash' 'lib32-dbus' 'jack' 'lib32-util-linux')
+makedepends=('gcc-multilib' 'libtool-multilib' 'lib32-python2')
+optdepends=('lib32-python2: Python bindings')
+source=("http://download.savannah.gnu.org/releases/lash/${_pkgname}-${pkgver}.tar.bz2")
 md5sums=('af1dc4f4ceb284b1b0845de4f4c2fe47')
 
 build() {
-  cd "$srcdir/$_name-$_relver"
+  cd "${srcdir}/${_pkgname}-${_relver}"
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
+  # We can't put the python includes in *FLAGS since that way they would be
+  # overwritten with the 64-bit ones by the build system of lash
+  export CC='gcc -m32 -I/usr/lib32/python2.7/include/python2.7'
+  export CXX='g++ -m32 -I/usr/lib32/python2.7/include/python2.7'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+  export PYTHON='/usr/bin/python2-32'
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib32 \
-              --enable-static=no \
-              --without-python
-  cd liblash && make
+              --enable-static=no
+  make -C liblash
+  make -C pylash
 }
 
 package() {
-  cd "$srcdir/$_name-$_relver/liblash"
-  make DESTDIR="$pkgdir/" install
+  cd "${srcdir}/${_pkgname}-${_relver}"
+
+  make install-pkgconfigDATA DESTDIR="${pkgdir}"
+  make -C liblash install DESTDIR="${pkgdir}"
+  make -C pylash install DESTDIR="${pkgdir}"
 }