zepto-mirrors/meta-musicians
1
0
Fork 0
mirror of https://github.com/schnitzeltony/meta-musicians.git synced 2026-09-13 06:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

mixxx: upgrade to 2.2.1+ and fix build after scons moved to python3

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-08-01 17:16:30 +02:00
parent 93930d7f15
commit 368e9d318d
7 changed files with 105 additions and 4066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
From b8673fb304f0eed41a1bcaa953a63bedb27b05e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 19 Sep 2016 01:11:47 +0200
Subject: [PATCH] do not check for known machine types
MIME-Version: 1.0
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
build/mixxx.py | 14 --------------
1 file changed, 14 deletions(-)
@@ -17,12 +17,12 @@ 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):
@@ -45,24 +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',
- 'alpha', 'hppa', 's390',
- 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
- 'armv5tel', 'armv5tejl', 'armv6l', 'armv6hl',
- 'armv7l', 'armv7hl', 'armv7hnl',
@@ -31,13 +31,17 @@ index aeed9e8..631bbfa 100644
- 'i486', 'i386', 'ppc', 'ppc64', 'powerpc',
- 'powerpc64', 'powerpcspe', 's390x',
- 'amd64', 'em64t', 'intel64', 'arm64',
- 'ppc64el', 'ppc64le', 'm68k', 'mips64',
- 'mips64el', 'mipsn32', 'mipsn32el',
- 'ppc64el', 'ppc64le', 'm68k',
- 'mips', 'mipsel', 'mipsr6', 'mipsr6el',
- 'mips64', 'mips64r6', 'mips64el', 'mips64r6el',
- 'mipsn32', 'mipsn32el', 'mipsn32r6', 'mipsn32r6el',
- 'mipsisa32r6', 'mipsisa32r6el', 'mipsisa64r6', 'mipsisa64r6el',
- 'aarch64']:
- raise Exception("invalid machine type")
-
if toolchain not in ['gnu', 'msvs']:
raise Exception('invalid toolchain type')
--
2.9.4

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

@@ -20,22 +20,24 @@ 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):
@@ -526,14 +526,9 @@ class SoundTouch(Dependence):
env = build.env
if build.platform_is_linux:
if build.platform_is_linux or build.platform_is_bsd:
- # Try using system lib
- if conf.CheckForPKG('soundtouch', '2.0.0'):
- # System Lib found
- build.env.ParseConfig('pkg-config soundtouch --silence-errors \
- --cflags --libs')
- if not conf.CheckLib(['SoundTouch']):
- raise Exception(
- "Could not find libSoundTouch or its development headers.")
- 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])
env.Append(CPPPATH=['#' + self.SOUNDTOUCH_INTERNAL_PATH])
--
2.5.5

4008
recipes-musicians/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch
View File

File diff suppressed because it is too large Load Diff

41
recipes-musicians/mixxx/mixxx/0004-build-mixxx.py-Fix-build-with-recent-python3.patch Normal file
View File

@@ -0,0 +1,41 @@
From 6d35e91b8c5112d5cbe897e919a5ca7fac8979c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 7 Jul 2019 23:41:35 +0200
Subject: [PATCH] build/mixxx.py: Fix build with recent python3
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/mixxx.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/mixxx.py b/build/mixxx.py
index b9501ee81a..e423c88018 100644
--- a/build/mixxx.py
+++ b/build/mixxx.py
@@ -214,15 +214,15 @@ class MixxxBuild(object):
import subprocess
process = subprocess.Popen("%s %s" %(self.env['CC'], '--version'), stdout=subprocess.PIPE, shell=True) # nosec
(stdout, stderr) = process.communicate()
- self.compiler_is_gcc = 'gcc' in stdout.lower()
- self.compiler_is_clang = 'clang' in stdout.lower()
+ self.compiler_is_gcc = 'gcc' in stdout.decode("utf-8").lower()
+ self.compiler_is_clang = 'clang' in stdout.decode("utf-8").lower()
# Determine the major compiler version (only GCC)
if self.compiler_is_gcc:
self.gcc_major_version = None
process = subprocess.Popen("%s %s" %(self.env['CC'], '-dumpversion'), stdout=subprocess.PIPE, shell=True) # nosec
(stdout, stderr) = process.communicate()
- gcc_version = stdout
+ gcc_version = stdout.decode("utf-8")
# If match is None we don't know the version.
if not gcc_version is None:
version_split = gcc_version.split('.')
--
2.21.0

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

@@ -1,34 +0,0 @@
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

31
recipes-musicians/mixxx/mixxx/0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch Normal file
View File

@@ -0,0 +1,31 @@
From 553cc367bf10401ac2a2849d24c0e93c4157a6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 1 Aug 2019 16:53:47 +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 cb6a21c0c7..f14ca0aa61 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -436,7 +436,7 @@ class Qt(Dependence):
build.env.Append(LIBS = 'qsqlite')
# Set the rpath for linux/bsd/macOS.
- if not build.platform_is_windows:
+ if False:
qtdir = build.env['QTDIR']
libdir_path = Qt.find_framework_libdir(qtdir)
if os.path.isdir(libdir_path):
--
2.21.0

27
recipes-musicians/mixxx/mixxx_git.bb
View File

@@ -1,7 +1,7 @@
SUMMARY = "Qt based DJ software"
HOMEPAGE = "http://mixxx.org/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=53e87493f719820ec7e95c60d090a4ae"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a8aab84a6580ace4c769a84255082b57"
inherit scons qmake5_paths pkgconfig distro_features_check
@@ -34,6 +34,7 @@ DEPENDS += " \
soundtouch \
libglu \
lilv \
lame \
"
# causes segfault trying to find debug libs
# gperftools
@@ -43,16 +44,12 @@ SRC_URI = " \
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 \
file://0004-build-mixxx.py-Fix-build-with-recent-python3.patch \
file://0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch \
"
SRCREV = "d9d7ea6404de71c86beacfc86f9087dc8db0fc58"
SRCREV = "6ae9e7947c743ab4cc3e54a6f09109d7558e7c50"
S = "${WORKDIR}/git"
PV = "2.2.0"
EXTRA_OESCONS_MATH ??= " \
vampfloatmath=1 \
"
PV = "2.2.1+git${SRCPV}"
# 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
@@ -61,21 +58,27 @@ 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}"
# 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() {
install -d ${D}${prefix}
sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript
sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/SConscript
}
FILES_${PN} += "${datadir}/appdata"