lmms: updated to 0.4.5

4 files changed, 18 insertions, 49 deletions

diff --git a/lmms/.footprint b/lmms/.footprint
index e8b605201..a1eb9bb5a 100644
--- a/lmms/.footprint
+++ b/lmms/.footprint
@@ -3,6 +3,15 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/lmms
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/lmms/
+-rw-r--r--	root/root	usr/include/lmms/Controller.h
+-rw-r--r--	root/root	usr/include/lmms/ControllerConnection.h
+-rw-r--r--	root/root	usr/include/lmms/ControllerConnectionDialog.h
+-rw-r--r--	root/root	usr/include/lmms/ControllerDialog.h
+-rw-r--r--	root/root	usr/include/lmms/ControllerRackView.h
+-rw-r--r--	root/root	usr/include/lmms/ControllerView.h
+-rw-r--r--	root/root	usr/include/lmms/LfoController.h
+-rw-r--r--	root/root	usr/include/lmms/MidiController.h
+-rw-r--r--	root/root	usr/include/lmms/PeakController.h
 -rw-r--r--	root/root	usr/include/lmms/about_dialog.h
 -rw-r--r--	root/root	usr/include/lmms/aeffectx.h
 -rw-r--r--	root/root	usr/include/lmms/atomic_int.h
@@ -37,12 +46,6 @@ drwxr-xr-x	root/root	usr/include/lmms/
 -rw-r--r--	root/root	usr/include/lmms/combobox.h
 -rw-r--r--	root/root	usr/include/lmms/combobox_model.h
 -rw-r--r--	root/root	usr/include/lmms/config_mgr.h
--rw-r--r--	root/root	usr/include/lmms/controller.h
--rw-r--r--	root/root	usr/include/lmms/controller_connection.h
--rw-r--r--	root/root	usr/include/lmms/controller_connection_dialog.h
--rw-r--r--	root/root	usr/include/lmms/controller_dialog.h
--rw-r--r--	root/root	usr/include/lmms/controller_rack_view.h
--rw-r--r--	root/root	usr/include/lmms/controller_view.h
 -rw-r--r--	root/root	usr/include/lmms/cpuload_widget.h
 -rw-r--r--	root/root	usr/include/lmms/custom_events.h
 -rw-r--r--	root/root	usr/include/lmms/debug.h
@@ -100,7 +103,6 @@ drwxr-xr-x	root/root	usr/include/lmms/
 -rw-r--r--	root/root	usr/include/lmms/ladspa_manager.h
 -rw-r--r--	root/root	usr/include/lmms/lcd_spinbox.h
 -rw-r--r--	root/root	usr/include/lmms/led_checkbox.h
--rw-r--r--	root/root	usr/include/lmms/lfo_controller.h
 -rw-r--r--	root/root	usr/include/lmms/lmms_basics.h
 -rw-r--r--	root/root	usr/include/lmms/lmms_constants.h
 -rw-r--r--	root/root	usr/include/lmms/lmms_math.h
@@ -114,7 +116,6 @@ drwxr-xr-x	root/root	usr/include/lmms/
 -rw-r--r--	root/root	usr/include/lmms/midi_alsa_raw.h
 -rw-r--r--	root/root	usr/include/lmms/midi_alsa_seq.h
 -rw-r--r--	root/root	usr/include/lmms/midi_client.h
--rw-r--r--	root/root	usr/include/lmms/midi_controller.h
 -rw-r--r--	root/root	usr/include/lmms/midi_dummy.h
 -rw-r--r--	root/root	usr/include/lmms/midi_event_processor.h
 -rw-r--r--	root/root	usr/include/lmms/midi_oss.h
@@ -133,7 +134,6 @@ drwxr-xr-x	root/root	usr/include/lmms/
 -rw-r--r--	root/root	usr/include/lmms/panning_constants.h
 -rw-r--r--	root/root	usr/include/lmms/pattern.h
 -rw-r--r--	root/root	usr/include/lmms/pch.h
--rw-r--r--	root/root	usr/include/lmms/peak_controller.h
 -rw-r--r--	root/root	usr/include/lmms/piano.h
 -rw-r--r--	root/root	usr/include/lmms/piano_roll.h
 -rw-r--r--	root/root	usr/include/lmms/pixmap_button.h
