vlc: updating vlc, dependencies and other stuff

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

2 files changed, 104 insertions, 10 deletions

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