diff options
| -rw-r--r-- | libraries/libmodplug/libmodplug.SlackBuild | 27 | ||||
| -rw-r--r-- | libraries/libmodplug/libmodplug.info | 6 |
2 files changed, 20 insertions, 13 deletions
diff --git a/libraries/libmodplug/libmodplug.SlackBuild b/libraries/libmodplug/libmodplug.SlackBuild index 9570bb471659..0f2fbdd3d551 100644 --- a/libraries/libmodplug/libmodplug.SlackBuild +++ b/libraries/libmodplug/libmodplug.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libmodplug -# Copyright 2010-2014 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2010-2017 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libmodplug -VERSION=${VERSION:-0.8.8.5} +VERSION=${VERSION:-0.8.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -64,10 +64,17 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Fix end-of-line encoding. +for i in ChangeLog; do + sed -e 's/\r//' $i > ${i}.new + touch -r $i ${i}.new + mv ${i}.new $i +done patch -p1 < $CWD/libmodplug-0.8.4-timiditypaths.patch @@ -86,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/libmodplug/libmodplug.info b/libraries/libmodplug/libmodplug.info index 07faa08758cd..ee34ff2c812d 100644 --- a/libraries/libmodplug/libmodplug.info +++ b/libraries/libmodplug/libmodplug.info @@ -1,8 +1,8 @@ PRGNAM="libmodplug" -VERSION="0.8.8.5" +VERSION="0.8.9.0" HOMEPAGE="http://modplug-xmms.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.8.5.tar.gz" -MD5SUM="5f30241db109d647781b784e62ddfaa1" +DOWNLOAD="http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.9.0.tar.gz" +MD5SUM="5ba16981e6515975e9a68a58d5ba69d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |