From 30bea119d6666aa4f1b42143221aa2484d330195 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Feb 09 2011 09:26:04 +0000 Subject: - Update to 0.4.10, rebase patches. - Add patch for bz 672918. --- diff --git a/.gitignore b/.gitignore index 7ba6019..027666f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /lmms-0.4.7.stripped.tar.bz2 /lmms-0.4.8.stripped.tar.bz2 /lmms-0.4.9.stripped.tar.bz2 +/lmms-0.4.10.stripped.tar.bz2 diff --git a/README.fedora b/README.fedora index 4002722..f8aae02 100644 --- a/README.fedora +++ b/README.fedora @@ -1,247 +1,247 @@ For legal reasons, the following files have been removed from the original tarfile: -lmms-0.4.9/data/projects/tutorials/editing_note_volumes.mmp -lmms-0.4.9/data/projects/demos/Zvonsully-RaceTheZBeat.mmp -lmms-0.4.9/data/projects/demos/beat_collection.mmp -lmms-0.4.9/data/projects/demos/demo5.mmp -lmms-0.4.9/data/projects/demos/newFangled.mmpz -lmms-0.4.9/data/projects/demos/TobyDox-Crystallo.mmp -lmms-0.4.9/data/projects/demos/loop_collection.mmp -lmms-0.4.9/data/projects/demos/demo1.mmp -lmms-0.4.9/data/projects/demos/demo4.mmp -lmms-0.4.9/data/projects/demos/demo3.mmp -lmms-0.4.9/data/projects/demos/lb302quick.mmpz -lmms-0.4.9/data/projects/demos/demo2.mmp -lmms-0.4.9/data/projects/demos/demo6.mmp -lmms-0.4.9/data/projects/demos/some_basslines.mmp -lmms-0.4.9/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp -lmms-0.4.9/data/projects/cool_songs/MysthR-Living.mmpz -lmms-0.4.9/data/projects/cool_songs/Siegel-DreamWave.mmp -lmms-0.4.9/data/projects/cool_songs/Silva-ElvesCall.mmp -lmms-0.4.9/data/projects/cool_songs/TobyDox-Psycho.mmp -lmms-0.4.9/data/projects/cool_songs/Chris-RaveRiff.mmpz -lmms-0.4.9/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz -lmms-0.4.9/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp -lmms-0.4.9/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz -lmms-0.4.9/data/projects/cool_songs/Chris-HorizonRemix.mmp -lmms-0.4.9/data/projects/cool_songs/j1m-DingDong.mmp -lmms-0.4.9/data/projects/cool_songs/Djeezus-BeatRolls.mmp -lmms-0.4.9/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp -lmms-0.4.9/data/projects/cool_songs/BlueWolf-DreamTravel.mmp -lmms-0.4.9/data/projects/cool_songs/Marfil-MarfilDrum01.mmp -lmms-0.4.9/data/projects/cool_songs/Malex-Horizon4.mmp -lmms-0.4.9/data/projects/cool_songs/StrictProduction-Underline.mmp -lmms-0.4.9/data/projects/cool_songs/Skiessi-TurningPoint.mmpz -lmms-0.4.9/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp -lmms-0.4.9/data/projects/cool_songs/SharkyX-Experiments.mmp -lmms-0.4.9/data/projects/cool_songs/Skiessi-Onion.mmpz -lmms-0.4.9/data/projects/cool_songs/TobyDox-Confused.mmp -lmms-0.4.9/data/projects/cool_songs/Siegel-SpeedTrack.mmp -lmms-0.4.9/data/projects/cool_songs/Djeezus-Oscilisous.mmp -lmms-0.4.9/data/samples/latin/latin_brass01.ogg -lmms-0.4.9/data/samples/latin/latin_guitar03.ogg -lmms-0.4.9/data/samples/latin/latin_guitar01.ogg -lmms-0.4.9/data/samples/latin/latin_guitar02.ogg -lmms-0.4.9/data/samples/shapes/technosynth3.wav -lmms-0.4.9/data/samples/shapes/technosynth1.wav -lmms-0.4.9/data/samples/shapes/technosynth2.wav -lmms-0.4.9/data/samples/shapes/additive2.wav -lmms-0.4.9/data/samples/shapes/harmonics.wav -lmms-0.4.9/data/samples/shapes/micro.wav -lmms-0.4.9/data/samples/shapes/bunglist2.wav -lmms-0.4.9/data/samples/shapes/bunglist3.wav -lmms-0.4.9/data/samples/shapes/saw+sine.wav -lmms-0.4.9/data/samples/shapes/smooth_inv_saw2.ogg -lmms-0.4.9/data/samples/shapes/bunglist.wav -lmms-0.4.9/data/samples/shapes/smooth_inv_saw.ogg -lmms-0.4.9/data/samples/shapes/roundbass.wav -lmms-0.4.9/data/samples/shapes/bunglist9.wav -lmms-0.4.9/data/samples/shapes/bunglist7.wav -lmms-0.4.9/data/samples/shapes/low_sine.wav -lmms-0.4.9/data/samples/shapes/bunglist4.wav -lmms-0.4.9/data/samples/shapes/bunglist5.wav -lmms-0.4.9/data/samples/shapes/sine_dist.ogg -lmms-0.4.9/data/samples/shapes/technobass.wav -lmms-0.4.9/data/samples/shapes/roundsaw.ogg -lmms-0.4.9/data/samples/shapes/technosynth6.wav -lmms-0.4.9/data/samples/shapes/smooth_inv_saw_dist.ogg -lmms-0.4.9/data/samples/shapes/bunglist6.wav -lmms-0.4.9/data/samples/shapes/moog.wav -lmms-0.4.9/data/samples/shapes/bunglist8.wav -lmms-0.4.9/data/samples/shapes/additive.wav -lmms-0.4.9/data/samples/shapes/technosynth5.wav -lmms-0.4.9/data/samples/shapes/technosynth4.wav -lmms-0.4.9/data/samples/shapes/vowel_a.wav -lmms-0.4.9/data/samples/shapes/vowel_u.wav -lmms-0.4.9/data/samples/basses/bass_punch01.ogg -lmms-0.4.9/data/samples/basses/bass_acid01.ogg -lmms-0.4.9/data/samples/basses/rave_bass02.ogg -lmms-0.4.9/data/samples/basses/bass_hard02.ogg -lmms-0.4.9/data/samples/basses/rave_bass01.ogg -lmms-0.4.9/data/samples/basses/bass_hard01.ogg -lmms-0.4.9/data/samples/basses/synth_acid02.ogg -lmms-0.4.9/data/samples/basses/horror_bass01.ogg -lmms-0.4.9/data/samples/basses/matrix1000_pluck01.ogg -lmms-0.4.9/data/samples/basses/bass01.ogg -lmms-0.4.9/data/samples/basses/bass_acid02.ogg -lmms-0.4.9/data/samples/basses/synth_acid01.ogg -lmms-0.4.9/data/samples/basses/techno_synth01.ogg -lmms-0.4.9/data/samples/basses/rave_bass04.ogg -lmms-0.4.9/data/samples/basses/rave_bass03.ogg -lmms-0.4.9/data/samples/effects/explode01.ogg -lmms-0.4.9/data/samples/effects/warp01.ogg -lmms-0.4.9/data/samples/effects/filter_sweep01.ogg -lmms-0.4.9/data/samples/effects/start01.ogg -lmms-0.4.9/data/samples/effects/wind_chimes01.ogg -lmms-0.4.9/data/samples/effects/scratch01.ogg -lmms-0.4.9/data/samples/effects/warp02.ogg -lmms-0.4.9/data/samples/effects/chroma_sound_effect01.ogg -lmms-0.4.9/data/samples/effects/stop01.ogg -lmms-0.4.9/data/samples/effects/start02.ogg -lmms-0.4.9/data/samples/beats/house_loop01.ogg -lmms-0.4.9/data/samples/beats/break02.ogg -lmms-0.4.9/data/samples/beats/909beat01.ogg -lmms-0.4.9/data/samples/beats/break03.ogg -lmms-0.4.9/data/samples/beats/electro_beat02.ogg -lmms-0.4.9/data/samples/beats/electro_beat01.ogg -lmms-0.4.9/data/samples/beats/jungle01.ogg -lmms-0.4.9/data/samples/beats/rave_hihat01.ogg -lmms-0.4.9/data/samples/beats/rave_kick01.ogg -lmms-0.4.9/data/samples/beats/rave_kick02.ogg -lmms-0.4.9/data/samples/beats/break01.ogg -lmms-0.4.9/data/samples/beats/rave_snare01.ogg -lmms-0.4.9/data/samples/beats/rave_hihat02.ogg -lmms-0.4.9/data/samples/stringsnpads/bell_choir02.ogg -lmms-0.4.9/data/samples/stringsnpads/strings01.ogg -lmms-0.4.9/data/samples/stringsnpads/korg_poly6_drone01.ogg -lmms-0.4.9/data/samples/stringsnpads/space_strings01.ogg -lmms-0.4.9/data/samples/stringsnpads/chorus02.ogg -lmms-0.4.9/data/samples/stringsnpads/space_strings03.ogg -lmms-0.4.9/data/samples/stringsnpads/chorus01.ogg -lmms-0.4.9/data/samples/stringsnpads/juno_pad01.ogg -lmms-0.4.9/data/samples/stringsnpads/orion_string01.ogg -lmms-0.4.9/data/samples/stringsnpads/rave_choir01.ogg -lmms-0.4.9/data/samples/stringsnpads/bell_choir01.ogg -lmms-0.4.9/data/samples/stringsnpads/heaven_strings01.ogg -lmms-0.4.9/data/samples/stringsnpads/nord_ambient01.ogg -lmms-0.4.9/data/samples/stringsnpads/space_strings02.ogg -lmms-0.4.9/data/samples/bassloopes/briff01.ogg -lmms-0.4.9/data/samples/bassloopes/techno_bass01.ogg -lmms-0.4.9/data/samples/bassloopes/rave_bass02.ogg -lmms-0.4.9/data/samples/bassloopes/techno_synth02.ogg -lmms-0.4.9/data/samples/bassloopes/tb303_01.ogg -lmms-0.4.9/data/samples/bassloopes/rave_bass01.ogg -lmms-0.4.9/data/samples/bassloopes/techno_synth03.ogg -lmms-0.4.9/data/samples/bassloopes/techno_bass02.ogg -lmms-0.4.9/data/samples/bassloopes/techno_synth04.ogg -lmms-0.4.9/data/samples/bassloopes/techno_synth01.ogg -lmms-0.4.9/data/samples/instruments/violin_double_stop01.ogg -lmms-0.4.9/data/samples/instruments/bassslap01.ogg -lmms-0.4.9/data/samples/instruments/church_organ01.ogg -lmms-0.4.9/data/samples/instruments/e_piano_accord01.ogg -lmms-0.4.9/data/samples/instruments/flute01.ogg -lmms-0.4.9/data/samples/instruments/steel_guitar_medium_distorted01.ogg -lmms-0.4.9/data/samples/instruments/church_organ04.ogg -lmms-0.4.9/data/samples/instruments/trumpet01.ogg -lmms-0.4.9/data/samples/instruments/steel_guitar_slight_distorted01.ogg -lmms-0.4.9/data/samples/instruments/steel_guitar_heavy_distorted01.ogg -lmms-0.4.9/data/samples/instruments/e_organ01.ogg -lmms-0.4.9/data/samples/instruments/church_organ03.ogg -lmms-0.4.9/data/samples/instruments/piano02.ogg -lmms-0.4.9/data/samples/instruments/cello01.ogg -lmms-0.4.9/data/samples/instruments/piano01.ogg -lmms-0.4.9/data/samples/instruments/violin_fingered01.ogg -lmms-0.4.9/data/samples/instruments/violin_pizzicato01.ogg -lmms-0.4.9/data/samples/instruments/e_piano_accord02.ogg -lmms-0.4.9/data/samples/instruments/harpsichord01.ogg -lmms-0.4.9/data/samples/instruments/steel_guitar01.ogg -lmms-0.4.9/data/samples/instruments/bassslap02.ogg -lmms-0.4.9/data/samples/instruments/church_organ02.ogg -lmms-0.4.9/data/samples/misc/applause01.ogg -lmms-0.4.9/data/samples/misc/breath01.ogg -lmms-0.4.9/data/samples/misc/raving_crowd01.ogg -lmms-0.4.9/data/samples/misc/hit02.ogg -lmms-0.4.9/data/samples/misc/dong01.ogg -lmms-0.4.9/data/samples/misc/hit01.ogg -lmms-0.4.9/data/samples/misc/bass!.ogg -lmms-0.4.9/data/samples/misc/dong03.ogg -lmms-0.4.9/data/samples/misc/undefined01.ogg -lmms-0.4.9/data/samples/misc/metronome01.ogg -lmms-0.4.9/data/samples/misc/buzz!.ogg -lmms-0.4.9/data/samples/misc/dong02.ogg -lmms-0.4.9/data/samples/misc/electric_ping01.ogg -lmms-0.4.9/data/samples/misc/metalish_dong01.ogg -lmms-0.4.9/data/samples/misc/snaph01.ogg -lmms-0.4.9/data/samples/drums/kick_soft01.ogg -lmms-0.4.9/data/samples/drums/snare_rim01.ogg -lmms-0.4.9/data/samples/drums/hihat_opened02.ogg -lmms-0.4.9/data/samples/drums/snare05.ogg -lmms-0.4.9/data/samples/drums/bassdrum_acoustic02.ogg -lmms-0.4.9/data/samples/drums/kick_hard01.ogg -lmms-0.4.9/data/samples/drums/sidestick01.ogg -lmms-0.4.9/data/samples/drums/clap01.ogg -lmms-0.4.9/data/samples/drums/snare02.ogg -lmms-0.4.9/data/samples/drums/clap02.ogg -lmms-0.4.9/data/samples/drums/snare04.ogg -lmms-0.4.9/data/samples/drums/bassdrum03.ogg -lmms-0.4.9/data/samples/drums/tom_low01.ogg -lmms-0.4.9/data/samples/drums/bassdrum02.ogg -lmms-0.4.9/data/samples/drums/tom02.ogg -lmms-0.4.9/data/samples/drums/shaker03.ogg -lmms-0.4.9/data/samples/drums/kick_hiphop01.ogg -lmms-0.4.9/data/samples/drums/clap03.ogg -lmms-0.4.9/data/samples/drums/snare_muffled02.ogg -lmms-0.4.9/data/samples/drums/tom01.ogg -lmms-0.4.9/data/samples/drums/hihat_closed03.ogg -lmms-0.4.9/data/samples/drums/hihat_closed05.ogg -lmms-0.4.9/data/samples/drums/tom_hi01.ogg -lmms-0.4.9/data/samples/drums/kick01.ogg -lmms-0.4.9/data/samples/drums/shaker01.ogg -lmms-0.4.9/data/samples/drums/tom05.ogg -lmms-0.4.9/data/samples/drums/ride01.ogg -lmms-0.4.9/data/samples/drums/shaker02.ogg -lmms-0.4.9/data/samples/drums/hihat_opened01.ogg -lmms-0.4.9/data/samples/drums/snare06.ogg -lmms-0.4.9/data/samples/drums/kick_soft02.ogg -lmms-0.4.9/data/samples/drums/kick_long01.ogg -lmms-0.4.9/data/samples/drums/kick04.ogg -lmms-0.4.9/data/samples/drums/snare07.ogg -lmms-0.4.9/data/samples/drums/bassdrum04.ogg -lmms-0.4.9/data/samples/drums/crash02.ogg -lmms-0.4.9/data/samples/drums/tom04.ogg -lmms-0.4.9/data/samples/drums/kick02.ogg -lmms-0.4.9/data/samples/drums/nasty_rim01.ogg -lmms-0.4.9/data/samples/drums/bassdrum_acoustic01.ogg -lmms-0.4.9/data/samples/drums/ride02.ogg -lmms-0.4.9/data/samples/drums/hihat_closed02.ogg -lmms-0.4.9/data/samples/drums/hihat_closed01.ogg -lmms-0.4.9/data/samples/drums/snare01.ogg -lmms-0.4.9/data/samples/drums/wood01.ogg -lmms-0.4.9/data/samples/drums/nasty_bass01.ogg -lmms-0.4.9/data/samples/drums/snare_hiphop02.ogg -lmms-0.4.9/data/samples/drums/kick_distorted01.ogg -lmms-0.4.9/data/samples/drums/zap01.ogg -lmms-0.4.9/data/samples/drums/clav01.ogg -lmms-0.4.9/data/samples/drums/rim01.ogg -lmms-0.4.9/data/samples/drums/nasty_snare01.ogg -lmms-0.4.9/data/samples/drums/snare_harsh01.ogg -lmms-0.4.9/data/samples/drums/clav02.ogg -lmms-0.4.9/data/samples/drums/clap04.ogg -lmms-0.4.9/data/samples/drums/snare_muffled01.ogg -lmms-0.4.9/data/samples/drums/kick03.ogg -lmms-0.4.9/data/samples/drums/snare_acoustic01.ogg -lmms-0.4.9/data/samples/drums/kick_hardcore01.ogg -lmms-0.4.9/data/samples/drums/hihat_foot_pedal01.ogg -lmms-0.4.9/data/samples/drums/snare_short01.ogg -lmms-0.4.9/data/samples/drums/hihat_closed04.ogg -lmms-0.4.9/data/samples/drums/bassdrum01.ogg -lmms-0.4.9/data/samples/drums/snare03.ogg -lmms-0.4.9/data/samples/drums/zap02.ogg -lmms-0.4.9/data/samples/drums/snare_hiphop01.ogg -lmms-0.4.9/data/samples/drums/snare_electro01.ogg -lmms-0.4.9/data/samples/drums/tom_mid01.ogg -lmms-0.4.9/data/samples/drums/tom03.ogg -lmms-0.4.9/data/samples/drums/crash01.ogg -lmms-0.4.9/data/samples/drums/hihat_opened03.ogg -lmms-0.4.9/data/samples/drums/zap03.ogg +lmms-0.4.10/data/samples/shapes/technobass.wav +lmms-0.4.10/data/samples/shapes/technosynth2.wav +lmms-0.4.10/data/samples/shapes/bunglist5.wav +lmms-0.4.10/data/samples/shapes/technosynth1.wav +lmms-0.4.10/data/samples/shapes/bunglist2.wav +lmms-0.4.10/data/samples/shapes/bunglist7.wav +lmms-0.4.10/data/samples/shapes/additive.wav +lmms-0.4.10/data/samples/shapes/saw+sine.wav +lmms-0.4.10/data/samples/shapes/low_sine.wav +lmms-0.4.10/data/samples/shapes/bunglist4.wav +lmms-0.4.10/data/samples/shapes/smooth_inv_saw.ogg +lmms-0.4.10/data/samples/shapes/technosynth4.wav +lmms-0.4.10/data/samples/shapes/roundbass.wav +lmms-0.4.10/data/samples/shapes/technosynth6.wav +lmms-0.4.10/data/samples/shapes/roundsaw.ogg +lmms-0.4.10/data/samples/shapes/sine_dist.ogg +lmms-0.4.10/data/samples/shapes/bunglist.wav +lmms-0.4.10/data/samples/shapes/vowel_a.wav +lmms-0.4.10/data/samples/shapes/bunglist6.wav +lmms-0.4.10/data/samples/shapes/technosynth3.wav +lmms-0.4.10/data/samples/shapes/vowel_u.wav +lmms-0.4.10/data/samples/shapes/technosynth5.wav +lmms-0.4.10/data/samples/shapes/smooth_inv_saw_dist.ogg +lmms-0.4.10/data/samples/shapes/harmonics.wav +lmms-0.4.10/data/samples/shapes/additive2.wav +lmms-0.4.10/data/samples/shapes/moog.wav +lmms-0.4.10/data/samples/shapes/micro.wav +lmms-0.4.10/data/samples/shapes/bunglist3.wav +lmms-0.4.10/data/samples/shapes/bunglist9.wav +lmms-0.4.10/data/samples/shapes/bunglist8.wav +lmms-0.4.10/data/samples/shapes/smooth_inv_saw2.ogg +lmms-0.4.10/data/samples/basses/rave_bass01.ogg +lmms-0.4.10/data/samples/basses/bass_punch01.ogg +lmms-0.4.10/data/samples/basses/bass_acid01.ogg +lmms-0.4.10/data/samples/basses/bass_hard02.ogg +lmms-0.4.10/data/samples/basses/bass_acid02.ogg +lmms-0.4.10/data/samples/basses/bass_hard01.ogg +lmms-0.4.10/data/samples/basses/techno_synth01.ogg +lmms-0.4.10/data/samples/basses/synth_acid01.ogg +lmms-0.4.10/data/samples/basses/rave_bass04.ogg +lmms-0.4.10/data/samples/basses/bass01.ogg +lmms-0.4.10/data/samples/basses/rave_bass02.ogg +lmms-0.4.10/data/samples/basses/rave_bass03.ogg +lmms-0.4.10/data/samples/basses/synth_acid02.ogg +lmms-0.4.10/data/samples/basses/horror_bass01.ogg +lmms-0.4.10/data/samples/basses/matrix1000_pluck01.ogg +lmms-0.4.10/data/samples/effects/chroma_sound_effect01.ogg +lmms-0.4.10/data/samples/effects/filter_sweep01.ogg +lmms-0.4.10/data/samples/effects/warp01.ogg +lmms-0.4.10/data/samples/effects/start01.ogg +lmms-0.4.10/data/samples/effects/scratch01.ogg +lmms-0.4.10/data/samples/effects/start02.ogg +lmms-0.4.10/data/samples/effects/warp02.ogg +lmms-0.4.10/data/samples/effects/wind_chimes01.ogg +lmms-0.4.10/data/samples/effects/stop01.ogg +lmms-0.4.10/data/samples/effects/explode01.ogg +lmms-0.4.10/data/samples/misc/dong02.ogg +lmms-0.4.10/data/samples/misc/buzz!.ogg +lmms-0.4.10/data/samples/misc/metronome01.ogg +lmms-0.4.10/data/samples/misc/applause01.ogg +lmms-0.4.10/data/samples/misc/dong03.ogg +lmms-0.4.10/data/samples/misc/dong01.ogg +lmms-0.4.10/data/samples/misc/undefined01.ogg +lmms-0.4.10/data/samples/misc/bass!.ogg +lmms-0.4.10/data/samples/misc/metalish_dong01.ogg +lmms-0.4.10/data/samples/misc/breath01.ogg +lmms-0.4.10/data/samples/misc/raving_crowd01.ogg +lmms-0.4.10/data/samples/misc/electric_ping01.ogg +lmms-0.4.10/data/samples/misc/hit01.ogg +lmms-0.4.10/data/samples/misc/snaph01.ogg +lmms-0.4.10/data/samples/misc/hit02.ogg +lmms-0.4.10/data/samples/beats/house_loop01.ogg +lmms-0.4.10/data/samples/beats/electro_beat02.ogg +lmms-0.4.10/data/samples/beats/rave_hihat01.ogg +lmms-0.4.10/data/samples/beats/909beat01.ogg +lmms-0.4.10/data/samples/beats/electro_beat01.ogg +lmms-0.4.10/data/samples/beats/break01.ogg +lmms-0.4.10/data/samples/beats/jungle01.ogg +lmms-0.4.10/data/samples/beats/rave_hihat02.ogg +lmms-0.4.10/data/samples/beats/rave_kick02.ogg +lmms-0.4.10/data/samples/beats/rave_kick01.ogg +lmms-0.4.10/data/samples/beats/break03.ogg +lmms-0.4.10/data/samples/beats/rave_snare01.ogg +lmms-0.4.10/data/samples/beats/break02.ogg +lmms-0.4.10/data/samples/drums/crash01.ogg +lmms-0.4.10/data/samples/drums/tom05.ogg +lmms-0.4.10/data/samples/drums/hihat_closed02.ogg +lmms-0.4.10/data/samples/drums/ride01.ogg +lmms-0.4.10/data/samples/drums/tom_mid01.ogg +lmms-0.4.10/data/samples/drums/snare_hiphop02.ogg +lmms-0.4.10/data/samples/drums/tom_hi01.ogg +lmms-0.4.10/data/samples/drums/snare_electro01.ogg +lmms-0.4.10/data/samples/drums/hihat_closed03.ogg +lmms-0.4.10/data/samples/drums/rim01.ogg +lmms-0.4.10/data/samples/drums/snare_acoustic01.ogg +lmms-0.4.10/data/samples/drums/snare01.ogg +lmms-0.4.10/data/samples/drums/snare_harsh01.ogg +lmms-0.4.10/data/samples/drums/clap03.ogg +lmms-0.4.10/data/samples/drums/nasty_bass01.ogg +lmms-0.4.10/data/samples/drums/snare_short01.ogg +lmms-0.4.10/data/samples/drums/crash02.ogg +lmms-0.4.10/data/samples/drums/tom02.ogg +lmms-0.4.10/data/samples/drums/bassdrum04.ogg +lmms-0.4.10/data/samples/drums/ride02.ogg +lmms-0.4.10/data/samples/drums/shaker01.ogg +lmms-0.4.10/data/samples/drums/kick01.ogg +lmms-0.4.10/data/samples/drums/shaker02.ogg +lmms-0.4.10/data/samples/drums/tom03.ogg +lmms-0.4.10/data/samples/drums/hihat_foot_pedal01.ogg +lmms-0.4.10/data/samples/drums/hihat_closed01.ogg +lmms-0.4.10/data/samples/drums/clap02.ogg +lmms-0.4.10/data/samples/drums/tom_low01.ogg +lmms-0.4.10/data/samples/drums/bassdrum_acoustic01.ogg +lmms-0.4.10/data/samples/drums/hihat_closed05.ogg +lmms-0.4.10/data/samples/drums/hihat_closed04.ogg +lmms-0.4.10/data/samples/drums/snare02.ogg +lmms-0.4.10/data/samples/drums/snare07.ogg +lmms-0.4.10/data/samples/drums/tom01.ogg +lmms-0.4.10/data/samples/drums/bassdrum01.ogg +lmms-0.4.10/data/samples/drums/hihat_opened01.ogg +lmms-0.4.10/data/samples/drums/kick_soft01.ogg +lmms-0.4.10/data/samples/drums/bassdrum03.ogg +lmms-0.4.10/data/samples/drums/kick03.ogg +lmms-0.4.10/data/samples/drums/kick04.ogg +lmms-0.4.10/data/samples/drums/kick_hardcore01.ogg +lmms-0.4.10/data/samples/drums/zap01.ogg +lmms-0.4.10/data/samples/drums/kick_distorted01.ogg +lmms-0.4.10/data/samples/drums/snare_rim01.ogg +lmms-0.4.10/data/samples/drums/clap04.ogg +lmms-0.4.10/data/samples/drums/snare06.ogg +lmms-0.4.10/data/samples/drums/snare_hiphop01.ogg +lmms-0.4.10/data/samples/drums/snare04.ogg +lmms-0.4.10/data/samples/drums/snare_muffled01.ogg +lmms-0.4.10/data/samples/drums/nasty_rim01.ogg +lmms-0.4.10/data/samples/drums/hihat_opened02.ogg +lmms-0.4.10/data/samples/drums/snare_muffled02.ogg +lmms-0.4.10/data/samples/drums/tom04.ogg +lmms-0.4.10/data/samples/drums/kick_soft02.ogg +lmms-0.4.10/data/samples/drums/bassdrum02.ogg +lmms-0.4.10/data/samples/drums/wood01.ogg +lmms-0.4.10/data/samples/drums/clav01.ogg +lmms-0.4.10/data/samples/drums/clap01.ogg +lmms-0.4.10/data/samples/drums/kick_hiphop01.ogg +lmms-0.4.10/data/samples/drums/shaker03.ogg +lmms-0.4.10/data/samples/drums/nasty_snare01.ogg +lmms-0.4.10/data/samples/drums/snare05.ogg +lmms-0.4.10/data/samples/drums/kick_hard01.ogg +lmms-0.4.10/data/samples/drums/kick02.ogg +lmms-0.4.10/data/samples/drums/sidestick01.ogg +lmms-0.4.10/data/samples/drums/bassdrum_acoustic02.ogg +lmms-0.4.10/data/samples/drums/snare03.ogg +lmms-0.4.10/data/samples/drums/clav02.ogg +lmms-0.4.10/data/samples/drums/kick_long01.ogg +lmms-0.4.10/data/samples/drums/hihat_opened03.ogg +lmms-0.4.10/data/samples/drums/zap02.ogg +lmms-0.4.10/data/samples/drums/zap03.ogg +lmms-0.4.10/data/samples/stringsnpads/space_strings03.ogg +lmms-0.4.10/data/samples/stringsnpads/juno_pad01.ogg +lmms-0.4.10/data/samples/stringsnpads/nord_ambient01.ogg +lmms-0.4.10/data/samples/stringsnpads/space_strings01.ogg +lmms-0.4.10/data/samples/stringsnpads/chorus01.ogg +lmms-0.4.10/data/samples/stringsnpads/rave_choir01.ogg +lmms-0.4.10/data/samples/stringsnpads/bell_choir02.ogg +lmms-0.4.10/data/samples/stringsnpads/space_strings02.ogg +lmms-0.4.10/data/samples/stringsnpads/bell_choir01.ogg +lmms-0.4.10/data/samples/stringsnpads/heaven_strings01.ogg +lmms-0.4.10/data/samples/stringsnpads/strings01.ogg +lmms-0.4.10/data/samples/stringsnpads/orion_string01.ogg +lmms-0.4.10/data/samples/stringsnpads/chorus02.ogg +lmms-0.4.10/data/samples/stringsnpads/korg_poly6_drone01.ogg +lmms-0.4.10/data/samples/instruments/cello01.ogg +lmms-0.4.10/data/samples/instruments/steel_guitar_heavy_distorted01.ogg +lmms-0.4.10/data/samples/instruments/violin_fingered01.ogg +lmms-0.4.10/data/samples/instruments/church_organ03.ogg +lmms-0.4.10/data/samples/instruments/bassslap01.ogg +lmms-0.4.10/data/samples/instruments/trumpet01.ogg +lmms-0.4.10/data/samples/instruments/harpsichord01.ogg +lmms-0.4.10/data/samples/instruments/piano02.ogg +lmms-0.4.10/data/samples/instruments/church_organ02.ogg +lmms-0.4.10/data/samples/instruments/church_organ01.ogg +lmms-0.4.10/data/samples/instruments/steel_guitar01.ogg +lmms-0.4.10/data/samples/instruments/violin_double_stop01.ogg +lmms-0.4.10/data/samples/instruments/steel_guitar_medium_distorted01.ogg +lmms-0.4.10/data/samples/instruments/e_piano_accord01.ogg +lmms-0.4.10/data/samples/instruments/bassslap02.ogg +lmms-0.4.10/data/samples/instruments/flute01.ogg +lmms-0.4.10/data/samples/instruments/e_organ01.ogg +lmms-0.4.10/data/samples/instruments/piano01.ogg +lmms-0.4.10/data/samples/instruments/steel_guitar_slight_distorted01.ogg +lmms-0.4.10/data/samples/instruments/church_organ04.ogg +lmms-0.4.10/data/samples/instruments/e_piano_accord02.ogg +lmms-0.4.10/data/samples/instruments/violin_pizzicato01.ogg +lmms-0.4.10/data/samples/bassloopes/briff01.ogg +lmms-0.4.10/data/samples/bassloopes/rave_bass01.ogg +lmms-0.4.10/data/samples/bassloopes/techno_synth02.ogg +lmms-0.4.10/data/samples/bassloopes/techno_synth03.ogg +lmms-0.4.10/data/samples/bassloopes/techno_synth01.ogg +lmms-0.4.10/data/samples/bassloopes/techno_bass01.ogg +lmms-0.4.10/data/samples/bassloopes/rave_bass02.ogg +lmms-0.4.10/data/samples/bassloopes/tb303_01.ogg +lmms-0.4.10/data/samples/bassloopes/techno_synth04.ogg +lmms-0.4.10/data/samples/bassloopes/techno_bass02.ogg +lmms-0.4.10/data/samples/latin/latin_brass01.ogg +lmms-0.4.10/data/samples/latin/latin_guitar03.ogg +lmms-0.4.10/data/samples/latin/latin_guitar01.ogg +lmms-0.4.10/data/samples/latin/latin_guitar02.ogg +lmms-0.4.10/data/projects/tutorials/editing_note_volumes.mmp +lmms-0.4.10/data/projects/cool_songs/Skiessi-Onion.mmpz +lmms-0.4.10/data/projects/cool_songs/BlueWolf-DreamTravel.mmp +lmms-0.4.10/data/projects/cool_songs/Skiessi-TurningPoint.mmpz +lmms-0.4.10/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp +lmms-0.4.10/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp +lmms-0.4.10/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz +lmms-0.4.10/data/projects/cool_songs/Chris-HorizonRemix.mmp +lmms-0.4.10/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp +lmms-0.4.10/data/projects/cool_songs/MysthR-Living.mmpz +lmms-0.4.10/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp +lmms-0.4.10/data/projects/cool_songs/TobyDox-Confused.mmp +lmms-0.4.10/data/projects/cool_songs/Marfil-MarfilDrum01.mmp +lmms-0.4.10/data/projects/cool_songs/Silva-ElvesCall.mmp +lmms-0.4.10/data/projects/cool_songs/Djeezus-BeatRolls.mmp +lmms-0.4.10/data/projects/cool_songs/TobyDox-Psycho.mmp +lmms-0.4.10/data/projects/cool_songs/Malex-Horizon4.mmp +lmms-0.4.10/data/projects/cool_songs/StrictProduction-Underline.mmp +lmms-0.4.10/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz +lmms-0.4.10/data/projects/cool_songs/Djeezus-Oscilisous.mmp +lmms-0.4.10/data/projects/cool_songs/Siegel-DreamWave.mmp +lmms-0.4.10/data/projects/cool_songs/Siegel-SpeedTrack.mmp +lmms-0.4.10/data/projects/cool_songs/j1m-DingDong.mmp +lmms-0.4.10/data/projects/cool_songs/SharkyX-Experiments.mmp +lmms-0.4.10/data/projects/cool_songs/Chris-RaveRiff.mmpz +lmms-0.4.10/data/projects/demos/loop_collection.mmp +lmms-0.4.10/data/projects/demos/demo6.mmp +lmms-0.4.10/data/projects/demos/newFangled.mmpz +lmms-0.4.10/data/projects/demos/demo1.mmp +lmms-0.4.10/data/projects/demos/beat_collection.mmp +lmms-0.4.10/data/projects/demos/demo4.mmp +lmms-0.4.10/data/projects/demos/demo3.mmp +lmms-0.4.10/data/projects/demos/TobyDox-Crystallo.mmp +lmms-0.4.10/data/projects/demos/lb302quick.mmpz +lmms-0.4.10/data/projects/demos/some_basslines.mmp +lmms-0.4.10/data/projects/demos/demo2.mmp +lmms-0.4.10/data/projects/demos/demo5.mmp +lmms-0.4.10/data/projects/demos/Zvonsully-RaceTheZBeat.mmp diff --git a/lmms-0.4.10-libexecdir.patch b/lmms-0.4.10-libexecdir.patch new file mode 100644 index 0000000..59bf1f2 --- /dev/null +++ b/lmms-0.4.10-libexecdir.patch @@ -0,0 +1,68 @@ +From: Thomas Moschny +Subject: [PATCH] t/libexecdir + +Move the vst and zynaddsubfx plugins to libexecdir. + +Signed-off-by: Thomas Moschny + +--- + CMakeLists.txt | 2 +- + plugins/vst_base/CMakeLists.txt | 2 +- + plugins/zynaddsubfx/CMakeLists.txt | 2 +- + src/core/RemotePlugin.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50bd3d1..c815ae5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -421,7 +421,7 @@ IF(LMMS_BUILD_WIN32) + SET(EXTRA_LIBRARIES "-lwinmm") + ENDIF() + +-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) ++ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) + + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) + LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) +diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt +index 274efa6..6ae0a08 100644 +--- a/plugins/vst_base/CMakeLists.txt ++++ b/plugins/vst_base/CMakeLists.txt +@@ -35,7 +35,7 @@ ADD_CUSTOM_COMMAND( + + SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES RemoteVstPlugin.exe.so) + +-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin ${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so DESTINATION ${PLUGIN_DIR}) ++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR}) + + ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE) + +diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt +index 9eee0f8..566cb07 100644 +--- a/plugins/zynaddsubfx/CMakeLists.txt ++++ b/plugins/zynaddsubfx/CMakeLists.txt +@@ -99,7 +99,7 @@ ENDIF(WIN32) + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) +-INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR}) ++INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR}) + TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) + ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + +diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp +index 55fe530..cd1218e 100644 +--- a/src/core/RemotePlugin.cpp ++++ b/src/core/RemotePlugin.cpp +@@ -130,7 +130,7 @@ bool RemotePlugin::init( const QString &pluginExecutable, + reset( new shmFifo(), new shmFifo() ); + m_failed = false; + } +- QString exec = configManager::inst()->pluginDir() + ++ QString exec = QString( LIBEXEC_DIR ) + + QDir::separator() + pluginExecutable; + + QStringList args; +-- +tg: (c959b9b..) t/libexecdir (depends on: stable-0.4) diff --git a/lmms-0.4.10-pa-volume.patch b/lmms-0.4.10-pa-volume.patch new file mode 100644 index 0000000..9ceec6e --- /dev/null +++ b/lmms-0.4.10-pa-volume.patch @@ -0,0 +1,35 @@ +From: Thomas Moschny +Subject: [PATCH] t/pa_volume + +Fix for bz 672918. + +Signed-off-by: Thomas Moschny + +--- + src/core/audio/AudioPulseAudio.cpp | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp +index 3fb77c0..bbc615c 100644 +--- a/src/core/audio/AudioPulseAudio.cpp ++++ b/src/core/audio/AudioPulseAudio.cpp +@@ -164,7 +164,6 @@ static void context_state_callback(pa_context *c, void *userdata) + + case PA_CONTEXT_READY: + { +- pa_cvolume cv; + qDebug( "Connection established.\n" ); + _this->m_s = pa_stream_new( c, "lmms", &_this->m_sampleSpec, NULL); + pa_stream_set_state_callback( _this->m_s, stream_state_callback, _this ); +@@ -189,8 +188,7 @@ static void context_state_callback(pa_context *c, void *userdata) + + pa_stream_connect_playback( _this->m_s, NULL, &buffer_attr, + PA_STREAM_ADJUST_LATENCY, +- pa_cvolume_set( &cv, _this->m_sampleSpec.channels, +- PA_VOLUME_NORM ), ++ NULL, + NULL ); + break; + } +-- +tg: (c959b9b..) t/pa_volume (depends on: stable-0.4) diff --git a/lmms-0.4.10-system-fltk.patch b/lmms-0.4.10-system-fltk.patch new file mode 100644 index 0000000..a4b4b0f --- /dev/null +++ b/lmms-0.4.10-system-fltk.patch @@ -0,0 +1,44 @@ +From: Thomas Moschny +Subject: [PATCH] t/system-fltk + +Use system's fltk. + +Signed-off-by: Thomas Moschny + +--- + plugins/zynaddsubfx/CMakeLists.txt | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt +index 566cb07..b8c083e 100644 +--- a/plugins/zynaddsubfx/CMakeLists.txt ++++ b/plugins/zynaddsubfx/CMakeLists.txt +@@ -47,7 +47,7 @@ IF(LMMS_BUILD_WIN32) + ADD_DEFINITIONS(-DPTW32_STATIC_LIB) + ENDIF(LMMS_BUILD_WIN32) + +-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) ++INCLUDE_DIRECTORIES(/usr/include/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) + + set(ZASF_CORE_LIBS + zynaddsubfx_input +@@ -100,7 +100,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) + INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR}) +-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) ++TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk) + ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) + + # link system libraries when on win32 +@@ -127,8 +127,6 @@ IF(LMMS_BUILD_WIN64) + ELSEIF(LMMS_BUILD_WIN32) + SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake") + ENDIF(LMMS_BUILD_WIN64) +-ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL}) + +-ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk) + ENDIF(LMMS_HAVE_FFTW3F) + +-- +tg: (5fa9c7a..) t/system-fltk (depends on: t/libexecdir) diff --git a/lmms-0.4.10-vst-nowine.patch b/lmms-0.4.10-vst-nowine.patch new file mode 100644 index 0000000..cc9a3ad --- /dev/null +++ b/lmms-0.4.10-vst-nowine.patch @@ -0,0 +1,27 @@ +From: Thomas Moschny +Subject: [PATCH] t/vst-nowine + +Build with vst support but without having wine. + +Signed-off-by: Thomas Moschny + +--- + CMakeLists.txt | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50bd3d1..449e2d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -318,6 +318,9 @@ IF(LMMS_BUILD_WIN32) + SET(LMMS_SUPPORT_VST TRUE) + SET(STATUS_VST "OK") + ENDIF(LMMS_BUILD_WIN32) ++IF(WANT_VST_NOWINE) ++ SET(LMMS_SUPPORT_VST TRUE) ++ENDIF(WANT_VST_NOWINE) + + + # check for libsamplerate +-- +tg: (c959b9b..) t/vst-nowine (depends on: stable-0.4) diff --git a/lmms-0.4.9-libexecdir.patch b/lmms-0.4.9-libexecdir.patch deleted file mode 100644 index 11692ad..0000000 --- a/lmms-0.4.9-libexecdir.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Thomas Moschny -Subject: [PATCH] t/libexecdir - -Move the vst and zynaddsubfx plugins to libexecdir. - -Signed-off-by: Thomas Moschny - ---- - CMakeLists.txt | 2 +- - plugins/vst_base/CMakeLists.txt | 2 +- - plugins/zynaddsubfx/CMakeLists.txt | 2 +- - src/core/RemotePlugin.cpp | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 470dfe0..a539d55 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -430,7 +430,7 @@ IF(LMMS_BUILD_WIN32) - SET(EXTRA_LIBRARIES "-lwinmm") - ENDIF() - --ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) -+ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' -D'LIBEXEC_DIR="${LIBEXEC_INSTALL_DIR}"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS}) - - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS}) - LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS}) -diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt -index bca397b..195bb26 100644 ---- a/plugins/vst_base/CMakeLists.txt -+++ b/plugins/vst_base/CMakeLists.txt -@@ -30,7 +30,7 @@ ADD_CUSTOM_COMMAND( - - SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES remote_vst_plugin.exe.so) - --INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${PLUGIN_DIR}) -+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe.so DESTINATION ${LIBEXEC_INSTALL_DIR}) - - ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE) - -diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt -index 93bde3b..3b93799 100644 ---- a/plugins/zynaddsubfx/CMakeLists.txt -+++ b/plugins/zynaddsubfx/CMakeLists.txt -@@ -99,7 +99,7 @@ ENDIF(WIN32) - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) --INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR}) -+INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR}) - TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) - ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) - -diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp -index e712cda..8a99780 100644 ---- a/src/core/RemotePlugin.cpp -+++ b/src/core/RemotePlugin.cpp -@@ -86,8 +86,8 @@ RemotePlugin::RemotePlugin( const QString & _plugin_executable, - m_outputCount( DEFAULT_CHANNELS ) - { - lock(); -- QString exec = configManager::inst()->pluginDir() + -- QDir::separator() + _plugin_executable; -+ QString exec = QString( LIBEXEC_DIR ) + -+ QDir::separator() + _plugin_executable; - QStringList args; - // swap in and out for bidirectional communication - args << QString::number( out()->shmKey() ); --- -tg: (482f89d..) t/libexecdir (depends on: stable-0.4) diff --git a/lmms-0.4.9-system-fltk.patch b/lmms-0.4.9-system-fltk.patch deleted file mode 100644 index 6c99cf9..0000000 --- a/lmms-0.4.9-system-fltk.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Thomas Moschny -Subject: [PATCH] t/system-fltk - -Use system's fltk. - -Signed-off-by: Thomas Moschny - ---- - plugins/zynaddsubfx/CMakeLists.txt | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt -index 3b93799..e57b42b 100644 ---- a/plugins/zynaddsubfx/CMakeLists.txt -+++ b/plugins/zynaddsubfx/CMakeLists.txt -@@ -47,7 +47,7 @@ IF(LMMS_BUILD_WIN32) - ADD_DEFINITIONS(-DPTW32_STATIC_LIB) - ENDIF(LMMS_BUILD_WIN32) - --INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) -+INCLUDE_DIRECTORIES(/usr/include/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) - - set(ZASF_CORE_LIBS - zynaddsubfx_input -@@ -100,7 +100,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}") - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC}) - INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR}) --TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a) -+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore -lfltk) - ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore) - - # link system libraries when on win32 -@@ -126,8 +126,6 @@ IF(LMMS_BUILD_WIN64) - ELSEIF(LMMS_BUILD_WIN32) - SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake") - ENDIF(LMMS_BUILD_WIN64) --ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL}) - --ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk) - ENDIF(LMMS_HAVE_FFTW3F) - --- -tg: (42d572e..) t/system-fltk (depends on: t/libexecdir) diff --git a/lmms-0.4.9-vst-nowine.patch b/lmms-0.4.9-vst-nowine.patch deleted file mode 100644 index 38bb243..0000000 --- a/lmms-0.4.9-vst-nowine.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Thomas Moschny -Subject: [PATCH] t/vst-nowine - -Build with vst support but without having wine. - -Signed-off-by: Thomas Moschny - ---- - CMakeLists.txt | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 470dfe0..22d22dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -327,6 +327,9 @@ IF(LMMS_BUILD_WIN32) - SET(LMMS_SUPPORT_VST TRUE) - SET(STATUS_VST "OK") - ENDIF(LMMS_BUILD_WIN32) -+IF(WANT_VST_NOWINE) -+ SET(LMMS_SUPPORT_VST TRUE) -+ENDIF(WANT_VST_NOWINE) - - - # check for libsamplerate --- -tg: (482f89d..) t/vst-nowine (depends on: stable-0.4) diff --git a/lmms.spec b/lmms.spec index b25751c..7e352e6 100644 --- a/lmms.spec +++ b/lmms.spec @@ -1,6 +1,6 @@ Name: lmms -Version: 0.4.9 -Release: 3%{?dist} +Version: 0.4.10 +Release: 1%{?dist} Summary: Linux MultiMedia Studio URL: http://lmms.sourceforge.net/ Group: Applications/Multimedia @@ -36,16 +36,19 @@ Source0: %{name}-%{version}.stripped.tar.bz2 Source1: README.fedora # move the vst and zynaddsubfx plugins to libexecdir. -Patch0: lmms-0.4.9-libexecdir.patch +Patch0: lmms-0.4.10-libexecdir.patch # build with vst support but without having wine. that is a tiny patch # upstream isn't really interested in. -Patch1: lmms-0.4.9-vst-nowine.patch +Patch1: lmms-0.4.10-vst-nowine.patch # make the embedded zynaddsubfx use system's fltk. using system's # zynaddsubfx however is, according to lmms' developers, not possible # because there are too many differences. -Patch2: lmms-0.4.9-system-fltk.patch +Patch2: lmms-0.4.10-system-fltk.patch + +# fix for bz 672918, received from upstream. included in next release. +Patch3: lmms-0.4.10-pa-volume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -130,6 +133,7 @@ developing addons for %{name}. %patch0 -p1 -b .libexecdir %patch1 -p1 -b .nowine %patch2 -p1 -b .fltk +%patch3 -p1 -b .pa-volume # remove spurious x-bits find . -type f -exec chmod 0644 {} \; @@ -221,6 +225,10 @@ This package contains the necessary files to host VST plugins. %changelog +* Wed Feb 9 2011 Thomas Moschny - 0.4.10-1 +- Update to 0.4.10, rebase patches. +- Add patch for bz 672918. + * Tue Feb 08 2011 Fedora Release Engineering - 0.4.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/repack.sh b/repack.sh index cd91390..8c5f344 100755 --- a/repack.sh +++ b/repack.sh @@ -1,6 +1,6 @@ #! /bin/bash -version=0.4.9 +version=0.4.10 name=lmms-${version} suffix=.tar.bz2 newsuffix=.stripped.tar.bz2 diff --git a/sources b/sources index dd5cf25..d4c11d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -972b2f941ce2e3df4842d712bb1e3e22 lmms-0.4.9.stripped.tar.bz2 +d2f8681440686f429b2961f5c03dcd84 lmms-0.4.10.stripped.tar.bz2