summaryrefslogtreecommitdiffstats
path: root/audio/swami
diff options
context:
space:
mode:
Diffstat (limited to 'audio/swami')
-rw-r--r--audio/swami/README2
-rw-r--r--audio/swami/swami-menu-qsort-bug.patch12
-rw-r--r--audio/swami/swami.SlackBuild48
-rw-r--r--audio/swami/swami.info6
4 files changed, 27 insertions, 41 deletions
diff --git a/audio/swami/README b/audio/swami/README
index 20b86d6405..c599aa904a 100644
--- a/audio/swami/README
+++ b/audio/swami/README
@@ -3,5 +3,3 @@ software for editing and sharing MIDI instruments and sounds. Swami
aims to provide cross platform (Linux, Windows and Mac OSX) instrument
editing and sharing software for instrument formats such as SoundFont,
DLS and GigaSampler
-
-fluidsynth is an optional dependency (for playback support).
diff --git a/audio/swami/swami-menu-qsort-bug.patch b/audio/swami/swami-menu-qsort-bug.patch
deleted file mode 100644
index f6119e420d..0000000000
--- a/audio/swami/swami-menu-qsort-bug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/swamigui/SwamiguiMenu.c (revision 370)
-+++ src/swamigui/SwamiguiMenu.c (working copy)
-@@ -373,7 +373,7 @@
- menu = gtk_menu_new ();
-
- types = swami_util_get_child_types (IPATCH_TYPE_BASE, &n_types);
-- qsort (types, sizeof (GType), n_types, sort_by_type_name);
-+ qsort (types, n_types, sizeof (GType), sort_by_type_name);
-
- for (ptype = types; *ptype; ptype++)
- {
-
diff --git a/audio/swami/swami.SlackBuild b/audio/swami/swami.SlackBuild
index 0965e52efa..db1d649e8b 100644
--- a/audio/swami/swami.SlackBuild
+++ b/audio/swami/swami.SlackBuild
@@ -1,27 +1,37 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for <swami>
# Written by Michales Michaloudes korgie@gmail.com
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=swami
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.2.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
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)
+# 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}
-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"
@@ -49,22 +59,12 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-#Solve segfault on Slackware64
-# Source: https://bugs.launchpad.net/bugs/810569
-patch -p0 < $CWD/swami-menu-qsort-bug.patch
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --build=$ARCH-slackware-linux
-
-make -j1
-make -j1 install DESTDIR=$PKG
+cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr
+make
+make install DESTDIR=$PKG
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
@@ -72,7 +72,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cd $TMP/$PRGNAM-$VERSION/
cp -a \
- ABOUT-NLS CVS-HOWTO NEWS AUTHORS COPYING ChangeLog INSTALL README \
+ ABOUT-NLS NEWS AUTHORS COPYING ChangeLog INSTALL README.md HACKERS TODO.tasks \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -81,4 +81,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
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/audio/swami/swami.info b/audio/swami/swami.info
index b85599b844..837c35d113 100644
--- a/audio/swami/swami.info
+++ b/audio/swami/swami.info
@@ -1,8 +1,8 @@
PRGNAM="swami"
-VERSION="2.0.0"
+VERSION="2.2.1"
HOMEPAGE="http://swamiproject.org"
-DOWNLOAD="http://downloads.sourceforge.net/swami/swami-2.0.0.tar.gz"
-MD5SUM="849b40e4a97c4f52faf069006358dd4f"
+DOWNLOAD="https://github.com/swami/swami/archive/v2.2.1/swami-2.2.1.tar.gz"
+MD5SUM="13fff4480db7537e3e042d07ffd2a354"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libgnomecanvas libinstpatch"