From 5fdb7f5a5d87b06df909045d1a89e04905a3e708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 20 Aug 2019 00:34:19 +0200 Subject: [PATCH] mixxx: upgrade 2.2.1+ -> 2.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...do-not-check-for-known-machine-types.patch | 21 ++++------ .../0002-force-using-system-soundtouch.patch | 29 ++++++------- ...not-add-host-libdir-to-LDPATH-rpath.patch} | 18 ++++---- ...xxx.py-Fix-build-with-recent-python3.patch | 41 ------------------- recipes-musicians/mixxx/mixxx_git.bb | 12 +++--- 5 files changed, 36 insertions(+), 85 deletions(-) rename recipes-musicians/mixxx/mixxx/{0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch => 0004-Do-not-add-host-libdir-to-LDPATH-rpath.patch} (58%) delete mode 100644 recipes-musicians/mixxx/mixxx/0004-build-mixxx.py-Fix-build-with-recent-python3.patch diff --git a/recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch b/recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch index b59783d..0dd97b7 100644 --- a/recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch +++ b/recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch @@ -1,6 +1,6 @@ From b8673fb304f0eed41a1bcaa953a63bedb27b05e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 19 Sep 2016 01:11:47 +0200 +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 @@ -10,19 +10,19 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - build/mixxx.py | 14 -------------- - 1 file changed, 14 deletions(-) + build/mixxx.py | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/build/mixxx.py b/build/mixxx.py -index aeed9e8..631bbfa 100644 +index 6009973453..b9c7a9fee3 100644 --- a/build/mixxx.py +++ b/build/mixxx.py -@@ -45,24 +45,6 @@ class MixxxBuild(object): +@@ -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', 's390', +- 'alpha', 'hppa', 'mips', 'mipsel', 's390', - 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386', - 'armv5tel', 'armv5tejl', 'armv6l', 'armv6hl', - 'armv7l', 'armv7hl', 'armv7hnl', @@ -31,11 +31,8 @@ index aeed9e8..631bbfa 100644 - 'i486', 'i386', 'ppc', 'ppc64', 'powerpc', - 'powerpc64', 'powerpcspe', 's390x', - 'amd64', 'em64t', 'intel64', 'arm64', -- 'ppc64el', 'ppc64le', 'm68k', -- 'mips', 'mipsel', 'mipsr6', 'mipsr6el', -- 'mips64', 'mips64r6', 'mips64el', 'mips64r6el', -- 'mipsn32', 'mipsn32el', 'mipsn32r6', 'mipsn32r6el', -- 'mipsisa32r6', 'mipsisa32r6el', 'mipsisa64r6', 'mipsisa64r6el', +- 'ppc64el', 'ppc64le', 'm68k', 'mips64', +- 'mips64el', 'mipsn32', 'mipsn32el', - 'aarch64']: - raise Exception("invalid machine type") - @@ -43,5 +40,5 @@ index aeed9e8..631bbfa 100644 raise Exception('invalid toolchain type') -- -2.9.4 +2.21.0 diff --git a/recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch b/recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch index 7f1192d..a7e1c9b 100644 --- a/recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch +++ b/recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch @@ -1,6 +1,6 @@ From bf659102f80fa2c104c2725e71943453ed8b9caf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 19 Sep 2016 23:46:11 +0200 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 @@ -11,33 +11,30 @@ PKG_CONFIG_PATH gets lost in some scons depth - no idea. Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- - build/depends.py | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) + build/depends.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build/depends.py b/build/depends.py -index a053970..3edb64e 100644 +index 9d5efa2293..8604466701 100644 --- a/build/depends.py +++ b/build/depends.py -@@ -526,14 +526,9 @@ class SoundTouch(Dependence): +@@ -604,12 +604,8 @@ class SoundTouch(Dependence): env = build.env - if build.platform_is_linux or build.platform_is_bsd: + if build.platform_is_linux: - # Try using system lib - if conf.CheckForPKG('soundtouch', '2.0.0'): - # System Lib found -- 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') +- build.env.ParseConfig('pkg-config soundtouch --silence-errors \ +- --cflags --libs') - self.INTERNAL_LINK = False -+ build.env.ParseConfig('pkg-config soundtouch --silence-errors \ -+ --cflags --libs') ++ 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 +2.21.0 diff --git a/recipes-musicians/mixxx/mixxx/0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch b/recipes-musicians/mixxx/mixxx/0004-Do-not-add-host-libdir-to-LDPATH-rpath.patch similarity index 58% rename from recipes-musicians/mixxx/mixxx/0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch rename to recipes-musicians/mixxx/mixxx/0004-Do-not-add-host-libdir-to-LDPATH-rpath.patch index 4778564..80d7ec5 100644 --- a/recipes-musicians/mixxx/mixxx/0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch +++ b/recipes-musicians/mixxx/mixxx/0004-Do-not-add-host-libdir-to-LDPATH-rpath.patch @@ -1,6 +1,6 @@ From 553cc367bf10401ac2a2849d24c0e93c4157a6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 1 Aug 2019 16:53:47 +0200 +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 @@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/depends.py b/build/depends.py -index cb6a21c0c7..f14ca0aa61 100644 +index 8604466701..954740fe79 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: +@@ -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'] - libdir_path = Qt.find_framework_libdir(qtdir) - if os.path.isdir(libdir_path): + framework_path = Qt.find_framework_libdir(qtdir, qt5) + if os.path.isdir(framework_path): -- 2.21.0 diff --git a/recipes-musicians/mixxx/mixxx/0004-build-mixxx.py-Fix-build-with-recent-python3.patch b/recipes-musicians/mixxx/mixxx/0004-build-mixxx.py-Fix-build-with-recent-python3.patch deleted file mode 100644 index 60a19e9..0000000 --- a/recipes-musicians/mixxx/mixxx/0004-build-mixxx.py-Fix-build-with-recent-python3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6d35e91b8c5112d5cbe897e919a5ca7fac8979c5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - diff --git a/recipes-musicians/mixxx/mixxx_git.bb b/recipes-musicians/mixxx/mixxx_git.bb index fe1cdfb..7b285ad 100644 --- a/recipes-musicians/mixxx/mixxx_git.bb +++ b/recipes-musicians/mixxx/mixxx_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Qt based DJ software" HOMEPAGE = "http://mixxx.org/" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a8aab84a6580ace4c769a84255082b57" +LIC_FILES_CHKSUM = "file://LICENSE;md5=827547320b68c9b65f19d8abd3d7a019" inherit scons qmake5_paths pkgconfig distro_features_check @@ -44,12 +44,11 @@ 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-build-mixxx.py-Fix-build-with-recent-python3.patch \ - file://0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch \ + file://0004-Do-not-add-host-libdir-to-LDPATH-rpath.patch \ " -SRCREV = "b679fd37093826efa7ab81b3d4679d9a88b02dbb" +SRCREV = "8a94cf57d07e3ce2397ea96724d7c6130aa74eff" S = "${WORKDIR}/git" -PV = "2.2.1+git${SRCPV}" +PV = "2.2.2" # 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 @@ -77,8 +76,7 @@ do_compile_prepend() { } do_install_prepend() { - install -d ${D}${prefix} - sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/SConscript + sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript } FILES_${PN} += "${datadir}/appdata"