aboutsummaryrefslogtreecommitdiff
path: root/media/video/vlc
diff options
context:
space:
mode:
Diffstat (limited to 'media/video/vlc')
-rw-r--r--media/video/vlc/Manifest24
-rwxr-xr-xmedia/video/vlc/vlc.SlackBuild90
2 files changed, 104 insertions, 10 deletions
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