multimedia/smplayer: Updated for version 0.6.8

3 files changed, 40 insertions, 22 deletions

diff --git a/multimedia/smplayer/README b/multimedia/smplayer/README
index 8f93c4a22d6e8..4d7b3f95a916d 100644
--- a/multimedia/smplayer/README
+++ b/multimedia/smplayer/README
@@ -1,15 +1,3 @@
 SMPlayer intends to be a complete front-end for MPlayer, from
 basic features like playing videos, DVDs, and VCDs to more
 advanced features like support for MPlayer filters and more.
-
-There are some optional icon themes available. If you would like
-to include them in your package, place these files in the same
-directory as smplayer.SlackBuild
-
-http://downloads.sourceforge.net/smplayer/smplayer-themes-0.1.19.tar.bz2
-MD5SUM: 06db0127d6221f3c8e78abdc2b0f2301
-
-http://downloads.sourceforge.net/smplayer/smplayer-themes-nonfree-0.1.1.tar.bz2
-MD5SUM: 84df710df9732b247dc16a393b101a01
-
-Requires MPlayer and QT4, available at SlackBuilds.org
diff --git a/multimedia/smplayer/smplayer.SlackBuild b/multimedia/smplayer/smplayer.SlackBuild
index f684a9fe0f799..a4299135e97b8 100644
--- a/multimedia/smplayer/smplayer.SlackBuild
+++ b/multimedia/smplayer/smplayer.SlackBuild
@@ -1,12 +1,31 @@
 #!/bin/sh
 
 # Slackware build script for SMPlayer
-# Written by Erik Hanson  erik@slackbuilds.org
+
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smplayer
-VERSION=${VERSION:-0.6.7}
+VERSION=${VERSION:-0.6.8}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Optional theme versions:
@@ -37,8 +56,8 @@ find . \
 sed -i "s%share/doc/packages/smplayer%doc/$PRGNAM-$VERSION%" Makefile
 sed -i "s%^CONF_PREFIX%#CONF_PREFIX%" Makefile
 
-make QMAKE=qmake-qt4 PREFIX=/usr
-make QMAKE=qmake-qt4 PREFIX=/usr DESTDIR=$PKG install
+make PREFIX=/usr
+make PREFIX=/usr DESTDIR=$PKG install
 
 strip --strip-unneeded $PKG/usr/bin/*
 
@@ -71,5 +90,10 @@ if [ -r $CWD/smplayer-themes-nonfree-$NONFVER.tar.bz2 ] ; then
   make PREFIX=/usr DESTDIR=$PKG install
 fi
 
+# Fix theme permissions.
+if [ -d $PKG/usr/share/smplayer/themes/ ] ; then
+  chown -R root:root $PKG/usr/share/smplayer/themes/
+fi
+
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/smplayer/smplayer.info b/multimedia/smplayer/smplayer.info
index ad2c790b155bc..9cbaf9e601e8f 100644
--- a/multimedia/smplayer/smplayer.info
+++ b/multimedia/smplayer/smplayer.info
@@ -1,8 +1,14 @@
 PRGNAM="smplayer"
-VERSION="0.6.7"
+VERSION="0.6.8"
 HOMEPAGE="http://smplayer.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/smplayer/smplayer-0.6.7.tar.bz2"
-MD5SUM="306b99374ad89cee93f1ad6fa94dea71"
+DOWNLOAD="http://downloads.sourceforge.net/smplayer/smplayer-0.6.8.tar.bz2 \
+          http://downloads.sourceforge.net/smplayer/smplayer-themes-0.1.19.tar.bz2 \
+          http://downloads.sourceforge.net/smplayer/smplayer-themes-nonfree-0.1.1.tar.bz2"
+MD5SUM="4465e060e6c1a254dcd9c8c4608e69eb
+        06db0127d6221f3c8e78abdc2b0f2301
+        84df710df9732b247dc16a393b101a01"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="dsomero,rworkman"