audio/mixxx: Updated for version 2.1.1, changed maintainer.

Added the new dependency opusfile

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 32 insertions, 71 deletions

diff --git a/audio/mixxx/README b/audio/mixxx/README
index 1f775a38e9..e029f97fab 100644
--- a/audio/mixxx/README
+++ b/audio/mixxx/README
@@ -6,4 +6,6 @@ wave recording, BPM detection, multichannel and multiple soundcard
 support, MIDI controllers support and scripting engine, a skinnable
 interface.
 
-opus is an optional dependency.
+NOTE: mixxx uses scons to build so it will ignore your MAKEFLAGS
+jobs settings: it will instead autodetect the number of cores and
+start a proper jobs number accordingly.
diff --git a/audio/mixxx/chromaprint-1.4.patch b/audio/mixxx/chromaprint-1.4.patch
deleted file mode 100644
index 35e63d2c5f..0000000000
--- a/audio/mixxx/chromaprint-1.4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: chromaprint 1.4 compatibility
-Origin: upstream,
- https://github.com/mixxxdj/mixxx/commit/71f3e5d0adb5116a23f9163b045f3419b9056a08,
- https://github.com/mixxxdj/mixxx/commit/830e864384ee1c96272997ee3f1dae4f71b28f3e,
- https://github.com/mixxxdj/mixxx/commit/c5b4368fd228feee28af4fb32ab6fbfd3f29f212
-Last-Update: 2017-01-11
-
---- mixxx-2.0.0~dfsg.orig/src/musicbrainz/chromaprinter.cpp
-+++ mixxx-2.0.0~dfsg/src/musicbrainz/chromaprinter.cpp
-@@ -5,6 +5,19 @@
- #include "musicbrainz/chromaprinter.h"
- #include "soundsourceproxy.h"
- 
-+namespace
-+{
-+    // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version
-+    // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016
-+    #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
-+        typedef uint32_t* uint32_p;
-+        typedef char* char_p;
-+    #else
-+        typedef void* uint32_p;
-+        typedef void* char_p;
-+    #endif
-+}
-+
- ChromaPrinter::ChromaPrinter(QObject* parent)
-              : QObject(parent) {
- }
-@@ -57,12 +70,12 @@ QString ChromaPrinter::calcFingerPrint(c
-     }
-     chromaprint_finish(ctx);
- 
--    void* fprint = NULL;
-+    uint32_p fprint = NULL;
-     int size = 0;
-     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
-     QByteArray fingerprint;
-     if (ret == 1) {
--        void* encoded = NULL;
-+        char_p encoded = NULL;
-         int encoded_size = 0;
-         chromaprint_encode_fingerprint(fprint, size,
-                                        CHROMAPRINT_ALGORITHM_DEFAULT,
diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild
index 4ee8066b9c..f122085abe 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for mixxx
 
 # Copyright 2011 Elvio "HelLViS69" Basello <hellvis69@gmail.com>
+# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by SlackBuilds.org
+
 PRGNAM=mixxx
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +43,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,46 +57,46 @@ else
   LIBDIRSUFFIX=""
 fi
 
-SRCVER=$(echo $VERSION | tr _ - )
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-release-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-release-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Upstream patch for the newer chromaprint
-patch -p1 < $CWD/chromaprint-1.4.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # 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
 
+export SCONSFLAGS="-j $(nproc)"
 CFLAGS="$SLKCFLAGS" \
 QTDIR=/usr/lib$LIBDIRSUFFIX/qt \
 scons \
   shoutcast=1 \
   faad=1 \
+  opus=1 \
+  build=release \
+  optimize=portable \
+  virtualize=0 \
+  localecompare=1 \
+  qt_sqlite_plugin=0 \
   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 \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir $PKG/usr/doc
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index b332a332b3..29be99b5b2 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -1,10 +1,10 @@
 PRGNAM="mixxx"
-VERSION="2.0.0"
+VERSION="2.1.1"
 HOMEPAGE="https://www.mixxx.org"
-DOWNLOAD="http://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz"
-MD5SUM="5520a2f110f1078197d2ff914ccca37a"
+DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.1.1/mixxx-2.1.1.tar.gz"
+MD5SUM="6336d6568bbf860c4e03295ae51ee286"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband"
-MAINTAINER="Elvio Basello (HelLViS69)"
-EMAIL="hellvis69@gmail.com"
+REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr opusfile portaudio portmidi protobuf rubberband"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"