rpms/audacious-plugins/devel audacious-plugins-2.2-amidi.patch, 1.1, 1.2 audacious-plugins.spec, 1.114, 1.115

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15637/devel

Modified Files:
	audacious-plugins-2.2-amidi.patch audacious-plugins.spec 
Log Message:
* Mon May 31 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-33
- Fix amidi-plug backend loader (#598005) and get_song_tuple.


audacious-plugins-2.2-amidi.patch:
 amidi-plug.c |    2 +-
 i_backend.c  |    2 +-
 i_midi.c     |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Index: audacious-plugins-2.2-amidi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.2-amidi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-plugins-2.2-amidi.patch	16 Mar 2010 09:49:38 -0000	1.1
+++ audacious-plugins-2.2-amidi.patch	31 May 2010 10:26:48 -0000	1.2
@@ -1,6 +1,30 @@
-diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/amidi-plug.c audacious-plugins-2.2/src/amidi-plug/amidi-plug.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/amidi-plug.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/amidi-plug.c	2010-05-31 12:17:41.000000000 +0200
+@@ -259,7 +259,7 @@
+   soft_init ();
+ 
+   if (filename != NULL)
+-      title = g_path_get_basename(filename_uri);
++      title = g_path_get_basename(filename);
+   else
+       title = g_strdup(filename_uri);
+ 
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_backend.c audacious-plugins-2.2/src/amidi-plug/i_backend.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/i_backend.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/i_backend.c	2010-05-31 12:18:24.000000000 +0200
+@@ -105,7 +105,7 @@
+ {
+   gchar * module_pathfilename = g_strjoin( "" , AMIDIPLUGBACKENDDIR , "/ap-" , module_name , ".so" , NULL );
+   DEBUGMSG( "loading backend '%s'\n" , module_pathfilename );
+-  backend.gmodule = g_module_open( module_pathfilename , 0 );
++  backend.gmodule = g_module_open( module_pathfilename, G_MODULE_BIND_LAZY|G_MODULE_BIND_LOCAL );
+ 
+   if ( backend.gmodule != NULL )
+   {
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2/src/amidi-plug/i_midi.c
 --- audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c	2009-11-22 23:49:52.000000000 +0100
-+++ audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c	2010-03-16 10:41:24.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/i_midi.c	2010-05-31 12:17:20.000000000 +0200
 @@ -659,8 +659,10 @@
    /* IMPORTANT
       this couple of important values is set by i_midi_set_length */


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- audacious-plugins.spec	27 May 2010 09:50:00 -0000	1.114
+++ audacious-plugins.spec	31 May 2010 10:26:48 -0000	1.115
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 32%{?dist}
+Release: 33%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -66,6 +66,7 @@ Patch18: audacious-plugins-2.2-no-adplug
 # is this even possible? bz 573075
 Patch19: audacious-plugins-2.2-playlist-font-safety.patch
 # div-by-zero with almost empty MIDI file, bz 573851
+# backend module load + get_song_tuple: fixed upstream
 Patch20: audacious-plugins-2.2-amidi.patch
 # merged upstream - Visualization Mode issues, fixed while looking at bz 575093
 Patch21: audacious-plugins-2.2-ui_vis.patch
@@ -322,6 +323,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon May 31 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-33
+- Fix amidi-plug backend loader (#598005) and get_song_tuple.
+
 * Sat Apr 10 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-32
 - Fix the gtk_message_dialog_new_with_markup() call as in 2.3.