diff options
| -rw-r--r-- | audio/streamtuner/README | 6 | ||||
| -rw-r--r-- | audio/streamtuner/doinst.sh | 5 | ||||
| -rw-r--r-- | audio/streamtuner/shoutcast-redesign-patch.diff | 12 | ||||
| -rw-r--r-- | audio/streamtuner/slack-desc | 16 | ||||
| -rw-r--r-- | audio/streamtuner/streamtuner.SlackBuild | 43 | ||||
| -rw-r--r-- | audio/streamtuner/streamtuner.info | 4 |
6 files changed, 54 insertions, 32 deletions
diff --git a/audio/streamtuner/README b/audio/streamtuner/README index 91909b6eee9a..a87520d0a6fd 100644 --- a/audio/streamtuner/README +++ b/audio/streamtuner/README @@ -1,3 +1,3 @@ -streamtuner is a stream directory browser. Through the use of -a plugin system, it offers an intuitive GTK+ 2.0 interface to -Internet radio directories such as SHOUTcast and Live365. +streamtuner is a stream directory browser. Through the use of a plugin +system, it offers an intuitive GTK+ 2.0 interface to Internet radio +directories such as SHOUTcast and Live365. diff --git a/audio/streamtuner/doinst.sh b/audio/streamtuner/doinst.sh index 3412314ed009..392c12adb9bd 100644 --- a/audio/streamtuner/doinst.sh +++ b/audio/streamtuner/doinst.sh @@ -1,5 +1,4 @@ - -if [ -x usr/bin/update-desktop-database ]; then - ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1 +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications fi diff --git a/audio/streamtuner/shoutcast-redesign-patch.diff b/audio/streamtuner/shoutcast-redesign-patch.diff new file mode 100644 index 000000000000..644e2273eff2 --- /dev/null +++ b/audio/streamtuner/shoutcast-redesign-patch.diff @@ -0,0 +1,12 @@ +diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c +--- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:04:00.229785732 -0400 ++++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:05:56.716440720 -0400 +@@ -37,7 +37,7 @@ + + /*** cpp *********************************************************************/ + +-#define SHOUTCAST_ROOT "http://www.shoutcast.com/" ++#define SHOUTCAST_ROOT "http://classic.shoutcast.com/" + + #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */ + diff --git a/audio/streamtuner/slack-desc b/audio/streamtuner/slack-desc index 029aad7afdfb..467cd677c72f 100644 --- a/audio/streamtuner/slack-desc +++ b/audio/streamtuner/slack-desc @@ -1,16 +1,16 @@ # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| streamtuner: streamtuner (Stream Directory Browser) streamtuner: -streamtuner: streamtuner is a stream directory browser. Through the use of -streamtuner: a plugin system, it offers an intuitive GTK+ 2.0 interface to -streamtuner: Internet radio directories such as SHOUTcast and Live365. +streamtuner: streamtuner is a stream directory browser. Through the use of a plugin +streamtuner: system, it offers an intuitive GTK+ 2.0 interface to Internet radio +streamtuner: directories such as SHOUTcast and Live365. streamtuner: streamtuner: Homepage: http://www.nongnu.org/streamtuner/ streamtuner: diff --git a/audio/streamtuner/streamtuner.SlackBuild b/audio/streamtuner/streamtuner.SlackBuild index 58b99b4fc15f..465004b8769f 100644 --- a/audio/streamtuner/streamtuner.SlackBuild +++ b/audio/streamtuner/streamtuner.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for streamtuner -# Copyright 2007 Frank Caraballo <fecaraballo[AT]gmail.com +# Copyright 2007, 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,61 +22,72 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by the SlackBuilds.org project - PRGNAM=streamtuner -VERSION=0.99.99 +VERSION=${VERSION:-0.99.99} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -PDOCS="AUTHORS COPYING INSTALL NEWS README TODO" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 cd $PRGNAM-$VERSION || exit 1 chown -R root:root . -chmod -R u+w,go+r-w,a-s . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -# Apply streamtuner-0.99.99-live365.diff patch: +# Apply official streamtuner-0.99.99-live365.diff patch: patch -p0 < $CWD/$PRGNAM-$VERSION-live365.diff || exit 1 +# Apply unofficial shoutcast-redesign-patch.diff patch from +# 'http://bugs.archlinux.org/task/11463': +( cd /src/plugins/shoutcast + patch -p1 < $CWD/shoutcast-redesign-patch.diff || exit 1 +) + +# This program will not build unless static is enabled. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --enable-static=yes \ + --build=$ARCH-slackware-linux \ || exit 1 make || exit 1 make install-strip DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Create link to html docs: ( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s /usr/share/gtk-doc/html/$PRGNAM html + ln -s ../../share/gtk-doc/html/streamtuner/ html ) mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/audio/streamtuner/streamtuner.info b/audio/streamtuner/streamtuner.info index d6551d740c93..d8f1c62414bf 100644 --- a/audio/streamtuner/streamtuner.info +++ b/audio/streamtuner/streamtuner.info @@ -4,5 +4,5 @@ HOMEPAGE="http://www.nongnu.org/streamtuner/" DOWNLOAD="http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99.tar.gz" MD5SUM="2027b7c34e85b594524b0b4351c14362" MAINTAINER="Frank Caraballo" -EMAIL="fecaraballo[AT]gmail.com" -APPROVED="rworkman" +EMAIL="fecaraballo{at}gmail{dot}com" +APPROVED="dsomero" |