20170807.1 global branch merge.current-20170807.1

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

3 files changed, 8 insertions, 57 deletions

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..2302eb09ae 100644
--- a/audio/mixxx/mixxx.SlackBuild
+++ b/audio/mixxx/mixxx.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mixxx
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20170530_27a110f}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -54,16 +54,14 @@ 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-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -71,9 +69,6 @@ find -L . \
  \( -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
-
 # 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
diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info
index b332a332b3..3c20e166c1 100644
--- a/audio/mixxx/mixxx.info
+++ b/audio/mixxx/mixxx.info
@@ -1,8 +1,8 @@
 PRGNAM="mixxx"
-VERSION="2.0.0"
+VERSION="20170530_27a110f"
 HOMEPAGE="https://www.mixxx.org"
-DOWNLOAD="http://downloads.mixxx.org/mixxx-2.0.0/mixxx-2.0.0-src.tar.gz"
-MD5SUM="5520a2f110f1078197d2ff914ccca37a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/mixxx-20170530_27a110f.tar.xz"
+MD5SUM="607e4e2e85d1b62e2fe2ef8735c12fe2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband"