Changes 3.95.1:

* improved presets
* fixed issues in VBR header
* more robust decoding
* several fixes in psychoacoustic model
* removed Vorbis support
* 10% faster on PowerPC

5 files changed, 25 insertions, 26 deletions

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 57eee4271d7..b45d07af7bf 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.31 2003/11/06 18:31:08 gavan Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/20 15:46:12 adam Exp $
 #
 
-VERS=		3.93.1
 DISTNAME=	lame-${VERS}
-PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/} \
-		http://hive.me.gu.edu.au/not_lame/ \
-		http://telia.dl.sourceforge.net/lame/
+		http://hive.me.gu.edu.au/not_lame/
 
 MAINTAINER=	hubertf@NetBSD.org
 HOMEPAGE=	http://www.mp3dev.org/mp3/
 COMMENT=	Fast, high quality MP3 encoder
 
+VERS=		3.95.1
+
 LICENSE=	fee-based-commercial-use
 
 USE_BUILDLINK2=		yes
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 90c1c0c2e31..d10443e32a8 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/12/19 00:53:48 wiz Exp $
+$NetBSD: distinfo,v 1.9 2004/01/20 15:46:12 adam Exp $
 
-SHA1 (lame-3.93.1.tar.gz) = d2a45170b78a79e27c84a85c5ce31a04cab04cd5
-Size (lame-3.93.1.tar.gz) = 1037603 bytes
-SHA1 (patch-aa) = 9273122d1edcaf2f1827460a49c191bcd30809f3
-SHA1 (patch-ab) = 3539fc4981ed0fbe758d254e01103feb225597f2
-SHA1 (patch-ac) = 4d69b600cc43433aa8d520b0d1a174fa37bd853d
+SHA1 (lame-3.95.1.tar.gz) = 6547f289ae2f078eb5f053a54e2724f0de72ca94
+Size (lame-3.95.1.tar.gz) = 1244071 bytes
+SHA1 (patch-aa) = 6ade10e302c6f848cdc9392fed89d87b40d0eb77
+SHA1 (patch-ab) = da88c3c130e8b1420baf52c36e657378bdb58a36
+SHA1 (patch-ac) = 8e1495493c534943608baeab18c1063c66509dbc
diff --git a/audio/lame/patches/patch-aa b/audio/lame/patches/patch-aa
index 7a1b1a4ac78..778ab9a55af 100644
--- a/audio/lame/patches/patch-aa
+++ b/audio/lame/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2002/12/19 00:53:48 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2004/01/20 15:46:12 adam Exp $
 
---- configure.orig	Sun Dec  1 17:16:10 2002
+--- configure.orig	2004-01-12 13:02:51.000000000 +0000
 +++ configure
-@@ -10867,7 +10867,7 @@ if test "${ac_cv_lib_ffm_cos+set}" = set
+@@ -26116,7 +26116,7 @@ if test "${ac_cv_lib_ffm_cos+set}" = set
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.10 2002/12/19 00:53:48 wiz Exp $
 +LIBS="-lffm  -lm $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
- #include "confdefs.h"
+ /* confdefs.h.  */
diff --git a/audio/lame/patches/patch-ab b/audio/lame/patches/patch-ab
index af50d312eb5..859b63f9f4b 100644
--- a/audio/lame/patches/patch-ab
+++ b/audio/lame/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2002/12/19 00:53:48 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/20 15:46:12 adam Exp $
 
---- doc/html/Makefile.in.orig	Sun Dec  1 17:18:39 2002
+--- doc/html/Makefile.in.orig	2004-01-11 11:16:19.000000000 +0000
 +++ doc/html/Makefile.in
-@@ -102,9 +102,9 @@ install_sh = @install_sh@
+@@ -164,9 +164,9 @@ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign ansi2knr
  
  docdir = $(datadir)/doc
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
index e3590174262..dca2040eb12 100644
--- a/audio/lame/patches/patch-ac
+++ b/audio/lame/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2002/12/19 00:53:49 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2004/01/20 15:46:12 adam Exp $
 
---- frontend/Makefile.in.orig	Sun Dec  1 17:18:27 2002
+--- frontend/Makefile.in.orig	2004-01-11 11:16:21.000000000 +0000
 +++ frontend/Makefile.in
-@@ -162,7 +162,7 @@ EXTRA_mp3x__EXEEXT__SOURCES = $(brhist_s
- @WITH_BRHIST_FALSE@mp3x__EXEEXT__SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources)
+@@ -91,7 +91,7 @@ LDADD = @LDADD@ \
+ 	$(top_builddir)/libmp3lame/libmp3lame.la \
+ 	@FRONTEND_LDADD@
  
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
 -LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
 +LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- 
- mp3x__EXEEXT__LDADD = $(LDADD) @GTK_LIBS@
- 
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@