From 9b8c08030923b4b742ee484a6fef97a6fc9d5fdc Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jun 18 2012 17:42:32 +0000
Subject: Rebuild for Audacious 3.3-alpha1 generic plugin API/ABI bump.


- Patch for Audacious 3.3-alpha1 API changes.

---

diff --git a/audacious-plugin-fc-0.6-aud40.patch b/audacious-plugin-fc-0.6-aud40.patch
new file mode 100644
index 0000000..4ca58cd
--- /dev/null
+++ b/audacious-plugin-fc-0.6-aud40.patch
@@ -0,0 +1,50 @@
+diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/configure.c audacious-plugin-fc-0.6-aud40/src/configure.c
+--- audacious-plugin-fc-0.6-aud38/src/configure.c	2012-06-18 14:08:35.138165744 +0200
++++ audacious-plugin-fc-0.6-aud40/src/configure.c	2012-06-18 14:01:54.000000000 +0200
+@@ -134,11 +134,8 @@
+ };
+ 
+ PluginPreferences fc_ip_preferences = {
+-    .domain = "fc14audiodecoder",
+-    .title = "Future Composer Decoder 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,
+ };
+diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/main.c audacious-plugin-fc-0.6-aud40/src/main.c
+--- audacious-plugin-fc-0.6-aud38/src/main.c	2012-06-18 14:08:33.203270001 +0200
++++ audacious-plugin-fc-0.6-aud40/src/main.c	2012-06-18 14:05:11.000000000 +0200
+@@ -205,9 +205,6 @@
+             if ( fc14dec_song_end(decoder) && jumpToTime<0 ) {
+                 stop_flag = TRUE;
+  DRAIN:
+-                while ( !stop_flag && playback->output->buffer_playing() ) {
+-                    g_usleep(20000);
+-                }
+                 break;
+             }
+         }
+@@ -217,7 +214,6 @@
+     g_cond_signal(seek_cond);  /* wake up any waiting request */
+     g_mutex_unlock(seek_mutex);
+ 
+-    playback->output->close_audio();
+     g_free(sampleBuf);
+     fc14dec_delete(decoder);
+     return TRUE;
+diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud38/src/plugin.c audacious-plugin-fc-0.6-aud40/src/plugin.c
+--- audacious-plugin-fc-0.6-aud38/src/plugin.c	2012-06-18 14:08:35.140165668 +0200
++++ audacious-plugin-fc-0.6-aud40/src/plugin.c	2012-06-18 14:07:40.000000000 +0200
+@@ -22,7 +22,7 @@
+     .name = "Future Composer decoder",
+     .init = ip_init,
+     .about = fc_ip_about,
+-    .settings = &fc_ip_preferences,
++    .prefs = &fc_ip_preferences,
+     .have_subtune = FALSE,
+     .extensions = fc_fmts,
+     .play = ip_play,
diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec
index 990cbf0..217a570 100644
--- a/audacious-plugin-fc.spec
+++ b/audacious-plugin-fc.spec
@@ -9,7 +9,7 @@
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
 Version: 0.6
-Release: 17%{?dist}
+Release: 18%{?dist}
 Provides: audacious-plugins-fc = %{version}-%{release}
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
@@ -24,6 +24,8 @@ Patch2: audacious-plugin-fc-0.6-aud37.patch
 # since Audacious 3.2-beta1
 # need glib-2.0.pc and gtk+-3.0.pc CFLAGS and include glib.h early
 Patch3: audacious-plugin-fc-0.6-aud38.patch
+#
+Patch4: audacious-plugin-fc-0.6-aud40.patch
 
 BuildRequires: audacious-devel
 BuildRequires: libfc14audiodecoder-devel
@@ -44,6 +46,7 @@ music files from AMIGA. Song-length detection and seek are implemented, too.
 %patch1 -p1 -b .aud31
 %patch2 -p1 -b .aud37
 %patch3 -p1 -b .aud38
+%patch4 -p1 -b .aud40
 
 
 %build
@@ -62,6 +65,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 
 
 %changelog
+* Mon Jun 18 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 0.6-18
+- Rebuild for Audacious 3.3-alpha1 generic plugin API/ABI bump.
+- Patch for Audacious 3.3-alpha1 API changes.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild