rpms/lmms/F-10 README.fedora, NONE, 1.1 import.log, NONE, 1.1 lmms-0.4.4-fltk-1.1.9-consts.patch, NONE, 1.1 lmms-0.4.4-fltk-1.1.9-gcc44.patch, NONE, 1.1 lmms-0.4.4-libdir.patch, NONE, 1.1 lmms-0.4.4-libexecdir.patch, NONE, 1.1 lmms-0.4.4-vst-nowine.patch, NONE, 1.1 lmms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thomas Moschny thm at fedoraproject.org
Tue May 19 19:01:14 UTC 2009


Author: thm

Update of /cvs/pkgs/rpms/lmms/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32091/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora import.log lmms-0.4.4-fltk-1.1.9-consts.patch 
	lmms-0.4.4-fltk-1.1.9-gcc44.patch lmms-0.4.4-libdir.patch 
	lmms-0.4.4-libexecdir.patch lmms-0.4.4-vst-nowine.patch 
	lmms.spec 
Log Message:
Update to 0.4.4.


--- NEW FILE README.fedora ---
For legal reasons, the following files have been removed from the
original tarfile:

lmms-0.4.4/data/projects/tutorials/editing_note_volumes.mmp
lmms-0.4.4/data/projects/covers/J.S.Bach-Preludium_and_Fugue_A-Minor.mmpz
lmms-0.4.4/data/projects/covers/MonkeyIsland1-Intro.mmpz
lmms-0.4.4/data/projects/oldstuff/SharkyX-DeadManDancing.mmp
lmms-0.4.4/data/projects/oldstuff/MaxFellner-Ease.mmp
lmms-0.4.4/data/projects/oldstuff/time_machine.mmp
lmms-0.4.4/data/projects/oldstuff/Mart-Dirt_Track.mmp
lmms-0.4.4/data/projects/oldstuff/1st.mmp
lmms-0.4.4/data/projects/demos/Zvonsully-RaceTheZBeat.mmp
lmms-0.4.4/data/projects/demos/beat_collection.mmp
lmms-0.4.4/data/projects/demos/demo5.mmp
lmms-0.4.4/data/projects/demos/newFangled.mmpz
lmms-0.4.4/data/projects/demos/TobyDox-Crystallo.mmp
lmms-0.4.4/data/projects/demos/loop_collection.mmp
lmms-0.4.4/data/projects/demos/demo1.mmp
lmms-0.4.4/data/projects/demos/demo4.mmp
lmms-0.4.4/data/projects/demos/demo3.mmp
lmms-0.4.4/data/projects/demos/lb302quick.mmpz
lmms-0.4.4/data/projects/demos/demo2.mmp
lmms-0.4.4/data/projects/demos/demo6.mmp
lmms-0.4.4/data/projects/demos/some_basslines.mmp
lmms-0.4.4/data/projects/cool_songs/Lokori-Systematic_Chaos.mmp
lmms-0.4.4/data/projects/cool_songs/MysthR-Living.mmpz
lmms-0.4.4/data/projects/cool_songs/Siegel-DreamWave.mmp
lmms-0.4.4/data/projects/cool_songs/Silva-ElvesCall.mmp
lmms-0.4.4/data/projects/cool_songs/TobyDox-Psycho.mmp
lmms-0.4.4/data/projects/cool_songs/Chris-RaveRiff.mmpz
lmms-0.4.4/data/projects/cool_songs/Skiessi-RandomProjectNumber14253.mmpz
lmms-0.4.4/data/projects/cool_songs/TobyDox-TheFourthDimension.mmp
lmms-0.4.4/data/projects/cool_songs/OrtalDj-FirstProyect.mmpz
lmms-0.4.4/data/projects/cool_songs/Chris-HorizonRemix.mmp
lmms-0.4.4/data/projects/cool_songs/j1m-DingDong.mmp
lmms-0.4.4/data/projects/cool_songs/Djeezus-BeatRolls.mmp
lmms-0.4.4/data/projects/cool_songs/StrictProduction-Lamentelnes.mmp
lmms-0.4.4/data/projects/cool_songs/BlueWolf-DreamTravel.mmp
lmms-0.4.4/data/projects/cool_songs/Marfil-MarfilDrum01.mmp
lmms-0.4.4/data/projects/cool_songs/Malex-Horizon4.mmp
lmms-0.4.4/data/projects/cool_songs/StrictProduction-Underline.mmp
lmms-0.4.4/data/projects/cool_songs/Skiessi-TurningPoint.mmpz
lmms-0.4.4/data/projects/cool_songs/StrictProduction-DearJonDoe.mmp
lmms-0.4.4/data/projects/cool_songs/SharkyX-Experiments.mmp
lmms-0.4.4/data/projects/cool_songs/Skiessi-Onion.mmpz
lmms-0.4.4/data/projects/cool_songs/TobyDox-Confused.mmp
lmms-0.4.4/data/projects/cool_songs/Siegel-SpeedTrack.mmp
lmms-0.4.4/data/projects/cool_songs/Djeezus-Oscilisous.mmp
lmms-0.4.4/data/samples/latin/latin_brass01.ogg
lmms-0.4.4/data/samples/latin/latin_guitar03.ogg
lmms-0.4.4/data/samples/latin/latin_guitar01.ogg
lmms-0.4.4/data/samples/latin/latin_guitar02.ogg
lmms-0.4.4/data/samples/shapes/technosynth3.wav
lmms-0.4.4/data/samples/shapes/technosynth1.wav
lmms-0.4.4/data/samples/shapes/technosynth2.wav
lmms-0.4.4/data/samples/shapes/additive2.wav
lmms-0.4.4/data/samples/shapes/harmonics.wav
lmms-0.4.4/data/samples/shapes/micro.wav
lmms-0.4.4/data/samples/shapes/bunglist2.wav
lmms-0.4.4/data/samples/shapes/bunglist3.wav
lmms-0.4.4/data/samples/shapes/saw+sine.wav
lmms-0.4.4/data/samples/shapes/smooth_inv_saw2.ogg
lmms-0.4.4/data/samples/shapes/bunglist.wav
lmms-0.4.4/data/samples/shapes/smooth_inv_saw.ogg
lmms-0.4.4/data/samples/shapes/roundbass.wav
lmms-0.4.4/data/samples/shapes/bunglist9.wav
lmms-0.4.4/data/samples/shapes/bunglist7.wav
lmms-0.4.4/data/samples/shapes/low_sine.wav
lmms-0.4.4/data/samples/shapes/bunglist4.wav
lmms-0.4.4/data/samples/shapes/bunglist5.wav
lmms-0.4.4/data/samples/shapes/sine_dist.ogg
lmms-0.4.4/data/samples/shapes/technobass.wav
lmms-0.4.4/data/samples/shapes/roundsaw.ogg
lmms-0.4.4/data/samples/shapes/technosynth6.wav
lmms-0.4.4/data/samples/shapes/smooth_inv_saw_dist.ogg
lmms-0.4.4/data/samples/shapes/bunglist6.wav
lmms-0.4.4/data/samples/shapes/moog.wav
lmms-0.4.4/data/samples/shapes/bunglist8.wav
lmms-0.4.4/data/samples/shapes/additive.wav
lmms-0.4.4/data/samples/shapes/technosynth5.wav
lmms-0.4.4/data/samples/shapes/technosynth4.wav
lmms-0.4.4/data/samples/shapes/vowel_a.wav
lmms-0.4.4/data/samples/shapes/vowel_u.wav
lmms-0.4.4/data/samples/basses/bass_punch01.ogg
lmms-0.4.4/data/samples/basses/bass_acid01.ogg
lmms-0.4.4/data/samples/basses/rave_bass02.ogg
lmms-0.4.4/data/samples/basses/bass_hard02.ogg
lmms-0.4.4/data/samples/basses/rave_bass01.ogg
lmms-0.4.4/data/samples/basses/bass_hard01.ogg
lmms-0.4.4/data/samples/basses/synth_acid02.ogg
lmms-0.4.4/data/samples/basses/horror_bass01.ogg
lmms-0.4.4/data/samples/basses/matrix1000_pluck01.ogg
lmms-0.4.4/data/samples/basses/bass01.ogg
lmms-0.4.4/data/samples/basses/bass_acid02.ogg
lmms-0.4.4/data/samples/basses/synth_acid01.ogg
lmms-0.4.4/data/samples/basses/techno_synth01.ogg
lmms-0.4.4/data/samples/basses/rave_bass04.ogg
lmms-0.4.4/data/samples/basses/rave_bass03.ogg
lmms-0.4.4/data/samples/effects/explode01.ogg
lmms-0.4.4/data/samples/effects/warp01.ogg
lmms-0.4.4/data/samples/effects/filter_sweep01.ogg
lmms-0.4.4/data/samples/effects/start01.ogg
lmms-0.4.4/data/samples/effects/wind_chimes01.ogg
lmms-0.4.4/data/samples/effects/scratch01.ogg
lmms-0.4.4/data/samples/effects/warp02.ogg
lmms-0.4.4/data/samples/effects/chroma_sound_effect01.ogg
lmms-0.4.4/data/samples/effects/stop01.ogg
lmms-0.4.4/data/samples/effects/start02.ogg
lmms-0.4.4/data/samples/beats/house_loop01.ogg
lmms-0.4.4/data/samples/beats/break02.ogg
lmms-0.4.4/data/samples/beats/909beat01.ogg
lmms-0.4.4/data/samples/beats/break03.ogg
lmms-0.4.4/data/samples/beats/electro_beat02.ogg
lmms-0.4.4/data/samples/beats/electro_beat01.ogg
lmms-0.4.4/data/samples/beats/jungle01.ogg
lmms-0.4.4/data/samples/beats/rave_hihat01.ogg
lmms-0.4.4/data/samples/beats/rave_kick01.ogg
lmms-0.4.4/data/samples/beats/rave_kick02.ogg
lmms-0.4.4/data/samples/beats/break01.ogg
lmms-0.4.4/data/samples/beats/rave_snare01.ogg
lmms-0.4.4/data/samples/beats/rave_hihat02.ogg
lmms-0.4.4/data/samples/stringsnpads/bell_choir02.ogg
lmms-0.4.4/data/samples/stringsnpads/strings01.ogg
lmms-0.4.4/data/samples/stringsnpads/korg_poly6_drone01.ogg
lmms-0.4.4/data/samples/stringsnpads/space_strings01.ogg
lmms-0.4.4/data/samples/stringsnpads/chorus02.ogg
lmms-0.4.4/data/samples/stringsnpads/space_strings03.ogg
lmms-0.4.4/data/samples/stringsnpads/chorus01.ogg
lmms-0.4.4/data/samples/stringsnpads/juno_pad01.ogg
lmms-0.4.4/data/samples/stringsnpads/orion_string01.ogg
lmms-0.4.4/data/samples/stringsnpads/rave_choir01.ogg
lmms-0.4.4/data/samples/stringsnpads/bell_choir01.ogg
lmms-0.4.4/data/samples/stringsnpads/heaven_strings01.ogg
lmms-0.4.4/data/samples/stringsnpads/nord_ambient01.ogg
lmms-0.4.4/data/samples/stringsnpads/space_strings02.ogg
lmms-0.4.4/data/samples/bassloopes/briff01.ogg
lmms-0.4.4/data/samples/bassloopes/techno_bass01.ogg
lmms-0.4.4/data/samples/bassloopes/rave_bass02.ogg
lmms-0.4.4/data/samples/bassloopes/techno_synth02.ogg
lmms-0.4.4/data/samples/bassloopes/tb303_01.ogg
lmms-0.4.4/data/samples/bassloopes/rave_bass01.ogg
lmms-0.4.4/data/samples/bassloopes/techno_synth03.ogg
lmms-0.4.4/data/samples/bassloopes/techno_bass02.ogg
lmms-0.4.4/data/samples/bassloopes/techno_synth04.ogg
lmms-0.4.4/data/samples/bassloopes/techno_synth01.ogg
lmms-0.4.4/data/samples/instruments/violin_double_stop01.ogg
lmms-0.4.4/data/samples/instruments/bassslap01.ogg
lmms-0.4.4/data/samples/instruments/church_organ01.ogg
lmms-0.4.4/data/samples/instruments/e_piano_accord01.ogg
lmms-0.4.4/data/samples/instruments/flute01.ogg
lmms-0.4.4/data/samples/instruments/steel_guitar_medium_distorted01.ogg
lmms-0.4.4/data/samples/instruments/church_organ04.ogg
lmms-0.4.4/data/samples/instruments/trumpet01.ogg
lmms-0.4.4/data/samples/instruments/steel_guitar_slight_distorted01.ogg
lmms-0.4.4/data/samples/instruments/steel_guitar_heavy_distorted01.ogg
lmms-0.4.4/data/samples/instruments/e_organ01.ogg
lmms-0.4.4/data/samples/instruments/church_organ03.ogg
lmms-0.4.4/data/samples/instruments/piano02.ogg
lmms-0.4.4/data/samples/instruments/cello01.ogg
lmms-0.4.4/data/samples/instruments/piano01.ogg
lmms-0.4.4/data/samples/instruments/violin_fingered01.ogg
lmms-0.4.4/data/samples/instruments/violin_pizzicato01.ogg
lmms-0.4.4/data/samples/instruments/e_piano_accord02.ogg
lmms-0.4.4/data/samples/instruments/harpsichord01.ogg
lmms-0.4.4/data/samples/instruments/steel_guitar01.ogg
lmms-0.4.4/data/samples/instruments/bassslap02.ogg
lmms-0.4.4/data/samples/instruments/church_organ02.ogg
lmms-0.4.4/data/samples/misc/applause01.ogg
lmms-0.4.4/data/samples/misc/breath01.ogg
lmms-0.4.4/data/samples/misc/raving_crowd01.ogg
lmms-0.4.4/data/samples/misc/hit02.ogg
lmms-0.4.4/data/samples/misc/dong01.ogg
lmms-0.4.4/data/samples/misc/hit01.ogg
lmms-0.4.4/data/samples/misc/bass!.ogg
lmms-0.4.4/data/samples/misc/dong03.ogg
lmms-0.4.4/data/samples/misc/undefined01.ogg
lmms-0.4.4/data/samples/misc/metronome01.ogg
lmms-0.4.4/data/samples/misc/buzz!.ogg
lmms-0.4.4/data/samples/misc/dong02.ogg
lmms-0.4.4/data/samples/misc/electric_ping01.ogg
lmms-0.4.4/data/samples/misc/metalish_dong01.ogg
lmms-0.4.4/data/samples/misc/snaph01.ogg
lmms-0.4.4/data/samples/drums/kick_soft01.ogg
lmms-0.4.4/data/samples/drums/snare_rim01.ogg
lmms-0.4.4/data/samples/drums/hihat_opened02.ogg
lmms-0.4.4/data/samples/drums/snare05.ogg
lmms-0.4.4/data/samples/drums/bassdrum_acoustic02.ogg
lmms-0.4.4/data/samples/drums/kick_hard01.ogg
lmms-0.4.4/data/samples/drums/sidestick01.ogg
lmms-0.4.4/data/samples/drums/clap01.ogg
lmms-0.4.4/data/samples/drums/snare02.ogg
lmms-0.4.4/data/samples/drums/clap02.ogg
lmms-0.4.4/data/samples/drums/snare04.ogg
lmms-0.4.4/data/samples/drums/bassdrum03.ogg
lmms-0.4.4/data/samples/drums/tom_low01.ogg
lmms-0.4.4/data/samples/drums/bassdrum02.ogg
lmms-0.4.4/data/samples/drums/tom02.ogg
lmms-0.4.4/data/samples/drums/shaker03.ogg
lmms-0.4.4/data/samples/drums/kick_hiphop01.ogg
lmms-0.4.4/data/samples/drums/clap03.ogg
lmms-0.4.4/data/samples/drums/snare_muffled02.ogg
lmms-0.4.4/data/samples/drums/tom01.ogg
lmms-0.4.4/data/samples/drums/hihat_closed03.ogg
lmms-0.4.4/data/samples/drums/hihat_closed05.ogg
lmms-0.4.4/data/samples/drums/tom_hi01.ogg
lmms-0.4.4/data/samples/drums/kick01.ogg
lmms-0.4.4/data/samples/drums/shaker01.ogg
lmms-0.4.4/data/samples/drums/tom05.ogg
lmms-0.4.4/data/samples/drums/ride01.ogg
lmms-0.4.4/data/samples/drums/shaker02.ogg
lmms-0.4.4/data/samples/drums/hihat_opened01.ogg
lmms-0.4.4/data/samples/drums/snare06.ogg
lmms-0.4.4/data/samples/drums/kick_soft02.ogg
lmms-0.4.4/data/samples/drums/kick_long01.ogg
lmms-0.4.4/data/samples/drums/kick04.ogg
lmms-0.4.4/data/samples/drums/snare07.ogg
lmms-0.4.4/data/samples/drums/bassdrum04.ogg
lmms-0.4.4/data/samples/drums/crash02.ogg
lmms-0.4.4/data/samples/drums/tom04.ogg
lmms-0.4.4/data/samples/drums/kick02.ogg
lmms-0.4.4/data/samples/drums/nasty_rim01.ogg
lmms-0.4.4/data/samples/drums/bassdrum_acoustic01.ogg
lmms-0.4.4/data/samples/drums/ride02.ogg
lmms-0.4.4/data/samples/drums/hihat_closed02.ogg
lmms-0.4.4/data/samples/drums/hihat_closed01.ogg
lmms-0.4.4/data/samples/drums/snare01.ogg
lmms-0.4.4/data/samples/drums/wood01.ogg
lmms-0.4.4/data/samples/drums/nasty_bass01.ogg
lmms-0.4.4/data/samples/drums/snare_hiphop02.ogg
lmms-0.4.4/data/samples/drums/kick_distorted01.ogg
lmms-0.4.4/data/samples/drums/zap01.ogg
lmms-0.4.4/data/samples/drums/clav01.ogg
lmms-0.4.4/data/samples/drums/rim01.ogg
lmms-0.4.4/data/samples/drums/nasty_snare01.ogg
lmms-0.4.4/data/samples/drums/snare_harsh01.ogg
lmms-0.4.4/data/samples/drums/clav02.ogg
lmms-0.4.4/data/samples/drums/clap04.ogg
lmms-0.4.4/data/samples/drums/snare_muffled01.ogg
lmms-0.4.4/data/samples/drums/kick03.ogg
lmms-0.4.4/data/samples/drums/snare_acoustic01.ogg
lmms-0.4.4/data/samples/drums/kick_hardcore01.ogg
lmms-0.4.4/data/samples/drums/hihat_foot_pedal01.ogg
lmms-0.4.4/data/samples/drums/snare_short01.ogg
lmms-0.4.4/data/samples/drums/hihat_closed04.ogg
lmms-0.4.4/data/samples/drums/bassdrum01.ogg
lmms-0.4.4/data/samples/drums/snare03.ogg
lmms-0.4.4/data/samples/drums/zap02.ogg
lmms-0.4.4/data/samples/drums/snare_hiphop01.ogg
lmms-0.4.4/data/samples/drums/snare_electro01.ogg
lmms-0.4.4/data/samples/drums/tom_mid01.ogg
lmms-0.4.4/data/samples/drums/tom03.ogg
lmms-0.4.4/data/samples/drums/crash01.ogg
lmms-0.4.4/data/samples/drums/hihat_opened03.ogg
lmms-0.4.4/data/samples/drums/zap03.ogg


--- NEW FILE import.log ---
lmms-0_4_4-1_fc11:F-10:lmms-0.4.4-1.fc11.src.rpm:1242759602

lmms-0.4.4-fltk-1.1.9-consts.patch:

--- NEW FILE lmms-0.4.4-fltk-1.1.9-consts.patch ---
diff -up lmms-0.4.4/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx.orig lmms-0.4.4/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx
--- lmms-0.4.4/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx.orig	2009-05-05 01:13:15.000000000 +0200
+++ lmms-0.4.4/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx	2009-05-19 14:16:09.000000000 +0200
@@ -253,13 +253,13 @@ Fl_Font Fl::set_fonts(const char* patter
       // So the bit we want is up to the first comma - BUT some strings have
       // more than one name, separated by, guess what?, a comma...
       stop = start = first = 0;
-      stop = strchr((const char *)font, ',');
-      start = strchr((const char *)font, ':');
+      stop = strchr((char *)font, ',');
+      start = strchr((char *)font, ':');
       if ((stop) && (start) && (stop < start))
       {
         first = stop + 1; // discard first version of name
         // find first comma *after* the end of the name
-        stop = strchr((const char *)start, ',');
+        stop = strchr((char *)start, ',');
       }
       else
       {

lmms-0.4.4-fltk-1.1.9-gcc44.patch:

--- NEW FILE lmms-0.4.4-fltk-1.1.9-gcc44.patch ---
diff -up lmms-0.4.4/plugins/zynaddsubfx/fltk/src/filename_list.cxx.orig lmms-0.4.4/plugins/zynaddsubfx/fltk/src/filename_list.cxx
--- lmms-0.4.4/plugins/zynaddsubfx/fltk/src/filename_list.cxx.orig	2009-05-05 01:13:15.000000000 +0200
+++ lmms-0.4.4/plugins/zynaddsubfx/fltk/src/filename_list.cxx	2009-05-19 13:57:25.000000000 +0200
@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire
   // The vast majority of UNIX systems want the sort function to have this
   // prototype, most likely so that it can be passed to qsort without any
   // changes:
-  int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
+  int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort);
 #else
   // This version is when we define our own scandir (WIN32 and perhaps
   // some Unix systems) and apparently on IRIX:

lmms-0.4.4-libdir.patch:

--- NEW FILE lmms-0.4.4-libdir.patch ---
diff -up lmms-0.4.4/CMakeLists.txt.orig lmms-0.4.4/CMakeLists.txt
--- lmms-0.4.4/CMakeLists.txt.orig	2009-05-05 01:13:12.000000000 +0200
+++ lmms-0.4.4/CMakeLists.txt	2009-05-19 14:48:38.000000000 +0200
@@ -423,7 +423,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-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="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${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})

lmms-0.4.4-libexecdir.patch:

--- NEW FILE lmms-0.4.4-libexecdir.patch ---
diff -up lmms-0.4.4/CMakeLists.txt.orig lmms-0.4.4/CMakeLists.txt
--- lmms-0.4.4/CMakeLists.txt.orig	2009-05-19 14:51:44.000000000 +0200
+++ lmms-0.4.4/CMakeLists.txt	2009-05-19 14:51:55.000000000 +0200
@@ -423,7 +423,7 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR}/"' -D'PLUGIN_DIR="${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 -up lmms-0.4.4/plugins/vst_base/CMakeLists.txt.orig lmms-0.4.4/plugins/vst_base/CMakeLists.txt
--- lmms-0.4.4/plugins/vst_base/CMakeLists.txt.orig	2009-05-05 01:13:16.000000000 +0200
+++ lmms-0.4.4/plugins/vst_base/CMakeLists.txt	2009-05-19 14:51:55.000000000 +0200
@@ -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 -up lmms-0.4.4/plugins/zynaddsubfx/CMakeLists.txt.orig lmms-0.4.4/plugins/zynaddsubfx/CMakeLists.txt
--- lmms-0.4.4/plugins/zynaddsubfx/CMakeLists.txt.orig	2009-05-05 01:13:15.000000000 +0200
+++ lmms-0.4.4/plugins/zynaddsubfx/CMakeLists.txt	2009-05-19 14:52:14.000000000 +0200
@@ -119,7 +119,7 @@ ENDIF(LMMS_BUILD_WIN32)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR})
 
 ADD_EXECUTABLE(remote_zynaddsubfx remote_zynaddsubfx.cpp ${ZYN_SRC} ${MXML_SRC})
-INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${PLUGIN_DIR})
+INSTALL(TARGETS remote_zynaddsubfx RUNTIME DESTINATION ${LIBEXEC_INSTALL_DIR})
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET remote_zynaddsubfx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/remote_zynaddsubfx.exe)
diff -up lmms-0.4.4/src/core/remote_plugin.cpp.orig lmms-0.4.4/src/core/remote_plugin.cpp
--- lmms-0.4.4/src/core/remote_plugin.cpp.orig	2009-05-05 01:13:16.000000000 +0200
+++ lmms-0.4.4/src/core/remote_plugin.cpp	2009-05-19 14:51:55.000000000 +0200
@@ -84,8 +84,8 @@ remotePlugin::remotePlugin( const QStrin
 	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() );

lmms-0.4.4-vst-nowine.patch:

--- NEW FILE lmms-0.4.4-vst-nowine.patch ---
diff -up lmms-0.4.4/CMakeLists.txt.orig lmms-0.4.4/CMakeLists.txt
--- lmms-0.4.4/CMakeLists.txt.orig	2009-05-05 01:13:12.000000000 +0200
+++ lmms-0.4.4/CMakeLists.txt	2009-05-19 14:55:26.000000000 +0200
@@ -321,6 +321,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


--- NEW FILE lmms.spec ---
Name:           lmms
Version:        0.4.4
Release:        1%{?dist}
Summary:        Linux MultiMedia Studio
URL:            http://lmms.sourceforge.net/
Group:          Applications/Multimedia

# - lmms itself is GPLv2+
# - included third-party code
#   - libsamplerate: GPLv2+ (but we use the system one)
# - third party code used by plugins:
#   - drumsynth files: GPLv2+ or MIT
#   - for ladspa-effecs (note that we only include cmt in the binary
#     rpm (see below):
#     - caps: GPLv2
#     - cmt: GPLv2(+?)
#     - swh: GPLv2+
#     - tap: GPLv2+
#   - GNU UnRTF (flp_import plugin): GPLv3+
#   - Portsmf (midi_import plugin): MIT
#   - Blip_Buffer and Gb_Snd_Emu (papu plugin): LGPLv2.1+
#   - reSID (sid plugin): GPLv2+
#   - basename.c (vst_base): Copyright only
#   - embedded zynaddsubfx plugin: GPLv2+
#     - mxml (zynaddsubfx): LGPLv2+, with exceptions
#     - fltk (zynaddsubfx): LGPLv2+, with exceptions
License:        GPLv2+ and GPLv2 and (GPLv2+ or MIT) and GPLv3+ and MIT and LGPLv2+ and (LGPLv2+ with exceptions) and Copyright only

# original tarfile can be found here:
# Source0: http://downloads.sourceforge.net/lmms/%{name}-%{version}.tar.bz2
Source0:        %{name}-%{version}.stripped.tar.bz2

