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

[Michael Schwendt]

commit 977a337a5a69900cf9459ea59165f20edc3802be
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jun 8 17:26:47 2011 +0200

    Fix Ogg metadata save for i686 (#711796).

 audacious-plugins-2.5.1-vcedit.patch |   44 ++++++++++++++++++++++++++++++++++
 audacious-plugins.spec               |    8 +++++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/audacious-plugins-2.5.1-vcedit.patch b/audacious-plugins-2.5.1-vcedit.patch
new file mode 100644
index 0000000..1c06dd4
--- /dev/null
+++ b/audacious-plugins-2.5.1-vcedit.patch
@@ -0,0 +1,44 @@
+diff -Nur audacious-plugins-fedora-2.5.1-orig/src/vorbis/vcedit.c audacious-plugins-fedora-2.5.1/src/vorbis/vcedit.c
+--- audacious-plugins-fedora-2.5.1-orig/src/vorbis/vcedit.c	2011-05-19 20:10:38.000000000 +0200
++++ audacious-plugins-fedora-2.5.1/src/vorbis/vcedit.c	2011-06-08 17:24:16.918706254 +0200
+@@ -145,7 +145,7 @@
+ {
+     int result;
+     char *buffer;
+-    int bytes;
++    gint64 bytes;
+ 
+     result = ogg_stream_packetout(s->os, p);
+ 
+@@ -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;
+@@ -317,7 +317,7 @@
+     ogg_int64_t granpos = 0;
+     int result;
+     char *buffer;
+-    int bytes;
++    gint64 bytes;
+     int needflush = 0, needout = 0;
+ 
+     state->eosin = 0;
+diff -Nur audacious-plugins-fedora-2.5.1-orig/src/vorbis/vcedit.h audacious-plugins-fedora-2.5.1/src/vorbis/vcedit.h
+--- audacious-plugins-fedora-2.5.1-orig/src/vorbis/vcedit.h	2011-05-19 20:10:38.000000000 +0200
++++ audacious-plugins-fedora-2.5.1/src/vorbis/vcedit.h	2011-06-08 17:23:20.655472870 +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 0970748..e0200cd 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -10,7 +10,7 @@ Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -29,6 +29,8 @@ Source2: audacious-amidi.desktop
 Patch0: audacious-plugins-2.5-alpha1-xmms-skindir.patch
 # Fedora customization: fix hardcoded libdir replacement
 Patch1: audacious-plugins-2.4-libdir.patch
+#
+Patch2: audacious-plugins-2.5.1-vcedit.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext
@@ -158,6 +160,7 @@ providers may build it with libsidplay 2 instead.
 %setup -q -n audacious-plugins-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
+%patch2 -p1 -b .vcedit-crash
 
 for i in src/ladspa/ladspa.c
 do
@@ -272,6 +275,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Jun  8 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-2
+- Fix Ogg metadata save for i686 (#711796).
+
 * Thu May 19 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.1-1
 - Update to 2.5.1.
 - No longer --disable-sse2 for %%ix86 since this option has been dropped.