From a95991205fa79eb659d59d6ebcd8b1afcfe7233c Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 15 Sep 2007 15:47:16 +0000 Subject: Updated script --- wavpack/build/wavpack.SlackBuild | 101 ++++++++++++++------------------------- 1 file changed, 35 insertions(+), 66 deletions(-) diff --git a/wavpack/build/wavpack.SlackBuild b/wavpack/build/wavpack.SlackBuild index 669da414..71c84b66 100755 --- a/wavpack/build/wavpack.SlackBuild +++ b/wavpack/build/wavpack.SlackBuild @@ -26,12 +26,14 @@ # =========================== # By: Eric Hameleers # For: wavpack -# Descr: Open audio compression codec -# URL: http://www.wavpack.com +# Descr: open audio compression codec +# URL: http://www.wavpack.com/ # Needs: # Changelog: # 4.40.0-1: 20/Mar/2007 by Eric Hameleers # * Initial build. +# 4.41.0-1: 15/Sep/2007 by Eric Hameleers +# * Update, SlackBuild rewrite. # # Run 'sh wavpack.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -39,19 +41,18 @@ # # ----------------------------------------------------------------------------- -# --- INIT --- # Set initial variables: PRGNAM=wavpack -VERSION=${VERSION:-4.40.0} +VERSION=${VERSION:-4.41.0} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} DOCS="AUTHORS ChangeLog NEWS README license.txt doc/*" # Where do we look for sources? -CWD=`pwd` -SRCDIR=`dirname $0` +CWD=$(pwd) +SRCDIR=$(dirname $0) [ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR} # Place to build (TMP) package (PKG) and output (OUTPUT) the program: @@ -59,6 +60,7 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# Input URL: http://www.wavpack.com/wavpack-4.41.0.tar.bz2 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" SRCURL="http://www.wavpack.com/${PRGNAM}-${VERSION}.tar.bz2" @@ -74,7 +76,7 @@ set -u P1=${1:-1} # Slackware 11 and up need other option (gcc > 3.3.x) -if [ `gcc -dumpversion | tr -d '.' |cut -c 1-2` -gt 33 ]; then +if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -gt 33 ]; then MOPT=tune else MOPT=cpu @@ -101,42 +103,28 @@ case "$ARCH" in ;; esac -if [ ! -d $TMP/tmp-$PRGNAM ]; then - mkdir -p $TMP/tmp-$PRGNAM # location to build the source -elif [ "$P1" != "--oldbuild" ]; then - # If the "--oldbuild" parameter is present, we keep - # the old build files and continue; - # By default we remove the remnants of previous build and continue: - rm -rf $TMP/tmp-$PRGNAM/* -fi - -if [ ! -d $PKG ]; then - mkdir -p $PKG # place for the package to be built -else - rm -rf $PKG/* # We always erase old package's contents: -fi - -if [ ! -d $OUTPUT ]; then - mkdir -p $OUTPUT # place for the package to be saved -fi - - -# --- SOURCE FILE AVAILABILITY --- +# 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 +mkdir -p $PKG # place for the package to be built +rm -rf $PKG/* # We always erase old package's contents: +mkdir -p $OUTPUT # place for the package to be saved +# Source file availability: if ! [ -f ${SOURCE} ]; then if ! [ "x${SRCURL}" == "x" ]; then # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`" - echo "Source '`basename ${SOURCE}`' not available yet..." - echo "Will download file to `dirname $SOURCE`" - wget -nv -O "${SOURCE}" "${SRCURL}" || true - if [ $? -ne 0 ]; then - echo "Downloading '`basename ${SOURCE}`' failed... aborting the build." + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + echo "Source '$(basename ${SOURCE})' not available yet..." + echo "Will download file to $(dirname $SOURCE)" + wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true + if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then + echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL exit 1 fi else - echo "File '`basename ${SOURCE}`' not available... aborting the build." + echo "File '$(basename ${SOURCE})' not available... aborting the build." exit 1 fi fi @@ -153,21 +141,18 @@ echo "|| $PRGNAM-$VERSION" echo "++" cd $TMP/tmp-$PRGNAM + echo "Extracting the source archive(s) for $PRGNAM..." -if `file ${SOURCE} | grep -q ": bzip2"`; then +if $(file ${SOURCE} | grep -q ": bzip2"); then tar -xjvf ${SOURCE} -elif `file ${SOURCE} | grep -q ": gzip"`; then +elif $(file ${SOURCE} | grep -q ": gzip"); then tar -xzvf ${SOURCE} fi -chown -R root:root * -chmod -R u+w,go+r-w,a-s * cd ${PRGNAM}-${VERSION} - - -# --- BUILDING --- +chown -R root:root . +chmod -R u+w,go+r-w,a-s . echo Building ... - if [ ! -r configure ]; then libtoolize aclocal @@ -176,6 +161,7 @@ if [ ! -r configure ]; then fi LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ @@ -186,53 +172,39 @@ CFLAGS="$SLKCFLAGS" \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -# # Install all the needed stuff to the package dir -# # Use installwatch if available, to produce a logfile of the installation # process that is more easily readable: -if `which installwatch > /dev/null 2>&1`; then +if $(which installwatch > /dev/null 2>&1); then installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install else make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log fi - -# --- DOCUMENTATION --- - +# Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* -# Compress the man page(s) +# Compress the man page(s): if [ -d $PKG/usr/man ]; then find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi -# Strip binaries +# Strip binaries: cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true cd - - -# --- OWNERSHIP, RIGHTS --- - -chmod -R o-w $PKG - - -# --- PACKAGE DESCRIPTION --- - +# Add a package description: mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc if [ -f $SRCDIR/doinst.sh ]; then cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh fi - -# --- BUILDING --- - # Build the package: cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log @@ -241,9 +213,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}- cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt - -# --- CLEANUP --- - # Clean up the extra stuff: if [ "$P1" = "--cleanup" ]; then rm -rf $TMP/tmp-$PRGNAM -- cgit v1.2.3-65-gdbad