From 0b5b8e4d6dff7a4cc730290f36662089e9ed8f97 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 31 May 2010 13:05:48 +0000 Subject: Rebuild for Slackware 13.1 --- libsndfile/build/libsndfile.SlackBuild | 9 +++++++++ soundtouch/build/soundtouch.SlackBuild | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libsndfile/build/libsndfile.SlackBuild b/libsndfile/build/libsndfile.SlackBuild index 57fe6b31..511f4ed0 100755 --- a/libsndfile/build/libsndfile.SlackBuild +++ b/libsndfile/build/libsndfile.SlackBuild @@ -40,6 +40,8 @@ # * Update # 1.0.21-1: 12/apr/2010 by Eric Hameleers # * Update +# 1.0.21-2: 31/may/2010 by Eric Hameleers +# * Rebuild for Slackware 13.1 # # Run 'sh libsndfile.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -99,6 +101,10 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR set -u P1=${1:-1} +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + # Create working directories: mkdir -p $TMP/tmp-$PRGNAM # location to build the source rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build @@ -201,3 +207,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}- cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +# Restore the original umask: +umask ${_UMASK_} + diff --git a/soundtouch/build/soundtouch.SlackBuild b/soundtouch/build/soundtouch.SlackBuild index 4d48afd1..c4e102e6 100755 --- a/soundtouch/build/soundtouch.SlackBuild +++ b/soundtouch/build/soundtouch.SlackBuild @@ -36,6 +36,8 @@ # * Use float samples instead of integer samples - Wired has this # 1.5.0-1: 12/apr/2010 by Eric Hameleers # * Update. +# 1.5.0-2: 12/apr/2010 by Eric Hameleers +# * Rebuild for Slackware 13.1. # # Run 'sh soundtouch.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -47,7 +49,7 @@ PRGNAM=soundtouch VERSION=${VERSION:-1.5.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -104,6 +106,10 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR set -u P1=${1:-1} +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + # Create working directories: mkdir -p $TMP/tmp-$PRGNAM # location to build the source rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build @@ -146,7 +152,7 @@ echo "Extracting the source archive(s) for $PRGNAM..." tar -xzvf ${SOURCE} cd ${PRGNAM} chown -R root:root . -chmod -R u+w,go+r-w,a-s . +chmod -R u+w,go+r-w,a+X-s . # More breakage to follow: ln -sf /usr/share/libtool/ltmain.sh config/ltmain.sh @@ -161,7 +167,7 @@ sed -i -e "s/-rpath \$(libdir)/-rpath \$(libdir) -version-number ${LTVERSION}/" if [ "$ARCH" == "i486" ]; then sed -i -e 's/-O3 -msse/$(CFLAGS) -msse/' source/SoundTouch/Makefile.* else - sed -i -e 's/-O3 -msse/$(CFLAGS)/' source/SoundTouch/Makefile.* + sed -i -e 's/-O3 -msse[^ ]*/$(CFLAGS)/' source/SoundTouch/Makefile.* fi echo Building ... @@ -221,3 +227,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +# Restore the original umask: +umask ${_UMASK_} + -- cgit v1.2.3-65-gdbad