diff options
| author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2009-04-02 15:23:25 +0000 |
|---|---|---|
| committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2009-04-02 15:23:25 +0000 |
| commit | c70453376604a3a1625770c3ec58cc8694eca4e0 (patch) | |
| tree | e7d6a8b47e015f1b0f8c851dad6f53277cc4599e /media/libs/faad2/faad2.SlackBuild | |
| parent | 0c700aec845def5dc0d56d56b4fd216b9dc1f5fb (diff) | |
| download | slackbuilds-c70453376604a3a1625770c3ec58cc8694eca4e0.tar.gz slackbuilds-c70453376604a3a1625770c3ec58cc8694eca4e0.tar.bz2 | |
faac and faad2 version bump
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2133 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media/libs/faad2/faad2.SlackBuild')
| -rwxr-xr-x | media/libs/faad2/faad2.SlackBuild | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/media/libs/faad2/faad2.SlackBuild b/media/libs/faad2/faad2.SlackBuild index d2dfb73d..5839e97f 100755 --- a/media/libs/faad2/faad2.SlackBuild +++ b/media/libs/faad2/faad2.SlackBuild @@ -16,7 +16,8 @@ # # slackbuild for faad2, by Silvio Rhatto # requires: -# tested: faad2-2.6.1 +# tested: faad2-2.7 +# model: generic.mkSlackBuild $Rev: 784 $ # # Look for slackbuildrc @@ -31,7 +32,7 @@ CWD="$(pwd)" SRC_NAME="faad2" PKG_NAME="faad2" ARCH=${ARCH:=i486} -SRC_VERSION=${VERSION:=2.6.1} +SRC_VERSION=${VERSION:=2.7} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1rha} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME @@ -47,9 +48,9 @@ NUMJOBS=${NUMJOBS:=""} LIBDIR="$PREFIX/lib" if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + SLKCFLAGS="-O2 -march=i386 -mtune=i686" elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mcpu=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686" elif [ "$ARCH" = "s390" ]; then @@ -65,6 +66,7 @@ ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36 ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39 ERROR_PATCH=40; ERROR_VCS=41; ERROR_MKDIR=42 +ERROR_MANIFEST=43; # Clean up any leftovers of previous builds rm -rf "$PKG_WORK" 2> /dev/null @@ -91,10 +93,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" cd "$PKG_SRC" # Patch source -patches=" +patches=" [[PATCH URLS]] $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff" for patch in $patches; do + patch="`basename $patch`" if [ -f "$CWD/$patch" ]; then patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH elif [ -f "$CWD/patches/$patch" ]; then @@ -103,15 +106,7 @@ for patch in $patches; do gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH elif [ -f "$CWD/patches/$patch.gz" ]; then gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH - fi -done - -if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then - for patch_url in [[PATCH URLS]]; do - patch="`basename $patch_url`" - if [ ! -s "$SRC_DIR/$patch" ]; then - wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET - fi + elif [ -f "$SRC_DIR/$patch" ]; then if [ "`basename $patch .gz`" != "$patch" ]; then gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH elif [ "`basename $patch .bz2`" != "$patch" ]; then @@ -119,8 +114,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then else patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH fi - done -fi + fi +done # Configure autoreconf -vif @@ -181,6 +176,6 @@ cd "$PKG" makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories if requested -if [ "$CLEANUP" == "yes" ]; then +if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then rm -rf "$PKG_WORK" "$PKG" fi |