multimedia/cantata: Updated for version 2.0.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 11 insertions, 62 deletions

diff --git a/multimedia/cantata/README b/multimedia/cantata/README
index b876ce9a3f..3d3963603b 100644
--- a/multimedia/cantata/README
+++ b/multimedia/cantata/README
@@ -1,10 +1 @@
 Cantata is a feature-rich graphical client for MPD.
-
-The download is from google drive, which when downloaded with wget
-results in ugly filenames. The slackbuild checks for either the
-"normal" filename or the ugly one, and uses the one it finds.
-
-You can use VERSION=svn to pull the sources directly from the svn.
-
-Cantata can be build with some additional features. See the SlackBuild for
-information on how to enable them.
diff --git a/multimedia/cantata/cantata.SlackBuild b/multimedia/cantata/cantata.SlackBuild
index 1d9ee2ba2a..84fe27fa6e 100644
--- a/multimedia/cantata/cantata.SlackBuild
+++ b/multimedia/cantata/cantata.SlackBuild
@@ -23,46 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cantata
-# this could be set to "svn" to automatically pull the newest source
-VERSION=${VERSION:-1.5.1}
-SRCFILE=${SRCFILE:-"uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"}
-
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Enable HTTP stream playback
-HTTPPLAYBACK=${HTTPPLAYBACK:-yes}
-
-# KDE related
-# Enable building for KDE4?
-WITHKDE=${WITHKDE:-no}
-
-# Build with KDE-Wallet support? Only used when build with kde support.
-WALLET=${WALLET:-no}
-
-# add extra options
-# (https://code.google.com/p/cantata/source/browse/trunk/INSTALL) here.
-EXTRAOPTIONS=""
-
-CMAKEFLAGS=""
-
-if [ "$WITHKDE" = "yes" ]; then
-	CMAKEFLAGS="-DENABLE_KDE=ON"
-
-	if [ "$WALLET" = "yes" ]; then
-		CMAKEFLAGS="$CMAKEFLAGS -DENABLE_KWALLET=ON"
-	fi
-else
-	CMAKEFLAGS="-DENABLE_KDE=OFF"
-	CMAKEFLAGS="$CMAKEFLAGS -DENABLE_PROXY_CONFIG=ON"
-fi
-
-if [ "$HTTPPLAYBACK" = "yes" ]; then
-	CMAKEFLAGS="$CMAKEFLAGS -DENABLE_HTTP_STREAM_PLAYBACK=ON"
-fi
-
-CMAKEFLAGS="$CMAKEFLAGS $EXTRAOPTIONS"
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -96,17 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-
-if [ "$VERSION" = "svn" ]; then
-	svn checkout http://cantata.googlecode.com/svn/trunk/ cantata-svn
-else
-	if [ -e $CWD/$PRGNAM-$VERSION.tar.bz2 ]; then
-		tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-	else
-		tar xvf $CWD/$SRCFILE
-	fi
-fi
-
+tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -121,9 +75,13 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_LIBVLC=NO \
+    -DENABLE_KDE=ON \
+    -DENABLE_QT5=OFF \
+    -DENABLE_KWALLET=ON \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DCMAKE_BUILD_TYPE=Release \
-	$CMAKEFLAGS ..
+     ..
   sed -i "s|lib/cantata|lib${LIBDIRSUFFIX}/cantata|" ../replaygain/CMakeLists.txt
   sed -i "s|lib/cantata|lib${LIBDIRSUFFIX}/cantata|" ../tags/CMakeLists.txt
   make
diff --git a/multimedia/cantata/cantata.info b/multimedia/cantata/cantata.info
index 02e376b029..d1e7ebdf8d 100644
--- a/multimedia/cantata/cantata.info
+++ b/multimedia/cantata/cantata.info
@@ -1,8 +1,8 @@
 PRGNAM="cantata"
-VERSION="1.5.1"
-HOMEPAGE="https://code.google.com/p/cantata/"
-DOWNLOAD="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"
-MD5SUM="367dab0b94503d1c1d0f4cfb775effca"
+VERSION="2.0.0"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+DOWNLOAD="https://github.com/CDrummond/cantata/archive/v2.0.0.tar.gz"
+MD5SUM="760417ece9f00b2e5c9811b65c87ecd5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"