From d7490b28088d6b34e8c837c2f55ad2a0dc698f13 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Jan 02 2012 17:33:24 +0000 Subject: Rebuild for Audacious 3.2-beta1 generic plugin API/ABI bump. Patch for Audacious 3.2-beta1 glib/gtk related header changes. --- diff --git a/audacious-plugin-fc-0.6-aud38.patch b/audacious-plugin-fc-0.6-aud38.patch new file mode 100644 index 0000000..4a9d28a --- /dev/null +++ b/audacious-plugin-fc-0.6-aud38.patch @@ -0,0 +1,32 @@ +diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud37/src/configure.c audacious-plugin-fc-0.6-aud38/src/configure.c +--- audacious-plugin-fc-0.6-aud37/src/configure.c 2011-12-23 22:08:04.000000000 +0100 ++++ audacious-plugin-fc-0.6-aud38/src/configure.c 2012-01-02 18:28:07.314459344 +0100 +@@ -1,7 +1,7 @@ ++#include + #include + #include + #include +-#include + + #include "configure.h" + +diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud37/src/Makefile.in audacious-plugin-fc-0.6-aud38/src/Makefile.in +--- audacious-plugin-fc-0.6-aud37/src/Makefile.in 2010-08-22 10:03:01.000000000 +0200 ++++ audacious-plugin-fc-0.6-aud38/src/Makefile.in 2012-01-02 18:27:45.971622430 +0100 +@@ -214,7 +214,7 @@ + EXTRA_DIST = config.h.in + pkglib_LTLIBRARIES = fcdecoder.la + fcdecoder_la_LDFLAGS = -module -avoid-version +-fcdecoder_la_CFLAGS = $(audacious_CFLAGS) ++fcdecoder_la_CFLAGS = $(audacious_CFLAGS) `pkg-config --cflags glib-2.0 gtk+-3.0` + fcdecoder_la_LIBADD = $(audacious_LIBS) + fcdecoder_la_SOURCES = \ + about.c \ +diff -Nurb --strip-trailing-cr audacious-plugin-fc-0.6-aud37/src/plugin.c audacious-plugin-fc-0.6-aud38/src/plugin.c +--- audacious-plugin-fc-0.6-aud37/src/plugin.c 2011-12-23 22:08:04.000000000 +0100 ++++ audacious-plugin-fc-0.6-aud38/src/plugin.c 2012-01-02 18:28:06.316513726 +0100 +@@ -1,3 +1,4 @@ ++#include + #include + + const gchar* const fc_fmts[] = { "fc", "fc13", "fc14", NULL }; diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec index 8c71c88..958f0bf 100644 --- a/audacious-plugin-fc.spec +++ b/audacious-plugin-fc.spec @@ -9,10 +9,11 @@ Summary: Future Composer input plugin for Audacious Name: audacious-plugin-fc Version: 0.6 -Release: 15%{?dist} +Release: 16%{?dist} Provides: audacious-plugins-fc = %{version}-%{release} URL: http://xmms-fc.sourceforge.net/ License: GPLv2+ +Group: Applications/Multimedia Source: http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.bz2 # post 0.6.1, committed upstream Patch0: audacious-plugin-fc-0.6-aud30.patch @@ -20,7 +21,9 @@ Patch0: audacious-plugin-fc-0.6-aud30.patch 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 +# 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 BuildRequires: audacious-devel BuildRequires: libfc14audiodecoder-devel @@ -40,6 +43,7 @@ music files from AMIGA. Song-length detection and seek are implemented, too. %patch0 -p1 -b .aud30 %patch1 -p1 -b .aud31 %patch2 -p1 -b .aud37 +%patch3 -p1 -b .aud38 %build @@ -58,6 +62,10 @@ make DESTDIR=${RPM_BUILD_ROOT} install %changelog +* Mon Jan 2 2012 Michael Schwendt - 0.6-16 +- Rebuild for Audacious 3.2-beta1 generic plugin API/ABI bump. +- Patch for Audacious 3.2-beta1 glib/gtk related header changes. + * 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.