lame: update to 3.99.5

3 files changed, 18 insertions, 106 deletions

diff --git a/abs/core/lame/03_lame-ffmpeg.diff b/abs/core/lame/03_lame-ffmpeg.diff
deleted file mode 100644
index a803935..0000000
--- a/abs/core/lame/03_lame-ffmpeg.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- lame-3.98.2.orig/libmp3lame/lame.c	2009-07-07 10:52:01.000000000 +0200
-+++ lame-3.98.2/libmp3lame/lame.c	2009-07-07 10:52:03.000000000 +0200
-@@ -1602,6 +1602,13 @@
-         /* update mfbuf[] counters */
-         gfc->mf_size += n_out;
-         assert(gfc->mf_size <= MFSIZE);
-+
-+        /* lame_encode_flush may have set gfc->mf_sample_to_encode to 0
-+         * so we have to reinitialize it here when that happened.
-+         */
-+        if (gfc->mf_samples_to_encode < 1) {
-+            gfc->mf_samples_to_encode = ENCDELAY + POSTDELAY;
-+        }
-         gfc->mf_samples_to_encode += n_out;
- 
- 
-@@ -1931,6 +1938,10 @@
-     int     frames_left;
-     int     samples_to_encode = gfc->mf_samples_to_encode;
- 
-+    /* Was flush already called? */
-+    if (gfc->mf_samples_to_encode < 1) {
-+        return 0;
-+    }
-     memset(buffer, 0, sizeof(buffer));
-     mp3count = 0;
-     
-@@ -1942,7 +1953,9 @@
-     end_padding += pad_out_samples;
- 
-     frames_left = (samples_to_encode + pad_out_samples) / gfp->framesize;
--    while (frames_left > 0) {
-+
-+    /* send in a frame of 0 padding until all internal sample buffers are flushed */
-+    while (frames_left > 0 && imp3 >= 0) {
-         int frame_num = gfp->frameNum;
- 
-         mp3buffer_size_remaining = mp3buffer_size - mp3count;
-@@ -1951,22 +1964,23 @@
-         if (mp3buffer_size == 0)
-             mp3buffer_size_remaining = 0;
- 
--        /* send in a frame of 0 padding until all internal sample buffers
--         * are flushed
--         */
-         imp3 = lame_encode_buffer(gfp, buffer[0], buffer[1], 32,
-                                   mp3buffer, mp3buffer_size_remaining);
-         
--        if (frame_num != gfp->frameNum) {
--            --frames_left;
--        }
--        if (imp3 < 0) {
--            /* some type of fatal error */
--            return imp3;
--        }
-         mp3buffer += imp3;
-         mp3count += imp3;
-+        frames_left -= (frame_num != gfp->frameNum) ? 1 : 0;
-     }
-+    /* Set gfc->mf_samples_to_encode to 0, so we may detect
-+     * and break loops calling it more than once in a row.
-+     */
-+    gfc->mf_samples_to_encode = 0;
-+
-+    if (imp3 < 0) {
-+        /* some type of fatal error */
-+        return imp3;
-+    }
-+
-     mp3buffer_size_remaining = mp3buffer_size - mp3count;
-     /* if user specifed buffer size = 0, dont check size */
-     if (mp3buffer_size == 0)
diff --git a/abs/core/lame/PKGBUILD b/abs/core/lame/PKGBUILD
index 6853b74..432a519 100644
--- a/abs/core/lame/PKGBUILD
+++ b/abs/core/lame/PKGBUILD
@@ -1,26 +1,33 @@
-# $Id: PKGBUILD 80636 2010-05-20 16:06:46Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor:	Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=lame
-pkgver=3.98.4
-pkgrel=1
-pkgdesc="An MP3 encoder and graphical frame analyzer"
+pkgver=3.99.5
+pkgrel=2
+pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
 arch=('i686' 'x86_64')
 url="http://lame.sourceforge.net/"
 depends=('ncurses')
 makedepends=('nasm')
 license=('LGPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e9866ad6b570c6c95c8cba48060473f')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('84835b313d4a8b68f5349816d33e07ce')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
               --enable-nasm \
               --enable-shared
-  make -j1 || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/core/lame/shared-frontend.patch b/abs/core/lame/shared-frontend.patch
deleted file mode 100644
index e5ae0a9..0000000
--- a/abs/core/lame/shared-frontend.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- lame-3.96.1.orig/frontend/Makefile.am	2004-01-21 01:41:36.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.am	2004-10-03 16:39:12.415901779 -0700
-@@ -50,7 +50,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
-diff -Naur lame-3.96.1.orig/frontend/Makefile.in lame-3.96.1/frontend/Makefile.in
---- lame-3.96.1.orig/frontend/Makefile.in	2004-01-21 05:50:29.000000000 -0800
-+++ lame-3.96.1/frontend/Makefile.in	2004-10-03 16:39:19.711701553 -0700
-@@ -91,7 +91,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@