audio/a2jmidid: Updated for version 1.3a, moved from multimedia.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 53 insertions, 31 deletions

diff --git a/audio/a2jmidid/README b/audio/a2jmidid/README
new file mode 100644
index 0000000000..8c20991b22
--- /dev/null
+++ b/audio/a2jmidid/README
@@ -0,0 +1,13 @@
+This project aims to ease the usage of legacy, non JACK enabled
+applications, in a JACK MIDI enabled system, when using jack2.
+
+Typical usecase is e.g. to connect bristol/azr3 with qtractor/seq24.
+
+Note: The latest jack-audio-connection-kit release contains a2jmidid
+functionality by itself.
+
+This package uses POSIX filesystem capabilities to execute with
+elevated privileges (required for realtime audio processing). This
+may be considered a security/stability risk. Please read
+http://www.slackbuilds.org/caps/ for more information. To disable
+capabilities, pass SETCAP=no to the script.
diff --git a/multimedia/a2jmidid/a2jmidid.SlackBuild b/audio/a2jmidid/a2jmidid.SlackBuild
index e340c3802a..47c531a305 100644
--- a/multimedia/a2jmidid/a2jmidid.SlackBuild
+++ b/audio/a2jmidid/a2jmidid.SlackBuild
@@ -3,23 +3,24 @@
 # Written by Michales Michaloudes korgie@gmail.com
 
 PRGNAM=a2jmidid
-VERSION=${VERSION:-7}
+VERSION=${VERSION:-9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -38,7 +39,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -49,11 +50,11 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./waf configure \
+meson \
   --prefix=/usr \
-
-./waf build -v
-./waf install --destdir=$PKG
+  build
+ninja -C build
+DESTDIR=$PKG meson install -C build
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -65,12 +66,25 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS INSTALL NEWS README \
+  {AUTHORS,CHANGELOG,INSTALLATION,README}.rst \
   $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
 
+# Only add capability stuff if not disabled:
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  # set realtime capabilities 
+  for i in \
+    a2j_control j2amidi_bridge a2jmidi_bridge a2j a2jmidid
+  do 
+    echo "/sbin/setcap cap_ipc_lock,cap_sys_nice=ep usr/bin/$i" >> $PKG/install/doinst.sh
+  done
+  # Only allow execution by audio group
+  chown root:audio $PKG/usr/bin/*
+  chmod 0750 $PKG/usr/bin/*
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/a2jmidid/a2jmidid.info b/audio/a2jmidid/a2jmidid.info
new file mode 100644
index 0000000000..96b10a1d61
--- /dev/null
+++ b/audio/a2jmidid/a2jmidid.info
@@ -0,0 +1,10 @@
+PRGNAM="a2jmidid"
+VERSION="9"
+HOMEPAGE="https://github.com/linuxaudio/a2jmidid"
+DOWNLOAD="https://github.com/linuxaudio/a2jmidid/archive/9/a2jmidid-9.tar.gz"
+MD5SUM="cfac8647a84513a698c2b310cdb2e2bb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jack2 meson"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"
diff --git a/multimedia/a2jmidid/slack-desc b/audio/a2jmidid/slack-desc
index 937d515a96..9739cfd445 100644
--- a/multimedia/a2jmidid/slack-desc
+++ b/audio/a2jmidid/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-a2jmidid: a2jmidid (ALSA-to-Jack midi daemon)
-a2jmidid:
-a2jmidid: a2jmidid is daemon for exposing legacy ALSA sequencer applications in
-a2jmidid: JACK MIDI system.
-a2jmidid:
-a2jmidid: (ex. connect fst with qtractor, or rosegarden)
+a2jmidid: a2jmidid (ALSA sequencer to JACK MIDI bridging for jack2)
 a2jmidid:
+a2jmidid: This project aims to ease the usage of legacy, non JACK enabled
+a2jmidid: applications, in a JACK MIDI enabled system, when using jack2.
 a2jmidid:
+a2jmidid: (e.g. connect bristol/azr3 with qtractor/rosegarden/seq24)
 a2jmidid:
+a2jmidid: Note: The latest jack-audio-connection-kit release contains a2jmidid
+a2jmidid: functionality by itself.
 a2jmidid:
 a2jmidid:
diff --git a/multimedia/a2jmidid/README b/multimedia/a2jmidid/README
deleted file mode 100644
index f9d726fdfe..0000000000
--- a/multimedia/a2jmidid/README
+++ /dev/null
@@ -1,5 +0,0 @@
-a2jmidid is daemon for exposing legacy ALSA sequencer applications in
-JACK MIDI system.  (ex. connect fst with qtractor, or rosegarden)
-
-Start/stop the user-deamon with a2j_control start/stop. You may prefer
-to add this to the qjackctl scripting fields.
diff --git a/multimedia/a2jmidid/a2jmidid.info b/multimedia/a2jmidid/a2jmidid.info
deleted file mode 100644
index fa8cab0fe1..0000000000
--- a/multimedia/a2jmidid/a2jmidid.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="a2jmidid"
-VERSION="7"
-HOMEPAGE="http://repo.or.cz/a2jmidid.git"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/a2jmidid-7.tar.bz2"
-MD5SUM="195f5587904ce307cbcd4ef89f2c791f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="jack-audio-connection-kit"
-MAINTAINER="Michales Michaloudes"
-EMAIL="korgie@gmail.com"