Attachment 195221 Details for Bug 244757 – Patch against F-7 branch of vorbist-tools to apply upstream patch

[patch] Patch against F-7 branch of vorbist-tools to apply upstream patch

vorbis-tools-fc7-oggdec.patch (text/plain), 2.75 KB, created by Todd Zullinger on 2007-09-13 20:42:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2007-09-13 20:42:20 UTC

Size: 2.75 KB

patch

obsolete

>? vorbis-tools-1.1.1.svn20070412
>Index: vorbis-tools-svn20070412-oggdec.patch
>===================================================================
>RCS file: vorbis-tools-svn20070412-oggdec.patch
>diff -N vorbis-tools-svn20070412-oggdec.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ vorbis-tools-svn20070412-oggdec.patch	13 Sep 2007 20:22:13 -0000
>@@ -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);
>Index: vorbis-tools.spec
>===================================================================
>RCS file: /cvs/extras/rpms/vorbis-tools/F-7/vorbis-tools.spec,v
>retrieving revision 1.28
>diff -u -p -r1.28 vorbis-tools.spec
>--- vorbis-tools.spec	16 May 2007 17:34:31 -0000	1.28
>+++ vorbis-tools.spec	13 Sep 2007 20:22:13 -0000
>@@ -1,7 +1,7 @@
> Summary: The Vorbis General Audio Compression Codec tools.
> Name:		vorbis-tools
> Version:	1.1.1.svn20070412
>-Release:	2%{?dist}
>+Release:	3%{?dist}
> Epoch:		1
> Group: Applications/Multimedia
> License:	GPL
>@@ -10,6 +10,7 @@ Source:		http://www.xiph.org/ogg/vorbis/
> 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=$R
> [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
> 
> %changelog
>+* Mon Aug 27 2007 Todd Zullinger <tmz@pobox.com> - 1:1.1.1.svn20070412-3
>+- Upstream patch to fix oggdec writing silent wav files (#244757)
>+
> * Wed May 16 2007 Christopher Aillon <caillon@redhat.com> 1:1.1.1.svn20070412-2.fc7
> - Bring back support for http URLs which was broken with the previous update
>   See https://bugzilla.redhat.com/240351

Actions: View | Diff

Attachments on bug 244757: 159267 | 195221