get mixxx and qmmp from meta-qt5-extra

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>

recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch

@@ -0,0 +1,43 @@
+From b8673fb304f0eed41a1bcaa953a63bedb27b05e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 19 Sep 2016 01:11:47 +0200
+Subject: [PATCH] do not check for known machine types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ build/mixxx.py | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/build/mixxx.py b/build/mixxx.py
+index aeed9e8..631bbfa 100644
+--- a/build/mixxx.py
++++ b/build/mixxx.py
+@@ -45,20 +45,6 @@ class MixxxBuild(object):
+         if target not in ['windows', 'osx', 'linux', 'bsd']:
+             raise Exception("invalid target platform")
+ 
+-        if machine.lower() not in ['x86_64', 'x86', 'i686', 'i586',
+-                                   'alpha', 'hppa', 'mips', 'mipsel', 's390',
+-                                   'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
+-                                   'armv5tel', 'armv5tejl', 'armv6l', 'armv6hl',
+-                                   'armv7l', 'armv7hl', 'armv7hnl',
+-                                   'sh3', 'sh4',
+-                                   'kfreebsd-amd64', 'kfreebsd-i386',
+-                                   'i486', 'i386', 'ppc', 'ppc64', 'powerpc',
+-                                   'powerpc64', 'powerpcspe', 's390x',
+-                                   'amd64', 'em64t', 'intel64', 'arm64',
+-                                   'ppc64el', 'ppc64le', 'm68k', 'mips64',
+-                                   'mips64el', 'mipsn32', 'mipsn32el',
+-                                   'aarch64']:
+-            raise Exception("invalid machine type")
+ 
+         if toolchain not in ['gnu', 'msvs']:
+             raise Exception('invalid toolchain type')
+-- 
+2.9.4
+

recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch

@@ -0,0 +1,41 @@
+From bf659102f80fa2c104c2725e71943453ed8b9caf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 19 Sep 2016 23:46:11 +0200
+Subject: [PATCH] force using system soundtouch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For unknown reasons soundtouch is not properly found - maybe
+PKG_CONFIG_PATH gets lost in some scons depth - no idea.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ build/depends.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/build/depends.py b/build/depends.py
+index a053970..3edb64e 100644
+--- a/build/depends.py
++++ b/build/depends.py
+@@ -490,12 +490,9 @@ class SoundTouch(Dependence):
+             env = build.env
+ 
+         if build.platform_is_linux:
+-            # Try using system lib
+-            if conf.CheckForPKG('soundtouch', '2.0.0'):
+-                # System Lib found
+-                build.env.ParseConfig('pkg-config soundtouch --silence-errors \
+-                                      --cflags --libs')
+-                self.INTERNAL_LINK = False
++            build.env.ParseConfig('pkg-config soundtouch --silence-errors \
++                                  --cflags --libs')
++            self.INTERNAL_LINK = False
+ 
+         if self.INTERNAL_LINK:
+             env.Append(CPPPATH=[self.SOUNDTOUCH_INTERNAL_PATH])
+-- 
+2.5.5
+

recipes-musicians/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch

@@ -0,0 +1,31 @@
+From 5c81f8bf6b60dbc289ec0ad7657362bec169a35b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 7 Dec 2016 18:33:04 +0100
+Subject: [PATCH] align path of qt build tools to our needs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ build/qt5.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/qt5.py b/build/qt5.py
+index aa70a42..da96996 100644
+--- a/build/qt5.py
++++ b/build/qt5.py
+@@ -704,7 +704,7 @@ def generate(env):
+     def locateQt5Command(env, command, qtdir) :
+         triedPaths = []
+         for suffix in suffixes :
+-            fullpath = os.path.join(qtdir,'bin',command + suffix)
++            fullpath = os.path.join(qtdir,command + suffix)
+             if os.access(fullpath, os.X_OK) :
+                 return fullpath
+             triedPaths.append(fullpath)
+-- 
+2.7.4
+

recipes-musicians/mixxx/mixxx/0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch

@@ -0,0 +1,34 @@
+From a16c3cf78bdfc954560812478e0022957acaca8d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 18 Nov 2018 23:16:19 +0100
+Subject: [PATCH] Do not add QT libdir - it injectst /usr/lib these days
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ build/depends.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/build/depends.py b/build/depends.py
+index e6c4a4d250..637ebd0bb9 100644
+--- a/build/depends.py
++++ b/build/depends.py
+@@ -484,11 +484,6 @@ class Qt(Dependence):
+         if build.platform_is_osx:
+             compiling_on_104 = (
+                 os.popen('sw_vers').readlines()[1].find('10.4') >= 0)
+-        if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
+-            qtdir = build.env['QTDIR']
+-            framework_path = Qt.find_framework_libdir(qtdir, qt5)
+-            if os.path.isdir(framework_path):
+-                build.env.Append(LINKFLAGS="-L" + framework_path)
+ 
+         # Mixxx requires C++11 support. Windows enables C++11 features by
+         # default but Clang/GCC require a flag.
+-- 
+2.14.4
+

recipes-musicians/mixxx/mixxx_git.bb

