From 96b79d43fb768c58e9de7ebeca3f1b2985409c82 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: May 31 2010 10:26:48 +0000
Subject: - Fix amidi-plug backend loader (#598005) and get_song_tuple.


---

diff --git a/audacious-plugins-2.2-amidi.patch b/audacious-plugins-2.2-amidi.patch
index ed0a417..2d2e7ae 100644
--- a/audacious-plugins-2.2-amidi.patch
+++ b/audacious-plugins-2.2-amidi.patch
@@ -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 */
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 5d0b751..357fd90 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -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-adplugdb.patch
 # 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@fedoraproject.org> - 2.2-33
+- Fix amidi-plug backend loader (#598005) and get_song_tuple.
+
 * Sat Apr 10 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-32
 - Fix the gtk_message_dialog_new_with_markup() call as in 2.3.