[xmp] Rebuild for Audacious 3.3-alpha1 generic plugin API/ABI bump.

[Michael Schwendt]

commit 7b2a91cfa1e5353550acf732cd090bef5f6bd004
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Jun 18 19:43:59 2012 +0200

    Rebuild for Audacious 3.3-alpha1 generic plugin API/ABI bump.
    
    - Patch for Audacious 3.3-alpha1 API changes.

 xmp-3.4.0-audacious-3.3.patch |   44 +++++++++++++++++++++++++++++++++++++++++
 xmp.spec                      |    9 +++++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/xmp-3.4.0-audacious-3.3.patch b/xmp-3.4.0-audacious-3.3.patch
new file mode 100644
index 0000000..54e3642
--- /dev/null
+++ b/xmp-3.4.0-audacious-3.3.patch
@@ -0,0 +1,44 @@
+diff -Nurb --strip-trailing-cr xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c xmp-3.4.0-audacious-3.3/src/plugin/audacious3.c
+--- xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c	2012-06-18 14:16:21.505055810 +0200
++++ xmp-3.4.0-audacious-3.3/src/plugin/audacious3.c	2012-06-18 14:15:36.000000000 +0200
+@@ -392,9 +392,6 @@
+ 		if ((xmp_player_frame(ctx) != 0) && jumpToTime < 0) {
+ 			stop_flag = TRUE;
+  DRAIN:
+-			while (!stop_flag && ipb->output->buffer_playing()) {
+-				g_usleep(20000);
+-			}
+ 			break;
+ 		}
+ 	}
+@@ -404,7 +401,6 @@
+ 	g_cond_signal(seek_cond);  /* wake up any waiting request */
+ 	g_mutex_unlock(seek_mutex);
+ 
+-	ipb->output->close_audio();
+ 	xmp_player_end(ctx);
+ 	xmp_release_module(ctx);
+ 	xmp_close_audio(ctx);
+@@ -597,11 +593,8 @@
+ };
+ 
+ PluginPreferences xmp_aud_preferences = {
+-	.domain = "xmpaudplugin",
+-	.title = "Extended Module Player Configuration",
+-	.prefs = prefs,
+-	.n_prefs = G_N_ELEMENTS(prefs),
+-	.type = PREFERENCES_WINDOW,
++	.widgets = prefs,
++	.n_widgets = G_N_ELEMENTS(prefs),
+ 	.init = configure_init,
+ 	.apply = configure_apply,
+ };
+@@ -619,7 +612,7 @@
+ 	.name		= "XMP Plugin " VERSION,
+ 	.init		= init,
+ 	.about		= xmp_aud_about,
+-	.settings	= &xmp_aud_preferences,
++	.prefs		= &xmp_aud_preferences,
+ 	.play		= play,
+ 	.stop		= stop,
+ 	.pause		= mod_pause,
diff --git a/xmp.spec b/xmp.spec
index eab0049..d6c7a66 100644
--- a/xmp.spec
+++ b/xmp.spec
@@ -8,7 +8,7 @@
 
 Name: xmp
 Version: 3.4.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://downloads.sourceforge.net/sourceforge/xmp/xmp-%{version}.tar.gz
@@ -31,6 +31,8 @@ Patch1: xmp-3.4.0-audacious-3.2.patch
 # fix untimely g_free calls and make probe_for_tuple thread-safe
 # (reported to xmp devel list)
 Patch2: xmp-3.4.0-audacious-probe_for_tuple.patch
+#
+Patch3: xmp-3.4.0-audacious-3.3.patch
 
 %description
 The Extended Module Player is a modplayer for Unix-like systems that plays
@@ -79,6 +81,7 @@ This package contains the xmp plugin for XMMS.
 %patch0 -p1 -b .aud-api-3.1
 %patch1 -p1 -b .aud-api-3.2
 %patch2 -p1 -b .aud-probe_for_tuple
+%patch3 -p1 -b .aud-api-3.3
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -115,6 +118,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Jun 18 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.0-11
+- Rebuild for Audacious 3.3-alpha1 generic plugin API/ABI bump.
+- Patch for Audacious 3.3-alpha1 API changes.
+
 * Fri Jun 15 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.0-10
 - Fix untimely g_free(filename) calls in Audacious 3 plugin and
   make module probing thread-safe.