4 files changed, 46 insertions, 33 deletions
diff --git a/libraries/zita-alsa-pcmi/README b/libraries/zita-alsa-pcmi/README
index 4692d95962..d54655e556 100644
--- a/libraries/zita-alsa-pcmi/README
+++ b/libraries/zita-alsa-pcmi/README
@@ -1 +1,12 @@
-Aeolus is a high quality pipe organ emulator using additive synthesis.
+Libzita-alsa-pcmi is a C++ library for using ALSA audio devices with
+minimal latency and using ALSA's memory-mapped mode (as used by Jack).
+It hides most of the complexity of configuring and using ALSA devices
+in this way.
+
+Input and output audio streams are converted to / from 32-bit float-
+ing point format, regardless of the hardware sample format. By cal-
+ling the read and write functions from a real-time thread, it is ea-
+sy to provide a callback interface, and to write applications that
+work with both ALSA and Jack using the same processing code.
+
+See jaaa or japa for examples.
diff --git a/libraries/zita-alsa-pcmi/slack-desc b/libraries/zita-alsa-pcmi/slack-desc
index 8fa370b779..15cb3c3ea8 100644
--- a/libraries/zita-alsa-pcmi/slack-desc
+++ b/libraries/zita-alsa-pcmi/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-zita-alsa-pcmi: zita-alsa-pcmi (Alsa library for Aeolus)
+zita-alsa-pcmi: zita-alsa-pcmi (C++ library for using ALSA audio devices)
 zita-alsa-pcmi:
-zita-alsa-pcmi: Aeolus is a high quality pipe organ emulator using additive synthesis
+zita-alsa-pcmi: a C++ library for using ALSA audio devices with minimal latency and
+zita-alsa-pcmi: using ALSA's memory-mapped mode (as used by Jack). It hides most of
+zita-alsa-pcmi: the complexity of configuring and using ALSA devices in this way.
 zita-alsa-pcmi:
 zita-alsa-pcmi:
 zita-alsa-pcmi: Project URL: http://kokkinizita.linuxaudio.org/linuxaudio/index.html
 zita-alsa-pcmi:
 zita-alsa-pcmi:
 zita-alsa-pcmi:
-zita-alsa-pcmi:
-zita-alsa-pcmi:
diff --git a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
index 4762c53fcc..af616c67ff 100644
--- a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
+++ b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.SlackBuild
@@ -1,12 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for <zita-alsa-pcmi>
 # Written by Michales Michaloudes korgie@gmail.com <2014>
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zita-alsa-pcmi
-VERSION=${VERSION:-0.2.0}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -16,7 +18,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -41,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -50,37 +59,30 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# compile libraries (mandatory).
-# fix prefix, delete ldconfig
-sed -i -e 's+/usr/local+/usr+' -e '/ldconfig/d' $TMP/$PRGNAM-$VERSION/libs/Makefile
-cd $TMP/$PRGNAM-$VERSION/libs
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make
-make install DESTDIR=$PKG
+# Thanks to ARCH Linux
+sed -e '/native/d' \
+      -e 's/ldconfig/& -N $(DESTDIR)\/$(LIBDIR)/' \
+      -i source/Makefile
+sed -e 's|\ $(BINDIR)|\ $(DESTDIR)$(BINDIR)|' apps/Makefile
 
-# compile optional demo programs (you have to compile...
-# .. twice for the library to recognized :/ )
-### sed -i -e 's+/usr/local+/usr+' $TMP/$PRGNAM-$VERSION/apps/Makefile
-### cd $TMP/$PRGNAM-$VERSION/apps
-
-### CFLAGS="$SLKCFLAGS" \
-### CXXFLAGS="$SLKCFLAGS" \
-### make
-### make install DESTDIR=$PKG
+make -C source
+ln -sv lib$PRGNAM.so.$VERSION source/lib$PRGNAM.so
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -I../source" \
+LDFLAGS+=" -L../source" \
+make -C apps
+make -C source install DESTDIR=$PKG PREFIX=/usr SUFFIX="$LIBDIRSUFFIX"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 cd $TMP/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
index 991c7ac326..fb24d6fcde 100644
--- a/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
+++ b/libraries/zita-alsa-pcmi/zita-alsa-pcmi.info
@@ -1,8 +1,8 @@
 PRGNAM="zita-alsa-pcmi"
-VERSION="0.2.0"
+VERSION="0.6.1"
 HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.2.0.tar.bz2"
-MD5SUM="0ba4d59abce231056e2628d081124114"
+DOWNLOAD="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-alsa-pcmi-0.6.1.tar.bz2"
+MD5SUM="729aac728c23f0bc40220c8a08e9cdbe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""