Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2016-02-18 11:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmms (Old) and /work/SRC/openSUSE:Factory/.lmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms" Changes: -------- --- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2015-06-30 10:18:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2016-02-18 12:35:55.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Jan 16 21:59:55 UTC 2016 - [email protected] + +- added support for internal Carla LV2/DSSI/VST plugin host + * lmms-carla.patch: backported an upstream patch to implement NATIVE_HOST_OPCODE_HOST_IDLE + * added falkTX's fix for lib/lib64 in the hardcoded carla plugin resource path so that they will find their GUIs + +------------------------------------------------------------------- +Fri Jul 3 06:52:52 UTC 2015 - [email protected] + +- Add versioned BuildRequires, adjust wine BuildRequires + +------------------------------------------------------------------- New: ---- lmms-carla.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.2qWt5E/_old 2016-02-18 12:35:56.000000000 +0100 +++ /var/tmp/diff_new_pack.2qWt5E/_new 2016-02-18 12:35:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lmms # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # +%bcond_with carla %bcond_without crippled_stk Name: lmms @@ -33,8 +34,8 @@ Patch2: lmms-1.1.0-return.patch # PATCH-FIX-OPENSUSE Some parts cannot be build because stk misses some files due to legal issues (bnc#761147) Patch4: lmms-1.0.0-crippled_stk.patch -# We don't add portaudio-devel and/or sdl to the build requires because both -# are built to use pulseaudio. Therefore they are unnecessary. +Patch5: lmms-carla.patch + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -42,30 +43,39 @@ BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libstk-devel -BuildRequires: wine -BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtCore) >= 4.3.0 BuildRequires: pkgconfig(QtGui) BuildRequires: pkgconfig(QtXml) BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(fftw3f) -BuildRequires: pkgconfig(fluidsynth) -BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(fftw3f) >= 3.0.0 +BuildRequires: pkgconfig(fluidsynth) >= 1.0.7 +BuildRequires: pkgconfig(jack) >= 0.77 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(ogg) -BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(samplerate) >= 0.1.8 BuildRequires: pkgconfig(shared-mime-info) -BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(sndfile) >= 1.0.11 BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) BuildRequires: pkgconfig(zlib) +%if %{with carla} +# to enable internal Carla plugin host +BuildRequires: pkgconfig(Carla) +# also needed (contains libcarla_standalone2 library) +BuildRequires: carla +%endif # VeSTige needs wineserver for using VST plugins +%ifarch %ix86 Requires: %{_bindir}/wineserver Recommends: %{_bindir}/wine -%ifarch %ix86 +BuildRequires: wine BuildRequires: wine-devel -%else +%endif %ifarch x86_64 +Requires: %{_bindir}/wineserver +Recommends: %{_bindir}/wine +BuildRequires: wine %if 0%{?suse_version} == 1230 # Workaround for missing dependency in wine-devel-32bit BuildRequires: wine-devel @@ -73,7 +83,6 @@ BuildRequires: gcc-c++-32bit BuildRequires: wine-devel-32bit %endif -%endif %description LMMS is a free cross-platform music studio which allows you to produce music @@ -95,6 +104,7 @@ %if %{with crippled_stk} %patch4 -p1 %endif +%patch5 -p1 %build mkdir build ++++++ lmms-carla.patch ++++++ diff -up lmms-1.1.3/plugins/carlabase/carla.cpp.orig lmms-1.1.3/plugins/carlabase/carla.cpp --- lmms-1.1.3/plugins/carlabase/carla.cpp.orig 2016-01-12 19:23:03.546267149 +0100 +++ lmms-1.1.3/plugins/carlabase/carla.cpp 2016-01-16 22:57:41.938774602 +0100 @@ -150,10 +150,11 @@ CarlaInstrument::CarlaInstrument(Instrum fHost.uiParentId = 0; // figure out prefix from dll filename - QString dllName(carla_get_library_filename()); + const QString dllName(carla_get_library_filename()); #if defined(CARLA_OS_LINUX) - fHost.resourceDir = strdup(QString(dllName.split("/lib/carla")[0] + "/share/carla/resources/").toUtf8().constData()); + const QString prefix(dllName.split("/lib")[0]); + fHost.resourceDir = strdup(QString(prefix + "/share/carla/resources/").toUtf8().constData()); #else fHost.resourceDir = NULL; #endif @@ -263,6 +264,9 @@ intptr_t CarlaInstrument::handleDispatch case NATIVE_HOST_OPCODE_UI_UNAVAILABLE: handleUiClosed(); break; + case NATIVE_HOST_OPCODE_HOST_IDLE: + qApp->processEvents(); + break; } return ret;
