diff options
| -rw-r--r-- | audio/swami/swami.SlackBuild | 32 | ||||
| -rw-r--r-- | audio/swami/swami.info | 6 |
2 files changed, 14 insertions, 24 deletions
diff --git a/audio/swami/swami.SlackBuild b/audio/swami/swami.SlackBuild index 0965e52efa48..77121c79c663 100644 --- a/audio/swami/swami.SlackBuild +++ b/audio/swami/swami.SlackBuild @@ -3,13 +3,13 @@ # Written by Michales Michaloudes korgie@gmail.com PRGNAM=swami -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.2.1} 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 @@ -20,8 +20,8 @@ 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 +49,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 +62,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 diff --git a/audio/swami/swami.info b/audio/swami/swami.info index b85599b844b8..837c35d11300 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" |