mirror of
https://github.com/schnitzeltony/meta-musicians.git
synced 2026-01-29 17:18:41 +01:00
mixxx: upgrade 2.2.4 -> 2.3.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
64
recipes-musicians/mixxx/mixxx.bb
Normal file
64
recipes-musicians/mixxx/mixxx.bb
Normal file
@@ -0,0 +1,64 @@
|
||||
SUMMARY = "Qt based DJ software"
|
||||
HOMEPAGE = "http://mixxx.org/"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=e5323335634095f8bdd15f6a5c5c5865"
|
||||
|
||||
inherit cmake_qt5 gtk-icon-cache features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtscript \
|
||||
qtsvg \
|
||||
qtxmlpatterns \
|
||||
qtx11extras \
|
||||
qtkeychain \
|
||||
qttools-native \
|
||||
libusb1 \
|
||||
hidapi \
|
||||
upower \
|
||||
sqlite3 \
|
||||
libid3tag \
|
||||
taglib \
|
||||
libmad \
|
||||
faad2 \
|
||||
libmp4v2 \
|
||||
libogg \
|
||||
libvorbis \
|
||||
protobuf protobuf-native \
|
||||
fftw \
|
||||
portaudio-v19 \
|
||||
portmidi \
|
||||
chromaprint \
|
||||
rubberband \
|
||||
soundtouch \
|
||||
libglu \
|
||||
lilv \
|
||||
lame \
|
||||
wavpack \
|
||||
libmodplug \
|
||||
libkeyfinder \
|
||||
libebur128 \
|
||||
"
|
||||
# causes segfault trying to find debug libs
|
||||
# gperftools
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/mixxxdj/${BPN}.git;branch=main \
|
||||
"
|
||||
SRCREV = "d1dca4785af375af8f73b5ee5389311f4a4ef5e6"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.3.0"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DSHOUTCAST=OFF \
|
||||
-DLOCALECOMPARE=OFF \
|
||||
-DFAAD=ON \
|
||||
"
|
||||
# -DPERFTOOLS=ON
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/appdata \
|
||||
${datadir}/metainfo \
|
||||
"
|
||||
@@ -1,44 +0,0 @@
|
||||
From b8673fb304f0eed41a1bcaa953a63bedb27b05e6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 19 Aug 2019 23:28:51 +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@gmail.com>
|
||||
---
|
||||
build/mixxx.py | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
|
||||
diff --git a/build/mixxx.py b/build/mixxx.py
|
||||
index 6009973453..b9c7a9fee3 100644
|
||||
--- a/build/mixxx.py
|
||||
+++ b/build/mixxx.py
|
||||
@@ -45,21 +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.21.0
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From bf659102f80fa2c104c2725e71943453ed8b9caf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 19 Aug 2019 23:33:01 +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@gmail.com>
|
||||
---
|
||||
build/depends.py | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/build/depends.py b/build/depends.py
|
||||
index 9d5efa2293..8604466701 100644
|
||||
--- a/build/depends.py
|
||||
+++ b/build/depends.py
|
||||
@@ -604,12 +604,8 @@ 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.21.0
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 553cc367bf10401ac2a2849d24c0e93c4157a6d3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 20 Aug 2019 00:20:06 +0200
|
||||
Subject: [PATCH] Do not add host libdir to LDPATH / rpath
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
build/depends.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/depends.py b/build/depends.py
|
||||
index 8604466701..954740fe79 100644
|
||||
--- a/build/depends.py
|
||||
+++ b/build/depends.py
|
||||
@@ -506,7 +506,7 @@ 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):
|
||||
+ if False:
|
||||
qtdir = build.env['QTDIR']
|
||||
framework_path = Qt.find_framework_libdir(qtdir, qt5)
|
||||
if os.path.isdir(framework_path):
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From da5d37978ba2d5fe791a87333e0ff0165a4a4706 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 14 Jun 2021 08:39:07 +0200
|
||||
Subject: [PATCH] Fix build with scons 4.x
|
||||
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/qt5.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/qt5.py b/build/qt5.py
|
||||
index 42c706a3ba..0c2ac31181 100644
|
||||
--- a/build/qt5.py
|
||||
+++ b/build/qt5.py
|
||||
@@ -43,7 +43,7 @@ import SCons.Scanner
|
||||
import SCons.Tool
|
||||
import SCons.Util
|
||||
|
||||
-class ToolQt5Warning(SCons.Warnings.Warning):
|
||||
+class ToolQt5Warning(SCons.Warnings.SConsWarning):
|
||||
pass
|
||||
|
||||
class GeneratedMocFileNotIncluded(ToolQt5Warning):
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
SUMMARY = "Qt based DJ software"
|
||||
HOMEPAGE = "http://mixxx.org/"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=827547320b68c9b65f19d8abd3d7a019"
|
||||
|
||||
inherit scons qmake5_paths pkgconfig features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtscript \
|
||||
qtsvg \
|
||||
qtxmlpatterns \
|
||||
qtx11extras \
|
||||
qttools-native \
|
||||
libusb1 \
|
||||
hidapi \
|
||||
upower \
|
||||
sqlite \
|
||||
libid3tag \
|
||||
taglib \
|
||||
libmad \
|
||||
faad2 \
|
||||
libmp4v2 \
|
||||
libogg \
|
||||
libvorbis \
|
||||
protobuf protobuf-native \
|
||||
fftw \
|
||||
portaudio-v19 \
|
||||
portmidi \
|
||||
chromaprint \
|
||||
rubberband \
|
||||
soundtouch \
|
||||
libglu \
|
||||
lilv \
|
||||
lame \
|
||||
"
|
||||
# causes segfault trying to find debug libs
|
||||
# gperftools
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/mixxxdj/${BPN}.git;branch=main \
|
||||
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-Do-not-add-host-libdir-to-LDPATH-rpath.patch \
|
||||
file://0005-Fix-build-with-scons-4.x.patch \
|
||||
"
|
||||
SRCREV = "59683489997e19d861a218e2e692cdbe52168869"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.2.4"
|
||||
|
||||
# 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} \
|
||||
qtdir=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
|
||||
shoutcast=0 \
|
||||
localecompare=0 \
|
||||
faad=1 \
|
||||
"
|
||||
# perftools=1
|
||||
|
||||
# If we export in do_install only, mixxx is compiled twice
|
||||
export LIBDIR="${libdir}"
|
||||
|
||||
# Have no idea why we need to create ui-headers...
|
||||
do_compile_prepend() {
|
||||
for uifile in `find ${S} -name '*.ui'`; do
|
||||
genfile=`echo $uifile | sed -e 's:.ui:.h:' -e 's:/dlg:/ui_dlg:'`
|
||||
uic $uifile -o $genfile
|
||||
done
|
||||
}
|
||||
|
||||
do_install_prepend() {
|
||||
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"
|
||||
Reference in New Issue
Block a user