diff options
| -rw-r--r-- | libraries/libshout/README | 3 | ||||
| -rw-r--r-- | libraries/libshout/libshout.SlackBuild | 12 | ||||
| -rw-r--r-- | libraries/libshout/libshout.info | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libraries/libshout/README b/libraries/libshout/README index c3174ee6f6..ddddb9e96b 100644 --- a/libraries/libshout/README +++ b/libraries/libshout/README @@ -8,5 +8,4 @@ developers who want a specific feature set (database access, request taking) to concentrate on that feature set, instead of worrying about how server communication works. -Libshout is an optional dependency for mpd and has an optional requirement -for speex, both of which are available at SlackBuilds.org. +Libshout optionally depends on speex. diff --git a/libraries/libshout/libshout.SlackBuild b/libraries/libshout/libshout.SlackBuild index 2ecdea9770..62125767c1 100644 --- a/libraries/libshout/libshout.SlackBuild +++ b/libraries/libshout/libshout.SlackBuild @@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit on most errors @@ -44,6 +47,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --disable-static \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ @@ -54,8 +58,10 @@ make docdir=/usr/doc/$PRGNAM-$VERSION make install docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -66,4 +72,4 @@ 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.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libshout/libshout.info b/libraries/libshout/libshout.info index 231c5754ea..ef96d21823 100644 --- a/libraries/libshout/libshout.info +++ b/libraries/libshout/libshout.info @@ -2,7 +2,9 @@ PRGNAM="libshout" VERSION="2.2.2" HOMEPAGE="http://www.icecast.org" DOWNLOAD="http://downloads.xiph.org/releases/libshout/libshout-2.2.2.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="4f75fc9901c724b712c371c9a1e782d3" +MD5SUM_x86_64="" MAINTAINER="Rodney Cobb" EMAIL="rdc@ktabic.co.uk" APPROVED="rworkman" |