vlc: updating vlc, dependencies and other stuff

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

3 files changed, 41 insertions, 26 deletions

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