# we strip all .ogg / .wav / .mmp(z) files from the tarfile,
# until their license situation becomes clearer.
Source1:        README.fedora

# our cmake seems to have a different value for LIB_DIR.
Patch0:         lmms-0.4.4-libdir.patch

# move the vst and zynaddsubfx plugins to libexecdir.
Patch1:         lmms-0.4.4-libexecdir.patch

# build with vst support but without having wine. that is a patch
# upstream isn't really interested in.
Patch2:         lmms-0.4.4-vst-nowine.patch

# patches borrowed from the fltk package
Patch3:         lmms-0.4.4-fltk-1.1.9-consts.patch
Patch4:         lmms-0.4.4-fltk-1.1.9-gcc44.patch
# FIXME: we surely want to patch zynaddsubfx to use system's fltk and
# minixml. using system's zynaddsubfx however is, according to lmms'
# developers, not possibe because there are to many changes.

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# according to upstream we should at least support oss, alsa, and
# jack. output via pulseaudio has high latency, but we enable it
# nevertheless as it is standard on fedora now. portaudio support is
# beta (and causes crashes), sdl is rarely used (?).
BuildRequires:  jack-audio-connection-kit-devel
BuildRequires:  alsa-lib-devel
BuildRequires:  pulseaudio-libs-devel

BuildRequires:  libsamplerate-devel
BuildRequires:  libsndfile-devel
BuildRequires:  fftw3-devel
BuildRequires:  fluidsynth-devel
BuildRequires:  libvorbis-devel
BuildRequires:  libogg-devel
BuildRequires:  ladspa-devel
BuildRequires:  stk-devel
BuildRequires:  qt4-devel
BuildRequires:  cmake
BuildRequires:  desktop-file-utils

%ifarch %ix86
BuildRequires:  wine-devel 
%endif

Requires:       ladspa-caps-plugins
Requires:       ladspa-tap-plugins
Requires:       ladspa-swh-plugins
# the version included in lmms contains patches sent to, but not yet
# applied by cmt's upstream.
#Requires: ladspa-cmt-plugins

# the -vst subpackage can only be built on ix86, but is also usable
# (and thus should be installed) on x86_64.
%ifarch %ix86 x86_64
Requires:       %{name}-vst = %{version}-%{release}
%endif


%description
LMMS aims to be a free alternative to popular (but commercial and
closed- source) programs like FruityLoops/FL Studio, Cubase and Logic
allowing you to produce music with your computer. This includes
creation of loops, synthesizing and mixing sounds, arranging samples,
having fun with your MIDI-keyboard and much more...

LMMS combines the features of a tracker-/sequencer-program and those
of powerful synthesizers, samplers, effects etc. in a modern,
user-friendly and easy to use graphical user-interface.