@@ -0,0 +1,81 @@
+SUMMARY = "Qt based DJ software"
+HOMEPAGE = "http://mixxx.org/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e029b0dfdd8cfff5e40a3741234b1ca7"
+
+inherit scons qmake5_paths pkgconfig
+
+DEPENDS += " \
+    qtbase \
+    qtscript \
+    qtsvg \
+    qtxmlpatterns \
+    qttools-native \
+    libusb1 \
+    hidapi \
+    upower \
+    sqlite \
+    libid3tag \
+    taglib \
+    libmad \
+    faad2 \
+    libmp4v2 \
+    libogg \
+    libvorbis \
+    protobuf protobuf-native \
+    fftw \
+    portaudio-v19 \
+    portmidi \
+    chromaprint \
+    rubberband \
+    soundtouch \
+    libglu \
+"
+# causes segfault trying to find debug libs
+#    gperftools
+
+SRC_URI = " \
+    git://github.com/mixxxdj/${BPN}.git;branch=2.1 \
+    file://0001-do-not-check-for-known-machine-types.patch \
+    file://0002-force-using-system-soundtouch.patch \
+    file://0003-align-path-of-qt-build-tools-to-our-needs.patch \
+    file://0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch \
+    file://0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch \
+"
+SRCREV = "b4e0fd7c215c7d9afa6fcef70a7f197200b5a5d1"
+S = "${WORKDIR}/git"
+PV = "2.1.5"
+
+EXTRA_OESCONS_MATH ??= " \
+    vampfloatmath=1 \
+"
+
+# qtbase is expected to be build for desktop GL. If there is qtbase with gles
+# add opengles=1 to EXTRA_OESCONS but that currently disables code paths and
+# wave displays remain empty
+EXTRA_OESCONS += " \
+    build=release \
+    target=linux \
+    machine=${TARGET_ARCH} \
+    qt5=1 \
+    qtdir=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
+    shoutcast=0 \
+    localecompare=0 \
+    faad=1 \
+    ${EXTRA_OESCONS_MATH} \
+"
+#    perftools=1
+
+# If we export in do_install only, mixxx is compiled twice
+export LIBDIR="${libdir}"
+
+do_install_prepend() {
+    install -d ${D}${prefix}
+    sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript
+}
+
+FILES_${PN} += "${datadir}/appdata"
+
+# was: 'probably-redundant RPATH /usr/lib' - not exactly a bad breaker. Looked
+# into but could't find why this is thrown - so ignore for now.
+INSANE_SKIP_${PN} = "useless-rpaths"

recipes-musicians/qmmp/files/0001-Remove-freebsd-compilation-support.patch

@@ -0,0 +1,27 @@
+From 6ceffc2725ed4146510436938ffda7dc0acc6c5d Mon Sep 17 00:00:00 2001
+From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
+Date: Tue, 3 May 2016 18:36:14 +0000
+Subject: [PATCH] Remove freebsd compilation support
+
+Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5976e69..0711b11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,9 +1,5 @@
+ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+ 
+-#freebsd support
+-include_directories(SYSTEM /usr/local/include)
+-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
+-
+ #macports support
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+   SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include)
+-- 
+2.1.4
+

recipes-musicians/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch

@@ -0,0 +1,34 @@
+From d0591ebca09921ed7bfd67f224015ced4bc7a9f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sat, 14 Apr 2018 19:12:49 +0200
+Subject: [PATCH] Hardcode projectM configuration file location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A bit of a hack but other attempts failed
+
+Upstream-Status: Inappropriate [workaround]
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ src/plugins/Visual/projectm/projectmwidget.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
+index 7f7fcc4..12d2595 100644
+--- a/src/plugins/Visual/projectm/projectmwidget.cpp
++++ b/src/plugins/Visual/projectm/projectmwidget.cpp
+@@ -33,9 +33,7 @@
+ #include "projectmwrapper.h"
+ #include "projectmwidget.h"
+ 
+-#ifndef PROJECTM_CONFIG
+ #define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
+-#endif
+ 
+ ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
+         : QOpenGLWidget(parent)
+-- 
+2.14.3
+

recipes-musicians/qmmp/qmmp_1.3.1.bb

@@ -0,0 +1,45 @@
+SUMMARY = "Qt5 based audio-player"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+# Note: to support projectm, qtbase must be configured with desktop gl / gles
+# won't work
+
+DEPENDS += " \
+    qttools-native \
+    qtbase \
+    qtmultimedia \
+    ffmpeg \
+    libsamplerate0 \
+    curl \
+    qtx11extras \
+    taglib \
+    libcdio \
+    libcdio-paranoia \
+    libcddb \
+    libmad \
+    faad2 \
+    wavpack \
+    libmms \
+    libmodplug \
+    libvorbis \
+    projectm \
+    enca \
+    jack \
+    soxr \
+"
+
+SRC_URI = " \
+    http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
+    file://0001-Remove-freebsd-compilation-support.patch \
+    file://0002-Hardcode-projectM-configuration-file-location.patch \
+"
+SRC_URI[md5sum] = "827963a73facb802c8f684a3762c6b8b"
+SRC_URI[sha256sum] = "1cd2dd430a12e987720d30832e9ead8220ce9fcc9b871d45bed0e4bbe25fbeb6"
+
+inherit cmake_qt5
+
+FILES_${PN} += " \
+    ${datadir} \
+    ${libdir}/qmmp-1.3 \
+"

recipes-support/libcddb/libcddb_1.3.2.bb

@@ -0,0 +1,11 @@
+SUMMARY = "Library to access CDDB data"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6e29c688d912da12b66b73e32b03d812"
+
+DEPENDS = "libcdio"
+
+SRC_URI = "http://downloads.sourceforge.net/sourceforge/${BPN}/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8bb4a6f542197e8e9648ae597cd6bc8a"
+SRC_URI[sha256sum] = "35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b"
+
+inherit autotools gettext pkgconfig

recipes-support/packagegroups/musicians-world.bb

@@ -75,6 +75,7 @@ RDEPENDS_${PN} += " \
     \
     lmms \
     lrdf \
+    mixxx \
     muse \
     nekobee \
     \
@@ -90,6 +91,7 @@ RDEPENDS_${PN} += " \
     portmidi \
     projectm \
     qmidiarp \
+    qmmp \
     qt-gstreamer \
     \
     \