[xmp] Rebuild for Audacious 3.2-beta1 generic plugin API/ABI bump. Update Audacious 3.1 Preferences API pa

[Michael Schwendt]

commit a8ab473a97403c14e582e92446243c9797ba3d50
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Mon Jan 2 13:43:11 2012 +0100

    Rebuild for Audacious 3.2-beta1 generic plugin API/ABI bump.
    Update Audacious 3.1 Preferences API patch for header changes.

 xmp-3.4.0-audacious-3.1.patch |   26 ++++++++++++++++++++++----
 xmp.spec                      |    6 +++++-
 2 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/xmp-3.4.0-audacious-3.1.patch b/xmp-3.4.0-audacious-3.1.patch
index fe451e4..250ae80 100644
--- a/xmp-3.4.0-audacious-3.1.patch
+++ b/xmp-3.4.0-audacious-3.1.patch
@@ -1,16 +1,22 @@
-diff -Nur xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c
+diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3.c
 --- xmp-3.4.0-orig/src/plugin/audacious3.c	2011-08-07 15:24:27.000000000 +0200
-+++ xmp-3.4.0/src/plugin/audacious3.c	2011-10-12 21:30:52.000000000 +0200
-@@ -16,8 +16,8 @@
++++ xmp-3.4.0/src/plugin/audacious3.c	2012-01-02 13:34:54.904832532 +0100
+@@ -16,12 +16,12 @@
  #include <unistd.h>
  #include <ctype.h>
  
 -#include <audacious/configdb.h>
++#include <glib.h>
++#include <gtk/gtk.h>
  #include <audacious/plugin.h>
 +#include <audacious/misc.h>
  #include <audacious/preferences.h>
  #include <libaudgui/libaudgui-gtk.h>
- #include <gtk/gtk.h>
+-#include <gtk/gtk.h>
+-#include <glib.h>
+ 
+ #include "xmp.h"
+ #include "common.h"
 @@ -66,6 +66,19 @@
  
  XMPConfig xmp_cfg;
@@ -171,3 +177,15 @@ diff -Nur xmp-3.4.0-orig/src/plugin/audacious3.c xmp-3.4.0/src/plugin/audacious3
  		{ .notebook = { prefs_tabs, G_N_ELEMENTS(prefs_tabs) } },
  	},
  };
+diff -Nurb --strip-trailing-cr xmp-3.4.0-orig/src/plugin/Makefile xmp-3.4.0/src/plugin/Makefile
+--- xmp-3.4.0-orig/src/plugin/Makefile	2011-08-06 15:51:13.000000000 +0200
++++ xmp-3.4.0/src/plugin/Makefile	2012-01-02 13:34:33.429987960 +0100
+@@ -47,7 +47,7 @@
+ 	eval $$CMD
+ 
+ $(PLUGIN_PATH)/audacious3.lo: $(PLUGIN_PATH)/audacious3.c $(PLUGIN_PATH)/Makefile
+-	@CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious` -o $@ $(PLUGIN_PATH)/audacious3.c'; \
++	@CMD='$(CC) $(CFLAGS) -fPIC -D_REENTRANT $(XCFLAGS) `pkg-config --cflags audacious glib-2.0 gtk+-3.0` -o $@ $(PLUGIN_PATH)/audacious3.c'; \
+ 	if [ "$(V)" -gt 0 ]; then echo $$CMD; else echo CC $@ ; fi; \
+ 	eval $$CMD
+ 
diff --git a/xmp.spec b/xmp.spec
index a73227b..b594707 100644
--- a/xmp.spec
+++ b/xmp.spec
@@ -8,7 +8,7 @@
 
 Name: xmp
 Version: 3.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://downloads.sourceforge.net/sourceforge/xmp/xmp-%{version}.tar.gz
@@ -109,6 +109,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Jan  2 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.0-5
+- Rebuild for Audacious 3.2-beta1 generic plugin API/ABI bump.
+- Update Audacious 3.1 Preferences API patch for header changes.
+
 * Sat Dec 24 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4.0-4
 - Rebuild for Audacious 3.2-alpha1 generic plugin API/ABI bump.