[xmp] updated to 3.5.0

[Dominik Mierzejewski]

commit 012dd7848a4f5ab2323d076cc65faeeb6c84f88b
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Wed Sep 5 20:37:04 2012 +0200

    updated to 3.5.0
    
    - rebased 3.3 API patch

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...ious-3.3.patch => xmp-3.5.0-audacious-3.3.patch |   18 ++++++++++--------
 xmp.spec                                           |   10 +++++++---
 4 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f634217..0cb108f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xmp-3.1.0-free.tar.gz
 /xmp-3.3.0-free.tar.gz
 /xmp-3.4.0-free.tar.gz
+/xmp-3.5.0-free.tar.gz
diff --git a/sources b/sources
index 8ddca8a..8da8e0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df82f7bc49b25b73d9fc8a64def15fad  xmp-3.4.0-free.tar.gz
+fd915c9c10eae05f0f75a92421e3247a  xmp-3.5.0-free.tar.gz
diff --git a/xmp-3.4.0-audacious-3.3.patch b/xmp-3.5.0-audacious-3.3.patch
similarity index 63%
rename from xmp-3.4.0-audacious-3.3.patch
rename to xmp-3.5.0-audacious-3.3.patch
index 54e3642..85e754b 100644
--- a/xmp-3.4.0-audacious-3.3.patch
+++ b/xmp-3.5.0-audacious-3.3.patch
@@ -1,7 +1,7 @@
-diff -Nurb --strip-trailing-cr xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c xmp-3.4.0-audacious-3.3/src/plugin/audacious3.c
---- xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c	2012-06-18 14:16:21.505055810 +0200
-+++ xmp-3.4.0-audacious-3.3/src/plugin/audacious3.c	2012-06-18 14:15:36.000000000 +0200
-@@ -392,9 +392,6 @@
+diff -up xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3 xmp-3.5.0/src/plugin/audacious3.c
+--- xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3	2012-09-05 14:53:54.000000000 +0200
++++ xmp-3.5.0/src/plugin/audacious3.c	2012-09-05 15:13:46.000000000 +0200
+@@ -392,9 +392,6 @@ static gboolean play(InputPlayback *ipb,
  		if ((xmp_player_frame(ctx) != 0) && jumpToTime < 0) {
  			stop_flag = TRUE;
   DRAIN:
@@ -11,7 +11,7 @@ diff -Nurb --strip-trailing-cr xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c x
  			break;
  		}
  	}
-@@ -404,7 +401,6 @@
+@@ -404,7 +401,6 @@ static gboolean play(InputPlayback *ipb,
  	g_cond_signal(seek_cond);  /* wake up any waiting request */
  	g_mutex_unlock(seek_mutex);
  
@@ -19,11 +19,13 @@ diff -Nurb --strip-trailing-cr xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c x
  	xmp_player_end(ctx);
  	xmp_release_module(ctx);
  	xmp_close_audio(ctx);
-@@ -597,11 +593,8 @@
+@@ -598,13 +594,8 @@ static PreferencesWidget prefs[] = {
  };
  
  PluginPreferences xmp_aud_preferences = {
+-#if _AUD_PLUGIN_VERSION > 20
 -	.domain = "xmpaudplugin",
+-#endif
 -	.title = "Extended Module Player Configuration",
 -	.prefs = prefs,
 -	.n_prefs = G_N_ELEMENTS(prefs),
@@ -33,8 +35,8 @@ diff -Nurb --strip-trailing-cr xmp-3.4.0-audacious-3.2/src/plugin/audacious3.c x
  	.init = configure_init,
  	.apply = configure_apply,
  };
-@@ -619,7 +612,7 @@
- 	.name		= "XMP Plugin " VERSION,
+@@ -631,7 +622,7 @@ AUD_INPUT_PLUGIN (
+ #endif
  	.init		= init,
  	.about		= xmp_aud_about,
 -	.settings	= &xmp_aud_preferences,
diff --git a/xmp.spec b/xmp.spec
index 03450cc..d75fb74 100644
--- a/xmp.spec
+++ b/xmp.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name: xmp
-Version: 3.4.0
-Release: 12%{?dist}
+Version: 3.5.0
+Release: 1%{?dist}
 Summary: A multi-format module player
 Group: Applications/Multimedia
 #Source: http://downloads.sourceforge.net/sourceforge/xmp/xmp-%{version}.tar.gz
@@ -32,7 +32,7 @@ Patch1: xmp-3.4.0-audacious-3.2.patch
 # (reported to xmp devel list)
 Patch2: xmp-3.4.0-audacious-probe_for_tuple.patch
 #
-Patch3: xmp-3.4.0-audacious-3.3.patch
+Patch3: xmp-3.5.0-audacious-3.3.patch
 
 %description
 The Extended Module Player is a modplayer for Unix-like systems that plays
@@ -118,6 +118,10 @@ rm -rf %{buildroot}
 %{xmms_input_plugin_dir}/*
 
 %changelog
+* Wed Sep 05 2012 Dominik Mierzejewski <rpm at greysector.net> - 3.5.0-1
+- updated to 3.5.0
+- rebased 3.3 API patch
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild