vlc: updating vlc, dependencies and other stuff

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

24 files changed, 969 insertions, 106 deletions

diff --git a/dev/yasm/Manifest b/dev/yasm/Manifest
new file mode 100644
index 00000000..e9532c06
--- /dev/null
+++ b/dev/yasm/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST yasm-0.7.1.tar.gz 1412314 MD5 fce21d066f4d04e3ec7f9318e6446e2b RMD160 17d04237c2287f0ea646fae329a2a8abed0873ba SHA1 c8adeb363ef52ee67c6e8e3041b509330aa30c87 SHA256 6074d93d48abe7eb61de03fb584f9ae3a700f68f175a1059172f8766c0e21e00 SHA512 9177917601822bf7d3df9ca95f9e0b86e7dee2d6a2bb8936cf046502a5a9bfce7b866c940ddba7f17a5561fb64db0d9d890b765ab3d47e5f176049b172b1c966
+DIST yasm-0.8.0.tar.gz 1419273 MD5 84a72204c9b452a00b39b1b00495163f RMD160 bec5b791f9ec121c52858f726943203901e6b7e7 SHA1 9d04e1c24c3f21b040fb298f3ec2f4dab252c569 SHA256 b5a9d4c99fb9d678eafc735f2eb9a05c193e6e6f7b0d45ed686796f3bfc8d887 SHA512 52a825bf7089e55d56ee474dd077bb7e6c076e9979367c4d90e395140d1e3e908e0c5cc84969dbb65e16668059ec34480d62a8b9bdaaa400d7332caf3b711488
+MKBUILD yasm.mkbuild 2923 MD5 ee5ff66e92e2cb6710446ddb7fc1b75e RMD160 a7431d24f7c31d28a15a3cc423783ee16d4ce40b SHA1 5e1cca0b6692f31da9d2f932c05ae35bb2f205a1 SHA256 05b5170659b704d951244f22e1f66ca767072744246bad6fc3280137ab5d3a43 SHA512 c55df0cf90065e9d29261d534cbaa5955d9a009161826a64e464a634ade1d2eeadf3046172d975ab797a4986179bb31b9a673808503f89e09f16bcf00152d3a1
+SLACKBUILD yasm.SlackBuild 5147 MD5 c36de857015fab5d5c4ba1732df86b02 RMD160 4616f630be5ef71eee760638efeb65f44667eb29 SHA1 f04d196a5ea5526d195d740ade2ebf954b57c005 SHA256 a7f8adabf79bca74a7165d3bdc22bbf3c3aa69b4762c3b4e54b436c90916fd73 SHA512 0a7426f4c478fbe6ae346c17beeaf0e8218aca07f6c9040b56c41915a3dbea1b097edc9fd9fefe100f1acac39fbfd20f2f3847f5bdc10a60d47b78c49ea5135e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80s/AAoJEEHL93ESzgein+cP/0N641QplvPduagX5yknXtpF
+dVQt+GGdAUmPIpl8TgnjpqYN/dk1furPuL4yoSRCoaIbFlB3PeOz6b0ds1Dy4b5O
+4IeuD2EAd4cITZgxDUX3l/GS3UPfqgSrDfLeyPXsrAcwAb/onzoF/EKDSckDoPgS
+CS+ACOa3r3/mGBmybXvoQwDudcrKjH2oMHng74a7B8k/ntyMs3BfDm1Geo8WnclE
+US5+QM8zbAaWiiL45zTnkMobXpg76ft4xyKF0VXSdO2t+2FrInfq588w04/Yx0o5
++KbH8/jtIYBPKxHM/5yRsIc5wq+iVpraVNDxvY8ciqDM8HNudDH46H14h7uqDHnf
++CubjJdok0/RlcTgfvq/IoM858ygn1DL1+XtyMyii2vewIJ+/ixq6FFjmjfRvjGq
+vRUEvOR4x6uhoWOV/dSNkRpn1yB9+vkpg5m++O0TUvv3rxDGVUDORncqJspQG16e
+s5jHSUPQmTeR2iqhaN+fZqE93SC4dcf3ZtC6HmgbqcU8G1sHgrVHffX50x1JxLEN
+Tx1gne99yJiVVaQqevbXGNNc9B4Sv6bjYceIlbvWHq7m8taysoCqMcVc1Sq1IVJV
+tgxITln8jg6olXXcXP1WtCZJL+q2tzhHp+Bx7W+7L5irnE6TW7nqDtA0OjWDbssK
+0n/8uwGzTMe6jeexV16a
+=WG1c
+-----END PGP SIGNATURE-----
diff --git a/dev/lang/yasm/yasm.SlackBuild b/dev/yasm/yasm.SlackBuild
index e92ab6c5..8ebce0bf 100755..100644
--- a/dev/lang/yasm/yasm.SlackBuild
+++ b/dev/yasm/yasm.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for yasm, by Silvio Rhatto
 # requires:  
-# tested: yasm-0.7.1
+# tested: yasm-0.8.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="yasm"
 PKG_NAME="yasm"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.7.1}
+SRC_VERSION=${VERSION:=0.8.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/yasm"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,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 +67,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
@@ -145,9 +148,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/media/libs/faac/Manifest b/media/libs/faac/Manifest
index 968d1223..5bc68e81 100644
--- a/media/libs/faac/Manifest
+++ b/media/libs/faac/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST faac-1.28.tar.gz 678891 MD5 80763728d392c7d789cde25614c878f6 RMD160 03902393488f04223aabdc804bfe77bb32a61c94 SHA1 d00b023a3642f81bb1fb13d962a65079121396ee SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b
-MKBUILD faac.mkbuild 2720 MD5 474f7bcc06eb4396f983efce7fd0bf54 RMD160 984af43577bd7ab29ae42972c1378617650d529d SHA1 2920ddcd948f218a29d8494b86a804581904175b SHA256 8d41b2907bd6c2e64ff4d21c7a829ebad32f55a0f74238dee2b5a50895dfb6a2 SHA512 6f0dd4faed330a442b6be046f2edeae356c934bc5b31bcc336a9ab7d6778d2b589c6068d90b88ba24e6d1c5a7abeef2f373130db603e58173dd94a910a6b695f
+MKBUILD faac.mkbuild 2740 MD5 d9aad599bdfa701f89007bada08fa424 RMD160 6a3e472c29f4d5a84588ff14800e0a2bfd619eb8 SHA1 23b9bb5e5e1854357cd3f6ffb48e403b5654fa8a SHA256 46b946ba90b27fab0e32760fdf69ac3d21eedc499c8c15dc1d8f1b9335544daa SHA512 8e8b4b27cb5a51aa12eaf57b2fe81c191e96add30e411b043b2e89dcacd4e4d97d4e0ff04b2e56080664e3471982f5a914b9abf8780aaf46c1a2e03c8a9c5b39
 PATCH faac-1.24.diff.gz 296212 MD5 5f53b4ee031873dffb1101b59aa05bcf RMD160 9b16bd34aa810661fb69674d76191df8507264a0 SHA1 6e66751f8eecd1e0bc439482879a93d26de97470 SHA256 ffd125a90ffb2f7767329a6b4ab682864abc9bb498032044e775a3c8b33eb7bf SHA512 5344c57f2ecee2edecbbb6c5593d6891f03e19c96efdbeb37950826d7000746fd2e0cd613d2b2922ded21587dce884f0740bf3edea6966c58e5dd6db86d31a3e
 PATCH faac-1.25.diff.gz 290557 MD5 4ab74a1aef1353319e1c9090759f254b RMD160 e950088ed15b0e57b7d9ec580cdd4c76b3b23842 SHA1 a99184f42e8ce9d4e77c8df9769029b12a416c37 SHA256 55f1ebd31ca692c0531ea169582d8ffaefc7662cb4291bfd91ad16be42093c3d SHA512 3139d989036faaf214977ec32d3048aac5d294a27abe1bf8b87cb5f7bf35b900e9bc3b7b2966dbafc12c89c3551f0a71d97812c5c41b568e17767bda8db396d8
-SLACKBUILD faac.SlackBuild 5789 MD5 c12494a2af257be2082804f6cdd72f20 RMD160 87e24a0453d83624034ffea0057873e501403dc8 SHA1 1b7887d6713199e90fa7807c7e5d64b8ab7e21ec SHA256 d1b23a2d57f5bf0d0dad8c29d3acd2f75240ecd1f9c084aed47c708e7042813c SHA512 1f02365fc37356a06be3d9a25fc954e7dea9fe87fba13f73f74ac5df10dc02ff99a4f34dfea75ce39a6d0f86a22445a1632faaf15bb8ae476f505b2df422ed08
+SLACKBUILD faac.SlackBuild 7938 MD5 e7a19e32fa2d6c913b047b45396f74bf RMD160 70262122ce53a71349e23d8fbb17209ff4e532cc SHA1 7c7c5205d9042e352f121fd21e946a53b1138bd2 SHA256 eb2de9ae2e3ba745cc05936de95167c28479d328ec8fbc4377e9d543db5519cb SHA512 e64a82ee1e3600feeb1276066961deaa0031854312da635eb010898037871e3b6057c5ce04f92b14a0cbc7d687242fb5f176439d4dc41feb974bafb50cee72e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80d6AAoJEEHL93ESzgeiY0MQALVO37obEa60Xe4mbnJjXrqJ
+qluIG0Ade2/E8cvydgXpUmCXS/ZeYOFkqzKIr+cUIImBhvfqynuw5ytt7nQNjxbS
+Bw/JXqIH18TqaStAZfTDN8kMRkHHLOFW7vRCUwai5kyQg+CsfDr+wlLPnQqCDBxI
+f+eZ6FyQRnX5oBC+KIs4Zmcv380jwZE70bJwBfv6UiXotnUx/ej4ZBq8gYqz9/sK
+fumWF/W9nZ8R/PQUhWKDXShqS+J4TqjUyV/mtVJ3Xj49Pj/yh887A6878AfrzQgo
+JAYDNuamFPnTF9BUO8EPZexJoxnAcKT3nz158k0uFZ0TxaTS6ncgt7WcbifGrB6d
+QNoG0ZhpgxBWrGbe16u4aPcemc1/bQZqxoOAhmvWSz0d4xBXb3N/XpzGhABD4lzc
+CofFTQ1qDzNhMCbrrkpvYaSHSd1U9pXjSHDgwDZNJzbow04m/GLr/+bF7sQkZB5w
+4usQjyoF49i/WkBl7HWF1xQ4Knod7pXa2DtmF2K/HAfOuMWI0BG1OfEBaSF1RcCZ
+R5/SV8RwqOuUQvE2x37gSiEvQLOh3wQHGML+0CGJrUgd9GgJ2o8Mv3QciVyz7ER3
+rVfiOuOAvdg9m/hNlBGYZZc58BNE4ewGmAq2FkNJBLvDuYSH4qIj2WXPH/cVxbp3
+QFTcffEuuNH0hf+cWS5A
+=TL7r
+-----END PGP SIGNATURE-----
diff --git a/media/libs/faac/faac.SlackBuild b/media/libs/faac/faac.SlackBuild
index 48d1d78b..a3801db7 100755
--- a/media/libs/faac/faac.SlackBuild
+++ b/media/libs/faac/faac.SlackBuild
@@ -17,7 +17,7 @@
 # slackbuild for faac, by Silvio Rhatto
 # requires:  
 # tested: faac-1.28
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -39,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/faac"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --with-docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -86,6 +87,72 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
@@ -174,7 +241,8 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/libs/faad2/Manifest b/media/libs/faad2/Manifest
index e6a384e6..f8a229c9 100644
--- a/media/libs/faad2/Manifest
+++ b/media/libs/faad2/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+MKBUILD faad2.mkbuild 2705 MD5 5c05f52cc2e131c3b8676a2e049feba3 RMD160 8080d30fa5ac5807b6406758d0d33ed1113921fb SHA1 ca63d4afe9b215b049ed230575dcfc44391c5bc8 SHA256 e210d14bab6532bb041bff35448b38698d9aaf157e3a783749a841067be7bb5a SHA512 53e874b5575fc571e1385b694beba7d4244f30485551f3af821c881587938ea35c7de30a85cae326569d93a765226387ad08104e17cb34fdfe85bf395fcec384
 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
+SLACKBUILD faad2.SlackBuild 7877 MD5 d06c7d8b9fbe42027178b01990050d40 RMD160 78aa9db8675f160976792068caee880722e622da SHA1 d091e5b4f667fe967a756c7b80ca5b50c286afd7 SHA256 fc5e9faf69e04fc217808f7b1c80d2e51bfaf93b472e9bce75e82e232c9b9fca SHA512 54a018f53940888d1f435b8c4368447d67dadaa3d0f11a226fb5ffa0a45c89a0633bfb916149709b49d561036012539f80b6372423792cf5c39c2a0857ed7e6a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ806TAAoJEEHL93ESzgeieXEP/0lahK8zfA4F2Xq2VTOFQYsr
+Ma3FbVXDJgpZR2yvHE1Qz1eYYjXbKBRM1Hde2v+EV9LTVIy6WICrsQBo6AIf+8YO
++YISoD3aBmpg74Ob+1mOObs+QT6Aq+gJb9urWX0eq+By/R3Xtt+J0AiRuEiNZTcp
+dbW3oEoFuH1rmCqphtsv8ocIGfW6ZsT21dmccIuc9eZEjQb5wB7Cb5y7ThgW+VBR
+tk8T/lEhuaudFxTy4Rsb1WLip2txTm2YNeW2bum+qNdox/Bj++2nipqde9ditm1a
+fWyKO3WD1uZOmJvr52NhLP5ZAHLY+H8LKLwpHNLDUvkDQFJ8uYeu+ccAhKqbzKbr
+0vDrFFDJMtIg3dxB6I+u43cW9ni1uOZBcFgC0qyIyKjluCMyBGlJE0loejQ4vp5d
+B3HEU7onXg53woz6oWjkUSTemcsI6Ul9MbsId/CLgZ4Vm87GMKSrmGc8rr8uab9e
+TWXz3l0a3ZAZ3F7awrkJaYaJ5u+7dMCD9LG91PuEyTRGhx7Hs50tJzQisrgCnVEN
+l5B4fu2VGYPubQ0TFoPvxY/dLXPahQeCHBcHHfpA+YtNE47Q7tV7KOJA6FrHFVWZ
+mKZUp3RwPewwUl7JTLqa9oathSJ5VPrisp2hEIIebw0Z9V1UiW6k4bKCJ8XwCCgv
+cQy2uhoSbUMCGfCnwxLO
+=u4Rx
+-----END PGP SIGNATURE-----
diff --git a/media/libs/faad2/faad2.SlackBuild b/media/libs/faad2/faad2.SlackBuild
index 5839e97f..b981bcdc 100755
--- a/media/libs/faad2/faad2.SlackBuild
+++ b/media/libs/faad2/faad2.SlackBuild
@@ -17,7 +17,7 @@
 # slackbuild for faad2, by Silvio Rhatto
 # requires:  
 # tested: faad2-2.7
-# model: generic.mkSlackBuild $Rev: 784 $
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -39,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/faad2"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--with-docdir=/usr/doc/$PKG_NAME-$VERSION"}
@@ -86,6 +87,72 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
@@ -173,7 +240,8 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/libs/liba52/Manifest b/media/libs/liba52/Manifest
new file mode 100644
index 00000000..0d06a40a
--- /dev/null
+++ b/media/libs/liba52/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST a52dec-0.7.4.tar.gz 241507 MD5 caa9f5bc44232dc8aeea773fea56be80 RMD160 5b63b34c5840e7182b733cad41e916a8d4875eb1 SHA1 79b33bd8d89dad7436f85b9154ad35667aa37321 SHA256 a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 SHA512 4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848
+MKBUILD liba52.mkbuild 2816 MD5 1f9e544517faabed40f0ba43a4225ad7 RMD160 ff5e2baa3173299aeb1d3db79f42671d0e51d9ff SHA1 8626bd483ee5802ae41716c932b5a675df9a3964 SHA256 1a7bf1a6ab507a92b988161b1816cfa3d4a7297c25be42a4375c37e259bcbaee SHA512 9ec980939f192f72daa7279dbf3fb7f9d65724dfb21f16dcdee4e4bf97f6f19a1c0fb07df48adc1a010afed9a4cfda3e2c71d4380b4a4f683c263ab424fb5aca
+SLACKBUILD liba52.SlackBuild 7056 MD5 527081899482aee8b974d5860c461aa5 RMD160 172c2bb5b16ed045409da47c34a6d14259208154 SHA1 de2fafd83dafc9d1cf0c32527ad02487cd81c45e SHA256 87a2dec42d5b483e4fe12c53ce2184ed6497f21e9bbb3a13a32ba4db2261cb68 SHA512 4e654f0938ea7c38a30d147d7f6e1235e0e67bebc22162503f28f77132119d3912c8480ba85d55145d15baeb3c8443e480bf9de1c86a687964b46034a91fbb5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80ZXAAoJEEHL93ESzgeiF28P/2IszvIm1b9ryYCIxmv9pzXm
+dpnEB+AaUMvfhhiAzzJtiJkvwiadqC7aEvZ61OL4JZpBSauXFfGHhKB6n0rXFgb6
+SQOHCfc8k9epjjNh5CZnoqWsPDY01v3GQRf++ZeHawU/ae1AFo67ALTMB1GHR5Nt
+V5f6Y4YeAnT54CIa/YCMBP3sRTls+55cDzLNdNbyailG1MfUflnt5nMWJud5Xcgl
+RCjD/CYT6QlYJwSu1mMmECQE4SFyzSa/gmXCftT8BjMdP8mFOKb6EBDjsGxlIf1k
+8JqzZZwFDCm+6jsO+osHrm9eF+iWHnC4OF2NvQGaA4o1ueIMjHB9t0177kicOcUa
+B5uYsJpDd3Yz3oylhWhtX00Vn392eT9kyqAIwpe7umo0gtHo2uYmh2JuKM8R/edX
+8u7L1kgW6keTDg0H3qmTDOyDiOPv6sgsZJDNymUY93Mv7+AhfMaPUEP4B+3fwPa/
+Z/XIVNIGP9Z7TffDCJXJpJY85B4kQAjDr391bYfrRVhbVVhyIhVZeDYgfwa36oWY
+sPdN12nn3ov7lkYLbmoNLFPEv0SG6LkxrATHQn9dAG9mTuVsk+HqRBBY17q6Vb1H
+Ck+7EIRcn9vihQo2upPskBarUWgJGzUxMWJsok40z6DRQs+0aFklBd0TFxDLkaDt
+IK+e7xvZG2j8910W0Gh8
+=ddIC
+-----END PGP SIGNATURE-----
diff --git a/media/libs/liba52/liba52.SlackBuild b/media/libs/liba52/liba52.SlackBuild
index 97214320..93acb267 100755
--- a/media/libs/liba52/liba52.SlackBuild
+++ b/media/libs/liba52/liba52.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for liba52, by Silvio Rhatto
 # requires:  
 # tested: liba52-0.7.4
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/liba52"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,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
@@ -57,6 +59,7 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,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
@@ -83,10 +87,76 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/media/libs/libdc1394/Manifest b/media/libs/libdc1394/Manifest
new file mode 100644
index 00000000..ef901df3
--- /dev/null
+++ b/media/libs/libdc1394/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdc1394-2.1.0.tar.gz 579429 MD5 51909785c8c3da6881dd983c98c0c6d6 RMD160 a9f98f142304444b71c0446127622bd375643c85 SHA1 a588d8802b555e45358435c48a399571532a817d SHA256 7175fd261aeb8f7ad991f6da38a1818a59ce6a14a70d4b8d754965aca6f77278 SHA512 bdfeeff69b39d99951ffb22c9cef28d01a5cec4dd6807f9c98ae343ade255e9772ce31f1a11c616357126ffaac534dce1a9d7c57cd33b001ff43150c27bfa234
+MKBUILD libdc1394.mkbuild 3182 MD5 17f8fac42fcb79d7ec14ffdc34f77f7d RMD160 0a627220e87ae98bf1a62429a2eed45eadf93e0f SHA1 e5658442599b82740a07e470ebda9ba39241e723 SHA256 59de1aa172dead2641b6261dca43b325583ab5679465043095c2d305ce51468d SHA512 920b55ec295151d8e3041b63fd0e1d667f9b7d4335e7460e4e7d6cff96561a854dee3405185fd471957cd79859dff6b2d80fcd3f40bf45439a3bbabba176eaee
+SLACK-REQUIRED slack-required 84 MD5 2bf54a3046d172dfe314b6b1155a5086 RMD160 cfc31f861f765314440c711c43c32f38fc946405 SHA1 3cc9c98cfbc817b4b4d4f16c5a4d9c73b996a7af SHA256 4c67224a017934876911b9c321fd0ea39d5ed35d648bbc0e1b00d5c673117e28 SHA512 2c02c477ff39195d304e3cce5aaf8ade0fb99c8235a3f85d429939ff28c9a3c7808cb69183d185efa9267aef84cbd2ab778e3f9cc3887c7e47e103f636d381cc
+SLACKBUILD libdc1394.SlackBuild 7314 MD5 58cd804c0194bc6b36d549aa306b63cd RMD160 53475fdd6c935b22d679f367ca5b24eb2b3d0408 SHA1 7247274be4079e01fc04b24d1fee0d84ee1525d0 SHA256 98bb665d300e4a4ede924c6f6ea58c1cee3e073191bb70c3044285c9abb7985a SHA512 0d18c557e2287721ef9bb090104010f0c24aee64f470459ae45f4bcf5c463834afa365ef0abfe7b74e66a742326d0b83ed3cd37a7906a4d84b41dcbe06351096
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80D7AAoJEEHL93ESzgei1vUP/Aloiw6yJGsi17wBkrNzRUn0
+rUAppFis4csKbtm7p+2SKBa9vAX38zmMsYSMHgpFlNOSHI/TJ8tEhXXk6aPZqueC
+FpO3851TvWrp4bN55y55NQxp5FKJMJLpf4gCP3y3h2oilLXBcsezFkmo/OxjBDBz
+K5xsFL0znzmHDPg4FIjF+DD1uoWdO96hJjjDSwCc5bjGZXs5PD4j2+hzYxI/J0fN
+3sk905mGkOx6Saoj1EMEnPIWAPVanHyF7xzDw4iI3+YpncpiFAyzKkfftFwqbtFq
+Hgbc4g6qBJHvXie3OjkbXe76HG3z4PYZsBl4bi2QrllyhizYdhIerbQjpj9xPJTB
+0VOW+AdyrLABgIb0UiqKtpd2ldFT9fXnugJKwsXhmEeAzwBsLsv3+WNIQMvFujeS
+Mf748i/ngOpqX0v7rIOA+8LPlpnRUUe1108KpVm1GDnvV7t9mlhrPX+ctTtcCtTf
+DJIo/v2t6X/4UKk8QLDt7JEXTYL+lJXEPhUfHDjy9tSAzFSfo+4eQxk6WcTt+kHl
+UaYBjfLA5bg8YS9H3rSwv0qPJipyv4+bOZHgeYiNgvjvchP3grwW31eX2FvCQQQ9
+94OsICnv+LOfIjUkRrPyUSlbqI9ympe8nmhM2Qk6cq5A6B4xMaAC+5FtG9EAwuIR
+NjTcYuEUuvrd1vvsQ5OC
+=mD31
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libdc1394/libdc1394.SlackBuild b/media/libs/libdc1394/libdc1394.SlackBuild
index 578551d5..f7d1ef08 100755
--- a/media/libs/libdc1394/libdc1394.SlackBuild
+++ b/media/libs/libdc1394/libdc1394.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libdc1394, by Silvio Rhatto
-# requires: libraw1394 
-# tested: libdc1394-1.2.2
+# requires:  
+# tested: libdc1394-2.1.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="libdc1394"
 PKG_NAME="libdc1394"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.2.2}
