4 files changed, 34 insertions, 17 deletions
diff --git a/libraries/libsidplay2/README b/libraries/libsidplay2/README
index 3d62235985..fb997d7499 100644
--- a/libraries/libsidplay2/README
+++ b/libraries/libsidplay2/README
@@ -4,9 +4,6 @@ is cycle accurate for improved sound reproduction.
 Build includes the reSID emulation/filter and HardSID support.
 
 For instance, you can use the stock Audacious plugin SlackBuild without
-modifications and rebuilding the package. It will automatically detect
+modifications and rebuilding the package.  It will automatically detect
 the SID emulation availability and compiles the SID plugin.
 Simply reinstall the created package by `upgradepkg --reinstall`.
-
-Many thanks to all people who provide(d) patches to keep this project
-alive.
diff --git a/libraries/libsidplay2/libsidplay2.SlackBuild b/libraries/libsidplay2/libsidplay2.SlackBuild
index 25fa8ec291..c74cb67a0d 100644
--- a/libraries/libsidplay2/libsidplay2.SlackBuild
+++ b/libraries/libsidplay2/libsidplay2.SlackBuild
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # SlackBuild script for "libsidplay2".
-# Copyright 2010 Marcel Saegebarth <marc@mos6581.de>
+
+# Copyright 2010-2011 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2011 Dominik Drobek <arcctgx@o2.pl>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,12 +26,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsidplay2
-SRCNAM=sidplay-libs
-DIFFVER=${DIFFVER:-7}
 VERSION=${VERSION:-2.1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+SRCNAM=sidplay-libs
+DIFFVER=${DIFFVER:-8}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,8 +62,7 @@ fi
 
 set -e
 
-rm -rf $PKG
-rm -rf $TMP/$PRGNAM
+rm -rf $TMP/$PRGNAM $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/${SRCNAM}_$VERSION.orig.tar.gz
@@ -83,6 +85,24 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $TMP/$SRCNAM-$VERSION/builders/hardsid-builder
+    mkdir $PKG/usr/doc/$PRGNAM-$VERSION/hardsid-builder
+    cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION/hardsid-builder
+  cd $TMP/$SRCNAM-$VERSION/libsidplay
+    mkdir $PKG/usr/doc/$PRGNAM-$VERSION/libsidplay
+    cp -a AUTHORS COPYING ChangeLog INSTALL README TODO \
+      $PKG/usr/doc/$PRGNAM-$VERSION/libsidplay
+  cd $TMP/$SRCNAM-$VERSION/libsidutils
+    mkdir $PKG/usr/doc/$PRGNAM-$VERSION/libsidutils
+    cp -a AUTHORS COPYING ChangeLog INSTALL README TODO \
+      $PKG/usr/doc/$PRGNAM-$VERSION/libsidutils
+  cd $TMP/$SRCNAM-$VERSION/resid
+    mkdir $PKG/usr/doc/$PRGNAM-$VERSION/resid
+    cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
+      $PKG/usr/doc/$PRGNAM-$VERSION/resid
+  cd $TMP/$SRCNAM-$VERSION/debian
+    cp -a changelog $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.Debian
+)
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/libsidplay2/libsidplay2.info b/libraries/libsidplay2/libsidplay2.info
index cfcaa2e395..c472095188 100644
--- a/libraries/libsidplay2/libsidplay2.info
+++ b/libraries/libsidplay2/libsidplay2.info
@@ -2,11 +2,11 @@ PRGNAM="libsidplay2"
 VERSION="2.1.1"
 HOMEPAGE="http://sidplay2.sourceforge.net/"
 DOWNLOAD="http://ftp.debian.org/debian/pool/main/s/sidplay-libs/sidplay-libs_2.1.1.orig.tar.gz \
-  http://ftp.de.debian.org/debian/pool/main/s/sidplay-libs/sidplay-libs_2.1.1-7.diff.gz"
+          http://ftp.de.debian.org/debian/pool/main/s/sidplay-libs/sidplay-libs_2.1.1-8.diff.gz"
 MD5SUM="7ea0ba5dc1da4604d15eaae001f7d2a7 \
-  14a0cd3b44173e6fab0c94933720d4d4"
+        735d14f7e55b302c1d414e3142c0e129"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marcel Saegebarth"
 EMAIL="marc@mos6581.de"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/libraries/libsidplay2/slack-desc b/libraries/libsidplay2/slack-desc
index f8553ffc76..65f12ad2ac 100644
--- a/libraries/libsidplay2/slack-desc
+++ b/libraries/libsidplay2/slack-desc
@@ -8,12 +8,12 @@
            |-----handy-ruler------------------------------------------------------|
 libsidplay2: Sidplay 2 (SID emulation)
 libsidplay2:
-libsidplay2: Sidplay 2 is capable of playing all C64 mono/stereo file formats and
-libsidplay2: is cycle accurate for improved sound reproduction.
+libsidplay2: Sidplay 2 is capable of playing all C64 mono/stereo file formats
+libsidplay2: and is cycle accurate for improved sound reproduction.
+libsidplay2:
+libsidplay2: Homepage: http://sidplay2.sourceforge.net/
 libsidplay2:
-libsidplay2: Build includes the reSID emulation/filter and HardSID support.
 libsidplay2:
 libsidplay2:
-libsidplay2: Homepage: http://sidplay2.sourceforge.net/
 libsidplay2:
 libsidplay2: