From 7d6dbe8deb233535af3bb354b230c05447bd19a3 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jun 28 2010 17:57:09 +0000
Subject: - Upgrade to 0.5 for libfc14audiodecoder.


---

diff --git a/.cvsignore b/.cvsignore
index b70e9be..29fc37b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-audacious-plugin-fc-0.4.tar.bz2
+audacious-plugin-fc-0.5.tar.bz2
diff --git a/audacious-plugin-fc-0.4-audacious-2.4.patch b/audacious-plugin-fc-0.4-audacious-2.4.patch
deleted file mode 100644
index 4cb7a24..0000000
--- a/audacious-plugin-fc-0.4-audacious-2.4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur audacious-plugin-fc-0.4-orig/src/configure.c audacious-plugin-fc-0.4/src/configure.c
---- audacious-plugin-fc-0.4-orig/src/configure.c	2009-06-07 15:25:53.000000000 +0200
-+++ audacious-plugin-fc-0.4/src/configure.c	2010-06-12 19:51:06.000000000 +0200
-@@ -1,5 +1,5 @@
- #include <audacious/configdb.h>
--#include <audacious/util.h>
-+#include <audacious/plugin.h>
- #include <gtk/gtk.h>
- 
- #include "configure.h"
-diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
---- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
-+++ audacious-plugin-fc-0.4/src/Main.cpp	2010-06-12 19:51:06.000000000 +0200
-@@ -22,7 +22,6 @@
- extern "C"
- {
- #include <audacious/plugin.h>
--#include <audacious/util.h>
- #include <glib.h>
- }
- 
-@@ -278,7 +277,7 @@
-         {
-             mixerFillBuffer(sampleBuf,sampleBufSize);
-             if ( playback->playing && jumpToTime<0 )
--                playback->pass_audio(playback,myFormat.xmmsAFormat,myFormat.channels,sampleBufSize,sampleBuf,NULL);
-+                playback->output->write_audio(sampleBuf,sampleBufSize);
-             if ( FC_songEnd && jumpToTime<0 )
-             {
-                 playback->eof = TRUE;
-diff -Nur audacious-plugin-fc-0.4-orig/src/plugin.c audacious-plugin-fc-0.4/src/plugin.c
---- audacious-plugin-fc-0.4-orig/src/plugin.c	2009-10-23 12:12:59.000000000 +0200
-+++ audacious-plugin-fc-0.4/src/plugin.c	2010-06-12 19:51:06.000000000 +0200
-@@ -20,7 +20,6 @@
-     .init = ip_init,
-     .about = fc_ip_about,
-     .configure = fc_ip_configure,
--    .enabled = TRUE,
-     .have_subtune = FALSE,
-     .vfs_extensions = fc_fmts,
-     .play_file = ip_play_file,
diff --git a/audacious-plugin-fc-0.4-unknown-songtime.patch b/audacious-plugin-fc-0.4-unknown-songtime.patch
deleted file mode 100644
index 2940b33..0000000
--- a/audacious-plugin-fc-0.4-unknown-songtime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur audacious-plugin-fc-0.4-orig/src/Main.cpp audacious-plugin-fc-0.4/src/Main.cpp
---- audacious-plugin-fc-0.4-orig/src/Main.cpp	2009-10-23 17:21:56.000000000 +0200
-+++ audacious-plugin-fc-0.4/src/Main.cpp	2009-10-24 12:34:16.689418212 +0200
-@@ -337,7 +337,7 @@
-     Tuple *t = aud_tuple_new_from_filename(filename);
- 
-     // delay length detection to start of playback
--    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, 0);
-+    aud_tuple_associate_int(t, FIELD_LENGTH, NULL, -1);
-     aud_tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced");
-     //aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tmp);
- 
diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec
index 716a9a5..0f3b3fc 100644
--- a/audacious-plugin-fc.spec
+++ b/audacious-plugin-fc.spec
@@ -6,8 +6,8 @@
 
 Summary: Future Composer input plugin for Audacious
 Name: audacious-plugin-fc
-Version: 0.4
-Release: 4
+Version: 0.5
+Release: 1
 URL: http://xmms-fc.sourceforge.net/
 License: GPLv2+
 Source:	http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2
@@ -19,11 +19,6 @@ BuildRequires: pkgconfig
 Provides: audacious-plugins-fc = %{version}-%{release}
 Requires: audacious >= %{aud_ver}
 
-# applied upstream
-Patch0: audacious-plugin-fc-0.4-unknown-songtime.patch
-#
-Patch1: audacious-plugin-fc-0.4-audacious-2.4.patch
-
 
 %description
 This is an input plugin for Audacious which can play back Future Composer
@@ -32,15 +27,10 @@ music files from AMIGA. Song-length detection and seek are implemented, too.
 
 %prep
 %setup -q
-%patch0 -p1 -b .unknown-songtime
-%patch1 -p1 -b .audacious-2.4
 
 
 %build
 %configure
-# temporary work-around for #454364
-#ln -s Config.h src/config.h
-# ---
 make %{?_smp_mflags}
 
 
@@ -55,12 +45,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README src/FC.README
-%{plugindir}/libfc.so
-%exclude %{plugindir}/libfc.la
+%doc COPYING README
+%{plugindir}/fcdecoder.so
+%exclude %{plugindir}/fcdecoder.la
 
 
 %changelog
+* Sun Jun 20 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 0.5-1
+- Upgrade to 0.5 for libfc14audiodecoder.
+
 * Sat Jun 12 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 0.4-4
 - Patch for Audacious 2.4 API changes.
 
diff --git a/sources b/sources
index 62fcb7d..2195b1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a36fbbddf41b162e1ed6df0b3a6637c7  audacious-plugin-fc-0.4.tar.bz2
+a0ec36abfe47b11769f94dc91948c8b6  audacious-plugin-fc-0.5.tar.bz2