mixxx: update to 2.2.3

mixxx/PKGBUILD

 #contributions from Arch: https://www.archlinux.org/packages/community/x86_64/mixxx/
 
 pkgname=mixxx
-pkgver=2.1.0
+pkgver=2.2.3
 pkgrel=1
-pkgdesc="Digital DJ mixing software with cpu optimization enabled"
+pkgdesc="Free, open source software for digital DJ'ing."
 arch=('x86_64')
-url="http://www.mixxx.org/"
+url="https://www.mixxx.org/"
 license=('GPL2')
-depends=('glu' 'fftw' 'libsndfile' 'libogg' 'taglib' 'libid3tag' 'libmad' 'libvorbis' 'portaudio'
-         'portmidi' 'flac' 'opus' 'faad2' 'libmp4v2' 'chromaprint' 'rubberband' 'qt' 'upower'
-         'libshout' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'opusfile' 'soundtouch')
-makedepends=('mesa' 'scons' 'pkgconfig')
-categories=('multimedia')
-screenshot=("http://www.mixxx.org/images/splash1.png")
+depends=('chromaprint' 'gcc-libs' 'glibc' 'glib2' 'hidapi' 'faad2'
+         'flac' 'libglvnd' 'libid3tag' 'lilv' 'libmad' 'libmodplug'
+         'libmp4v2' 'libogg' 'portaudio' 'portmidi' 'protobuf'
+         'rubberband' 'libshout' 'libsndfile' 'gperftools' 'libusb'
+         'libvorbis' 'libx11' 'opusfile' 'qt5-base' 'qt5-script' 'qt5-svg'
+         'qt5-x11extras' 'qtkeychain' 'soundtouch' 'sqlite' 'taglib' 'upower' 'wavpack')
+makedepends=('glu' 'lv2' 'qt5-tools' 'scons' 'vamp-plugin-sdk')
 source=("https://github.com/${pkgname}dj/${pkgname}/archive/release-${pkgver}.tar.gz")
-sha256sums=('148b0ab222fa1c310e62b566d87c0a3d43fdee9435150d40d62055dbc228d396')
+sha256sums=('69230dca511ba08a284a22a979ff05b62130e97156d39a044bb4045f5f43cd2e')
 
 build() {
   cd "${srcdir}/${pkgname}-release-${pkgver}"
   export SCONSFLAGS="-j $(nproc)"
-  scons build=release optimize=portable virtualize=0 localecompare=1 qt_sqlite_plugin=0 opus=1 \
-    qtdir=/usr/lib/qt prefix=/usr faad=1
+  scons prefix=/usr \
+        build=release \
+        faad=1 \
+        ffmpeg=1 \
+        modplug=1 \
+        perftools=1 \
+        perftools_profiler=1 \
+        qt_sqlite_plugin=0 \
+        qtkeychain=1 \
+        target=linux \
+        virtualize=0 \
+        wv=1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-release-${pkgver}"
-  scons qtdir=/usr/lib/qt prefix=/usr install_root=$pkgdir/usr install 
+  scons prefix=/usr \
+        install_root="${pkgdir}/usr" \
+        install
 }

mixxx/mixxx-2.0.0-build.patch

-diff -ur mixxx-2.0.0/build/mixxx.py mixxx-2.0.0-patched/build/mixxx.py
---- ./build/depends.py.orig	2016-02-09 04:30:54.860754912 +0000
-+++ ./build/depends.py	2016-02-09 04:29:53.286383033 +0000
-@@ -359,7 +359,6 @@ class Qt(Dependence):
-             qtdir = build.env['QTDIR']
-             framework_path = Qt.find_framework_libdir(qtdir, qt5)
-             if os.path.isdir(framework_path):
--                build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
-                 build.env.Append(LINKFLAGS="-L" + framework_path)
-

mixxx/mixxx-2.0.0-chromaprint-1.4.0.patch

---- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp.old	2017-01-13 14:24:15.105139156 +0100
-+++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp	2017-01-13 14:24:06.568450904 +0100
-@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c
-     }
-     chromaprint_finish(ctx);
- 
--    void* fprint = NULL;
-+    uint32_t* fprint = NULL;
-     int size = 0;
-     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
-     QByteArray fingerprint;
-     if (ret == 1) {
--        void* encoded = NULL;
-+        char* encoded = NULL;
-         int encoded_size = 0;
-         chromaprint_encode_fingerprint(fprint, size,
-                                        CHROMAPRINT_ALGORITHM_DEFAULT,

mixxx/mixxx-2.0.0-gcc-6.patch

---- ./src/util/math.h.orig	2016-07-14 04:13:22.861482580 +0100
-+++ ./src/util/math.h	2016-07-14 04:15:36.966067224 +0100
-@@ -4,7 +4,13 @@
- // Causes MSVC to define M_PI and friends.
- // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
- #define _USE_MATH_DEFINES
--#include <cmath>
-+#include <math.h>
-+#include <cmath> 
-+// Note: Because of our fpclassify hack, we actualy need to inlude both, 
-+// the c and the c++ version of the math header.  
-+// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included 
-+// after our fpclassify hack 
-+
- #include <algorithm>
- 
- #include "util/assert.h"

mixxx/mixxx-remove-sqlite-typedef.patch

---- a/src/library/trackcollection.cpp
-+++ b/src/library/trackcollection.cpp
-@@ -2,10 +2,6 @@
- #include <QtDebug>
- 
- #include "library/trackcollection.h"
--
--#ifdef __SQLITE3__
--#include <sqlite3.h>
--#endif
- 
- #include "library/librarytablemodel.h"
- #include "library/schemamanager.h"
-
---- a/src/library/trackcollection.h
-+++ b/src/library/trackcollection.h
-@@ -34,8 +34,7 @@
- #include "library/dao/libraryhashdao.h"
- 
- #ifdef __SQLITE3__
--typedef struct sqlite3_context sqlite3_context;
--typedef struct Mem sqlite3_value;
-+#include <sqlite3.h>
- #endif
- 
- class TrackInfoObject;
-