Features

 * Song-Editor for arranging the song
 * creating beats and basslines using the Beat-/Bassline-Editor
 * easy-to-use piano-roll for editing patterns and melodies
 * instrument- and effect-plugins
 * support for hosting VST(i)- and LADSPA-plugins (instruments/effects)
 * automation-editor
 * MIDI-support


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}


%description devel
The %{name}-devel package contains header files for
developing addons for %{name}.


%prep
%setup0 -q
%patch0 -p1 -b .libdir
%patch1 -p1 -b .libexecdir
%patch2 -p1 -b .nowine
%patch3 -p1 -b .consts
%if 0%{?fedora} > 10
%patch4 -p1 -b .gcc44
%endif

# remove spurious x-bits
find . -type f -exec chmod 0644 {} \;

%{__cp} -a %{SOURCE1} README.fedora


%build
%cmake \
       -DWANT_SDL:BOOL=OFF \
       -DWANT_PORTAUDIO:BOOL=OFF \
       -DWANT_CAPS:BOOL=OFF \
       -DWANT_TAP:BOOL=OFF \
       -DWANT_SWH:BOOL=OFF \
%ifarch %ix86
       -DWANT_VST:BOOL=ON \
%else
       -DWANT_VST:BOOL=OFF \
%endif
%ifarch x86_64
       -DWANT_VST_NOWINE:BOOL=ON \
