[audacious-plugins/f14] Fix Ogg metadata save for i686 (#711796).

[Michael Schwendt]

commit e409602a9778dff9ddf2862b4a7dd7b52b3559a1
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jun 8 17:14:20 2011 +0200

    Fix Ogg metadata save for i686 (#711796).

 audacious-plugins-2.4.5-vcedit.patch |   26 ++++++++++++++++++++++++++
 audacious-plugins.spec               |   10 ++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/audacious-plugins-2.4.5-vcedit.patch b/audacious-plugins-2.4.5-vcedit.patch
new file mode 100644
index 0000000..33f2398
--- /dev/null
+++ b/audacious-plugins-2.4.5-vcedit.patch
@@ -0,0 +1,26 @@
+diff -Nur audacious-plugins-fedora-2.4.5-orig/src/vorbis/vcedit.c audacious-plugins-fedora-2.4.5/src/vorbis/vcedit.c
+--- audacious-plugins-fedora-2.4.5-orig/src/vorbis/vcedit.c	2011-04-17 15:29:26.000000000 +0200
++++ audacious-plugins-fedora-2.4.5/src/vorbis/vcedit.c	2011-06-08 17:08:48.314512099 +0200
+@@ -189,7 +189,7 @@
+                       vcedit_write_func write_func)
+ {
+     char *buffer;
+-    int bytes, i;
++    gint64 bytes, i;
+     ogg_packet *header;
+     ogg_packet header_main;
+     ogg_packet header_comments;
+diff -Nur audacious-plugins-fedora-2.4.5-orig/src/vorbis/vcedit.h audacious-plugins-fedora-2.4.5/src/vorbis/vcedit.h
+--- audacious-plugins-fedora-2.4.5-orig/src/vorbis/vcedit.h	2011-04-17 15:29:26.000000000 +0200
++++ audacious-plugins-fedora-2.4.5/src/vorbis/vcedit.h	2011-06-08 17:07:42.029568313 +0200
+@@ -19,8 +19,8 @@
+ #include <vorbis/codec.h>
+ #include <audacious/plugin.h>
+ 
+-typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);
+-typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
++typedef gint64 (*vcedit_read_func)(void *, gint64, gint64, void *);
++typedef gint64 (*vcedit_write_func)(const void *, gint64, gint64, void *);
+ 
+ typedef struct {
+ 	ogg_sync_state	 *oy;
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 36370bb..984e6c3 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.4.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,8 +29,10 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 # Fedora customization: fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
-#
+# merged post 2.4.5
 Patch2: audacious-plugins-2.4.5-m3u.patch
+#
+Patch3: audacious-plugins-2.4.5-vcedit.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -161,6 +163,7 @@ providers may build it with libsidplay 2 instead.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .m3u-crash
+%patch3 -p1 -b .vcedit-i686-crash
 
 for i in src/ladspa/ladspa.c
 do
@@ -280,6 +283,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Jun  8 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-3
+- Fix Ogg metadata save for i686 (#711796).
+
 * Sat Apr 23 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.5-2
 - Fix missing newline NULL-ptr crash in m3u loader (#699107).
 - Build OSS output plugin according to default.