mjpegtools version bump

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

2 files changed, 18 insertions, 16 deletions

diff --git a/media/video/mjpegtools/Manifest b/media/video/mjpegtools/Manifest
new file mode 100644
index 00000000..080c5eab
--- /dev/null
+++ b/media/video/mjpegtools/Manifest
@@ -0,0 +1,7 @@
+DIST mjpegtools-1.9.0.tar.gz 1718063 MD5 309a6fcf0900a010d6a9c1e91afc2f5c RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711 SHA512 98046c8b648c68ce6afb0e27bd775484468c82c95b20e3e443ceffb0303f7f3cff52aeaf26e9b92a860a3b16e488430e22e0e0894b1955c3bfc949882401379d
+MKBUILD mjpegtools.mkbuild 3415 MD5 1e57112aa62a5739bb276154478f7e6e RMD160 d71a13cfd3fb8d3083130b35c5511e4821e354e6 SHA1 59dda5b65c53a579b6ca3df1d4db0368c3537fba SHA256 b1736dd965bd070587cad10cb774eb198e47bc9f8a8e7ba0f2a8791c494e3ea5 SHA512 041b26f04ab46c563a33a744d3d63347464430c329be92cc910c37439026c67ebb9fa514758e6bb4a05e57f97abdbdcb5fc14acff8401ed17d8f01e535b2f29d
+PATCH mjpegtools-1.8.0-powerpc.diff 271 MD5 6bda996b94c1c6fbeb0ca57c9bbf545f RMD160 4ca6ea775449e6f74c179a3aff64129ae3410e24 SHA1 19c24485d48dda444e40b0c077fe9370512357d8 SHA256 5d94d8e7cd6015d3a204f32b54a7fefd0d064b244691e9509af2f600ae3b5e3b SHA512 4d79772990bdc2d66c92416d776ada12ff891c13c1867c98631a49f3c19600e16b8332f0abcad78dbc069be43d59e9415bb015819039df9c7774e330bb0fe916
+PATCH mjpegtools-1.8.0.diff 370 MD5 13f280039b6e3f12225fe0199bf2fe17 RMD160 c7de06e25fc96ecddaf88341341558488b6e2023 SHA1 9cb58a2b72175cb2b4d03873c77f78e213bcc555 SHA256 5ed4adf76454bacbb5e0cec35a6ef2d6bf601ecb2ec664435647134a9d73ffe4 SHA512 c300c2736f6f5c6080bee7be331a9a34850ed77abc209f6a2518e3e7f21dccc3573bc1f8e7b34cb7321f539ee5317183c7180d69c1057c9f6917ea16042c5d7a
+PATCH mjpegtools-1.9.0rc2-x86_64.diff 1062 MD5 b69348e9f4120ceaaea42e72bbb3a0a2 RMD160 df7dbed4b24c31ed759f5018ea58b6c9370a0aab SHA1 bf1983c91d9e2c048591d440d0bc9c5c411f221e SHA256 119edb9fad88a0f53a368d34d136521d394df9e4e9263b4174a0de6df52a86e2 SHA512 5bfd2849b0b0a156a408ac65ba9cfb5940a876e1699494af47e3c5606916aba9a2639380c9a37136de1b78e71e670139fe0655fdb1ae8d355eb5ec55935c36a6
+SLACK-REQUIRED slack-required 97 MD5 75dc44e48a4f96e3d7ff63d63a2ff1d2 RMD160 4660f49b0b1e0205b8ade63396bce3572c251bde SHA1 de4415b89d05cd331461d51d485ad883bf8d9bab SHA256 da710ce17c14bd9aab64d641fff4667f1093caa3145240178362c46e92893e86 SHA512 bc4497fc4050bd92a55737267df235b5a01ee9bcdb3e47b8a13241f02e31d4a5eea9a44852446944274c20907dd019dbc5661b48cf3ada091c4d18dc55e1d622
+SLACKBUILD mjpegtools.SlackBuild 6253 MD5 e99a3d70bc61c434da298c78793de67d RMD160 828994031983fb3b4eb1cf436751075d62363621 SHA1 de78904de7af170561899dc487638f59c6909cb8 SHA256 88c59f0c4202fb4c29d58ad9484523bd6c267d1a4c2b76e2f4249be3f5c746ef SHA512 a3050434fe49a32c949b1ed4ede5818469595d6cf412f626cb2951867ccf4830f03a7ae936e16acb72a382cacc06cd7cfa95397c030ed3747edb5272dda6cbf9
diff --git a/media/video/mjpegtools/mjpegtools.SlackBuild b/media/video/mjpegtools/mjpegtools.SlackBuild
index 8294a421..e5c5686d 100755
--- a/media/video/mjpegtools/mjpegtools.SlackBuild
+++ b/media/video/mjpegtools/mjpegtools.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for mjpegtools, by Silvio Rhatto
 # requires: libdv libquicktime 
-# tested: mjpegtools-1.9.0rc3
+# tested: mjpegtools-1.9.0
+# model: generic.mkSlackBuild $Rev: 784 $
 #
 
 # Look for slackbuildrc
@@ -31,7 +32,7 @@ CWD="$(pwd)"
 SRC_NAME="mjpegtools"
 PKG_NAME="mjpegtools"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.9.0rc3}
+SRC_VERSION=${VERSION:=1.9.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -51,9 +52,9 @@ if [ "$ARCH" == "i386" ] || [ "$ARCH" == "i486" ]; then
 fi
 
 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
@@ -69,6 +70,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
@@ -95,10 +97,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
@@ -107,15 +110,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
@@ -123,8 +118,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