Added 2pass patch. closes #25829

4 files changed, 87 insertions, 6 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index ee2eb32a2306..978da827065b 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.47 2003/08/28 22:27:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.48 2003/09/24 20:46:33 mholzer Exp $
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> transcode-0.6.6.ebuild:
+  Added 2pass patch. closes #25829
 
 *transcode-0.6.9 (29 Aug 2003)
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index de9bc04b5d36..eb8cbd55db1a 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,13 +1,14 @@
-MD5 77f1fe50a3ac63877526a6bed39709b4 ChangeLog 9595
+MD5 d97bd62dd3e070494da1c12fa7b8e454 ChangeLog 9705
 MD5 9bb698a6ef1870268dc9a8e7dbf4a285 transcode-0.6.3.ebuild 3049
-MD5 019bf7a47d553d4956af0d293f3f0ef9 transcode-0.6.6.ebuild 3277
+MD5 4a54801c033dca53b937e3f793f5d4be transcode-0.6.6.ebuild 3348
 MD5 1ea4f41a1198c9baa644bbc9bdfc3203 transcode-0.6.7.ebuild 3375
 MD5 9d9c922108721f4d8aeff0304c1564cd transcode-0.6.8.ebuild 3330
 MD5 bb865c02f4152b7492bdbdf2042389e5 transcode-0.6.9.ebuild 3698
-MD5 40f99c39a21fb09fb3218e2956d758be files/digest-transcode-0.6.8 68
 MD5 225a843999c440c3060e96b9fe6fca35 files/digest-transcode-0.6.3 68
 MD5 2e179af41bdf16c1de0a976eb914a141 files/digest-transcode-0.6.6 68
 MD5 4a954714299d666fbf12472d96760bed files/digest-transcode-0.6.7 68
-MD5 14479296c3af00baa49396d77c35d01e files/transcode-0.6.7-clone_close.diff 597
+MD5 40f99c39a21fb09fb3218e2956d758be files/digest-transcode-0.6.8 68
 MD5 2b19613dfc575babca14ae8f3878cf9f files/digest-transcode-0.6.9 68
+MD5 14479296c3af00baa49396d77c35d01e files/transcode-0.6.7-clone_close.diff 597
 MD5 32c936c145faf596052a5cdbc95376cf files/transcode-0.6.9-makefile.patch 969
+MD5 17ed099139bdf45b65fa1f217b9bb42b files/transcode-0.6.6-2pass.patch 2005
diff --git a/media-video/transcode/files/transcode-0.6.6-2pass.patch b/media-video/transcode/files/transcode-0.6.6-2pass.patch
new file mode 100644
index 000000000000..ecebd6be2c72
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.6-2pass.patch
@@ -0,0 +1,75 @@
+--- transcode-0.6.6/export/aud_aux.c	2003-05-20 12:31:35.000000000 +0000
++++ export/aud_aux.c	2003-09-25 22:46:38.000000000 +0000
+@@ -94,6 +94,7 @@
+  *
+  * ------------------------------------------------------------*/
+ 
++char * lame_error2str(int error);
+ 
+ int audio_init(vob_t *vob, int debug)
+ {
+@@ -535,7 +536,7 @@
+ #define DEBUG
+ #undef DEBUG
+ 
+-	while(buffer_len < 4) {
++	while(buffer_len < 4 && input_buffer_len >= aud_size_len) {
+ 
+ 
+ 	    if(aud_mono) {
+@@ -551,6 +552,10 @@
+ 
+ 	    }
+ 
++	    if(outsize<0) {
++		fprintf(stderr, "(%s) lame encoding error|1| (%s)\n", __FILE__, lame_error2str(outsize));
++		return(TC_EXPORT_ERROR); 
++	    }
+ 	    // please, please rewrite me.
+ 	    memmove (input_buffer, input_buffer+aud_size_len, buffer_size - aud_size_len);
+ 
+@@ -598,6 +603,10 @@
+ 
+ 		}
+ 
++		if(outsize<0) {
++		    fprintf(stderr, "(%s) lame encoding error |2|(%s)\n", __FILE__, lame_error2str(outsize));
++		    return(TC_EXPORT_ERROR); 
++		}
+ 		// please, please rewrite me.
+ 		memmove (input_buffer, input_buffer+aud_size_len, buffer_size - aud_size_len);
+ 		buffer_len += outsize;
+@@ -613,7 +622,7 @@
+ 
+ 
+ 	if(outsize<0) {
+-	    fprintf(stderr, "(%s) lame encoding error (%d)\n", __FILE__, outsize);
++	    fprintf(stderr, "(%s) lame encoding error |3|(%d)\n", __FILE__, outsize);
+ 	    return(TC_EXPORT_ERROR); 
+ 	}
+ #ifdef DEBUG
+@@ -621,7 +630,7 @@
+ 		__FILE__, buffer_len, header_len, aud_size, (write_audio?"yes":"no"));
+ #endif
+ 
+-	if (write_audio) {
++	if (header_len > 0 && write_audio) {
+ 	    int doit=1;
+ 	    int inner_len = header_len;
+ 
+@@ -922,3 +931,15 @@
+     return framesize;
+ }
+ 
++char * lame_error2str(int error)
++{
++    switch (error) {
++	case -1: return "-1:  mp3buf was too small";
++	case -2: return "-2:  malloc() problem";
++	case -3: return "-3:  lame_init_params() not called";
++	case -4: return "-4:  psycho acoustic problems";
++	case -5: return "-5:  ogg cleanup encoding error";
++	case -6: return "-6:  ogg frame encoding error";
++	default: return "";
++    }
++}
diff --git a/media-video/transcode/transcode-0.6.6.ebuild b/media-video/transcode/transcode-0.6.6.ebuild
index 501f5792d222..206acb197757 100644
--- a/media-video/transcode/transcode-0.6.6.ebuild
+++ b/media-video/transcode/transcode-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.6.ebuild,v 1.6 2003/09/07 00:08:13 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.6.ebuild,v 1.7 2003/09/24 20:46:33 mholzer Exp $
 
 inherit libtool flag-o-matic
 
@@ -41,6 +41,8 @@ DEPEND=">=media-libs/a52dec-0.7.3
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-2pass.patch || die "2pass patch died"
 
 	if has_version  '>=media-libs/netpbm-9.13'
 	then