From efbcbe15fe20550a3391fcfa37ff7440521cf0db Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Wed, 8 Sep 2010 18:17:22 -0400
Subject: multimedia/xvst: Updated for version 2.4.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 multimedia/xvst/README          |  1 +
 multimedia/xvst/doinst.sh       |  1 -
 multimedia/xvst/slack-desc      | 10 +++++-----
 multimedia/xvst/xvst.SlackBuild | 11 +++--------
 multimedia/xvst/xvst.desktop    |  3 +--
 multimedia/xvst/xvst.info       |  8 ++++----
 6 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'multimedia/xvst')

diff --git a/multimedia/xvst/README b/multimedia/xvst/README
index 2c739e62859d..7f0ffe72e0af 100644
--- a/multimedia/xvst/README
+++ b/multimedia/xvst/README
@@ -4,3 +4,4 @@ you the ability to convert each video in most popular formats: AVI,
 MPEG1, MPEG2, WMV, MP4, 3GP, MP3 file formats.
 
 xvst requires ffmpeg as a runtime requirement for video conversion(s).
+xvst can also use flvstreamer as an optional dependency.
diff --git a/multimedia/xvst/doinst.sh b/multimedia/xvst/doinst.sh
index 4e8ba7071dea..5fb28930db0b 100644
--- a/multimedia/xvst/doinst.sh
+++ b/multimedia/xvst/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/multimedia/xvst/slack-desc b/multimedia/xvst/slack-desc
index ac2f7ea85f91..1a4170073e0d 100644
--- a/multimedia/xvst/slack-desc
+++ b/multimedia/xvst/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler------------------------------------------------------|
 xvst: xvst (Qt Gui for downloading favorite video clips from the web)
-xvst: 
+xvst:
 xvst: xVideoServiceThief is a tool for downloading your favourite video
 xvst: clips from a lot of video websites. xVideoServiceThief also provides
 xvst: you the ability to convert each video in most popular formats: AVI,
 xvst: MPEG1, MPEG2, WMV, MP4, 3GP, MP3 file formats.
-xvst: 
+xvst:
 xvst: Homepage: http://xviservicethief.sourceforge.net/
-xvst: 
-xvst: 
-xvst: 
+xvst:
+xvst:
+xvst:
diff --git a/multimedia/xvst/xvst.SlackBuild b/multimedia/xvst/xvst.SlackBuild
index bee9ef571487..192443b1bb5e 100644
--- a/multimedia/xvst/xvst.SlackBuild
+++ b/multimedia/xvst/xvst.SlackBuild
@@ -5,8 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=xvst
-VERSION=2.4
-SRCVER=$(echo $VERSION | tr '.' '_')
+VERSION=2.4.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -25,16 +24,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -45,7 +40,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/xVST_${SRCVER}_src.zip
+unzip $CWD/xVST_${VERSION//\./_}_src.zip
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -56,7 +51,7 @@ find . \
 # Change file from DOS to Unix, change path for plugins and language files
 # and make translations.
 sed -i 's/\r//g' "how to compile.txt"
-sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/${PRGNAM}|g" src/options.cpp
+sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/$PRGNAM|g" src/options.cpp
 lrelease resources/translations/*.ts
 rm -f resources/translations/template_for_new_translations.qm
 
diff --git a/multimedia/xvst/xvst.desktop b/multimedia/xvst/xvst.desktop
index 15e061a87085..2d388d899324 100644
--- a/multimedia/xvst/xvst.desktop
+++ b/multimedia/xvst/xvst.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=xVideoServiceThief
 GenericName=Video Downloader
 GenericName[de]=Video-Downloader
@@ -8,7 +7,7 @@ GenericName[cs]=Stahování videí
 Comment=Download videos and convert it
 Comment[de]=Videos herunterladen und konvertieren
 Comment[cs]=Nástroj pro stahování a konvertování videí z různých portálů
-Icon=xvst.png
+Icon=xvst
 Exec=xvst
 Terminal=false
 StartupNotify=false
diff --git a/multimedia/xvst/xvst.info b/multimedia/xvst/xvst.info
index 23848a4abf8b..e1e03dc8a798 100644
--- a/multimedia/xvst/xvst.info
+++ b/multimedia/xvst/xvst.info
@@ -1,10 +1,10 @@
 PRGNAM="xvst"
-VERSION="2.4"
+VERSION="2.4.1"
 HOMEPAGE="http://xviservicethief.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xviservicethief/xVST_2_4_src.zip"
-MD5SUM="27b83803906981b731ab5658b6b96528"
+DOWNLOAD="http://downloads.sourceforge.net/xviservicethief/xVST_2_4_1_src.zip"
+MD5SUM="7f8c2e79c3431cc46da306419abc16eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
-- 
cgit v1.2.3