From 7d905991045a860c961c64e0ecf720dd2d222972 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@fedoraproject.org>
Date: Oct 05 2007 04:36:21 +0000
Subject: - Upstream patch to fix oggdec writing silent wav files (#244757)


---

diff --git a/vorbis-tools-svn20070412-oggdec.patch b/vorbis-tools-svn20070412-oggdec.patch
new file mode 100644
index 0000000..c02caf7
--- /dev/null
+++ b/vorbis-tools-svn20070412-oggdec.patch
@@ -0,0 +1,28 @@
+See https://trac.xiph.org/ticket/1209 for the bug report.  This patch comes
+from: https://trac.xiph.org/changeset/13263?format=diff&new=13263
+
+Index: /trunk/vorbis-tools/oggdec/oggdec.c
+===================================================================
+--- vorbis-tools/oggdec/oggdec.c (revision 12221)
++++ vorbis-tools/oggdec/oggdec.c (revision 13263)
+@@ -256,4 +256,5 @@
+     int bs = 0;
+     char buf[8192], outbuf[8192];
++    char *p_outbuf;
+     int buflen = 8192;
+     unsigned int written = 0;
+@@ -325,7 +326,11 @@
+           /* Then permute! */
+           permute_channels(buf, outbuf, ret, channels, bits/8);
+-        }
+-
+-        if(fwrite(outbuf, 1, ret, out) != ret) {
++          p_outbuf = outbuf;
++        }
++        else {
++          p_outbuf = buf;
++        }
++
++        if(fwrite(p_outbuf, 1, ret, out) != ret) {
+             fprintf(stderr, "Error writing to file: %s\n", strerror(errno));
+             ov_clear(&vf);
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index 701c6a7..6efd2f4 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1.svn20070412
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -10,6 +10,7 @@ Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.0-build.patch
 Patch1:		vorbis-tools-1.0-curlconfig.patch
 Patch2:		vorbis-tools-svn20070412-libcurl.patch
+Patch3:		vorbis-tools-svn20070412-oggdec.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libogg >= 2:1.1
 Requires:	libvorbis >= 1:%{version} 
@@ -41,6 +42,7 @@ comment editor.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoconf
@@ -68,6 +70,9 @@ make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 04 2007 Todd Zullinger <tmz@pobox.com> - 1:1.1.1.svn20070412-4
+- Upstream patch to fix oggdec writing silent wav files (#244757)
+
 * Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> - 1:1.1.1.svn20070412-3
 - Rebuild for build ID