Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2018-08-31 10:41:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmms (Old) and /work/SRC/openSUSE:Factory/.lmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms" Fri Aug 31 10:41:38 2018 rev:28 rq:630717 version:1.2.0rc6+git20180601.1349d45d7 Changes: -------- --- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2018-07-07 22:02:28.651007669 +0200 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2018-08-31 10:43:19.923123079 +0200 @@ -1,0 +2,42 @@ +Mon Aug 20 13:32:27 UTC 2018 - [email protected] + +- Run spec-cleaner +- Simplify conditions +- Use cmake macros +- Drop unused dependencies +- Drop obsolete macros +- Adjust changelog to follow patch guidelines +- Fix changelog formatting + +------------------------------------------------------------------- +Wed Aug 15 08:42:11 UTC 2018 - [email protected] + +- further cleanups and corrections in specfile: + * BuildRequire just git-core, not git + * rewrite BuildRequires: to use pkgconfig() for all the devel packages that support it + * reenable use of %{_smp_mflags} in make call + * remove unneeded static library libqx11embedcontainer.a from package + * comment out BuildRequires: to some 32bit devel packages for now (from an upstream list of build requirements) +- Drop not needed patches: + * lmms-fix.patch + * lmms-code-min.patch + * lmms-code-macro.patch + * lmms-carla.patch + * lmms-code-indent.patch + * lmms-1.1.3-fix-wrong-comparison-logic.patch + * lmms-1.2.0-undefined_ref.patch + * lmms-no-Werror.patch + +------------------------------------------------------------------- +Sun Aug 12 09:43:55 UTC 2018 - [email protected] + +- update to 1.2.0rc6 using obs_scm source service, reworked patches and spec + * rc6 release tarball misses some external submodule sources and doesn't compile, so use obs_scm + * workaround the illegal "-" char in official version string (1.2.0-rc6) + * modify/add BuildRequires to work for a Qt5 build + * update and rename lmms-1.0.0-crippled_stk.patch to lmms-1.2.0-crippled_stk.patch + * remove obsolete patches (applied upstream, problem fixed otherwise or pointing at now non-existing code) + * build against Qt5 + * backport an upstream patch for upcoming rc7 to fix undefined references due to vectorization (gh#LMMS/lmms#4434) + +------------------------------------------------------------------- Old: ---- lmms-1.0.0-crippled_stk.patch lmms-1.1.3-fix-wrong-comparison-logic.patch lmms-1.1.3.tar.gz lmms-carla.patch lmms-code-indent.patch lmms-code-macro.patch lmms-code-min.patch lmms-fix.patch lmms-no-Werror.patch New: ---- _service _servicedata lmms-1.2.0-crippled_stk.patch lmms-1.2.0-undefined_ref.patch lmms-1.2.0rc6+git20180601.1349d45d7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.nEZymp/_old 2018-08-31 10:43:21.171124557 +0200 +++ /var/tmp/diff_new_pack.nEZymp/_new 2018-08-31 10:43:21.175124562 +0200 @@ -18,79 +18,66 @@ # Since 42.2 RPM creates a hard requirement on a build time library (libvstbase), the requirement is unnecessary and bad %global __requires_exclude_from ^%{_libdir}/lmms/.*\\.so$ - %bcond_without carla %bcond_without crippled_stk - Name: lmms -Version: 1.1.3 +Version: 1.2.0rc6+git20180601.1349d45d7 Release: 0 Summary: Linux MultiMedia Studio License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Midi -ExclusiveArch: x86_64 -Url: https://lmms.io/ - -Source0: https://github.com/LMMS/lmms/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Fix wrong comparison logic (from upstream) -Patch1: lmms-1.1.3-fix-wrong-comparison-logic.patch +URL: https://lmms.io/ +Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch for providing proper return code in a function -Patch2: lmms-1.1.0-return.patch +Patch0: 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 -Patch5: lmms-carla.patch -Patch6: lmms-code-indent.patch -Patch7: lmms-code-min.patch -Patch8: lmms-code-macro.patch -Patch9: lmms-fix.patch -Patch10: lmms-no-Werror.patch - +Patch1: lmms-1.2.0-crippled_stk.patch +# PATCH-FIX-UPSTREAM Fix undefined references due to vectorization, backport from git (gh#LMMS/lmms#4434) +Patch2: lmms-1.2.0-undefined_ref.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: fltk-devel -BuildRequires: gcc-c++ +BuildRequires: fluidsynth +BuildRequires: gcc-c++-32bit BuildRequires: hicolor-icon-theme +BuildRequires: libQt5Widgets-private-headers-devel +BuildRequires: libmp3lame-devel +BuildRequires: libqt5-qttools BuildRequires: libstk-devel -BuildRequires: pkgconfig(QtCore) >= 4.3.0 -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(QtXml) +BuildRequires: pkgconfig +BuildRequires: wine +BuildRequires: wine-devel +BuildRequires: wine-devel-32bit +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(fftw3f) >= 3.0.0 BuildRequires: pkgconfig(fluidsynth) >= 1.0.7 +BuildRequires: pkgconfig(gig) BuildRequires: pkgconfig(jack) >= 0.77 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(portaudio-2.0) BuildRequires: pkgconfig(samplerate) >= 0.1.8 +BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) >= 1.0.11 BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(zlib) +Recommends: wine +ExclusiveArch: x86_64 %if %{with carla} -# to enable internal Carla plugin host -BuildRequires: pkgconfig(carla-standalone) # also needed (contains libcarla_standalone2 library) BuildRequires: carla -%endif -# VeSTige needs wineserver for using VST plugins -%ifarch %ix86 -Requires: %{_bindir}/wineserver -Recommends: %{_bindir}/wine -BuildRequires: wine -BuildRequires: wine-devel -%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 -%endif -BuildRequires: gcc-c++-32bit -BuildRequires: wine-devel-32bit +# to enable internal Carla plugin host +BuildRequires: pkgconfig(carla-standalone) %endif %description @@ -108,60 +95,35 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch0 -p1 %if %{with crippled_stk} -%patch4 -p1 +%patch1 -p1 %endif -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%patch2 -p1 %build -mkdir build -cd build -export CFLAGS="%{optflags} -fgnu89-inline -fPIC -fPIE" -export CXXFLAGS="%{optflags} -fPIC -fPIE" -cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="-pie" \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - .. -make %{?_smp_mflags} +%cmake \ + -DWANT_QT5=ON \ + -DCMAKE_SHARED_LINKER_FLAGS="" \ + -Wno-dev +%make_jobs %install -cd build -%make_install -cd .. -# Debian menu system -rm -r '%{buildroot}%{_datadir}/menu' +%cmake_install mkdir -p '%{buildroot}%{_defaultdocdir}/lmms/' +# remove unneeded static helper library from install +rm %{buildroot}%{_libdir}/libqx11embedcontainer.a %fdupes -s %{buildroot}/%{_datadir} -%post -%icon_theme_cache_post -%mime_database_post -%desktop_database_post - -%postun -%desktop_database_postun -%mime_database_postun -%icon_theme_cache_postun - %files -%defattr(-,root,root) -%doc AUTHORS COPYING README TODO +%doc doc/AUTHORS README.md INSTALL.txt +%license LICENSE.txt %{_bindir}/lmms -%{_mandir}/man1/lmms.1* +%{_mandir}/man1/lmms.1%{?ext_man} %{_libdir}/lmms/ %{_datadir}/lmms/ %{_datadir}/applications/lmms.desktop -%{_datadir}/pixmaps/lmms.png +%{_datadir}/icons/hicolor/scalable/* %{_datadir}/mime/packages/lmms.xml %files devel ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/LMMS/lmms.git</param> <param name="scm">git</param> <param name="submodules">enable</param> <param name="exclude">.git</param> <param name="filename">lmms</param> <param name="versionformat">1.2.0rc6+git%cd.%h</param> <param name="revision">1349d45</param> <param name="changesgenerate">enable</param> </service> <service name="tar" mode="disabled"> </service> <service name="recompress" mode="disabled"> <param name="file">lmms-*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">lmms</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="obs_scm"> <param name="url">https://github.com/LMMS/lmms.git</param> <param name="changesrevision">1349d45d72d74b83d30cdf8a092b51e2e1b73afe</param> </service> <service name="tar_scm"> <param name="url">https://github.com/LMMS/lmms.git</param> <param name="changesrevision">1349d45d72d74b83d30cdf8a092b51e2e1b73afe</param></service> <service name="recompress"> <param name="file">lmms-*.tar</param> <param name="compression">xz</param> </service> </servicedata> ++++++ lmms-1.0.0-crippled_stk.patch -> lmms-1.2.0-crippled_stk.patch ++++++ --- /work/SRC/openSUSE:Factory/lmms/lmms-1.0.0-crippled_stk.patch 2014-05-10 08:02:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms-1.2.0-crippled_stk.patch 2018-08-31 10:43:04.231104523 +0200 @@ -1,15 +1,15 @@ -diff -urN lmms-1.0.0.old/plugins/stk/mallets/mallets.cpp lmms-1.0.0/plugins/stk/mallets/mallets.cpp ---- lmms-1.0.0.old/plugins/stk/mallets/mallets.cpp 2014-03-24 00:00:39.000000000 +0100 -+++ lmms-1.0.0/plugins/stk/mallets/mallets.cpp 2014-03-24 08:28:45.557483536 +0100 -@@ -30,7 +30,6 @@ +diff -up lmms/plugins/stk/mallets/mallets.cpp.orig lmms/plugins/stk/mallets/mallets.cpp +--- lmms/plugins/stk/mallets/mallets.cpp.orig 2018-08-10 16:46:42.000000000 +0200 ++++ lmms/plugins/stk/mallets/mallets.cpp 2018-08-10 17:44:45.206135965 +0200 +@@ -31,7 +31,6 @@ #include "BandedWG.h" #include "ModalBar.h" -#include "TubeBell.h" - #include "engine.h" - #include "gui_templates.h" -@@ -111,10 +110,6 @@ + #include "ConfigManager.h" + #include "Engine.h" +@@ -107,10 +106,6 @@ malletsInstrument::malletsInstrument( In m_presetsModel.addItem( tr( "Clump" ) ); m_scalers.append( 4.0 ); @@ -20,7 +20,7 @@ // BandedWG m_presetsModel.addItem( tr( "Uniform Bar" ) ); m_scalers.append( 25.0 ); -@@ -145,13 +140,6 @@ +@@ -141,13 +136,6 @@ void malletsInstrument::saveSettings( QD m_vibratoFreqModel.saveSettings( _doc, _this, "vib_freq" ); m_stickModel.saveSettings( _doc, _this, "stick_mix" ); @@ -33,8 +33,8 @@ - // BandedWG m_pressureModel.saveSettings( _doc, _this, "pressure" ); - m_motionModel.saveSettings( _doc, _this, "motion" ); -@@ -175,13 +163,6 @@ + // m_motionModel.saveSettings( _doc, _this, "motion" ); +@@ -175,13 +163,6 @@ void malletsInstrument::loadSettings( co m_vibratoFreqModel.loadSettings( _this, "vib_freq" ); m_stickModel.loadSettings( _this, "stick_mix" ); @@ -47,10 +47,10 @@ - // BandedWG m_pressureModel.loadSettings( _this, "pressure" ); - m_motionModel.loadSettings( _this, "motion" ); -@@ -235,19 +216,6 @@ + // m_motionModel.loadSettings( _this, "motion" ); +@@ -311,19 +292,6 @@ void malletsInstrument::playNote( NotePl (uint8_t) m_spreadModel.value(), - engine::mixer()->processingSampleRate() ); + Engine::mixer()->processingSampleRate() ); } - else if( p == 9 ) - { @@ -63,24 +63,23 @@ - m_lfoSpeedModel.value(), - m_adsrModel.value(), - (uint8_t) m_spreadModel.value(), -- engine::mixer()->processingSampleRate() ); +- Engine::mixer()->processingSampleRate() ); - } else { _n->m_pluginData = new malletsSynth( freq, -@@ -313,11 +281,6 @@ - m_modalBarWidget->show(); +@@ -390,10 +358,6 @@ malletsInstrumentView::malletsInstrument + setWidgetBackground( m_modalBarWidget, "artwork" ); m_modalBarWidget->move( 0,0 ); - m_tubeBellWidget = setupTubeBellControls( this ); - setWidgetBackground( m_tubeBellWidget, "artwork" ); -- m_tubeBellWidget->hide(); - m_tubeBellWidget->move( 0,0 ); - m_bandedWGWidget = setupBandedWGControls( this ); setWidgetBackground( m_bandedWGWidget, "artwork" ); - m_bandedWGWidget->hide(); -@@ -393,40 +356,6 @@ + m_bandedWGWidget->move( 0,0 ); +@@ -480,42 +444,6 @@ QWidget * malletsInstrumentView::setupMo @@ -89,39 +88,41 @@ - QWidget * widget = new QWidget( _parent ); - widget->setFixedSize( 250, 250 ); - -- m_modulatorKnob = new knob( knobVintage_32, widget ); +- m_modulatorKnob = new Knob( knobVintage_32, widget ); - m_modulatorKnob->setLabel( tr( "Modulator" ) ); - m_modulatorKnob->move( 30, 90 ); -- m_modulatorKnob->setHintText( tr( "Modulator:" ) + " ", "" ); +- m_modulatorKnob->setHintText( tr( "Modulator:" ), "" ); - -- m_crossfadeKnob = new knob( knobVintage_32, widget ); +- m_crossfadeKnob = new Knob( knobVintage_32, widget ); - m_crossfadeKnob->setLabel( tr( "Crossfade" ) ); - m_crossfadeKnob->move( 110, 90 ); -- m_crossfadeKnob->setHintText( tr( "Crossfade:" ) + " ", "" ); +- m_crossfadeKnob->setHintText( tr( "Crossfade:" ), "" ); - -- m_lfoSpeedKnob = new knob( knobVintage_32, widget ); +- m_lfoSpeedKnob = new Knob( knobVintage_32, widget ); - m_lfoSpeedKnob->setLabel( tr( "LFO Speed" ) ); - m_lfoSpeedKnob->move( 30, 140 ); -- m_lfoSpeedKnob->setHintText( tr( "LFO Speed:" ) + " ", "" ); +- m_lfoSpeedKnob->setHintText( tr( "LFO Speed:" ), "" ); - -- m_lfoDepthKnob = new knob( knobVintage_32, widget ); +- m_lfoDepthKnob = new Knob( knobVintage_32, widget ); - m_lfoDepthKnob->setLabel( tr( "LFO Depth" ) ); - m_lfoDepthKnob->move( 110, 140 ); -- m_lfoDepthKnob->setHintText( tr( "LFO Depth:" ) + " ", "" ); +- m_lfoDepthKnob->setHintText( tr( "LFO Depth:" ), "" ); - -- m_adsrKnob = new knob( knobVintage_32, widget ); +- m_adsrKnob = new Knob( knobVintage_32, widget ); - m_adsrKnob->setLabel( tr( "ADSR" ) ); - m_adsrKnob->move( 190, 90 ); -- m_adsrKnob->setHintText( tr( "ADSR:" ) + " ", "" ); +- m_adsrKnob->setHintText( tr( "ADSR:" ), "" ); - - return( widget ); -} - - - - +- +- QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent ) -@@ -472,11 +401,6 @@ + { + // BandedWG +@@ -559,11 +487,6 @@ void malletsInstrumentView::modelChanged m_vibratoGainKnob->setModel( &inst->m_vibratoGainModel ); m_vibratoFreqKnob->setModel( &inst->m_vibratoFreqModel ); m_stickKnob->setModel( &inst->m_stickModel ); @@ -131,17 +132,17 @@ - m_lfoDepthKnob->setModel( &inst->m_lfoDepthModel ); - m_adsrKnob->setModel( &inst->m_adsrModel ); m_pressureKnob->setModel( &inst->m_pressureModel ); - m_motionKnob->setModel( &inst->m_motionModel ); - m_vibratoKnob->setModel( &inst->m_vibratoModel ); -@@ -497,7 +421,6 @@ - printf("malletsInstrumentView %d\n", _preset); + // m_motionKnob->setModel( &inst->m_motionModel ); + // m_vibratoKnob->setModel( &inst->m_vibratoModel ); +@@ -584,7 +507,6 @@ void malletsInstrumentView::changePreset + if( _preset < 9 ) { - m_tubeBellWidget->hide(); m_bandedWGWidget->hide(); m_modalBarWidget->show(); } -@@ -505,12 +428,10 @@ +@@ -592,12 +514,10 @@ void malletsInstrumentView::changePreset { m_modalBarWidget->hide(); m_bandedWGWidget->hide(); @@ -152,12 +153,28 @@ m_modalBarWidget->hide(); - m_tubeBellWidget->hide(); m_bandedWGWidget->show(); - } + } } -@@ -564,50 +485,6 @@ - - - +@@ -638,54 +558,6 @@ malletsSynth::malletsSynth( const StkFlo + m_voice->noteOn( _pitch, _velocity ); + } + catch( ... ) +- { +- m_voice = NULL; +- } +- +- m_delay = new StkFloat[256]; +- m_delayRead = 0; +- m_delayWrite = _delay; +- for( int i = 0; i < 256; i++ ) +- { +- m_delay[i] = 0.0; +- } +-} +- +- +- +- -// TubeBell -malletsSynth::malletsSynth( const StkFloat _pitch, - const StkFloat _velocity, @@ -173,9 +190,12 @@ - try - { - Stk::setSampleRate( _sample_rate ); -- Stk::setRawwavePath( configManager::inst()->stkDir() -- .toAscii().constData() ); -- +- Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath() +- .toLatin1().constData() ); +-#ifndef LMMS_DEBUG +- Stk::showWarnings( false ); +-#endif +- - m_voice = new TubeBell(); - - m_voice->controlChange( 1, _control1 ); @@ -187,65 +207,6 @@ - m_voice->noteOn( _pitch, _velocity ); - } - catch( ... ) -- { -- m_voice = NULL; -- } -- -- m_delay = new StkFloat[256]; -- m_delayRead = 0; -- m_delayWrite = _delay; -- for( int i = 0; i < 256; i++ ) -- { -- m_delay[i] = 0.0; -- } --} -- -- -- - - // BandedWG - malletsSynth::malletsSynth( const StkFloat _pitch, -diff -urN lmms-1.0.0.old/plugins/stk/mallets/mallets.h lmms-1.0.0/plugins/stk/mallets/mallets.h ---- lmms-1.0.0.old/plugins/stk/mallets/mallets.h 2014-03-24 00:00:39.000000000 +0100 -+++ lmms-1.0.0/plugins/stk/mallets/mallets.h 2014-03-24 08:29:33.317983335 +0100 -@@ -58,18 +58,6 @@ - const uint8_t _delay, - const sample_rate_t _sample_rate ); - -- // TubeBell -- malletsSynth( const StkFloat _pitch, -- const StkFloat _velocity, -- const int _preset, -- const StkFloat _control1, -- const StkFloat _control2, -- const StkFloat _control4, -- const StkFloat _control11, -- const StkFloat _control128, -- const uint8_t _delay, -- const sample_rate_t _sample_rate ); -- - // BandedWG - malletsSynth( const StkFloat _pitch, - const StkFloat _velocity, -@@ -199,7 +187,6 @@ - - void setWidgetBackground( QWidget * _widget, const QString & _pic ); - QWidget * setupModalBarControls( QWidget * _parent ); -- QWidget * setupTubeBellControls( QWidget * _parent ); - QWidget * setupBandedWGControls( QWidget * _parent ); - - QWidget * m_modalBarWidget; -@@ -209,13 +196,6 @@ - knob * m_vibratoFreqKnob; - knob * m_stickKnob; - -- QWidget * m_tubeBellWidget; -- knob * m_modulatorKnob; -- knob * m_crossfadeKnob; -- knob * m_lfoSpeedKnob; -- knob * m_lfoDepthKnob; -- knob * m_adsrKnob; -- - QWidget * m_bandedWGWidget; - knob * m_pressureKnob; - knob * m_motionKnob; + { + m_voice = NULL; + } ++++++ lmms-1.2.0-undefined_ref.patch ++++++ diff -up lmms/plugins/LadspaEffect/swh/CMakeLists.txt.undefined_ref lmms/plugins/LadspaEffect/swh/CMakeLists.txt --- lmms/plugins/LadspaEffect/swh/CMakeLists.txt.undefined_ref 2018-08-12 14:05:23.242875848 +0200 +++ lmms/plugins/LadspaEffect/swh/CMakeLists.txt 2018-08-12 14:11:48.234722216 +0200 @@ -7,6 +7,11 @@ LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) FILE(GLOB PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.c") LIST(SORT PLUGIN_SOURCES) +SET(COMPILE_FLAGS "${COMPILE_FLAGS} -O3 -Wall -fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing") +IF(NOT LMMS_BUILD_WIN32) + SET(COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC") +ENDIF() + FOREACH(_item ${PLUGIN_SOURCES}) GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE) @@ -15,22 +20,15 @@ FOREACH(_item ${PLUGIN_SOURCES}) IF(NOT ("${_plugin}" STREQUAL "vocoder_1337")) TARGET_LINK_LIBRARIES("${_plugin}" -lfftw3f) ENDIF() + IF(NOT MSVC) + TARGET_LINK_LIBRARIES("${_plugin}" m) + ENDIF() INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -c -fno-strict-aliasing") IF(LMMS_BUILD_WIN32) ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:${_plugin}>\") - ELSE(LMMS_BUILD_WIN32) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -DPIC") - ENDIF(LMMS_BUILD_WIN32) - IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") - ELSEIF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") - ENDIF(LMMS_BUILD_APPLE) - IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}") - ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU) + ENDIF() + SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}") ENDFOREACH(_item ${PLUGIN_SOURCES}) diff -up lmms/plugins/LadspaEffect/tap/CMakeLists.txt.undefined_ref lmms/plugins/LadspaEffect/tap/CMakeLists.txt --- lmms/plugins/LadspaEffect/tap/CMakeLists.txt.undefined_ref 2018-08-10 16:46:42.000000000 +0200 +++ lmms/plugins/LadspaEffect/tap/CMakeLists.txt 2018-08-12 14:14:56.890646935 +0200 @@ -10,13 +10,8 @@ FOREACH(_item ${PLUGIN_SOURCES}) IF(LMMS_BUILD_WIN32) ADD_CUSTOM_COMMAND(TARGET "${_plugin}" POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:${_plugin}>\") ENDIF(LMMS_BUILD_WIN32) - IF(LMMS_BUILD_APPLE) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Bsymbolic -lm") - ELSEIF(NOT LMMS_BUILD_OPENBSD) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm") - ENDIF(LMMS_BUILD_APPLE) - IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU) - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}") - ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU) + IF(NOT MSVC) + TARGET_LINK_LIBRARIES("${_plugin}" m) + ENDIF() ENDFOREACH(_item ${PLUGIN_SOURCES})
