faac and faad2 version bump

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2133 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 17 insertions, 17 deletions

diff --git a/media/libs/faad2/Manifest b/media/libs/faad2/Manifest
new file mode 100644
index 00000000..e6a384e6
--- /dev/null
+++ b/media/libs/faad2/Manifest
@@ -0,0 +1,5 @@
+DIST faad2-2.7.tar.gz 1137407 MD5 ee1b4d67ea2d76ee52c5621bc6dbf61e RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
+MKBUILD faad2.mkbuild 2685 MD5 a1e2b4fe726f44081eb2300bb9d39fb8 RMD160 639d4826d52f9e9eb9341c63010e586cd59becf1 SHA1 b59ba2e8f2a799e1a17b43089bb90832660c28ef SHA256 6ce23d8be649519ea4a341413cdb8fc60cc1c363fe8bf24b05df494006bfd771 SHA512 40b6e0a84dcdf4f9bec19fe615f8a866567ee464ccfb1ec777e323fbf54bfb1f8444c897d6390601630e138fef5a187872fd0cb2b132459813505dcbc0dfd03a
+PATCH faad2-2.0.diff 882 MD5 4ae96f9e2b691e0be30f24caddb5d472 RMD160 3276b3d5dd4c12f2a3ff6270a1213931818adfbd SHA1 e9f0cf5413a96e3542c2b953d52169ff8de2858b SHA256 c9c7d972ae805544afe787abfcaa771fb0afdc3fa9a30e18940e3e7ca38e6adb SHA512 a1b92dd556d85cee0c612b1ef8692758d38e61f5a7e37dfb9b9f9f96c148076e22e9b70ed23bd504a975183be4083b93c88c2116a4ee6de93fca118d30161d14
+PATCH faad2-2.6.1.diff 39665 MD5 75a75ed4e71ba5c2514b6bdaa63b21a5 RMD160 ad96d242f174e38d8890a1ba17e946569550bd38 SHA1 32279d11038786612741fef5332f2f0997a07319 SHA256 2d3ab5b8672bab2fbc59373fe60048e10f557b7606fd731e299b21c544fe6925 SHA512 75401e04d9db0446eac11256d1c70a5c16101e3eec84ef2a9619a58b0e1db62af4b2d50d88c7b2b2584867891b71bdf2b784533be31eb48d89ef44faf51da0ec
+SLACKBUILD faad2.SlackBuild 5727 MD5 6fe6c282ebcf58094ec50707e8aa72c9 RMD160 524437a8a9ce01f1060ea2b638a5a29d015b629b SHA1 240130a580a356e3c0217a723899297d0d3922d2 SHA256 be401735f08fe0c1de8f162c11563d52475d6e81d2b88c7a39498d6f50e2407a SHA512 9d68d2468619ba06bbf932c21787b9a3d7ac9c4da9b8822849b9798bc229e48c0685d61c54c35523ec502acd7b9b1ed69f0025cff4fd6e4a71060d9b9df1f9da
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