libraries/libsidplay2: Added some debian patches.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 18 insertions, 14 deletions

diff --git a/libraries/libsidplay2/libsidplay2.SlackBuild b/libraries/libsidplay2/libsidplay2.SlackBuild
index c74cb67a0d..6eca187a39 100644
--- a/libraries/libsidplay2/libsidplay2.SlackBuild
+++ b/libraries/libsidplay2/libsidplay2.SlackBuild
@@ -2,8 +2,8 @@
 
 # SlackBuild script for "libsidplay2".
 
-# Copyright 2010-2011 Marcel Saegebarth <marc@mos6581.de>
-# Copyright 2011 Dominik Drobek <arcctgx@o2.pl>
+# Copyright 2010-2013 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2011-2012 Dominik Drobek <arcctgx@o2.pl>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,11 +27,11 @@
 
 PRGNAM=libsidplay2
 VERSION=${VERSION:-2.1.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SRCNAM=sidplay-libs
-DIFFVER=${DIFFVER:-8}
+DIFFVER=${DIFFVER:-14}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -62,12 +62,16 @@ fi
 
 set -e
 
-rm -rf $TMP/$PRGNAM $PKG
+rm -rf $TMP/$PRGNAM $TMP/debian $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 tar xvf $CWD/${SRCNAM}_$VERSION.orig.tar.gz
+tar xvf $CWD/${SRCNAM}_$VERSION-$DIFFVER.debian.tar.gz
 cd $TMP/$SRCNAM-$VERSION
-zcat $CWD/${SRCNAM}_$VERSION-$DIFFVER.diff.gz | patch -p1
+patch -p1 < $TMP/debian/patches/configure-fixes.patch
+patch -p1 < $TMP/debian/patches/gcc4-fixes.patch
+patch -p1 < $TMP/debian/patches/hardsid_4_bsd.patch
+patch -p1 < $TMP/debian/patches/pkg-config.patch
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -100,7 +104,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
     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
+  cd $TMP/debian
     cp -a changelog $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.Debian
 )
 
diff --git a/libraries/libsidplay2/libsidplay2.info b/libraries/libsidplay2/libsidplay2.info
index 491d54f78b..beff8cdb33 100644
--- a/libraries/libsidplay2/libsidplay2.info
+++ b/libraries/libsidplay2/libsidplay2.info
@@ -2,9 +2,9 @@ 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-8.diff.gz"
+          http://ftp.debian.org/debian/pool/main/s/sidplay-libs/sidplay-libs_2.1.1-14.debian.tar.gz"
 MD5SUM="7ea0ba5dc1da4604d15eaae001f7d2a7 \
-        735d14f7e55b302c1d414e3142c0e129"
+        042f39a3eb7716229f6272710ccd6e33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libsidplay2/slack-desc b/libraries/libsidplay2/slack-desc
index 65f12ad2ac..5e8095b0d5 100644
--- a/libraries/libsidplay2/slack-desc
+++ b/libraries/libsidplay2/slack-desc
@@ -1,9 +1,9 @@
 # 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 ':'.
+# 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 ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
 libsidplay2: Sidplay 2 (SID emulation)