+SRC_VERSION=${VERSION:=2.1.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/libdc1394"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,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 +67,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 +87,72 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/libs/libshout/Manifest b/media/libs/libshout/Manifest
new file mode 100644
index 00000000..e383151f
--- /dev/null
+++ b/media/libs/libshout/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libshout-2.2.2.tar.gz 476564 MD5 4f75fc9901c724b712c371c9a1e782d3 RMD160 7ea5bc197953cfae6aff53876865909b2f6ac5f1 SHA1 cabc409e63f55383f4d85fac26d3056bf0365aac SHA256 912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160 SHA512 f6ebe556ab10cc67201d35f1172127a411ebb28494a7873474c9f33077e2f097244b0fb94d861ff258a2b887a17afbe4c6916283cc234ead6d0981d85fe45ee5
+MKBUILD libshout.mkbuild 2626 MD5 e51c352f9f1a285f22efb2e65da83bab RMD160 1bbe97608110ab6fed912066ab71d4b8b2059056 SHA1 dd132ea490cf9af52e935d943339db5a10a211a4 SHA256 836b9293d1bd5bd1ec6d77b4f5b04db669e95993ded1b67995be95711d5eeda8 SHA512 528eff0e3aa83515122e97c005e193fbf8994c89a6f9380a77f0456433bb1dc39b8eec1c8112ec473c5bcd5446bb9a7e02e7274ad3572a7c78a1e76e1c53bf6a
+SLACKBUILD libshout.SlackBuild 6867 MD5 14a6facb1adc8b48ae15b7bb0c55f40c RMD160 59d061e56ea64cdb4f5abd9c8867b891b87a5411 SHA1 2ab822678c3628e41b06729d75477299fc30f8db SHA256 2ed6984be0e08d930842d8de407194df67d7dc5ec88f8a154fde0dec4e06ec5f SHA512 e69a29784c20da9084bd3627a6650b8d04ce7c051b8f00b203b9b7f082fc7ea88d50afba25ebfa29b8eae1758069b33cad3b176195b97bcaf8eb7bb81ee24a12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80kiAAoJEEHL93ESzgeiHhsP/0AvCRYcY4BhK9gtkGix89JN
+bkrwU/pT4ir75tXhqDBex+DVNTahXSKC/sfuicMdCypCbVvvqM+eoFDIoIEX0hNS
+xsvzLsrApChtjPatpwG33Vj4SqH+TGK8YhD9ttkbpQZ1kaOe0CfdC5BvYuISqpo0
+Xp6YfPYBlL4uCHgXHOhNlOS6AyKJqS9GOwHPz4PjD0HGpkoEXVfvkzQO9z11Vc13
++fayhelQNxIt8ve5xHygHMdXb56lcsF61PEPprtFgz9ZTVAtrMTqtwy8ojAtnc0J
++ClqxPKtq1Doi1vyL4JyJaGFYFXwzBmqohmdmkojFUj0yq2tc8aO6dCVxJRwNDIu
+i3hclhqQ19xTFDNf1lsqjT06K7UF+pminul7ox+RS2KKik+Bqkf12oIHQBv3ozP5
+UlDCHX0t6rK5gdhCLFyZ6ZRw/ngKSRpR2BEHzYOtLq6M0eC+QJolvIFzqhsH9X8W
+9XOFOU8+zCKPPObYmE2udp1bri4ZH/S9LtmW4YYTd60fucaRJKUtn4rH0SPOHw+t
+TQZpUNGKWyqr+WVrW/aIXW6VXTfUNQYCTZ6z6L9/ZfLHt2lU0Civxh5TJIGsJlpo
+bvyOxcwgvcD7Qt8wP/tVnz3H4co69aQGTJ9lQgVv2/jh+hdxuCsUa8nV5QT1B6uf
+OpcDTK2IY3N3hAhupMY/
+=vl2m
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libshout/libshout.SlackBuild b/media/libs/libshout/libshout.SlackBuild
index b7b95591..1a3c9165 100755
--- a/media/libs/libshout/libshout.SlackBuild
+++ b/media/libs/libshout/libshout.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libshout, by Silvio Rhatto
 # requires:  
 # tested: libshout-2.2.2
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/libshout"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,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
@@ -57,6 +59,7 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,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
@@ -83,10 +87,76 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/media/libs/libx264/Manifest b/media/libs/libx264/Manifest
new file mode 100644
index 00000000..61378108
--- /dev/null
+++ b/media/libs/libx264/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST x264-snapshot-20081210-2245.tar.bz2 2311508 MD5 be6b87d61f9be1dbd4f4700dde63c67f RMD160 1300867575625ccf89ebf0d1331d133f3bfbb23e SHA1 ad04776b76ae10766bbc960150f46113d8a0040c SHA256 ba470b1a000bcfbfd2c35741e5d34ee0707b99880fffd43f9f01b6abf270753f SHA512 146cff7aa837de961b27b5f418e68c4ccf0af469cd913382496bced47c54204dae85ee8db79f065676ceb6f73dcf11dd598b142d51653bcb0d4c29cffb0fbef1
+MKBUILD libx264.mkbuild 3775 MD5 75196f1bd90d1d743859e495554ab081 RMD160 441d093972890e5cc4a457d81c3ebb87c7845163 SHA1 ea1d7d5279a31e0ba889bb8095d2367d8c001227 SHA256 a34b35b12a82de59100fcc6889cdbba530fd66f8520b1aa2e5e372bbd12e46a3 SHA512 9a15dd3aa5311c8d0b110881276f0f191b02cd8f4a234a21f608d9406fb77eab88b487a0f59294799228ea99ad8cf42b91d6d01b3c98d08c0f87ad6f19b9dec9
+SLACK-REQUIRED slack-required 76 MD5 ad8c1451ea436596f42bff4fea1c11c6 RMD160 00db8daf6bda0b325f355885a3123aa53bdd9020 SHA1 828db9eeb230a118861bd0d72b9096fc5ac98724 SHA256 22a138cf8ee3e079b0e5ef132b1c80c7ee97bd74300844cbbf766e8cab8ad767 SHA512 5c432e36803a22b522cf33d525b9e532835cc9caa79da0672732037cbc02c9878624a28464ad0211b1976d0a6a7a1dc01514d7ac5539976dccf1cedec538cf82
+SLACKBUILD libx264.SlackBuild 8360 MD5 29623e84022a969f7e2a15e8f3ab81b5 RMD160 849965da76db2e4771ed471000672436aa298e38 SHA1 5725a762316e6fbd588f35bb7a0514d8f2282f51 SHA256 da470cb7c5d177039ecee66bb8db3c4b0e41c68684d74f0689ae51eceb930c14 SHA512 adfe9390ab7ea46e3a904ad7c6ab3112fc888439dc5b9d1d1f1d42b388e01f6eb1f09ea250f79a0559987cf141e79de9b1bd5cca10d289f75ea6627922fc6f3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80w4AAoJEEHL93ESzgeilVMQALNg+PZ96PnyJrmXn3pZCx/v
+2U9tpZm+OAc8FjcegIoYb12aAaZJr0xlJL5MbCFUTqkogmAsS5GJSqSn+F8DAL5O
+rkwioYIqklBpnkj2RDJdrIvxOIrjsaFKEdsa9O3peT1Ynl42liygWTqcOfy/AeAA
+CMZTAm5Smix6/YvGnYLFvzAI2FDXRQBYiLlIWEyCM+BX2CwWQ9RbnPK/YMSUC1G8
+6sVnGtFbpOwiYX8J+l08VZX5bWLXzVd8xCnrD/rTK0ukxkU4QxihIHSkgGXOys2s
+1RZlbnPJ1P+wWjyD4DLHMNd03NCDSI8P1XUX6rMoaj22OxMPKnXSCvZv8r5SiM4H
+aApfu7oTTWRO3J32C1T1o/uDhwWT+xsVIT0LjdsgI90xZ7EEED8S1XSjYNT1mziK
+o3CMsK08+7J2vN+UuiLz8To7wjhJDIe75XtAPUG0zqCRCCVuuTmxt275+SNr4LG9
+ZLADjj7d2J2+mekFkoninnE1NIZjPScQFZLaUyPuiby6O4UFzGM5ngyOIbuSxdnp
+jNTYVYCvh8cGeD3bqRTRPvb04OUMj/sLLzdKs9oX47nIPoNSOcvE7e+iFicRoZCA
+eN+x1I6ZnksNQnVqyedijv9ocbF0WZoW3QkjmknPaxNGR0e219Z+D40uYFJYrhWJ
+vPMKMxiaIc6G5D1ezfLQ
+=AgFz
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libx264/libx264.SlackBuild b/media/libs/libx264/libx264.SlackBuild
index 6e9c39eb..f3a9690a 100755
--- a/media/libs/libx264/libx264.SlackBuild
+++ b/media/libs/libx264/libx264.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libx264, by Silvio Rhatto
-# requires: yasm 
+# requires:  
 # tested: libx264-20081210
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/libs/libx264"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--enable-shared --enable-visualize --enable-pic"}
@@ -47,9 +49,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 +67,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 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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 +160,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 +173,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 +181,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" \
@@ -183,7 +245,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/media/video/ffmpeg/Manifest b/media/video/ffmpeg/Manifest
index 5561beed..841c375e 100644
--- a/media/video/ffmpeg/Manifest
+++ b/media/video/ffmpeg/Manifest
@@ -1,3 +1,23 @@
-MKBUILD ffmpeg.mkbuild 3706 MD5 50ca7ad4b4f31f6af2da896fc34a05d8 RMD160 304a40d779f28b01d3468d0968945ebf2fd42a2e SHA1 5712396054c6dc62e0b496fa382b7a29e54fa2ba SHA256 7e37064f184ee19a84eb2969d889f727f6166aefaabaf2a23c8904539c20676e SHA512 c6a9ea36f8841a9781fb60833a425a7fc841825452c333405d6c2d679957a82dcd87fff8ce589b43abcc88da66d3834d65d65e773fd25a25ad42edbde4467d00
-SLACK-REQUIRED slack-required 96 MD5 8060943a0b388056311c0cda6c6b917a RMD160 7872b5c31988699fbc3d754cae189032f67b5f94 SHA1 af288341846ac139b78c54333b8c5bbec405848b SHA256 8084daa9d474566831b39cab4e24ed94ddee478a5ed4a713f442f1472897b00b SHA512 607ebb19f1fac59d2dd44a69f1f8bf5cb9592d2675f88c44cd91b93e3cca9b5696b1a6fc438bf8b3e0333fdbc43849235a50971f2bc5d7c055ad5f940ed4c34e
-SLACKBUILD ffmpeg.SlackBuild 6842 MD5 f0a89b5cf1b4db4e247b1825c51a50d7 RMD160 e3904ac40cd3400ec1950b978e08d608fbb03160 SHA1 114eaac13106857f1df1ee4dcb8c3adba57e6b78 SHA256 70bc1fdea196f5bc1bb0c95ad0170382563d2be3de92eebecfd6460e69a3e2e8 SHA512 06d7b0bc3778f7315132a7e17d485da4d129c0a4f45a8b7859fc849bd09de451e3f37b42d3858c68565b64f61845709a652a2a5d8a93995f4f5ff0035f48e156
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MKBUILD ffmpeg.mkbuild 3733 MD5 6525954e91b607b4cf3e250c4fc20f2c RMD160 bf6ffa6779120d46e9a58e698ab61a38e666105e SHA1 0bbc98c50b6440967cd336fba9fb8697891d5653 SHA256 3e6732ad5b7d70e167e5f5a8f2a93f1d44f63adb4c66772ebd87d3d73a1da03c SHA512 db3559c7afafa8ef775a43d3b73ce726464bbafcf5347fd50f37b1950a02db9b3312f3e9837a548bbdfb159fc18e38a089464d19fcb015032059a6fb853a2000
+SLACK-REQUIRED slack-required 106 MD5 b7c18a5ca91581acda9bb7bf750d6b3b RMD160 292eb967eaf437dc0a29004fc0cd22af3fcdc019 SHA1 4d75e5e5dcbe70bc44ab134cade77d57c88a5399 SHA256 6df14409e362af22858d675914390f400ee4991f972785633d185fbece3fba80 SHA512 38a768c04892c33d228db617089faa26537e9cf712b6db195bb039cbca6ff43f6a5dfd3e2e806a8a337b35da9f94aaa45cf718f19c82b55d4add936e936e86a4
+SLACKBUILD ffmpeg.SlackBuild 8870 MD5 21786e94c549b56b23be201af7a5e0b1 RMD160 991399d4e0dfd254991c189a72d1ee66398f2f75 SHA1 bb348bfb5f8f5e2820ad8c79548a9014d896b664 SHA256 e1c2060dddd7fd2143784688402c2e205b5fcfddc3f706c8a1bc633597d29478 SHA512 83c673e5ddb75b93be09d7e374bc5e8b2d76a5feb50223c648b6b8e8a1d562cba7cd1a8526c1afe4d835694d9efc82bd99dee3c3b115b88d06a0572b458b8b53
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ807qAAoJEEHL93ESzgei6pkP/jBzOIVRoPjbJdzVCsWnZD1h
+mrVwyZ1SERRWlyvJI4Vp66BAQJS+oOALrdeVk/TotV+AuhhmKfodXTBUhL3Y4nbr
+bqsH/sVp0BUDstjmM8db15fQzzRqBOZUHSLbAz8UHSMYgvPm53VMH7ha9z+/kNEa
+HtSu0IusdhqtLp9trv2eVlrQYBnzoyAtzlcjaSgR12Vi0ZQWk61eJRwLl8FTS9ZK
+oJ4YmWAkT/bjQfrp3J19W9cEiojlF6s+Jnzt5AfW0ss5X2+9eXnxx4vk4D7kAbTX
++DoKjLFeq1AsOfCRuoY1ZId+ENA6TAl22ojt+FCWQ6gc8QWSApBSzq0n2JLKqTgD
+tD/BIaX010t4/DpB2TKazE5GfYwn51DHpP6xt4lwpL3XKnYg47hIg3RjZnr0YoME
+FYqGpEZY7djWLvz4Ryl1rYqSOjVS4RWnGPRCJIspqrom1XVDDz+PXrsHVOR7OidT
+2xoqxbqZIbdHRel+m/yi4j4RnQ64iohMSO1uhR/IWzRTqgX2fUbQhAb7bxcsM65s
+AuBgq0cWDG1Cr1GelexkHTl2hyJcHfL363BCtZ5XzNRzw6iq6kLQJYMOPLhAR05p
+I24kpFlTDWqlicS/jYmRQ8l6VGYwor0GPNcrYMa8LLYmXxaJr6jvIS/tEoBbp8uI
+y5FCPRcKpXAyQLiLczIE
+=A+LX
+-----END PGP SIGNATURE-----
diff --git a/media/video/ffmpeg/ffmpeg.SlackBuild b/media/video/ffmpeg/ffmpeg.SlackBuild
index 6b8ef359..e362f723 100755
--- a/media/video/ffmpeg/ffmpeg.SlackBuild
+++ b/media/video/ffmpeg/ffmpeg.SlackBuild
@@ -15,7 +15,7 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for ffmpeg, by Silvio Rhatto
-# requires: lame faac libx264 
+# requires:  
 # tested: ffmpeg-svn_version
 # model: generic.mkSlackBuild $Rev: 805 $
 #
