kino: updating to 1.3.2 and adding Manifest

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

3 files changed, 71 insertions, 17 deletions

diff --git a/media/video/kino/Manifest b/media/video/kino/Manifest
new file mode 100644
index 00000000..e4b3dbc8
--- /dev/null
+++ b/media/video/kino/Manifest
@@ -0,0 +1,4 @@
+DIST kino-1.3.2.tar.gz 11064107 MD5 c534c666ed0312c75c877eb1580b985c RMD160 188323a1a8c4faa6c0cb0937fa161e8c4d61d964 SHA1 c59a3967432a450cb278601c961da1c946c72cfa SHA256 5d830fb0e32340f383d5ca9c503032c8df3ffa5c653c4d83f3f74eafea0b0532 SHA512 ebf45d2021f6a7d88da4345b349a1461398fb81d5d3c876fb22bdfadcb933a5a3c27ab5c094e9d37a2ab414486d5c3357fbe223f31280b0a322d6b1bec3640ee
+MKBUILD kino.mkbuild 3077 MD5 07d61ab018d07f7c4e8916ca1770dbbd RMD160 e080b8a444fc0c7e7885b3e6be6ae7e05f49ad38 SHA1 6bb9920e3c36cdaa8a2a229e619fc8eacf628fb2 SHA256 3ed6ec4aad8f4ee7786238f5d185ab67a8b629935e14c43f4a246912571307e3 SHA512 26d9a89599ac2651c6af321c41749165901a0577e03ef9f847e85279a24ecee8e9072c547cdb860d43d97c46320b9183ff11ae3cfcc4485c86a0ca08fdf1cbba
+SLACK-REQUIRED slack-required 155 MD5 8a9da8ce7947f8616643532ceca9afd3 RMD160 a8d6147ebcbf9a0065aff5d7f04a654ad55c78f7 SHA1 8fdae6caa300902a52beb8f8e793237808add725 SHA256 d394ef53175a1a0609a1e0dda7894173a708281380f5460ef0ed87c48c1ccd62 SHA512 7c9c2ccd7005321f09eade2618571432337230c4327b75bb9da026077262e8ff1cff39b5d717287f5e1202592794498f5e75c9409ac2d52ba759aa13f0a0e146
+SLACKBUILD kino.SlackBuild 7885 MD5 f851a505b69ef095ce47bec18514daee RMD160 4cc2f1bd946229a002774628c7f2617cc0dc3635 SHA1 e595dec6c0aac94a037408c9e1e59bf0e613b047 SHA256 d016e551503b9a9f7415f547913be8c1caf31c2a1b4287f872e1c27c99dd5e89 SHA512 6655b545b35f5c15a362b59bc28bde18525d02000827ac89ac1e119bb275071a089687efa3acc86e1e545e02404581adba41749b9b8e05a636588340cf722085
diff --git a/media/video/kino/kino.SlackBuild b/media/video/kino/kino.SlackBuild
index 495bc4d8..efb33679 100755
--- a/media/video/kino/kino.SlackBuild
+++ b/media/video/kino/kino.SlackBuild
@@ -15,8 +15,8 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for kino, by Silvio Rhatto
-# requires: libsamplerate libraw1394 libavc1394 libdv libiec61883 libquicktime 
-# tested: kino-1.3.0
+# requires:  
+# tested: kino-1.3.2
 #
 
 # Look for slackbuildrc
@@ -47,9 +47,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 +65,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
@@ -84,6 +85,63 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +149,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 +162,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 +170,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
 CFLAGS="$SLKCFLAGS" \
diff --git a/media/video/kino/slack-required b/media/video/kino/slack-required
index 64b2438f..3fc6c61a 100644
--- a/media/video/kino/slack-required
+++ b/media/video/kino/slack-required
@@ -7,4 +7,3 @@ libavc1394
 libdv				
 libiec61883				
 libquicktime				
-intltool