%endif
       -DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
       .
make VERBOSE=1 %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install

desktop-file-install --vendor '' \
        --dir %{buildroot}%{_datadir}/applications \
        %{buildroot}%{_datadir}/applications/%{name}.desktop

%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
%{__ln_s} ../%{name}/themes/default/icon.png \
        %{buildroot}%{_datadir}/pixmaps/%{name}-icon.png


%clean
%{__rm} -rf %{buildroot}


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO README.fedora
%{_bindir}/%{name}
%{_libdir}/%{name}
%{_libexecdir}/remote_zynaddsubfx
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/pixmaps/%{name}-icon.png
%{_mandir}/man*/%{name}*
%exclude %{_datadir}/menu/%{name}


%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}


%ifarch %ix86

%package vst
Summary:        VST hosting plugin for %{name}
Group:          Applications/Multimedia

%description vst
This package contains the necessary files to host VST plugins.

%files vst
%defattr(-,root,root,-)
%{_libexecdir}/remote_vst_plugin*

%endif


%changelog
* Sun May 17 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.4-1
- Update to 0.4.4.
- Need to borrow patches for embedded fltk from the fltk package.
- Update detailed license information in the spec file.
- Update patches.

* Mon Mar  9 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.3-1
- Update to 0.4.3.
- Remove lmms-0.4.2-gcc44.patch (fixed upstream).
- Add README.fedora.

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Wed Feb 18 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.2-4
- Re-add drumsynth files and adjust License tag.

* Thu Feb 12 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.2-3
- Add patch for gcc44 issues.

* Wed Feb 11 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.2-2
- Strip files with unclear licensing from the tarfile.
- Regenerate patches.
- Add BR on libsamplerate-devel.

* Thu Jan 22 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.2-1
- Update to 0.4.2.

* Sun Nov  2 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-1
- Updated to 0.4.0 final.
- Removed patches already applied upstream, adjusted the remaining.

* Fri Oct 24 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-0.2.rc3
- Add patch to fix libdir on ppc64.

* Tue Oct 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-0.1.rc3
- Update to 0.4.0rc3.
- Don't build remote_vst_plugin.exe on x86_64, but do build all other
  parts of the VST host there.

* Fri Sep 26 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-0.1.rc2
- Update to 0.4.0rc2.
- Use oss, jack, alsa and pulseaudio backends and disable other
  backends.
- Depend on the system packages for all but one of the ladspa plugins
  instead of building our own versions.

* Thu Sep 18 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.4.0-0.1.rc1
- Update to 0.4.0rc1. Upstream uses cmake and qt4 now.
- Updated license tag.
- Drop festival dependency, and add fftw and fluidsynth.
- Remove patches no longer necessary.
- VST now also builds on x86_64.

* Wed Sep 17 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.3.2-3
- Add stk-devel BR.
- Use libdir patch from upstream bug tracker.
- Use xdg-open instead of x-www-browser.

* Wed Jun 25 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.3.2-2
- Update license tag.
- Add patch to fix plugin dir on 64bit archs.
- Add ladspa-caps-plugins dependency.
- Suggestions from the review:
  * Simplify configure step.
  * Fix sf.net download link.
  * Add patch to let configure find the qt translations.
  * Link icon to _datadir/pixmaps.

* Mon Apr 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.3.2-1
- New package.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Nov 2008 18:25:26 -0000	1.1
+++ .cvsignore	19 May 2009 19:00:43 -0000	1.2
@@ -0,0 +1 @@
+lmms-0.4.4.stripped.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lmms/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Nov 2008 18:25:26 -0000	1.1
+++ sources	19 May 2009 19:00:43 -0000	1.2
@@ -0,0 +1 @@
+ec84f9c766742b4ebfa37ac06bebe391  lmms-0.4.4.stripped.tar.bz2




More information about the scm-commits mailing list