@@ -99,6 +99,72 @@ cp -a $SRC_DIR/* .
 PKG_SRC="$PWD/$SND_DIR"
 cd "$PKG_SRC"
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
+
 # Patch source
 patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
diff --git a/media/video/ffmpeg/slack-required b/media/video/ffmpeg/slack-required
index 54b5b619..776a75f5 100644
--- a/media/video/ffmpeg/slack-required
+++ b/media/video/ffmpeg/slack-required
@@ -4,3 +4,4 @@
 lame				
 faac				
 libx264				
+faad2				
diff --git a/media/video/mpeg2dec/Manifest b/media/video/mpeg2dec/Manifest
new file mode 100644
index 00000000..fedf500c
--- /dev/null
+++ b/media/video/mpeg2dec/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST mpeg2dec-0.4.1.tar.gz 494539 MD5 7631b0a4bcfdd0d78c0bb0083080b0dc RMD160 5377ae45abdd37fabcea6d3d0a9d74e493b84483 SHA1 80be8b16dff4caa4253470d1a3b563fdc0177fcb SHA256 c74a76068f8ec36d4bb59a03bf1157be44118ca02252180e8b358b0b5e3edeee SHA512 7be820ada1f2194d3c15867612e65af16a8cdfb637f2e974a884026b6b97c4bb71232951889ef428b87401db74a551ec614f421639384cac40f3bcb361e48393
+MKBUILD mpeg2dec.mkbuild 2637 MD5 bef364b44ad99259fe65b3629cec7cf1 RMD160 4b3d5747a6a2b98d8f08beb4f20a6068abbec865 SHA1 66ff45060e6b937725ba334df3ce1ffbd424082c SHA256 06c2e5502b97c46b1629d275a9fe8c905672221cdfc9510d055a08039e1a56fe SHA512 07cc2ef0b8fcb8d661d0cd7ed525c9a9b3cf037500fd882ce32ce0ed05aa47f3e2c1f6b82db0441bff7270ddd1e129dc6b65cc44f3d77ba76195b4757b8775e1
+SLACKBUILD mpeg2dec.SlackBuild 6878 MD5 584e17cb255fcbd5bdffaa773c743963 RMD160 e449a22193af22e486e3dd72eea75d65ffd1395b SHA1 b529c95fc481ec968ce81d89a3b9dfde6a22dce9 SHA256 6594648cf8083fa300cad5f09e11830ecae24055c272c6c59746f3ef38121b5c SHA512 7c85c408e15e3af670425767eaebc47dd3fa72185b811d98bb7e9c554270c6283995d9c58de4100bf80c75a59d66cee8bbfe705c146860382a0d5ca3567d00a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ80PLAAoJEEHL93ESzgeimhAQAKQceW/wOGjyVHZ1SUUOPJXh
+HJcwgCQW9p0PencUklVclqN059f9o66Sc4fca++7vpZiapx6hRNUZa1gSwssYAAY
+JocEkos92s4UnSWjVOCJ3v6SOrfVHVDKyaqs9sZp0i4NiCLZU7BIvzRLbAoG7YPt
+hiFbVP6YmLCGxrCHXrPfun97VwpzVy4sG3cLc1f+E7OvjD4n+1bZsskdLVQfpBo3
+xJZrz214lcFTVi7sCcBHBze01J9SIkeRx76RC4966Cnp4IoK1tc47v9Bdw4r3way
+wgJVlMpZMKRX09ZCyv/VEcgjxbupg6SABD/Lqqhy205nscWuuIzr6E2tiVXC++c+
+m92lTWsRd8wgxVRLZc05JST9nmfMsSoW70f6LFoWs8qqs/epEqZH5Rz865LR7Mpy
+tjW/kfnSvuFfD61dya8T8yu5iQMKJq5QMagp+Ivky7TNjV2DFZm/DhmhDWL68GgG
+P8iJVewnpIAP6rzYFmLGOSj+xMxH3bXogbeJUbblAeCFmy5Qr3Sd8gTJmtRSCDk3
+eLJN7mxWwBYbiveHlFhzEHsF4zd5V8YLqc3W0+ol8E0B46yAcsNPgIfjVvz40XUD
+b+fJxz86ldOIo3MnuDVKPqfV58V6erQz08PvOXUNtx9HxW3S2R/VzmomZCugnQv2
+iQ8N+Ajb0YFDZDbVDdk+
+=tCxg
+-----END PGP SIGNATURE-----
diff --git a/media/video/mpeg2dec/mpeg2dec.SlackBuild b/media/video/mpeg2dec/mpeg2dec.SlackBuild
index 190eb3fa..2097581e 100755
--- a/media/video/mpeg2dec/mpeg2dec.SlackBuild
+++ b/media/video/mpeg2dec/mpeg2dec.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for mpeg2dec, by Silvio Rhatto
 # requires:  
 # tested: mpeg2dec-0.4.1
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/mpeg2dec"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,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
@@ -57,6 +59,7 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,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
@@ -83,10 +87,76 @@ 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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$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
diff --git a/media/video/mplayer/MPlayer.SlackBuild b/media/video/mplayer/MPlayer.SlackBuild
index d26d4527..db609030 100755
--- a/media/video/mplayer/MPlayer.SlackBuild
+++ b/media/video/mplayer/MPlayer.SlackBuild
@@ -15,8 +15,8 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for MPlayer, by Silvio Rhatto
-# requires: speex jack libx264 faac faad2 
-# tested: MPlayer-snapshot
+# requires:  
+# tested: MPlayer-svn_version
 # model: generic.mkSlackBuild $Rev: 805 $
 #
 
@@ -29,10 +29,10 @@ fi
 
 # Set variables
 CWD="$(pwd)"
-SRC_NAME="mplayer-export"
+SRC_NAME="MPlayer"
 PKG_NAME="MPlayer"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=snapshot}
+SRC_VERSION=${VERSION:=svn_version}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -79,29 +79,24 @@ mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
-# Dowload source if necessary
-SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://www1.mplayerhq.hu/MPlayer/releases/$SRC"
+# Get svn source code
+cd "$SRC_DIR"
+SND_DIR="`basename svn://svn.mplayerhq.hu/mplayer/trunk`"
 
-if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
-  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+if [ "`find "$SRC_DIR/" -name .svn`" != "" ] && [ -d "$SRC_DIR/$SND_DIR" ]; then
+  cd $SND_DIR
+  svn update || exit $ERROR_VCS
+else
+  svn checkout svn://svn.mplayerhq.hu/mplayer/trunk $SND_DIR || exit $ERROR_VCS
+  cd $SND_DIR
 fi
 
-# Download skin
-SKIN="Blue"
-SKIN_VERSION="1.7"
-SKIN_EXT="bz2"
-SKIN_SRC=${PACKAGE_SKIN:=$SKIN-$SKIN_VERSION.tar.$SKIN_EXT}
-SKIN_URL="http://www.mplayerhq.hu/MPlayer/skins/$SKIN_SRC"
+PKG_VERSION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`_svn"
 
-if [ ! -s "$SRC_DIR/$SKIN_SRC" ] || ! bunzip2 -t "$SRC_DIR/$SKIN_SRC" 2> /dev/null; then
-  wget "$SKIN_URL" -O "$SRC_DIR/$SKIN_SRC" || exit $ERROR_WGET
-fi
-
-# Untar
+# Copy svn source
 cd "$PKG_WORK"
-tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cp -a $SRC_DIR/* .
+PKG_SRC="$PWD/$SND_DIR"
 cd "$PKG_SRC"
 
 # Patch source
diff --git a/media/video/mplayer/Manifest b/media/video/mplayer/Manifest
index 8b437e00..eb4911c3 100644
--- a/media/video/mplayer/Manifest
+++ b/media/video/mplayer/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST mplayer-export-snapshot.tar.bz2 8207032 MD5 8f9ef66219521a765f2c76f232cd06b5 RMD160 79a8b6531e78d3800456812af9c191f839be39f1 SHA1 4bacf80ecf406e8e27d2de57868fbff64655f535 SHA256 6b4e26ff65925de8695d1f56fc14ae3ed4c08601af965f36bd21d45a3fa8d318 SHA512 ea533f85a10a9b74e7d66b133ea65b282db0e7091f2bc4587181e58726618b42b5089dcfc1b58d423aa9c7d0948de344288fbcc45d581d4608228e5d64a2a60e
-MKBUILD MPlayer.mkbuild 4651 MD5 7c35db0d233aa671623d088192b09320 RMD160 9b15422649fefffe9143df3b54e5f971b6c906c5 SHA1 9d3196b1e90cf94cbe73861913cca8b6624e0089 SHA256 7454cda176c89434689c4120d9903a8013638f73a69d7397bf0d6fba26cc3ca4 SHA512 8d89347cab1da91589a949682fc519e16f94e03eb03d39fbadcbd60edc4c49b36786bccf1e290911399f9141c69dbf5a7addb8750510e57e7684f6e914a04067
+MKBUILD MPlayer.mkbuild 4603 MD5 7691c5c02246681fac4bff0957babf3d RMD160 fd539ec8f5e98051b3c5489897bb2c336ae560d4 SHA1 a972cfaf07b42c2e04aaab9a7fca6c04c2cf9992 SHA256 d410736acbd933489b7ab44568216a698a7c0e121dcaec6f13a0f5e44749fa38 SHA512 5626c8c1f574dd841ba63558d1f87193a0828dc35ab47f787f501d1796e90e300f2c1431ac883a546fe1f1b66149a88148dd65672ce46cf56cbd62dfc1013fbc
 PATCH MPlayer-1.0rc1.diff 1290 MD5 bd8a233ea31c6686a956387ad28c5c5c RMD160 0bf83ef398927ef28b5bf4287f1a1e9bb3bd4454 SHA1 4ed701ae65ede2f3510668be85d1efb093dc1f3c SHA256 480622f56e111db471010511ec7bc01d1302149a75d2549b9e57363530d0e918 SHA512 687cd547786e2397ee3fd565054c3306e6a8ffec2bac38400d388d0f58fcd2a4e31a8ec65fe3cd89f660cf36f51650fe61e75b6ac98dbf5544a52ded5e7e41cf
-SLACK-REQUIRED slack-required 124 MD5 1e1b4d769504ed25dcb8acd4d38c215e RMD160 461066b116af20348561d3d0fc03d12aa587fdcf SHA1 939c20c730d1ad016a2a2adc1308c1be51acaf36 SHA256 726f86886b9feec0d186aec988b2fce92f6cdc7d4864cf8f921d3f5384abb502 SHA512 00133dece716b260287118c9a552720635a2b123c52b1f5192da45e515714da6666cf5749bb2a084b853d4d8167ac20f144e6001a3cc9bfc1112ed55f1a0b24a
-SLACKBUILD MPlayer.SlackBuild 7009 MD5 5e885ee0c3c61ae6c1a2884035d473f7 RMD160 1c8d0ca81e7d438c52ca8b5c81f7297e50accbd6 SHA1 b49f5fe048a63a867a58b0bca510f554aadf0f3f SHA256 502dbac905c3017d7ee61254303a57dba15d561ad62500f159d649a4533f2e58 SHA512 76cc6740fc6311fcc196bf6b50d209a3829351def4da94285011b5140118ebdae1e854d9b02b85e2e6955f42fb5ceab067a155b8b9ac3ac7093e8627e8741947
+SLACK-REQUIRED slack-required 117 MD5 24c34746a675f9b786fc6e74fd741a3e RMD160 d926a6e449fb3ffcb512ff66da7797892d4b41c1 SHA1 148013a67d71386beb44478ed897c5df3c6629e8 SHA256 92b424917ece1bb6c63f361c98cf35291bf922154b4f1d54d49a711cbbf253bd SHA512 7a373eb663bdadc86ffba3390823937562305bfb4e97680c816ce0b17feb3ee4d8c4b860c0c92562ffbec98c3af02ebe10b5f9ca3ff936e338cf187dde9f16de
+SLACKBUILD MPlayer.SlackBuild 6705 MD5 8792c81e1715d716a33e4c8793eb717b RMD160 397182305544b3dbb03503ad88e45fe60eec8e1c SHA1 16d0395c92aa8262000b8da5e678ddf4940471f1 SHA256 e6b5ed156f650f15a7a9dc8806896992ec2639b7ea646d0db80b1df6a4eee5d1 SHA512 be01234cc3060ed6aabb3a4ad4dc8764985dc5cb933ca9806bc9daef71444f07ec630b06d4673c233026329c3ef78c02998cb6591946bebaba7fd9773e4bcac7
 SLACKBUILD mplayer-export.SlackBuild 7072 MD5 9fd696a2e454714dc06ef9ee7693d4b7 RMD160 3357aeab4134410226967e1eff62ac564c518d17 SHA1 2325f26f4018ed5a176b6d7ae44e735c8856c193 SHA256 412292c5db6fe29fe70494c5debaa969dab4f877296b4653cbffef6183c71cc8 SHA512 b30717ed524c623e096ed0c6ceaefc0613e36d6fbd739d871ec499083d2b67e1a17dabdebdc740c3c8046399050f6f2ef32966143078b16c21d4094ec0b0d9a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ805NAAoJEEHL93ESzgeiu40QAJcMT2wSp8h959PKE/kGFIn0
+c3GrRCyuzc3hWDe6dw7gt7iZAKPbDeC8zOZwXeSFC2J5z9UrIBM4sVqZcucQ4O8c
+lgZS4AcVP126WwgeCsGU3/Ycrf4Ct3wL45mj/qEbiWt/EOuSGgOu6P+cFnGXCIMJ
+X3xDh/LqnihcJ0f+IIeDEnS867vOoX4MiYlbVMKaRLtdSakwF6p2/hOn0W1N60am
+O+Y2wkDzyH0jac8Ne/XerQVvs3Ufkr5aM+hfXt6FleU6CvWcJNaPTzNToxdW6gxr
+iM4JQcbDZ3IlxDshEhEleEO+9koWkT+qxcMuhzg5WChvYZIJUmkjPvq46Lvwy3G3
+se02YSBbYw+nPq4MfgRA/xyXYQncsJCltFxabNDxCRbtIF0Qso4NUda4Tt/aetP+
+ZFmIvo2JXNMfuLaTTGNEz2iaDZdJzDT1dBUXh+/sJ41F9Gv2zg38/geP6Oen7eMd
+WHYt1/3uhvZYN6e0b22ooasmMxI8q3jOjveSE/Kh7E5uRlgoAbcj7icfU8JZs163
+rUBO1dh6fN8DMyR5kwU0t15pkKLmx4Q42HX22yMAHPYzi//eeU6OMyZ/3fZuSyKy
+bKhrCl4+eNqPSIhKXgWF/lsavsNacZFNRScJLu5RKZSSOxmogfhhtSyd1GgQavso
+IVnWdrCkZyODW19eoXD7
+=qFJ8
+-----END PGP SIGNATURE-----
diff --git a/media/video/mplayer/slack-required b/media/video/mplayer/slack-required
index 5a421f7f..102254b8 100644
--- a/media/video/mplayer/slack-required
+++ b/media/video/mplayer/slack-required
@@ -1,4 +1,4 @@
-# Dependency list to mplayer-export
+# Dependency list to MPlayer
 #
 # dependency [condition] [version]]
 speex				
diff --git a/media/video/vlc/Manifest b/media/video/vlc/Manifest
new file mode 100644
index 00000000..2ffbedf1
--- /dev/null
+++ b/media/video/vlc/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST vlc-0.9.9a.tar.bz2 17500620 MD5 c8d832deeef7f4072a73506f8d033198 RMD160 c185b5e8dae8e8aacb6e1c03f14eae24cb805648 SHA1 c72a3aa7854292356c0c5149cbb732da7d46b163 SHA256 e5d0a168263f56bccc62d30031287d56f0b6a3447b552f3a5224132d0b597dd6 SHA512 3018579264781286308d44f223f1f5b9425b9ab5f1ad5eb53bc35cf7373b5c327277839ff6432b7cd0220be7a3b38b28b880995ab4a5e5499e84f480216dfd3a
+MKBUILD vlc.mkbuild 3384 MD5 4f8e6fd749e12168fa3cb1fbe61ac44e RMD160 ce39fb4189a530545ca718e29b3fb7724a580f74 SHA1 4afa7a0cebe90d88999fec4f179dc16ae197c42b SHA256 dec76b7079d95e0351597513135ec612bd3e5fc5d2bc11abb7f405d2107ed373 SHA512 c598bf76d9e7a6a96807a08eba1c1cd8a52caa7e961261ab03b6416615a6e4bebef8150d7989bcf7ab5ff70e44edd9a1d4d4db2246314f1bf273d6a955c67445
+SLACK-REQUIRED slack-required 191 MD5 0a0b958ce81b2c0279bb10aba9561707 RMD160 5b70665e82cf1d667fc4fdb24a00073734066a96 SHA1 99f4799840f71f8680b27e3e2c4eeac830a0f947 SHA256 e11c993542a0ecb29dc93bf58ad5e9767006fd746b9487a33dd2f50dc5d7e920 SHA512 1964c7a0fb030317ba30703a20ecccf864b9cde7ce3e0ff57fe340b9e56af14910c791aa5331723266c0a6e3ba1f08a6cfdd60cde4a0820a274cfbe9903be070
+SLACKBUILD vlc.SlackBuild 7394 MD5 990a7d452d06b74165175fe8477f4941 RMD160 2db3a02d33cff11e05a2ab8c3e68430127e41a7b SHA1 66756572946e51df0f4a6926c72a1c70248d7bff SHA256 5d4ee8b882f4d4fa7efd92f937c244a384d3aca3dacbb58adae0fb92622fd83c SHA512 1f815a31e21296ff8be5f311bee423baf5d721145a1825ac1326549da9b36d3d61753fafe2f708b5d1898fae22a5d79edaa4d699aa3ed7180670c88b99fd7341
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ81L3AAoJEEHL93ESzgeivDcQAI3eycJ1fLlNnMc8uBgWdWYK
+l8t0sFry1C6aQYcI77WcUJjqJqCUUx90OEl0ka0TgRBmTK0X1qx2svohkMwx+JDF
+SiK7antue2EFedf8ZfhAoA0uxn+ouP69SvZCZigcuCgxnpUMnbrA75krRdX6aQ0a
+tfHY3Ik8uErOv6qQYmhB0FzMpyfN5uMktvfWDpBp4M6XWz78NzWQtrHoVysRZnB3
+lKUb9FQ/GriX4eo3QouDr8B+zWbu1+j2svVbrGQFX90tBCz1SFAnhFhkWLaXkyf8
+odd16T3EvKZE6q+oQh+S6dxc10fEW3w/T2Usn0Vi7OLUmQOMCDnm7Gde/S9jzK/w
+/SClaNI07HLswLIzoNHJwiqqwzGxNSqMowyZj7ZrHeuqbUbyofIZMuc900v9fIfw
+eqDbzLo5iFPIVpUKroUkB/C+HEISBsdEVfhSbylNj/5p1Viqm8qgOQc46kGUaQF9
+ifGYUumyhY4wVTO0GwtGjbkT2URG7npsEIcxKIUA2KWgE5I7cS9qu9l4Q37ArBc7
+2V2WmIF6v3YQQS73d6EMrH+5hSNXeAk3+Cd7UuQE6TXLLqpb8ZCbUG+uJMRG42xo
+bxYlgmhgSewyD0of7twxMK+KX1NAGq69u3kV9ezMj+dTtROHl/se84/qjo2eQRQw
+uTQxPEC8gXif6Qon/XQZ
+=PR5l
+-----END PGP SIGNATURE-----
diff --git a/media/video/vlc/vlc.SlackBuild b/media/video/vlc/vlc.SlackBuild
index d0d83607..5273da9e 100755
--- a/media/video/vlc/vlc.SlackBuild
+++ b/media/video/vlc/vlc.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for vlc, by Silvio Rhatto
-# requires: jack libraw1394 libdc1394 mpeg2dec liba52 faac lame wxWidgets libshout ffmpeg 
-# tested: vlc-0.8.6i
+# requires:  
+# tested: vlc-0.9.9a
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,25 +32,26 @@ CWD="$(pwd)"
 SRC_NAME="vlc"
 PKG_NAME="vlc"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.8.6i}
+SRC_VERSION=${VERSION:=0.9.9a}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="media/video/vlc"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:="--enable-theora --enable-dv --enable-v4l --enable-real --enable-dc1394 --enable-realrtsp --enable-flac --enable-snapshot --enable-aa --enable-jack --enable-shout"}
+CONF_OPTIONS=${CONF_OPTIONS:="--enable-theora --enable-dv --enable-v4l --enable-real --enable-realrtsp --enable-flac --enable-snapshot --enable-aa --enable-jack --enable-shout --disable-dc1394 --disable-qt4 --disable-skins2"}
 NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 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 +67,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
@@ -77,13 +80,79 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://download.videolan.org/pub/videolan/vlc/0.8.6i/$SRC"
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://download.videolan.org/pub/videolan/vlc/0.9.9a/$SRC"
 
-if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -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 signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  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
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then