@@ -184,6 +184,7 @@ drwxr-xr-x	root/root	usr/include/lmms/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/lmms/
 drwxr-xr-x	root/root	usr/lib/lmms/ladspa/
+-rwxr-xr-x	root/root	usr/lib/lmms/ladspa/calf.so
 -rwxr-xr-x	root/root	usr/lib/lmms/ladspa/caps.so
 -rwxr-xr-x	root/root	usr/lib/lmms/ladspa/cmt.so
 -rwxr-xr-x	root/root	usr/lib/lmms/ladspa/comb_1190.so
@@ -1988,8 +1989,11 @@ drwxr-xr-x	root/root	usr/share/lmms/themes/default/
 -rw-r--r--	root/root	usr/share/lmms/themes/default/plugins.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/ports.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/pr_black_key.png
+-rw-r--r--	root/root	usr/share/lmms/themes/default/pr_black_key_pressed.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/pr_white_key_big.png
+-rw-r--r--	root/root	usr/share/lmms/themes/default/pr_white_key_big_pressed.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/pr_white_key_small.png
+-rw-r--r--	root/root	usr/share/lmms/themes/default/pr_white_key_small_pressed.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/preset_file.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/project_export.png
 -rw-r--r--	root/root	usr/share/lmms/themes/default/project_file.png
diff --git a/lmms/.md5sum b/lmms/.md5sum
index 58960592b..a5691e1db 100644
--- a/lmms/.md5sum
+++ b/lmms/.md5sum
@@ -1,2 +1 @@
-c09f00053d1defddb1df7131715f2b74  lmms-0.4.4.tar.bz2
-5d7079e60b1b2681a407210d866c4fa1  lmms-midi_import.diff
+6d58d73b44baddadc4f0ac6464fbd530  lmms-0.4.5.tar.bz2
diff --git a/lmms/Pkgfile b/lmms/Pkgfile
index a162a0ca3..a64858ad1 100644
--- a/lmms/Pkgfile
+++ b/lmms/Pkgfile
@@ -1,20 +1,18 @@
 # Description: LMMS aims to be a free alternative to popular programs like FruityLoops.
 # URL: http://lmms.sourceforge.net/
-# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
-# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Maintainer: Jose V Beneyto, sepen at crux dot nu
+# Packager: Jose V Beneyto, sepen at crux dot nu
 # Depends on: cmake qt4 jack-audio-connection-kit
 # Nice to have: libsamplerate fluidsynth
 
 name=lmms
-version=0.4.4
+version=0.4.5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2 \
-        $name-midi_import.diff)
+source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
 
 build() {
   export QTDIR=/usr/share/qt4
   cd $name-$version
-  patch -p1 -i $SRC/$name-midi_import.diff
   mkdir build
   cd build
   cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/lmms/lmms-midi_import.diff b/lmms/lmms-midi_import.diff
deleted file mode 100644
index 146692e5d..000000000
--- a/lmms/lmms-midi_import.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/plugins/midi_import/midi_import.cpp b/plugins/midi_import/midi_import.cpp
-index 820943c..ed3f3c3 100644
---- a/plugins/midi_import/midi_import.cpp
-+++ b/plugins/midi_import/midi_import.cpp
-@@ -93,6 +93,8 @@ bool midiImport::tryImport( trackContainer * _tc )
- 	{
- 		return( FALSE );
- 	}
-+
-+#ifdef LMMS_HAVE_FLUIDSYNTH
- 	if( engine::hasGUI() &&
- 		configManager::inst()->defaultSoundfont().isEmpty() )
- 	{
-@@ -105,6 +107,18 @@ bool midiImport::tryImport( trackContainer * _tc )
- 				"a General MIDI soundfont, specify it in "
- 				"settings dialog and try again." ) );
- 	}
-+#else
-+	if( engine::hasGUI() )
-+	{
-+		QMessageBox::information( engine::getMainWindow(),
-+			tr( "Setup incomplete" ),
-+			tr( "You did not compile LMMS with support for "
-+				"SoundFont2 player, which is used to add default "
-+				"sound to imported MIDI files. "
-+				"Therefore no sound will be played back after "
-+				"importing this MIDI file." ) );
-+	}
-+#endif
- 
- 	switch( readID() )
- 	{