diff --git a/audacious-plugin-fc-0.6-aud37.patch b/audacious-plugin-fc-0.6-aud37.patch new file mode 100644 index 0000000..f10fb69 --- /dev/null +++ b/audacious-plugin-fc-0.6-aud37.patch @@ -0,0 +1,38 @@ +diff -Nur audacious-plugin-fc-0.6-aud31/src/main.c audacious-plugin-fc-0.6-aud37/src/main.c +--- audacious-plugin-fc-0.6-aud31/src/main.c 2011-10-13 23:17:11.000000000 +0200 ++++ audacious-plugin-fc-0.6-aud37/src/main.c 2011-12-23 22:13:57.450003995 +0100 +@@ -21,9 +21,10 @@ + #include + #include + #include ++#include + +-#if _AUD_PLUGIN_VERSION < 30 +-#error "At least Audacious 3.0 alpha1 is required." ++#if _AUD_PLUGIN_VERSION < 37 ++#error "At least Audacious 3.2-alpha1 is required." + #endif + + #include "config.h" +@@ -175,8 +176,8 @@ + int msecSongLen = fc14dec_duration(decoder); + + Tuple *t = tuple_new_from_filename( filename ); +- tuple_associate_int(t, FIELD_LENGTH, NULL, msecSongLen); +- tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced"); ++ tuple_set_int(t, FIELD_LENGTH, NULL, msecSongLen); ++ tuple_set_str(t, FIELD_QUALITY, NULL, "sequenced"); + playback->set_tuple( playback, t ); + + /* bitrate => 4*1000 will be displayed as "4 CHANNELS" */ +@@ -275,8 +276,8 @@ + decoder = fc14dec_new(); + if (fc14dec_init(decoder,fileBuf,fileLen)) { + t = tuple_new_from_filename(filename); +- tuple_associate_int(t, FIELD_LENGTH, NULL, fc14dec_duration(decoder)); +- tuple_associate_string(t, FIELD_QUALITY, NULL, "sequenced"); ++ tuple_set_int(t, FIELD_LENGTH, NULL, fc14dec_duration(decoder)); ++ tuple_set_str(t, FIELD_QUALITY, NULL, "sequenced"); + } + else { + t = NULL; diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec index 8c8a5d0..8c71c88 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: 14%{?dist} +Release: 15%{?dist} Provides: audacious-plugins-fc = %{version}-%{release} URL: http://xmms-fc.sourceforge.net/ License: GPLv2+ @@ -18,6 +18,8 @@ Source: http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}. Patch0: audacious-plugin-fc-0.6-aud30.patch # port to Audacious 3.1 API, committed upstream Patch1: audacious-plugin-fc-0.6-aud31.patch +# port to Audacious 3.2 API +Patch2: audacious-plugin-fc-0.6-aud37.patch Group: Applications/Multimedia BuildRequires: audacious-devel @@ -37,6 +39,7 @@ music files from AMIGA. Song-length detection and seek are implemented, too. %setup -q %patch0 -p1 -b .aud30 %patch1 -p1 -b .aud31 +%patch2 -p1 -b .aud37 %build @@ -55,6 +58,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install %changelog +* Fri Dec 23 2011 Michael Schwendt - 0.6-15 +- Rebuild for Audacious 3.2-alpha1 generic plugin API/ABI bump. +- Patch for Audacious 3.2-alpha1 API changes. + * Wed Oct 26 2011 Michael Schwendt - 0.6-14 - Rebuild for Audacious 3.1-beta3 generic plugin API/ABI bump.