[audacious-plugins] Merge fix for wavpack input to not complain about .wvc files.

[Michael Schwendt]

commit f76d23f2b9a14ac93084a6de0315f804c6ca8e5e
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Jan 3 12:44:57 2013 +0100

    Merge fix for wavpack input to not complain about .wvc files.
    
    - Fix m3u parser to handle (=skip) empty lines.

 audacious-plugins-3.3.3-m3u-empty-lines.patch |   29 +++++++++++++++++++++++++
 audacious-plugins-3.3.3-wavpack.patch         |   26 ++++++++++++++++++++++
 audacious-plugins.spec                        |   12 +++++++++-
 3 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/audacious-plugins-3.3.3-m3u-empty-lines.patch b/audacious-plugins-3.3.3-m3u-empty-lines.patch
new file mode 100644
index 0000000..705374a
--- /dev/null
+++ b/audacious-plugins-3.3.3-m3u-empty-lines.patch
@@ -0,0 +1,29 @@
+diff -Nur audacious-plugins-3.3.3-orig/src/m3u/m3u.c audacious-plugins-3.3.3/src/m3u/m3u.c
+--- audacious-plugins-3.3.3-orig/src/m3u/m3u.c	2012-12-11 00:49:06.000000000 +0100
++++ audacious-plugins-3.3.3/src/m3u/m3u.c	2013-01-02 22:01:41.065219839 +0100
+@@ -63,8 +63,11 @@
+     if (! feed)
+         return NULL;
+ 
+-    * feed = 0;
+-    return feed + 1;
++    * feed++ = 0;
++    if (*feed)
++        return feed;
++    else
++        return NULL;
+ }
+ 
+ static bool_t playlist_load_m3u (const char * path, VFSFile * file,
+@@ -85,10 +88,7 @@
+         while (* parse == ' ' || * parse == '\t')
+             parse ++;
+ 
+-        if (! * parse)
+-            break;
+-
+-        if (* parse == '#')
++        if (* parse == '#' || *parse=='\0')
+             goto NEXT;
+ 
+         char * s = aud_construct_uri (parse, path);
diff --git a/audacious-plugins-3.3.3-wavpack.patch b/audacious-plugins-3.3.3-wavpack.patch
new file mode 100644
index 0000000..7ccfdf5
--- /dev/null
+++ b/audacious-plugins-3.3.3-wavpack.patch
@@ -0,0 +1,26 @@
+diff -Nur audacious-plugins-3.3.3-orig/src/wavpack/wavpack.c audacious-plugins-3.3.3/src/wavpack/wavpack.c
+--- audacious-plugins-3.3.3-orig/src/wavpack/wavpack.c	2012-12-11 00:49:06.000000000 +0100
++++ audacious-plugins-3.3.3/src/wavpack/wavpack.c	2013-01-03 12:35:44.973320237 +0100
+@@ -93,16 +93,14 @@
+     if (flags & OPEN_WVC)
+     {
+         SPRINTF (corrFilename, "%sc", filename);
+-        *wvc_input = vfs_fopen(corrFilename, "rb");
++        if (vfs_file_test (corrFilename, VFS_IS_REGULAR))
++            * wvc_input = vfs_fopen (corrFilename, "r");
++        else
++            * wvc_input = NULL;
+     }
+ 
+-    * ctx = WavpackOpenFileInputEx (& wv_readers, wv_input, * wvc_input, error,
+-     flags, 0);
+-
+-    if (ctx == NULL)
+-        return FALSE;
+-    else
+-        return TRUE;
++    * ctx = WavpackOpenFileInputEx (& wv_readers, wv_input, * wvc_input, error, flags, 0);
++    return (* ctx != NULL);
+ }
+ 
+ static void wv_deattach (VFSFile * wvc_input, WavpackContext * ctx)
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index eb08ec5..887967d 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -30,6 +30,10 @@ Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 Patch1: audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
+#
+Patch3: audacious-plugins-3.3.3-m3u-empty-lines.patch
+# merged from post-3.3.x
+Patch4: audacious-plugins-3.3.3-wavpack.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -135,6 +139,8 @@ providers may build it with libsidplay 2 instead.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
+%patch3 -p1 -b .m3u-empty-lines
+%patch4 -p1 -b .wavpack
 
 for i in src/ladspa/plugin.c
 do
@@ -247,6 +253,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Jan  3 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.3-2
+- Merge fix for wavpack input to not complain about .wvc files.
+- Fix m3u parser to handle (=skip) empty lines.
+
 * Tue Dec 11 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.3-1
 - Update to 3.3.3 (a few bug-fixes and translation updates).