4 files changed, 22 insertions, 24 deletions
diff --git a/audio/mixxx/README b/audio/mixxx/README
index e8e1406e74..1f775a38e9 100644
--- a/audio/mixxx/README
+++ b/audio/mixxx/README
@@ -5,3 +5,5 @@ and FLAC playback, pitch independent time stretch, vinyl emulation,
 wave recording, BPM detection, multichannel and multiple soundcard
 support, MIDI controllers support and scripting engine, a skinnable
 interface.
+
+opus is an optional dependency.
diff --git a/audio/mixxx/desktop.diff b/audio/mixxx/desktop.diff
deleted file mode 100644
index 2594650305..0000000000
--- a/audio/mixxx/desktop.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mixxx.desktop	2010-12-06 00:07:57.000000000 +0100
-+++ src/mixxx.desktop.new	2011-01-21 17:51:19.000000000 +0100
-@@ -3,9 +3,9 @@
- Name=Mixxx
- GenericName=Digital DJ interface
- Comment=A digital DJ interface
--Exec=pasuspender mixxx
-+Exec=mixxx
- Terminal=false
- Icon=mixxx-icon
- Type=Application
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index 73c8c601eb..6583332a8e 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mixxx
-VERSION=${VERSION:-1.11.0}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,14 +54,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+SRCVER=$(echo $VERSION | tr _ - )
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,26 +71,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix the desktop file
-patch -p0 < $CWD/desktop.diff
+# Fix library installation path
+sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript || exit 1
+sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript || exit 1
 
-# it seems libshout isn't detected :(
 CFLAGS="$SLKCFLAGS" \
 QTDIR=/usr/lib$LIBDIRSUFFIX/qt \
 scons \
-  shoutcast=0 \
+  shoutcast=1 \
+  faad=1 \
   prefix=/usr
 
 QTDIR=/usr/lib$LIBDIRSUFFIX/qt \
 scons \
   install_root=$PKG/usr \
   prefix=/usr \
+  shoutcast=1 \
+  faad=1 \
   install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index d1c53baa1a..e3c9a1b035 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -1,10 +1,10 @@
 PRGNAM="mixxx"
-VERSION="1.11.0"
+VERSION="2.0.0"
 HOMEPAGE="http://www.mixxx.org"
-DOWNLOAD="http://downloads.mixxx.org/mixxx-1.11.0/mixxx-1.11.0-src.tar.gz"
-MD5SUM="89ee8ba60824919d8dd1194287bda259"
+DOWNLOAD="http://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz"
+MD5SUM="5520a2f110f1078197d2ff914ccca37a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libshout portaudio portmidi protobuf"
+REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband"
 MAINTAINER="Elvio Basello (HelLViS69)"
 EMAIL="hellvis69@gmail.com"