rpms/xmp/devel xmp-3.2.0-audacious-2.4-api.patch, NONE, 1.1 xmp.spec, 1.13, 1.14

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/xmp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24365

Modified Files:
	xmp.spec 
Added Files:
	xmp-3.2.0-audacious-2.4-api.patch 
Log Message:
* Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.0-3
- Patch and rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.


xmp-3.2.0-audacious-2.4-api.patch:
 audacious.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE xmp-3.2.0-audacious-2.4-api.patch ---
diff -Nur xmp-3.2.0-orig/src/plugin/audacious.c xmp-3.2.0/src/plugin/audacious.c
--- xmp-3.2.0-orig/src/plugin/audacious.c	2010-07-21 16:51:25.000000000 +0200
+++ xmp-3.2.0/src/plugin/audacious.c	2010-07-21 16:52:29.000000000 +0200
@@ -64,7 +64,7 @@
 
 static struct {
 	InputPlayback *ipb;
-	AFormat fmt;
+	gint fmt;
 	int nch;
 } play_data;
 
@@ -349,7 +349,7 @@
 
 static void init(void)
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 
 	_D("Plugin init");
 	xmp_drv_register(&drv_smix);
@@ -467,7 +467,7 @@
 	_D("filename = %s", filename);
 	strip_vfs((char *)filename);		/* Sorry, no VFS support */
 
-	tuple = aud_tuple_new_from_filename(filename);
+	tuple = tuple_new_from_filename(filename);
 
 	/* Create new context to load a file and get the length */
 
@@ -486,9 +486,9 @@
 
 	xmp_get_module_info(ctx2, &mi);
 
-	aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name);
-	aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type);
-	aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret);
+	tuple_associate_string(tuple, FIELD_TITLE, NULL, mi.name);
+	tuple_associate_string(tuple, FIELD_CODEC, NULL, mi.type);
+	tuple_associate_int(tuple, FIELD_LENGTH, NULL, lret);
 
 	xmp_release_module(ctx2);
 	xmp_free_context(ctx2);
@@ -887,7 +887,7 @@
 
 static void config_ok(GtkWidget *widget, gpointer data)
 {
-	ConfigDb *cfg;
+	mcs_handle_t *cfg;
 	struct xmp_options *opt;
 
 	opt = xmp_get_options(ctx);


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xmp.spec	21 Jul 2010 13:55:43 -0000	1.13
+++ xmp.spec	21 Jul 2010 14:56:11 -0000	1.14
@@ -12,6 +12,7 @@ Source: %{name}-%{version}-free.tar.gz
 # run this to get the above tarball
 Source1: mktarball.sh
 Patch0: %{name}-compile.patch
+Patch1: xmp-3.2.0-audacious-2.4-api.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
@@ -56,6 +57,7 @@ This package contains the xmp plugin for
 %prep
 %setup -q
 %patch0 -p1 -b .compile
+%patch1 -p1 -b .audacious-2.4-api
 pushd docs
 for file in ChangeLog CREDITS ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf $file && touch -r $file $file.utf && mv $file.utf $file
@@ -93,7 +95,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Jul 21 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.0-3
-- Rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.
+- Patch and rebuild for Audacious 2.4 beta1 generic plugin API/ABI bump.
 
 * Thu Jul 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 3.2.0-2
 - Rebuild for Audacious 2.4 alpha3 generic plugin API/ABI bump.