From 8790921c9932d50ad9cd1409a169c7d169445060 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Oct 06 2009 19:31:07 +0000
Subject: - upstream patch fixing crash of oggenc --resample (#526653)


---

diff --git a/vorbis-tools-1.2.0-oggenc-resample.patch b/vorbis-tools-1.2.0-oggenc-resample.patch
new file mode 100644
index 0000000..e89727a
--- /dev/null
+++ b/vorbis-tools-1.2.0-oggenc-resample.patch
@@ -0,0 +1,29 @@
+diff -rup vorbis-tools-1.2.0.orig/oggenc/oggenc.c vorbis-tools-1.2.0/oggenc/oggenc.c
+--- vorbis-tools-1.2.0.orig/oggenc/oggenc.c	2008-03-03 06:37:27.000000000 +0100
++++ vorbis-tools-1.2.0/oggenc/oggenc.c	2009-10-06 21:27:09.398047466 +0200
+@@ -147,6 +147,7 @@ int main(int argc, char **argv)
+         char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
+         char *date=NULL, *genre=NULL;
+         input_format *format;
++        int resampled = 0;
+ 
+         /* Set various encoding defaults */
+ 
+@@ -324,6 +325,8 @@ int main(int argc, char **argv)
+ 
+         if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
+             int fromrate = enc_opts.rate;
++
++            resampled = 1;
+             enc_opts.resamplefreq = opt.resamplefreq;
+             if(setup_resample(&enc_opts)) {
+                 errors++;
+@@ -369,7 +372,7 @@ int main(int argc, char **argv)
+             clear_scaler(&enc_opts);
+         if(opt.downmix)
+             clear_downmix(&enc_opts);
+-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
++        if(resampled)
+             clear_resample(&enc_opts);
+ clear_all:
+ 
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index 19c8f61..de24194 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,13 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.2.0-non-block.patch
+Patch1:		vorbis-tools-1.2.0-oggenc-resample.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
@@ -24,7 +25,8 @@ comment editor.
 
 %prep
 %setup -q
-%patch0 -p1 -b .non-block
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -49,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 06 2009 Kamil Dudka <kdudka@redhat.com> - 1:1.2.0-6
+- upstream patch fixing crash of oggenc --resample (#526653)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild