Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2016-06-25 02:21:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-03-01 09:44:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2016-06-25 02:22:03.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 18 22:19:53 UTC 2016 - [email protected] + +- Adjust indent to allow compile with gcc6 (bnc#985248) + lmms-code-indent.patch + lmms-code-macro.patch + lmms-code-min.patch + +------------------------------------------------------------------- New: ---- lmms-code-indent.patch lmms-code-macro.patch lmms-code-min.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.LSxpy8/_old 2016-06-25 02:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.LSxpy8/_new 2016-06-25 02:22:04.000000000 +0200 @@ -35,6 +35,9 @@ # 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 BuildRequires: cmake BuildRequires: desktop-file-utils @@ -105,6 +108,9 @@ %patch4 -p1 %endif %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build mkdir build ++++++ lmms-code-indent.patch ++++++ --- plugins/opl2/fmopl.c | 5 ++++- plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl | 6 ++++-- plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl | 6 ++++-- src/core/drumsynth.cpp | 7 +++++-- 4 files changed, 17 insertions(+), 7 deletions(-) --- a/plugins/opl2/fmopl.c +++ b/plugins/opl2/fmopl.c @@ -653,7 +653,10 @@ static void init_timetables( FM_OPL *OPL double rate; /* make attack rate & decay rate tables */ - for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; { + for ( i = 0; i < 4; i++ ) + OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; + if (1) + { for (i = 4; i <= 60; i++) { rate = OPL->freqbase; /* frequency rate */ if( i < 60 ) { --- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl @@ -204,12 +204,14 @@ if (event==FL_RELEASE){ if ((event==FL_DRAG)&&(currentpoint>=0)){ int ny=127-(int) (y_*127.0/h()); - if (ny<0) ny=0;if (ny>127) ny=127; + if (ny<0) ny=0; + if (ny>127) ny=127; env->Penvval[currentpoint]=ny; int dx=(int)((x_-cpx)*0.1); int newdt=cpdt+dx; - if (newdt<0) newdt=0;if (newdt>127) newdt=127; + if (newdt<0) newdt=0; + if (newdt>127) newdt=127; if (currentpoint!=0) env->Penvdt[currentpoint]=newdt; else env->Penvdt[currentpoint]=0; --- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl @@ -133,8 +133,10 @@ if ( (x_>=0)&&(x_<w()) && (y_>=0)&&(y_<h if ((event==FL_PUSH)||(event==FL_DRAG)){ int leftbutton=1; if (Fl::event_button()==FL_RIGHT_MOUSE) leftbutton=0; - if (x_<0) x_=0;if (y_<0) y_=0; - if (x_>=w()) x_=w();if (y_>=h()-1) y_=h()-1; + if (x_<0) x_=0; + if (y_<0) y_=0; + if (x_>=w()) x_=w(); + if (y_>=h()-1) y_=h()-1; if ((oldx<0)||(oldx==x_)){ int sn=(int)(x_*1.0/w()*N_RES_POINTS); --- a/src/core/drumsynth.cpp +++ b/src/core/drumsynth.cpp @@ -155,7 +155,8 @@ float DrumSynth::waveform(float ph, int case 1: w = (float)fabs(2.0f*(float)sin(fmod(0.5f*ph,TwoPi)))-1.f; break; //sine^2 case 2: while(ph<TwoPi) ph+=TwoPi; w = 0.6366197f * (float)fmod(ph,TwoPi) - 1.f; //tri - if(w>1.f) w=2.f-w; break; + if(w>1.f) w=2.f-w; + break; case 3: w = ph - TwoPi * (float)(int)(ph / TwoPi); //saw w = (0.3183098f * w) - 1.f; break; default: w = (sin(fmod(ph,TwoPi))>0.0)? 1.f: -1.f; break; //square @@ -429,7 +430,9 @@ int DrumSynth::GetDSFileSamples(const ch strcpy(sec, "Distortion"); chkOn[5] = GetPrivateProfileInt(sec,"On",0,dsfile); DiON = chkOn[5]; DStep = 1 + GetPrivateProfileInt(sec,"Rate",0,dsfile); - if(DStep==7) DStep=20; if(DStep==6) DStep=10; if(DStep==5) DStep=8; + if(DStep==7) DStep=20; + if(DStep==6) DStep=10; + if(DStep==5) DStep=8; clippoint = 32700; DAtten = 1.0f; ++++++ lmms-code-macro.patch ++++++ include/versioninfo.h:2:21: error: invalid suffix on literal; C++11 requires a space between literal and string macro [-Werror=literal-suffix] --- include/versioninfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/versioninfo.h +++ b/include/versioninfo.h @@ -1,5 +1,5 @@ #ifdef __GNUC__ -#define GCC_VERSION "GCC "__VERSION__ +#define GCC_VERSION "GCC " __VERSION__ #else #define GCC_VERSION "unknown compiler" #endif ++++++ lmms-code-min.patch ++++++ --- plugins/LadspaEffect/calf/src/modules_limit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/plugins/LadspaEffect/calf/src/modules_limit.cpp +++ b/plugins/LadspaEffect/calf/src/modules_limit.cpp @@ -540,7 +540,7 @@ uint32_t multibandlimiter_audio_module:: } // process single strip with filter // write multiband coefficient to buffer - buffer[pos] = std::min(*params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)), 1.0); + buffer[pos] = std::min(*params[param_limit] / float(std::max(fabs(sum_left), fabs(sum_right))), float(1.0)); for (int i = 0; i < strips; i++) { // process gain reduction
