diff -Nru lmms-1.1.3/debian/changelog lmms-1.1.3/debian/changelog --- lmms-1.1.3/debian/changelog 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/changelog 2019-02-18 18:33:43.000000000 +0000 @@ -1,3 +1,45 @@ +lmms (1.1.3-8.1ubuntu1) disco; urgency=medium + + * Fix FTBFS on ppc64el by allowing uninitialised variables + (LP: #1816459). Thanks to Javier Serrano Polo. + + -- Ross Gammon Mon, 18 Feb 2019 19:33:43 +0100 + +lmms (1.1.3-8.1) unstable; urgency=high + + * Non-maintainer upload. + + [ Javier Serrano Polo ] + * Add patch to fix FTBFS on i386 with wine 4.x. + (Closes: #920393) + + [ Boyuan Yang ] + * Limit supported wine version to 4.x. + + -- Boyuan Yang Fri, 25 Jan 2019 10:13:32 -0500 + +lmms (1.1.3-8) unstable; urgency=medium + + [ Javier Serrano Polo ] + * Incorporate previous non-maintainer upload + * Add build-amd64-20181013.patch to fix build with GCC 8 (Closes: #897806) + + [ Ross Gammon ] + * Drop calf-ladspa from Depends to Recommends (Closes: #891756) + * Move lmms maintenance to Debian Multimedia Team (Closes: #918242) + * Update Vcs URLS to Debian Multimedia Team + * Add myself to uploaders + * Bumped standards version, copyright format URL now uses https + * Remove trailing whitespace in debian/changelog + * Fix grammatical error in wine-runpath.patch + * Drop unused lintian overrides + * Add hardening options to debian/rules + * Add spelling.patch to fix some spelling errors + * Unapply patches from source + * Add a Salsa Gitlab CI file + + -- Ross Gammon Sun, 20 Jan 2019 18:35:35 +0100 + lmms (1.1.3-7.1) unstable; urgency=high * Non-maintainer upload. @@ -365,4 +407,3 @@ * Initial Release (Closes: #315976). -- Florian Ragwitz Fri, 22 Jul 2005 16:33:17 +0200 - diff -Nru lmms-1.1.3/debian/control lmms-1.1.3/debian/control --- lmms-1.1.3/debian/control 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/control 2019-02-18 18:33:12.000000000 +0000 @@ -1,11 +1,13 @@ Source: lmms Section: sound Priority: optional -Maintainer: Debian Edu Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Petter Reinholdtsen , Israel Dahl , Javier Serrano Polo , + Ross Gammon Build-Depends: cmake, debhelper (>= 9.0.0), @@ -25,19 +27,28 @@ libfftw3-dev, portaudio19-dev, qt4-qmake, - wine32-tools [i386] -Standards-Version: 3.9.8 + wine32-tools (>= 4.0~) [i386], +Standards-Version: 4.3.0 Homepage: http://lmms.io/ -Vcs-Browser: http://anonscm.debian.org/cgit/debian-edu/pkg-team/lmms.git/ -Vcs-Git: git://anonscm.debian.org/debian-edu/pkg-team/lmms.git +Vcs-Git: https://salsa.debian.org/multimedia-team/lmms.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/lmms Package: lmms Architecture: any -Depends: lmms-common (>= ${source:Version}) , - calf-ladspa, ${shlibs:Depends}, ${misc:Depends}, stk -Recommends: tap-plugins, caps, +Depends: + lmms-common (>= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + stk +Recommends: calf-ladspa, + tap-plugins, + caps, lmms-vst-server:i386 (>= ${source:Version}) -Suggests: fil-plugins, mcp-plugins, omins, freepats, fluid-soundfont-gm, +Suggests: fil-plugins, + mcp-plugins, + omins, + freepats, + fluid-soundfont-gm, ladspa-plugin Replaces: lmms-common (<< 1.0.0-1) Breaks: lmms-common (<< 1.0.0-1) @@ -55,8 +66,12 @@ Package: lmms-common Architecture: all -Depends: zynaddsubfx-data, ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} +Depends: + zynaddsubfx-data, + ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: + ${misc:Pre-Depends} Description: Linux Multimedia Studio - common files LMMS aims to be a free alternative to popular (but commercial and closed- source) programs like FruityLoops, Cubase and Logic giving you the ability of @@ -74,14 +89,20 @@ Package: lmms-vst-server Architecture: i386 # Order matters to avoid wine64 -Depends: wine32, wine, ${shlibs:Depends}, ${misc:Depends} +Depends: + wine32 (>= 4.0~), + wine (>= 4.0~), + ${shlibs:Depends}, + ${misc:Depends} Recommends: lmms:any Description: Linux Multimedia Studio - VST server This package contains a helper application that loads VST plugins. Package: calf-ladspa Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} Replaces: calf-plugins (<< 0.0.19) Provides: ladspa-plugin Description: Linux Multimedia Studio - Calf LADSPA plugins diff -Nru lmms-1.1.3/debian/copyright lmms-1.1.3/debian/copyright --- lmms-1.1.3/debian/copyright 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/copyright 2019-01-22 15:15:01.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: LMMS Upstream-Contact: https://github.com/LMMS/lmms Source: https://github.com/LMMS/lmms/tags diff -Nru lmms-1.1.3/debian/gitlab-ci.yml lmms-1.1.3/debian/gitlab-ci.yml --- lmms-1.1.3/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ lmms-1.1.3/debian/gitlab-ci.yml 2019-01-22 15:15:01.000000000 +0000 @@ -0,0 +1,16 @@ +include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + +build: + extends: .build-unstable + +reprotest: + extends: .test-reprotest + +lintian: + extends: .test-lintian + +autopkgtest: + extends: .test-autopkgtest + +piuparts: + extends: .test-piuparts diff -Nru lmms-1.1.3/debian/lmms.lintian-overrides lmms-1.1.3/debian/lmms.lintian-overrides --- lmms-1.1.3/debian/lmms.lintian-overrides 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/lmms.lintian-overrides 2019-01-22 15:15:01.000000000 +0000 @@ -1,9 +1,2 @@ -lmms: pkg-has-shlibs-control-file-but-no-actual-shared-libs -lmms: postinst-has-useless-call-to-ldconfig -lmms: postrm-has-useless-call-to-ldconfig - # env is used to set the environment, then lmms is called. lmms: desktop-command-not-in-package usr/share/applications/lmms.desktop env - -# Icon is in lmms-common. -lmms: menu-icon-missing usr/share/pixmaps/lmms.xpm diff -Nru lmms-1.1.3/debian/patches/build-amd64-20181013.patch lmms-1.1.3/debian/patches/build-amd64-20181013.patch --- lmms-1.1.3/debian/patches/build-amd64-20181013.patch 1970-01-01 00:00:00.000000000 +0000 +++ lmms-1.1.3/debian/patches/build-amd64-20181013.patch 2019-01-22 15:15:01.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Fix build as of 2018-10-13 + Fix build errors, possibly introduced with GCC 8. +Author: Javier Serrano Polo +Bug-Debian: https://bugs.debian.org/897806 + +Index: lmms-1.1.3/plugins/LadspaEffect/caps/dsp/FPTruncateMode.h +=================================================================== +--- lmms-1.1.3.orig/plugins/LadspaEffect/caps/dsp/FPTruncateMode.h ++++ lmms-1.1.3/plugins/LadspaEffect/caps/dsp/FPTruncateMode.h +@@ -40,9 +40,11 @@ class FPTruncateMode + + FPTruncateMode() + { ++#ifdef __i386__ + fstcw (cw0); + cw1 = cw0 | 0xC00; + fldcw (cw1); ++#endif + } + + ~FPTruncateMode() +Index: lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp +=================================================================== +--- lmms-1.1.3.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp ++++ lmms-1.1.3/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp +@@ -33,7 +33,8 @@ + //operations on FFTfreqs + inline void clearAll(fft_t *freqs) + { +- memset(freqs, 0, synth->oscilsize / 2 * sizeof(fft_t)); ++ for(int i = 0; i < synth->oscilsize / 2; ++i) ++ freqs[i] = fft_t(0.0f, 0.0f); + } + + inline void clearDC(fft_t *freqs) +@@ -928,8 +929,8 @@ void OscilGen::getspectrum(int n, float + if(what == 0) { + for(int i = 0; i < n; ++i) + outoscilFFTfreqs[i] = fft_t(spc[i], spc[i]); +- memset(outoscilFFTfreqs + n, 0, +- (synth->oscilsize / 2 - n) * sizeof(fft_t)); ++ for(int i = n; i < synth->oscilsize / 2; ++i) ++ outoscilFFTfreqs[i] = fft_t(0.0f, 0.0f); + adaptiveharmonic(outoscilFFTfreqs, 0.0f); + adaptiveharmonicpostprocess(outoscilFFTfreqs, n - 1); + for(int i = 0; i < n; ++i) diff -Nru lmms-1.1.3/debian/patches/find-wine.patch lmms-1.1.3/debian/patches/find-wine.patch --- lmms-1.1.3/debian/patches/find-wine.patch 1970-01-01 00:00:00.000000000 +0000 +++ lmms-1.1.3/debian/patches/find-wine.patch 2019-01-25 15:13:28.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Find Wine 4 headers + Wine headers' location has changed in version 4. + . + Fixed upstream in 1.2.0. +Author: Javier Serrano Polo +Last-Update: 2019-01-25 +Applied-Upstream: https://github.com/LMMS/lmms/commit/1df461d64db73da03ee6c0df5bdb2e6f87c2a770 +Bug-Debian: https://bugs.debian.org/920393 + +Index: lmms-1.1.3/cmake/modules/FindWine.cmake +=================================================================== +--- lmms-1.1.3.orig/cmake/modules/FindWine.cmake ++++ lmms-1.1.3/cmake/modules/FindWine.cmake +@@ -7,7 +7,7 @@ + # WINE_DEFINITIONS - Compiler switches required for using wine + # + +-FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine) ++FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine wine/wine) + FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine) + FIND_PROGRAM(WINE_CXX NAMES wineg++) + diff -Nru lmms-1.1.3/debian/patches/series lmms-1.1.3/debian/patches/series --- lmms-1.1.3/debian/patches/series 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/patches/series 2019-01-25 15:08:59.000000000 +0000 @@ -22,3 +22,6 @@ wine-flags-space.patch clang.patch gcc7.patch +build-amd64-20181013.patch +spelling.patch +find-wine.patch diff -Nru lmms-1.1.3/debian/patches/spelling.patch lmms-1.1.3/debian/patches/spelling.patch --- lmms-1.1.3/debian/patches/spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ lmms-1.1.3/debian/patches/spelling.patch 2019-01-22 15:15:01.000000000 +0000 @@ -0,0 +1,336 @@ +Description: Spelling Patch + Correct some of the spelling errors found by lintian, and some others found + whilst correcting the lintian ones. As we are several versions behind + upstream, the patch won't be forwarded until we are up to date in Debian. +Author: Ross Gammon +Forwarded: Not Yet +Last-Update: 2019-01-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- lmms.orig/src/core/audio/AudioPulseAudio.cpp ++++ lmms/src/core/audio/AudioPulseAudio.cpp +@@ -143,7 +143,7 @@ + + case PA_STREAM_FAILED: + default: +- qCritical( "Stream errror: %s\n", ++ qCritical( "Stream error: %s\n", + pa_strerror(pa_context_errno( + pa_stream_get_context( s ) ) ) ); + } +--- lmms.orig/src/core/main.cpp ++++ lmms/src/core/main.cpp +@@ -191,7 +191,7 @@ + " possible values: 1, 2, 4, 8\n" + " default: 2\n" + "-u, --upgrade [out] upgrade file and save as \n" +- " standard out is used if no output file is specifed\n" ++ " standard out is used if no output file is specified\n" + "-d, --dump dump XML of compressed file \n" + "-v, --version show version information and exit.\n" + "-h, --help show this usage information and exit.\n\n", +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/UI/MasterUI.fl +@@ -1641,7 +1641,7 @@ + xywh {10 165 100 35} color 229 labelfont 1 labelsize 16 + } + Fl_Box {} { +- label {.. if you have used ZynAddSubFX before, or you like to have full controll to all parameters.} ++ label {.. if you have used ZynAddSubFX before, or you like to have full control of all parameters.} + xywh {110 165 310 35} labelfont 1 labelsize 11 align 144 + } + Fl_Button {} { +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/HISTORY.txt ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/HISTORY.txt +@@ -148,7 +148,7 @@ + 1.2.1 (6 Apr 2003) + - improved filter interpolation + - bugfix: wav header is written correctly +- - bugfix: NRPN works correctly (eg:the controller was 0x98 instead of 98), now you can controll all effects parametrer realtime via MIDI ++ - bugfix: NRPN works correctly (eg:the controller was 0x98 instead of 98), now you can control all effects parameters realtime via MIDI + - bugfix: pitch bend works OK in windows + - added master fine detune (-64..63 cents) + - it is possible to swap effects or copy them +--- lmms.orig/plugins/zynaddsubfx/HISTORY.txt ++++ lmms/plugins/zynaddsubfx/HISTORY.txt +@@ -105,7 +105,7 @@ + 1.2.1 (6 Apr 2003) + - improved filter interpolation + - bugfix: wav header is written correctly +- - bugfix: NRPN works correctly (eg:the controller was 0x98 instead of 98), now you can controll all effects parametrer realtime via MIDI ++ - bugfix: NRPN works correctly (eg:the controller was 0x98 instead of 98), now you can control all effects parameters realtime via MIDI + - bugfix: pitch bend works OK in windows + - added master fine detune (-64..63 cents) + - it is possible to swap effects or copy them +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/UI/PADnoteUI.fl +@@ -859,7 +859,7 @@ + Fl_Dial fixedfreqetdial { + label {Eq.T.} + callback {pars->PfixedfreqET=(int) o->value();} +- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 ++ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {420 295 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 + code0 {o->value(pars->PfixedfreqET);} + code1 {if (pars->Pfixedfreq==0) o->deactivate();} + class WidgetPDial +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/UI/SUBnoteUI.fl +@@ -277,7 +277,7 @@ + Fl_Dial fixedfreqetdial { + label {Eq.T.} + callback {pars->PfixedfreqET=(int) o->value();} +- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {610 53 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 ++ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {610 53 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 + code0 {o->value(pars->PfixedfreqET);} + code1 {if (pars->Pfixedfreq==0) o->deactivate();} + class WidgetPDial +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/UI/ADnoteUI.fl +@@ -210,7 +210,7 @@ + if (o->value()==0) voiceFMfreqenvgroup->deactivate(); + else voiceFMfreqenvgroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {545 305 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {545 305 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFMFreqEnvelopeEnabled);} + } + Fl_Counter {} { +@@ -287,7 +287,7 @@ + if (o->value()==0) voiceFMampenvgroup->deactivate(); + else voiceFMampenvgroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {545 150 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {545 150 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFMAmpEnvelopeEnabled);} + } + Fl_Value_Slider {} { +@@ -415,7 +415,7 @@ + if (o->value()==0) voicefreqenvgroup->deactivate(); + else voicefreqenvgroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {15 310 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {15 310 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFreqEnvelopeEnabled);} + } + Fl_Group voicefreqlfogroup { +@@ -431,7 +431,7 @@ + if (o->value()==0) voicefreqlfogroup->deactivate(); + else voicefreqlfogroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {225 311 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {225 311 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFreqLfoEnabled);} + } + Fl_Counter {} { +@@ -481,7 +481,7 @@ + Fl_Dial fixedfreqetdial { + label {Eq.T.} + callback {pars->VoicePar[nvoice].PfixedfreqET=(int) o->value();} +- tooltip {How the frequency varies acording to the keyboard (leftmost for fixed frequency)} xywh {405 270 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 ++ tooltip {How the frequency varies according to the keyboard (leftmost for fixed frequency)} xywh {405 270 15 15} box ROUND_UP_BOX labelsize 10 align 8 maximum 127 step 1 + code0 {o->value(pars->VoicePar[nvoice].PfixedfreqET);} + code1 {if (pars->VoicePar[nvoice].Pfixedfreq==0) o->deactivate();} + class WidgetPDial +@@ -644,7 +644,7 @@ + if (o->value()==0) voiceampenvgroup->deactivate(); + else voiceampenvgroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {15 110 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {15 110 50 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PAmpEnvelopeEnabled);} + } + Fl_Group voiceamplfogroup { +@@ -660,7 +660,7 @@ + if (o->value()==0) voiceamplfogroup->deactivate(); + else voiceamplfogroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {15 185 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {15 185 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PAmpLfoEnabled);} + } + Fl_Check_Button {} { +@@ -694,7 +694,7 @@ + if (o->value()==0) voicefilterenvgroup->deactivate(); + else voicefilterenvgroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {255 119 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {255 119 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFilterEnvelopeEnabled);} + } + Fl_Group voicefilterlfogroup { +@@ -710,7 +710,7 @@ + if (o->value()==0) voicefilterlfogroup->deactivate(); + else voicefilterlfogroup->activate(); + o->redraw();} +- tooltip {Forced Relase} xywh {255 196 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 ++ tooltip {Forced Release} xywh {255 196 55 10} down_box DOWN_BOX labelfont 1 labelsize 11 + code0 {o->value(pars->VoicePar[nvoice].PFilterLfoEnabled);} + } + } +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp +@@ -618,14 +618,14 @@ + } + } + +- //this only relase the keys if there is maximum number of keys allowed ++ //this only releases the keys if there is maximum number of keys allowed + setkeylimit(Pkeylimit); + } + + /* + * Note Off Messages + */ +-void Part::NoteOff(unsigned char note) //relase the key ++void Part::NoteOff(unsigned char note) //release the key + { + int i; + +@@ -791,7 +791,7 @@ + } + } + /* +- * Relase the sustained keys ++ * Release the sustained keys + */ + + void Part::RelaseSustainedKeys() +@@ -807,7 +807,7 @@ + } + + /* +- * Relase all keys ++ * Release all keys + */ + + void Part::RelaseAllKeys() +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp +@@ -589,7 +589,7 @@ + } + + /* +- * Relase Key (Note Off) ++ * Release Key (Note Off) + */ + void SUBnote::relasekey() + { +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp +@@ -1716,7 +1716,7 @@ + + + /* +- * Relase the key (NoteOff) ++ * Release the key (NoteOff) + */ + void ADnote::relasekey() + { +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp +@@ -94,7 +94,7 @@ + + + /* +- * Relase the key (note envelope) ++ * Release the key (note envelope) + */ + void Envelope::relasekey() + { +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +@@ -325,7 +325,7 @@ + Fl_Check_Button forcedreleasecheck { + label frcR + callback {env->Pforcedrelease=(int)o->value();} +- tooltip {Forced Relase} xywh {410 165 40 15} down_box DOWN_BOX labelsize 10 ++ tooltip {Forced Release} xywh {410 165 40 15} down_box DOWN_BOX labelsize 10 + code0 {o->value(env->Pforcedrelease);} + code1 {if (env->Pfreemode==0) o->hide();} + } +@@ -417,7 +417,7 @@ + Fl_Check_Button e1forcedrelease { + label frcR + callback {env->Pforcedrelease=(int)o->value();} +- tooltip {Forced Relase} xywh {180 35 20 15} down_box DOWN_BOX labelsize 10 align 6 ++ tooltip {Forced Release} xywh {180 35 20 15} down_box DOWN_BOX labelsize 10 align 6 + code0 {o->value(env->Pforcedrelease);} + } + Fl_Dial e1envstretch { +@@ -594,7 +594,7 @@ + Fl_Check_Button e3forcedrelease { + label frcR + callback {env->Pforcedrelease=(int)o->value();} +- tooltip {Forced Relase} xywh {250 30 15 20} down_box DOWN_BOX labelsize 10 align 6 ++ tooltip {Forced Release} xywh {250 30 15 20} down_box DOWN_BOX labelsize 10 align 6 + code0 {o->value(env->Pforcedrelease);} + } + Fl_Button {} { +--- lmms.orig/plugins/sid/envelope.cc ++++ lmms/plugins/sid/envelope.cc +@@ -134,7 +134,7 @@ + // of ENV3 with another timed loop to fully synchronize with ENV3. + // + // At the first period when an exponential counter period larger than one +-// is used (decay or relase), one extra cycle is spent before the envelope is ++// is used (decay or release), one extra cycle is spent before the envelope is + // decremented. The envelope output is then delayed one cycle until the state + // is changed to attack. Now one cycle less will be spent before the envelope + // is incremented, and the situation is normalized. +--- lmms.orig/plugins/monstro/Monstro.cpp ++++ lmms/plugins/monstro/Monstro.cpp +@@ -323,7 +323,7 @@ + float o1l_f; + float o1r_f; + float o1l_p = m_osc1l_phase + o1lpo; // we add phase offset here so we don't have to do it every frame +- float o1r_p = m_osc1r_phase + o1rpo; // then substract it again after loop... ++ float o1r_p = m_osc1r_phase + o1rpo; // then subtract it again after loop... + float o1_pw; + + // osc2 vars +--- lmms.orig/plugins/LadspaEffect/calf/src/calf/osc.h ++++ lmms/plugins/LadspaEffect/calf/src/calf/osc.h +@@ -252,7 +252,7 @@ + uint32_t wpos = phase >> (32 - SIZE_BITS); + return dsp::lerp(waveform[wpos], waveform[(wpos + 1) & MASK], (phase & (SCALE - 1)) * (1.0f / SCALE)); + } +- /// Add/substract two phase-shifted values ++ /// Add/subtract two phase-shifted values + inline float get_phaseshifted(uint32_t shift, float mix) + { + uint32_t wpos = phase >> (32 - SIZE_BITS); +--- lmms.orig/plugins/LadspaEffect/swh/util/buffer.h ++++ lmms/plugins/LadspaEffect/swh/util/buffer.h +@@ -1,7 +1,7 @@ + #ifndef _BUFFER_H + #define _BUFFER_H + +-/* substract buffer b from a, save in c ++/* subtract buffer b from a, save in c + * + * this could be sped up by vector operations + */ +--- lmms.orig/plugins/zynaddsubfx/zynaddsubfx/doc/effects.txt ++++ lmms/plugins/zynaddsubfx/zynaddsubfx/doc/effects.txt +@@ -149,7 +149,7 @@ + the delay also depends on the current pitch. + * After the correct element of the sound buffer is found using the LFO, the + *Fb* knob lets you set how loud it shall be played. This is mostly redundant to +-the *D/W* knob, but we have not applied panning and substraction yet. ++the *D/W* knob, but we have not applied panning and subtraction yet. + * Next, the singal can be negated. If the *Substract* Checkbox is activated, + the amplitude is multiplied by -1. + * Finally, *Pan* lets you apply panning. +--- lmms.orig/src/gui/widgets/EnvelopeAndLfoView.cpp ++++ lmms/src/gui/widgets/EnvelopeAndLfoView.cpp +@@ -485,8 +485,8 @@ + p.fillRect( x5, y_base - 1, 2, 2, end_points_color ); + + +- int LFO_GRAPH_W = s_lfoGraph->width() - 6; // substract border +- int LFO_GRAPH_H = s_lfoGraph->height() - 6; // substract border ++ int LFO_GRAPH_W = s_lfoGraph->width() - 6; // subtract border ++ int LFO_GRAPH_H = s_lfoGraph->height() - 6; // subtract border + int graph_x_base = LFO_GRAPH_X + 3; + int graph_y_base = LFO_GRAPH_Y + 3 + LFO_GRAPH_H / 2; + diff -Nru lmms-1.1.3/debian/patches/switch-pulse.patch lmms-1.1.3/debian/patches/switch-pulse.patch --- lmms-1.1.3/debian/patches/switch-pulse.patch 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/patches/switch-pulse.patch 2019-01-22 15:15:01.000000000 +0000 @@ -1,6 +1,8 @@ Description: Switch to PulseAudio back end on likely ALSA interception If pulse.conf exists, it is likely that there will be an interception. The back end next to ALSA is selected, which is PulseAudio. + . + There is a better approach at https://github.com/LMMS/lmms/pull/2992. Author: Javier Serrano Polo Bug-Debian: https://bugs.debian.org/781479 Forwarded: https://github.com/LMMS/lmms/pull/2743 diff -Nru lmms-1.1.3/debian/patches/wine-runpath.patch lmms-1.1.3/debian/patches/wine-runpath.patch --- lmms-1.1.3/debian/patches/wine-runpath.patch 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/patches/wine-runpath.patch 2019-01-22 15:15:01.000000000 +0000 @@ -1,6 +1,6 @@ Description: Define RUNPATH to find wine library Debian does not ship the wine library in a directory expected by the dynamic - linker. WINE_CXX_FLAGS allows to set RUNPATH information. + linker. WINE_CXX_FLAGS allows one to set RUNPATH information. Author: Javier Serrano Polo Bug-Debian: https://bugs.debian.org/763720 Forwarded: https://github.com/LMMS/lmms/pull/2746 diff -Nru lmms-1.1.3/debian/rules lmms-1.1.3/debian/rules --- lmms-1.1.3/debian/rules 2018-03-10 03:32:05.000000000 +0000 +++ lmms-1.1.3/debian/rules 2019-02-18 18:33:43.000000000 +0000 @@ -22,8 +22,18 @@ endif # Define NDEBUG. This helps with reproducible builds. +# Add -Wno-error=format-truncation because truncation is expected in snprintf. +ifeq ($(DEB_HOST_ARCH),ppc64el) +# -Wno-maybe-uninitialized needed on Ubuntu ppc64el to avoid FTBFS (LP: 1816459) export CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) -DNDEBUG -export CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) -DNDEBUG +export CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) -DNDEBUG \ + -Wno-error=format-truncation -Wno-maybe-uninitialized +else +export CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) -DNDEBUG +export CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) -DNDEBUG \ + -Wno-error=format-truncation +endif +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --buildsystem cmake