diff options
| -rw-r--r-- | multimedia/cantata/cantata.SlackBuild | 18 | ||||
| -rw-r--r-- | multimedia/cantata/cantata.info | 8 | ||||
| -rw-r--r-- | multimedia/cantata/doinst.sh | 9 |
3 files changed, 23 insertions, 12 deletions
diff --git a/multimedia/cantata/cantata.SlackBuild b/multimedia/cantata/cantata.SlackBuild index 84fe27fa6ec35..cf4ed7888c534 100644 --- a/multimedia/cantata/cantata.SlackBuild +++ b/multimedia/cantata/cantata.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cantata -# Copyright 2014 Ruben Schuller +# Copyright 2014 - 2017 Ruben Schuller # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cantata -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.0.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 @@ -40,8 +40,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,6 +49,8 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +# for upcoming releases. +# CMAKEFLAGS="$CMAKEFLAGS -DUSE_LIB64_FOR_HELPERS=ON" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -60,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,6 +71,8 @@ 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 {} \; +sed -i "s|LINUX_LIB_DIR lib|LINUX_LIB_DIR lib${LIBDIRSUFFIX}|" CMakeLists.txt + mkdir -p build cd build cmake \ @@ -82,8 +86,6 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ .. - sed -i "s|lib/cantata|lib${LIBDIRSUFFIX}/cantata|" ../replaygain/CMakeLists.txt - sed -i "s|lib/cantata|lib${LIBDIRSUFFIX}/cantata|" ../tags/CMakeLists.txt make make install DESTDIR=$PKG cd .. diff --git a/multimedia/cantata/cantata.info b/multimedia/cantata/cantata.info index d1e7ebdf8d4df..ef59fb5c29f1a 100644 --- a/multimedia/cantata/cantata.info +++ b/multimedia/cantata/cantata.info @@ -1,10 +1,10 @@ PRGNAM="cantata" -VERSION="2.0.0" +VERSION="2.0.1" HOMEPAGE="https://github.com/CDrummond/cantata" -DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.0.0.tar.gz" -MD5SUM="760417ece9f00b2e5c9811b65c87ecd5" +DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.0.1/cantata-2.0.1.tar.gz" +MD5SUM="db916af5dad5063d31e1ab43fac61ffa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" MAINTAINER="Ruben Schuller" -EMAIL="ruben@orgizm.net" +EMAIL="sb@rbn.im" diff --git a/multimedia/cantata/doinst.sh b/multimedia/cantata/doinst.sh new file mode 100644 index 0000000000000..65c7e2eeb9aa5 --- /dev/null +++ b/multimedia/cantata/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi |