rpms/xmp/devel xmp-2.5.1-audacious2.patch, NONE, 1.1 xmp.spec, 1.3, 1.4

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/xmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15063

Modified Files:
	xmp.spec 
Added Files:
	xmp-2.5.1-audacious2.patch 
Log Message:
* Sun Jul 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-6
- patch for Audacious 2 (xmp-2.5.1-audacious2.patch)


xmp-2.5.1-audacious2.patch:
 audacious.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xmp-2.5.1-audacious2.patch ---
diff -Nur xmp-2.5.1-orig/src/plugin/audacious.c xmp-2.5.1/src/plugin/audacious.c
--- xmp-2.5.1-orig/src/plugin/audacious.c	2007-11-25 15:24:58.000000000 +0100
+++ xmp-2.5.1/src/plugin/audacious.c	2009-07-19 19:49:42.000000000 +0200
@@ -296,7 +296,7 @@
 			if (i > 0)
 				i--;
 			a = xmp_ord_set(ctx, i);
-			xmp_ip.output->flush(p->m.xxo_info[i].time);
+			ipb->output->flush(p->m.xxo_info[i].time);
 			break;
 		}
 	}
@@ -305,7 +305,7 @@
 static void mod_pause(InputPlayback *ipb, short p)
 {
 	ii->pause = p;
-	xmp_ip.output->pause(p);
+	ipb->output->pause(p);
 }
 
 
@@ -316,7 +316,7 @@
 	if (!ipb->playing)
 		return -1;
 
-	return xmp_ip.output->output_time();
+	return ipb->output->output_time();
 }
 
 


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xmp.spec	16 Jun 2009 10:52:21 -0000	1.3
+++ xmp.spec	19 Jul 2009 17:54:25 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name: xmp
 Version: 2.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Source: http://rathann.fedorapeople.org/
 # run this to get the above tarball
 Source1: mktarball.sh
 Patch0: %{name}-nostrip.patch
+Patch1: xmp-2.5.1-audacious2.patch
 License: GPLv2+
 URL: http://xmp.sourceforge.net/
 Buildrequires: alsa-lib-devel
@@ -55,6 +56,7 @@ This package contains the xmp plugin for
 %prep
 %setup -q
 %patch0 -p1 -b .nostrip
+%patch1 -p1 -b .audacious2
 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
@@ -92,6 +94,9 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Sun Jul 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-6
+- patch for Audacious 2 (xmp-2.5.1-audacious2.patch)
+
 * Tue Jun 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-5
 - rebuild for new libmowgli SONAME (audacious-plugin-xmp depends on it
   indirectly because of audacious-devel pkgconfig dep-chain)