This closes all open lame bugs. hehe. tcc compile fix from spider on bug #31191 and added the missing mlame binary as noted on bug #35978

4 files changed, 29 insertions, 4 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index d4d7f281eda9..ef76d2ee6a27 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lame
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.25 2004/01/21 10:31:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.26 2004/01/21 18:58:52 raker Exp $
+
+  21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
+  Added the mlame binary as noted on bug #35978 and added spider's
+  tcc compiler fix as seen on bug #31191.
 
   21 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
   Changed emake to make as it seems to be a little finicky with 
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index e1c4eceea8f6..d39e6c21bc33 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,9 +1,10 @@
 MD5 7bcb3f80ad12d4045f440ccc22e11cee lame-3.93.1-r1.ebuild 1592
-MD5 fbe210c969e71c65dcafa8742e362360 lame-3.95.1.ebuild 1727
+MD5 23c3107cb8b4fdb55bc4c83ec40f5155 lame-3.95.1.ebuild 1835
 MD5 1eedc2442d1109207a7f6def838850ee lame-3.92.ebuild 1539
-MD5 44c11cf8e07494e9485b6b9b2c783fe2 ChangeLog 4434
+MD5 14f4cb3942491840655e15cf51745c53 ChangeLog 4611
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
 MD5 2b1af4843f5ca4107de793b7a584db34 files/digest-lame-3.92 61
 MD5 1dfbfacec1d8f89bf39620c15becb6bc files/lame-3.91-gcc3.diff 383
 MD5 aefad4480f6888fcee536e08205804b1 files/digest-lame-3.93.1-r1 64
 MD5 d765815e2edcad0f6d81c0813c2dc8f3 files/digest-lame-3.95.1 64
+MD5 6c1464935f34b024a01a7acc304727ee files/intcast.spider 437
diff --git a/media-sound/lame/files/intcast.spider b/media-sound/lame/files/intcast.spider
new file mode 100644
index 000000000000..ee19e7ea5b75
--- /dev/null
+++ b/media-sound/lame/files/intcast.spider
@@ -0,0 +1,12 @@
+diff -urN lame-3.95.1/libmp3lame/takehiro.c lame-3.95.1-temp/libmp3lame/takehiro.c
+--- lame-3.95.1/libmp3lame/takehiro.c	2004-01-12 07:02:03.000000000 -0600
++++ lame-3.95.1-temp/libmp3lame/takehiro.c	2004-01-21 12:49:08.545591944 -0600
+@@ -1394,7 +1394,7 @@
+ {
+     int i;
+ 
+-    gfc->choose_table = choose_table_nonMMX;
++    gfc->choose_table = (int)choose_table_nonMMX;
+     
+ #ifdef MMX_choose_table
+     if (gfc->CPU_features.MMX) {
diff --git a/media-sound/lame/lame-3.95.1.ebuild b/media-sound/lame/lame-3.95.1.ebuild
index cbdc3a064f8f..5e53a30d4dad 100644
--- a/media-sound/lame/lame-3.95.1.ebuild
+++ b/media-sound/lame/lame-3.95.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.95.1.ebuild,v 1.3 2004/01/21 10:38:21 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.95.1.ebuild,v 1.4 2004/01/21 18:58:52 raker Exp $
 
 inherit flag-o-matic gcc
 
@@ -18,6 +18,12 @@ RDEPEND=">=sys-libs/ncurses-5.2
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/intcast.spider
+}
+
 src_compile() {
 	# take out -fomit-frame-pointer from CFLAGS if k6-2
 	is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
@@ -58,4 +64,6 @@ src_install() {
 	dodoc API ChangeLog HACKING PRESETS.draft README* \
 		STYLEGUIDE TODO USAGE
 	dohtml Dll/LameDLLInterface.htm
+
+	cp ${S}/misc/mlame ${D}usr/bin
 }