rpms/xmp/devel xmp-2.5.1-audacious2.patch,1.1,1.2 xmp.spec,1.4,1.5

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	xmp-2.5.1-audacious2.patch xmp.spec 
Log Message:
* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-7
- patch further for Audacious 2, because the bmp_cfg_* symbols are gone
  since Audacious 1.5 already


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

Index: xmp-2.5.1-audacious2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp-2.5.1-audacious2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xmp-2.5.1-audacious2.patch	19 Jul 2009 17:54:25 -0000	1.1
+++ xmp-2.5.1-audacious2.patch	20 Jul 2009 10:01:44 -0000	1.2
@@ -1,12 +1,12 @@
 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
++++ xmp-2.5.1/src/plugin/audacious.c	2009-07-20 12:03:33.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);
++			ibp->output->flush(p->m.xxo_info[i].time);
  			break;
  		}
  	}
@@ -28,3 +28,45 @@ diff -Nur xmp-2.5.1-orig/src/plugin/auda
  }
  
  
+@@ -366,9 +366,9 @@
+ 	xmp_cfg.filter = TRUE;
+ 	xmp_cfg.pan_amplitude = 80;
+ 
+-#define CFGREADINT(x) bmp_cfg_db_get_int (cfg, "XMP", #x, &xmp_cfg.x)
++#define CFGREADINT(x) aud_cfg_db_get_int (cfg, "XMP", #x, &xmp_cfg.x)
+ 
+-	if ((cfg = bmp_cfg_db_open())) {
++	if ((cfg = aud_cfg_db_open())) {
+ 		CFGREADINT(mixing_freq);
+ 		CFGREADINT(force8bit);
+ 		CFGREADINT(convert8bit);
+@@ -379,7 +379,7 @@
+ 		CFGREADINT(filter);
+ 		CFGREADINT(pan_amplitude);
+ 
+-		bmp_cfg_db_close(cfg);
++		aud_cfg_db_close(cfg);
+ 	}
+ 
+ 	file_info_box_build();
+@@ -926,9 +926,9 @@
+ 	xmp_cfg.pan_amplitude = (guchar)GTK_ADJUSTMENT(pansep_adj)->value;
+         opt->mix = xmp_cfg.pan_amplitude;
+ 
+-	cfg = bmp_cfg_db_open();
++	cfg = aud_cfg_db_open();
+ 
+-#define CFGWRITEINT(x) bmp_cfg_db_set_int (cfg, "XMP", #x, xmp_cfg.x)
++#define CFGWRITEINT(x) aud_cfg_db_set_int (cfg, "XMP", #x, xmp_cfg.x)
+ 
+ 	CFGWRITEINT (mixing_freq);
+ 	CFGWRITEINT (force8bit);
+@@ -940,7 +940,7 @@
+ 	CFGWRITEINT (filter);
+ 	CFGWRITEINT (pan_amplitude);
+ 
+-	bmp_cfg_db_close(cfg);
++	aud_cfg_db_close(cfg);
+ 
+ 	gtk_widget_destroy(xmp_conf_window);
+ }


Index: xmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xmp/devel/xmp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xmp.spec	19 Jul 2009 17:54:25 -0000	1.4
+++ xmp.spec	20 Jul 2009 10:01:44 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name: xmp
 Version: 2.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://dl.sourceforge.net/sourceforge/xmp/%{name}-%{version}.tar.gz
@@ -94,6 +94,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-7
+- patch further for Audacious 2, because the bmp_cfg_* symbols are gone
+  since Audacious 1.5 already
+
 * Sun Jul 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-6
 - patch for Audacious 2 (xmp-2.5.1-audacious2.patch)