Fix bug 236236, upstream ticket 1316.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

4 files changed, 93 insertions, 2 deletions

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index ae5cb8a7a75b..8d1ee5050410 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.82 2008/05/26 16:57:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.83 2008/08/31 21:12:16 loki_val Exp $
+
+*vorbis-tools-1.2.0-r2 (31 Aug 2008)
+
+  31 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch,
+  +vorbis-tools-1.2.0-r2.ebuild:
+  Fix bug 236236, upstream ticket 1316.
 
   26 May 2008; Samuli Suominen <drac@gentoo.org>
   -files/vorbis-tools-1.1.1-curl-7.16.0.patch,
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index d383cc23dee5..507b8ef889c9 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,6 +1,8 @@
+AUX vorbis-tools-1.2.0-oggenc-resample-call-fix.patch 954 RMD160 5de658636ad7115653cf4acc8a0afaf55094733a SHA1 362aa0a3e659bad26b36866ed5240f6b2fb4cf77 SHA256 e2bf4d7d019c522c4e1788d100d14cd5fab06605f2b664cbfc5c4486d95fbf19
 AUX vorbis-tools-1.2.0-sec.patch 642 RMD160 d869da8ef8ec80d22b36cb6c0cec2cf00cdc459b SHA1 9bf63b57a2e83642d2faa7cac52ebd149589170f SHA256 169aa8bd7fd7bb6a311008fb56b5faaaa5738ac673dc866d945370db27baafce
 AUX vorbis-tools-1.2.0-with-args.patch 1175 RMD160 60149bb7e4e838b1f70674beb9c54f31e50fa4f2 SHA1 6fe1c5d2d913c6fd005642d79de99221c2dca032 SHA256 d182e0d42aa85eb78c321aa21dbc5499aa484e461b29a76b0565d9eb63f5c980
 DIST vorbis-tools-1.2.0.tar.gz 1076814 RMD160 8cb6925c6e4e69373b6c91ff20d7ed8d75153b7c SHA1 c5c5ee4637ab8c9fc953d203663b7264432f874a SHA256 dbe753ce0ae0797f25117720bb2ba0d848388d3f47af8db31ebc35552c3de07b
 EBUILD vorbis-tools-1.2.0-r1.ebuild 1219 RMD160 164fb5fe483caaa81cf8ec4ec75bcfcbec78851a SHA1 227e58e29f8624487c840fa61180dc26e99239d9 SHA256 581d52de61284e56037c1eb54b1efa18f06b8154a8f805b62ccf00d2526a7453
-MISC ChangeLog 11346 RMD160 ea8b39b2812f9fca983fcc056b35f3aa36ccd346 SHA1 b4d176cf1e8005bb3951b67522c04578a3e46b67 SHA256 5d7f16f71c1a38a62b7162a1d4d47069bd3bc99de39a75d1802de18fdf74cbc3
+EBUILD vorbis-tools-1.2.0-r2.ebuild 1300 RMD160 59edb30918b81de2a004021440bbf0bf75027224 SHA1 dc60aabb60485553098d5d8a7d35d7d8236da183 SHA256 a5bfa5f6f4082390be7b8c8e1511b47a6ffbe746050212a6f5b28029c7d89411
+MISC ChangeLog 11575 RMD160 e94a1f2a32f4876c8371f38ece9aa9d8b4995936 SHA1 6c1160df863ed062ea8caba9982fddebd9252a2e SHA256 626300ed72267429f15ad2b5736bbde7f87c8e3ec19740c37fd4ffa1f2f07465
 MISC metadata.xml 352 RMD160 1945e3eb6c451708ce38ca1ffefd310e28e44f0e SHA1 57a3ade92f83ab4a567491a144d5afd6ad7c96e8 SHA256 13f8af04c0bafdae148d278edfb4f55e53461303cb0515bdd5d1a6a5283df3c8
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
new file mode 100644
index 000000000000..c7fa21188c1e
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
@@ -0,0 +1,30 @@
+Index: oggenc/oggenc.c
+===================================================================
+--- oggenc/oggenc.c	(revision 14552)
++++ oggenc/oggenc.c	(working copy)
+@@ -147,6 +151,7 @@
+         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 +329,8 @@
+ 
+         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 +376,7 @@
+             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/media-sound/vorbis-tools/vorbis-tools-1.2.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..0b2ea52f7735
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.2.0-r2.ebuild,v 1.1 2008/08/31 21:12:16 loki_val Exp $
+
+EAPI=1
+
+inherit base autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="flac nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.1
+	flac? ( media-libs/flac )
+	ogg123? ( media-libs/libao net-misc/curl )
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-with-args.patch"
+	"${FILESDIR}"/${P}-sec.patch
+	"${FILESDIR}"/${P}-oggenc-resample-call-fix.patch )
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf	--enable-vcut \
+		$(use_enable nls) \
+		$(use_enable ogg123) \
+		$(use_with flac) \
+		$(use_with speex)
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake docdir=/usr/share/doc/${PF} DESTDIR="${D}" \
+		install || die "emake install failed."
+
+	dodoc AUTHORS CHANGES README
+	prepalldocs
+}