4 files changed, 58 insertions, 20 deletions
diff --git a/desktop/rss-glx/README b/desktop/rss-glx/README
index 93cd11930d..351d2f4f82 100644
--- a/desktop/rss-glx/README
+++ b/desktop/rss-glx/README
@@ -2,11 +2,4 @@ The Really Slick ScreenSavers GLX Port is a port of some nifty OpenGL
 screensavers that were originally written for Windows to GLX. It is
 intended for use with an existing screensaver daemon like xscreensaver.
 
-Optional Requirements:
- OpenAL for sound (skyrocket)
- GLEW for vertical refresh (all) and shaders (hyperspace).
-
-GLEW is highly recommended as it reduces CPU usage and prevents
-visual tearing.
-
-Both are available at SlackBuilds.org
+Optional Requirements: OpenAL for sound.
diff --git a/desktop/rss-glx/rss-glx.SlackBuild b/desktop/rss-glx/rss-glx.SlackBuild
index 7e9761a967..17f48d6930 100644
--- a/desktop/rss-glx/rss-glx.SlackBuild
+++ b/desktop/rss-glx/rss-glx.SlackBuild
@@ -1,12 +1,29 @@
 #!/bin/sh
-
+#
 # Slackware build script for rss-glx
-# Written by Erik Hanson  erik@slackbuilds.org
-
-set -eu
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=rss-glx
-VERSION=0.8.2
+VERSION=0.9.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,10 +34,17 @@ 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 -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -43,13 +67,24 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-configdir=/usr/share/xscreensaver/config \
   --disable-static \
-  --disable-sound
+  --disable-sound \
+  --program-prefix="rss-" \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
 
 make
 make install-strip DESTDIR=$PKG
 
+mv $PKG/usr/bin/rss-rss-glx_install.pl $PKG/usr/bin/rss-glx_install.pl
+RSS_LIST="biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview plasma skyrocket solarwinds spirographx sundancer2 pixelcity"
+for RSS in $RSS_LIST ; do
+ mv $PKG/usr/share/xscreensaver/config/${RSS}.xml $PKG/usr/share/xscreensaver/config/rss-${RSS}.xml
+ sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/share/xscreensaver/config/rss-${RSS}.xml
+ sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/share/kde4/services/ScreenSavers/${RSS}.desktop
+ sed -i "s/$RSS/rss-$RSS/g" $PKG/usr/bin/rss-glx_install.pl
+done
+
 gzip -9 $PKG/usr/man/man?/*.?
-rm $PKG/usr/lib/*.a
+rm $PKG/usr/lib${LIBDIRSUFFIX}/*.a
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README README.xscreensaver \
@@ -58,4 +93,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 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/desktop/rss-glx/rss-glx.info b/desktop/rss-glx/rss-glx.info
index da0f0af9c4..6a2d539d42 100644
--- a/desktop/rss-glx/rss-glx.info
+++ b/desktop/rss-glx/rss-glx.info
@@ -1,8 +1,10 @@
 PRGNAM="rss-glx"
-VERSION="0.8.2"
+VERSION="0.9.1"
 HOMEPAGE="http://rss-glx.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rss-glx/rss-glx_0.8.2.tar.bz2"
-MD5SUM="583b686e604580cc2f74079f321f4db6"
+DOWNLOAD="http://downloads.sourceforge.net/rss-glx/rss-glx_0.9.1.tar.bz2"
+MD5SUM="a772bd143cd8d141edf4d9eff9860ab3"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero"
+APPROVED="michiel"
diff --git a/desktop/rss-glx/slack-desc b/desktop/rss-glx/slack-desc
index 4aa0a0e1e2..086929613a 100644
--- a/desktop/rss-glx/slack-desc
+++ b/desktop/rss-glx/slack-desc
@@ -1,3 +1,11 @@
+# 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 ':'.
+
+       |-----handy-ruler------------------------------------------------------|
 rss-glx: rss-glx (Really Slick Screensavers Port to GLX)
 rss-glx: 
 rss-glx: The Really Slick ScreenSavers GLX Port is a port of some nifty OpenGL