multimedia/xvst: Fixed to compile against gcc 4.7.x

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 31 insertions, 4 deletions

diff --git a/multimedia/xvst/README b/multimedia/xvst/README
index 7f0ffe72e0afc..8b99536021a8f 100644
--- a/multimedia/xvst/README
+++ b/multimedia/xvst/README
@@ -5,3 +5,6 @@ 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.
+
+If you'd like to check out the latest plugins from SVN, then pass
+"PLUGINS=yes" to the slackbuild.
diff --git a/multimedia/xvst/gcc-4.7.patch b/multimedia/xvst/gcc-4.7.patch
new file mode 100644
index 0000000000000..735a2d4e50328
--- /dev/null
+++ b/multimedia/xvst/gcc-4.7.patch
@@ -0,0 +1,11 @@
+diff -Naur xvst.orig/src/qtsingleapplication/src/qtlocalpeer.cpp xvst/src/qtsingleapplication/src/qtlocalpeer.cpp
+--- xvst.orig/src/qtsingleapplication/src/qtlocalpeer.cpp	2009-10-12 03:43:46.000000000 +0000
++++ xvst/src/qtsingleapplication/src/qtlocalpeer.cpp	2012-07-02 04:24:37.152806791 +0000
+@@ -57,6 +57,7 @@
+ #endif

+ #if defined(Q_OS_UNIX)

+ #include <time.h>

++#include <unistd.h>

+ #endif

+ 

+ namespace QtLP_Private {

diff --git a/multimedia/xvst/xvst.SlackBuild b/multimedia/xvst/xvst.SlackBuild
index 192443b1bb5ea..8e554f1bf37f8 100644
--- a/multimedia/xvst/xvst.SlackBuild
+++ b/multimedia/xvst/xvst.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=xvst
-VERSION=2.4.1
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.4.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -41,6 +41,16 @@ rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/xVST_${VERSION//\./_}_src.zip
+# Xvst hasn't had a stable release in a couple years.
+# However, the developer(s) have updated the plugins in svn.
+# Add PLUGINS=yes to the slackbuild to download the updated
+# plugins/translations.
+if [ "${PLUGINS:-no}" == "yes" ]; then
+  svn export --force https://xviservicethief.svn.sourceforge.net/svnroot/xviservicethief/trunk/resources/services \
+    resources/services
+  svn export --force https://xviservicethief.svn.sourceforge.net/svnroot/xviservicethief/trunk/resources/translations/definitions \
+    resources/translations/definitions
+fi
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,8 +65,11 @@ sed -i "s|getApplicationPath()\ +\ \"|\"/usr/share/$PRGNAM|g" src/options.cpp
 lrelease resources/translations/*.ts
 rm -f resources/translations/template_for_new_translations.qm
 
+# Fix to compile against gcc 4.7.x.
+patch -p1 < $CWD/gcc-4.7.patch
+
 qmake -set build_mode dynamic_build
-qmake -unix PREFIX=/usr -o Makefile xVideoServiceThief.pro
+qmake PREFIX=/usr -o Makefile xVideoServiceThief.pro
 make \
   CFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)" \
   CXXFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)"
diff --git a/multimedia/xvst/xvst.info b/multimedia/xvst/xvst.info
index e1e03dc8a7986..f61a28896bf5c 100644
--- a/multimedia/xvst/xvst.info
+++ b/multimedia/xvst/xvst.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="rworkman"