vlc: updating vlc, dependencies and other stuff

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

10 files changed, 340 insertions, 50 deletions

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