From fb2d150884f2ff111ca3cd0c9936e3d65df45bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 14 Aug 2019 01:18:53 +0200 Subject: [PATCH 1/5] mixxx: upgrade to latest maste to fix build with current oe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Something changed in scons/python3: | TypeError: changed_since_last_build_node() takes 3 positional arguments but 4 were given: Guess this one fixed it: Author: Uwe Klotz Date: Fri Aug 9 15:18:05 2019 +0200 Fix signature of changed_since_last_build_node() for SCons 3.1.x Add a 4th parameter with default value: https://scons.org/doc/3.1.0/HTML/scons-api/SCons.Node-module.html#changed_since_last_build_nodehttps://scons.org/doc/3.1.0/HTML/scons-api/SCons.Node-module.html Signed-off-by: Andreas Müller --- recipes-musicians/mixxx/mixxx_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-musicians/mixxx/mixxx_git.bb b/recipes-musicians/mixxx/mixxx_git.bb index c56e30a..fe1cdfb 100644 --- a/recipes-musicians/mixxx/mixxx_git.bb +++ b/recipes-musicians/mixxx/mixxx_git.bb @@ -47,7 +47,7 @@ SRC_URI = " \ file://0004-build-mixxx.py-Fix-build-with-recent-python3.patch \ file://0005-Do-not-add-host-libdir-to-LDPATH-rpath.patch \ " -SRCREV = "6ae9e7947c743ab4cc3e54a6f09109d7558e7c50" +SRCREV = "b679fd37093826efa7ab81b3d4679d9a88b02dbb" S = "${WORKDIR}/git" PV = "2.2.1+git${SRCPV}" 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 2/5] 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" From a4fa4f42a20e21acf42ba49f7c0e2cce28cc37e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 27 Aug 2019 22:45:42 +0200 Subject: [PATCH 3/5] carla: upgrade 1.9.11+ -> 2.0.0+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...re-fluidsynth-s-defaults-are-set-onc.patch | 245 ------------------ .../0004-Fixes-for-fluidsynth-2.0.0.patch | 143 ---------- recipes-musicians/carla/carla_git.bb | 9 +- 3 files changed, 4 insertions(+), 393 deletions(-) delete mode 100644 recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch delete mode 100644 recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch diff --git a/recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch b/recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch deleted file mode 100644 index ba26dfd..0000000 --- a/recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch +++ /dev/null @@ -1,245 +0,0 @@ -From d55575c62bd911e1edf126e1efed8219c97bb25a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 10 Oct 2018 23:48:22 +0200 -Subject: [PATCH 1/3] Fluidsynths: Ensure fluidsynth's defaults are set once - and in one place -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This makes transition fluidsynth 1.x -> 2.x a lot easier. - -Upstream-Status: Submitted [1] - -[1] https://github.com/falkTX/Carla/pull/766 - -Signed-off-by: Andreas Müller ---- - source/backend/plugin/CarlaPluginFluidSynth.cpp | 67 ++++++++++++++++++------- - 1 file changed, 48 insertions(+), 19 deletions(-) - -diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp -index be9e720a..7f6d919c 100644 ---- a/source/backend/plugin/CarlaPluginFluidSynth.cpp -+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp -@@ -73,20 +73,22 @@ public: - fSynth = new_fluid_synth(fSettings); - CARLA_SAFE_ASSERT_RETURN(fSynth != nullptr,); - -+ initializeFluidDefaultsIfNeeded(); -+ - fluid_synth_set_sample_rate(fSynth, (float)pData->engine->getSampleRate()); - - // set default values - fluid_synth_set_reverb_on(fSynth, 1); -- fluid_synth_set_reverb(fSynth, FLUID_REVERB_DEFAULT_ROOMSIZE, FLUID_REVERB_DEFAULT_DAMP, FLUID_REVERB_DEFAULT_WIDTH, FLUID_REVERB_DEFAULT_LEVEL); -+ fluid_synth_set_reverb(fSynth, sFluidDefaults[FluidSynthReverbRoomSize], sFluidDefaults[FluidSynthReverbDamp], sFluidDefaults[FluidSynthReverbWidth], sFluidDefaults[FluidSynthReverbLevel]); - - fluid_synth_set_chorus_on(fSynth, 1); -- fluid_synth_set_chorus(fSynth, FLUID_CHORUS_DEFAULT_N, FLUID_CHORUS_DEFAULT_LEVEL, FLUID_CHORUS_DEFAULT_SPEED, FLUID_CHORUS_DEFAULT_DEPTH, FLUID_CHORUS_DEFAULT_TYPE); -+ fluid_synth_set_chorus(fSynth, sFluidDefaults[FluidSynthChorusNr], sFluidDefaults[FluidSynthChorusLevel], sFluidDefaults[FluidSynthChorusSpeedHz], sFluidDefaults[FluidSynthChorusDepthMs], sFluidDefaults[FluidSynthChorusType]); - - fluid_synth_set_polyphony(fSynth, FLUID_DEFAULT_POLYPHONY); - fluid_synth_set_gain(fSynth, 1.0f); - - for (int i=0; i < MAX_MIDI_CHANNELS; ++i) -- fluid_synth_set_interp_method(fSynth, i, FLUID_INTERP_DEFAULT); -+ fluid_synth_set_interp_method(fSynth, i, sFluidDefaults[FluidSynthInterpolation]); - } - - ~CarlaPluginFluidSynth() override -@@ -195,7 +197,7 @@ public: - case 1: - return FLUID_CHORUS_MOD_TRIANGLE; - default: -- return FLUID_CHORUS_DEFAULT_TYPE; -+ return sFluidDefaults[FluidSynthChorusType]; - } - case FluidSynthInterpolation: - switch (scalePointId) -@@ -209,7 +211,7 @@ public: - case 3: - return FLUID_INTERP_7THORDER; - default: -- return FLUID_INTERP_DEFAULT; -+ return sFluidDefaults[FluidSynthInterpolation]; - } - default: - return 0.0f; -@@ -721,7 +723,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 1.0f; -- pData->param.ranges[j].def = 1.0f; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 1.0f; -@@ -734,7 +736,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 1.2f; -- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_ROOMSIZE; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -747,7 +749,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 1.0f; -- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_DAMP; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -761,7 +763,7 @@ public: - pData->param.data[j].midiCC = MIDI_CONTROL_REVERB_SEND_LEVEL; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 1.0f; -- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_LEVEL; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -774,7 +776,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 10.0f; // should be 100, but that sounds too much -- pData->param.ranges[j].def = FLUID_REVERB_DEFAULT_WIDTH; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -787,7 +789,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 1.0f; -- pData->param.ranges[j].def = 1.0f; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 1.0f; -@@ -800,7 +802,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 99.0f; -- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_N; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 10.0f; -@@ -813,7 +815,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 10.0f; -- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_LEVEL; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -826,7 +828,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.29f; - pData->param.ranges[j].max = 5.0f; -- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_SPEED; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -839,7 +841,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = float(2048.0 * 1000.0 / pData->engine->getSampleRate()); // FIXME? -- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_DEPTH; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 0.01f; - pData->param.ranges[j].stepSmall = 0.0001f; - pData->param.ranges[j].stepLarge = 0.1f; -@@ -852,7 +854,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = FLUID_CHORUS_MOD_SINE; - pData->param.ranges[j].max = FLUID_CHORUS_MOD_TRIANGLE; -- pData->param.ranges[j].def = FLUID_CHORUS_DEFAULT_TYPE; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 1.0f; -@@ -865,7 +867,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 1.0f; - pData->param.ranges[j].max = 512.0f; // max theoric is 65535 -- pData->param.ranges[j].def = (float)fluid_synth_get_polyphony(fSynth); -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 10.0f; -@@ -878,7 +880,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = FLUID_INTERP_NONE; - pData->param.ranges[j].max = FLUID_INTERP_HIGHEST; -- pData->param.ranges[j].def = FLUID_INTERP_DEFAULT; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 1.0f; -@@ -891,7 +893,7 @@ public: - pData->param.data[j].rindex = j; - pData->param.ranges[j].min = 0.0f; - pData->param.ranges[j].max = 65535.0f; -- pData->param.ranges[j].def = 0.0f; -+ pData->param.ranges[j].def = sFluidDefaults[j]; - pData->param.ranges[j].step = 1.0f; - pData->param.ranges[j].stepSmall = 1.0f; - pData->param.ranges[j].stepLarge = 1.0f; -@@ -1656,6 +1658,27 @@ public: - } - - private: -+ void initializeFluidDefaultsIfNeeded() -+ { -+ if (sFluidDefaultsStored) -+ return; -+ sFluidDefaultsStored = true; -+ sFluidDefaults[FluidSynthReverbOnOff] = 1.0f; -+ sFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE; -+ sFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP; -+ sFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL; -+ sFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH; -+ sFluidDefaults[FluidSynthChorusOnOff] = 1.0f; -+ sFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N; -+ sFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL; -+ sFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED; -+ sFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH; -+ sFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE; -+ sFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth); -+ sFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT; -+ sFluidDefaults[FluidSynthVoiceCount] = 0.0f; -+ } -+ - enum FluidSynthParameters { - FluidSynthReverbOnOff = 0, - FluidSynthReverbRoomSize = 1, -@@ -1683,6 +1706,9 @@ private: - float** fAudio16Buffers; - float fParamBuffers[FluidSynthParametersMax]; - -+ static bool sFluidDefaultsStored; -+ static float sFluidDefaults[FluidSynthParametersMax]; -+ - int32_t fCurMidiProgs[MAX_MIDI_CHANNELS]; - - const char* fLabel; -@@ -1690,6 +1716,9 @@ private: - CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginFluidSynth) - }; - -+bool CarlaPluginFluidSynth::sFluidDefaultsStored = false; -+float CarlaPluginFluidSynth::sFluidDefaults[FluidSynthParametersMax]; -+ - CARLA_BACKEND_END_NAMESPACE - - #endif // HAVE_FLUIDSYNTH --- -2.14.4 - diff --git a/recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch b/recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch deleted file mode 100644 index a88c99d..0000000 --- a/recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 94c96ee0d04e324122ee1a73344a44f1b21837ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 13 Oct 2018 15:16:20 +0200 -Subject: [PATCH 2/3] Fixes for fluidsynth >= 2.0.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* preset iteration and getters have changed -* constants for most defaults are no more available in public headers - - fluidsynth wants to be asked - -Upstream-Status: Submitted [1] - -[1] https://github.com/falkTX/Carla/pull/766 - -Signed-off-by: Andreas Müller ---- - source/backend/plugin/CarlaPluginFluidSynth.cpp | 62 +++++++++++++++++++++++++ - source/discovery/carla-discovery.cpp | 5 ++ - 2 files changed, 67 insertions(+) - -diff --git a/source/backend/plugin/CarlaPluginFluidSynth.cpp b/source/backend/plugin/CarlaPluginFluidSynth.cpp -index 7f6d919c..5645fe3c 100644 ---- a/source/backend/plugin/CarlaPluginFluidSynth.cpp -+++ b/source/backend/plugin/CarlaPluginFluidSynth.cpp -@@ -943,6 +943,7 @@ public: - - if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(fSynth, fSynthId)) - { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - fluid_preset_t f_preset; - - // initial check to know how many midi-programs we have -@@ -971,6 +972,36 @@ public: - pData->midiprog.data[i].program = (tmp >= 0) ? static_cast(tmp) : 0; - - pData->midiprog.data[i].name = carla_strdup(f_preset.get_name(&f_preset)); -+#else -+ fluid_preset_t* f_preset; -+ -+ // initial check to know how many midi-programs we have -+ fluid_sfont_iteration_start(f_sfont); -+ for (; fluid_sfont_iteration_next(f_sfont);) -+ ++count; -+ -+ // sound kits must always have at least 1 midi-program -+ CARLA_SAFE_ASSERT_RETURN(count > 0,); -+ -+ pData->midiprog.createNew(count); -+ -+ // Update data -+ int tmp; -+ uint32_t i = 0; -+ fluid_sfont_iteration_start(f_sfont); -+ -+ for (; (f_preset = fluid_sfont_iteration_next(f_sfont));) -+ { -+ CARLA_SAFE_ASSERT_BREAK(i < count); -+ -+ tmp = fluid_preset_get_banknum(f_preset); -+ pData->midiprog.data[i].bank = (tmp >= 0) ? static_cast(tmp) : 0; -+ -+ tmp = fluid_preset_get_num(f_preset); -+ pData->midiprog.data[i].program = (tmp >= 0) ? static_cast(tmp) : 0; -+ -+ pData->midiprog.data[i].name = carla_strdup(fluid_preset_get_name(f_preset)); -+#endif - - if (pData->midiprog.data[i].bank == 128 && ! hasDrums) - { -@@ -1663,17 +1694,48 @@ private: - if (sFluidDefaultsStored) - return; - sFluidDefaultsStored = true; -+ // reverb defaults - sFluidDefaults[FluidSynthReverbOnOff] = 1.0f; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - sFluidDefaults[FluidSynthReverbRoomSize] = FLUID_REVERB_DEFAULT_ROOMSIZE; - sFluidDefaults[FluidSynthReverbDamp] = FLUID_REVERB_DEFAULT_DAMP; - sFluidDefaults[FluidSynthReverbLevel] = FLUID_REVERB_DEFAULT_LEVEL; - sFluidDefaults[FluidSynthReverbWidth] = FLUID_REVERB_DEFAULT_WIDTH; -+#else -+ double reverbVal; -+ fluid_settings_getnum_default(fSettings, "synth.reverb.room-size", &reverbVal); -+ sFluidDefaults[FluidSynthReverbRoomSize] = reverbVal; -+ fluid_settings_getnum_default(fSettings, "synth.reverb.damp", &reverbVal); -+ sFluidDefaults[FluidSynthReverbDamp] = reverbVal; -+ fluid_settings_getnum_default(fSettings, "synth.reverb.level", &reverbVal); -+ sFluidDefaults[FluidSynthReverbLevel] = reverbVal; -+ fluid_settings_getnum_default(fSettings, "synth.reverb.width", &reverbVal); -+ sFluidDefaults[FluidSynthReverbWidth] = reverbVal; -+#endif -+ -+ // chorus defaults - sFluidDefaults[FluidSynthChorusOnOff] = 1.0f; -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - sFluidDefaults[FluidSynthChorusNr] = FLUID_CHORUS_DEFAULT_N; - sFluidDefaults[FluidSynthChorusLevel] = FLUID_CHORUS_DEFAULT_LEVEL; - sFluidDefaults[FluidSynthChorusSpeedHz] = FLUID_CHORUS_DEFAULT_SPEED; - sFluidDefaults[FluidSynthChorusDepthMs] = FLUID_CHORUS_DEFAULT_DEPTH; - sFluidDefaults[FluidSynthChorusType] = FLUID_CHORUS_DEFAULT_TYPE; -+#else -+ double chorusVal; -+ fluid_settings_getnum_default(fSettings, "synth.chorus.nr", &chorusVal); -+ sFluidDefaults[FluidSynthChorusNr] = chorusVal; -+ fluid_settings_getnum_default(fSettings, "synth.chorus.level", &chorusVal); -+ sFluidDefaults[FluidSynthChorusLevel] = chorusVal; -+ fluid_settings_getnum_default(fSettings, "synth.chorus.speed", &chorusVal); -+ sFluidDefaults[FluidSynthChorusSpeedHz] = chorusVal; -+ fluid_settings_getnum_default(fSettings, "synth.chorus.depth", &chorusVal); -+ sFluidDefaults[FluidSynthChorusDepthMs] = chorusVal; -+ // There is no settings for chorus default type -+ sFluidDefaults[FluidSynthChorusType] = (float)fluid_synth_get_chorus_type(fSynth); -+#endif -+ -+ // misc. defaults - sFluidDefaults[FluidSynthPolyphony] = (float)fluid_synth_get_polyphony(fSynth); - sFluidDefaults[FluidSynthInterpolation] = FLUID_INTERP_DEFAULT; - sFluidDefaults[FluidSynthVoiceCount] = 0.0f; -diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp -index a0745e23..d2cd2931 100644 ---- a/source/discovery/carla-discovery.cpp -+++ b/source/discovery/carla-discovery.cpp -@@ -1323,10 +1323,15 @@ static void do_fluidsynth_check(const char* const filename, const bool doInit) - - if (fluid_sfont_t* const f_sfont = fluid_synth_get_sfont_by_id(f_synth, static_cast(f_id))) - { -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - fluid_preset_t f_preset; - - f_sfont->iteration_start(f_sfont); - for (; f_sfont->iteration_next(f_sfont, &f_preset);) -+#else -+ fluid_sfont_iteration_start(f_sfont); -+ for (; fluid_sfont_iteration_next(f_sfont);) -+#endif - ++programs; - } - --- -2.14.4 - diff --git a/recipes-musicians/carla/carla_git.bb b/recipes-musicians/carla/carla_git.bb index b8dfa0b..aefdd63 100644 --- a/recipes-musicians/carla/carla_git.bb +++ b/recipes-musicians/carla/carla_git.bb @@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = " \ " SRC_URI = " \ - git://github.com/falkTX/Carla.git \ + git://github.com/falkTX/Carla.git;branch=develop \ file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \ file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \ - file://0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch \ - file://0004-Fixes-for-fluidsynth-2.0.0.patch \ " -SRCREV = "d73c0788ccc5fb9019d224046ef1b652aa5a9bbe" +SRCREV = "8385b5ee418357e2dc907518ac39c20beb3b28ed" S = "${WORKDIR}/git" -PV = "1.9.11+git${SRCPV}" +PV = "2.0.0+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "x11" @@ -62,6 +60,7 @@ do_install() { FILES_${PN} += " \ ${datadir}/icons \ ${datadir}/mime \ + ${libdir}/jack \ ${libdir}/lv2 \ ${libdir}/vst \ " From 46e0a2afe428c16906197ddafce468ddb7154db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 27 Aug 2019 23:26:55 +0200 Subject: [PATCH 4/5] lmms: upgrade 1.2.0 -> 1.2.0+ and workaround build failures with latest carla MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/lmms/lmms.bb | 2 ++ recipes-musicians/lmms/lmms.inc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-musicians/lmms/lmms.bb b/recipes-musicians/lmms/lmms.bb index a666972..29e49e9 100644 --- a/recipes-musicians/lmms/lmms.bb +++ b/recipes-musicians/lmms/lmms.bb @@ -27,6 +27,8 @@ DEPENDS += " \ fltk fltk-native \ " +CXXFLAGS += "-fpermissive" + EXTRA_OECMAKE += " \ -DWANT_QT5=ON \ -DWANT_WEAKJACK=OFF \ diff --git a/recipes-musicians/lmms/lmms.inc b/recipes-musicians/lmms/lmms.inc index d3280ee..c2ae1f8 100644 --- a/recipes-musicians/lmms/lmms.inc +++ b/recipes-musicians/lmms/lmms.inc @@ -4,6 +4,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2" -SRCREV = "0fbaca40bd6ea1a3fa664e12beaec5803d0d9662" +SRCREV = "8568ae4eacdd3bbdae8e8eaeb1536bebce3cfeeb" S = "${WORKDIR}/git" -PV = "1.2.0" +PV = "1.2.0+git${SRCPV}" From b4933eef7f523790f6d6b8adac07e76fc3667928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 1 Sep 2019 00:02:25 +0200 Subject: [PATCH 5/5] polyphone: update SRCREV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Took me a while to understand whats's going on: master was rebased [1-2] which causes github release revisions point to thin air. New revision was found by commit message. [1] https://github.com/davy7125/polyphone/issues/60 [2] https://github.com/davy7125/polyphone/issues/55 Signed-off-by: Andreas Müller --- recipes-musicians/polyphone/polyphone_2.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-musicians/polyphone/polyphone_2.0.1.bb b/recipes-musicians/polyphone/polyphone_2.0.1.bb index 49d0143..8c3cf5a 100644 --- a/recipes-musicians/polyphone/polyphone_2.0.1.bb +++ b/recipes-musicians/polyphone/polyphone_2.0.1.bb @@ -24,7 +24,7 @@ SRC_URI = " \ file://polyphone.mime \ file://0001-align-compiler-switches-constants-for-cross-compilin.patch \ " -SRCREV = "9f9720f4fded286f253e85fc708ee9bbba507eb5" +SRCREV = "e5863e3147599e51563cd93d5f1e4f96384eba9b" S = "${WORKDIR}/git/sources" do_configure_prepend() {