[arch-commits] Commit in lame/repos (8 files)
Ray Rashif
schiv at archlinux.org
Fri Oct 21 20:21:59 UTC 2011
Date: Friday, October 21, 2011 @ 16:21:58
Author: schiv
Revision: 141020
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lame/repos/extra-i686/PKGBUILD
(from rev 141019, lame/trunk/PKGBUILD)
lame/repos/extra-x86_64/PKGBUILD
(from rev 141019, lame/trunk/PKGBUILD)
Deleted:
lame/repos/extra-i686/03_lame-ffmpeg.diff
lame/repos/extra-i686/PKGBUILD
lame/repos/extra-i686/shared-frontend.patch
lame/repos/extra-x86_64/03_lame-ffmpeg.diff
lame/repos/extra-x86_64/PKGBUILD
lame/repos/extra-x86_64/shared-frontend.patch
------------------------------------+
extra-i686/03_lame-ffmpeg.diff | 72 -----------------------------------
extra-i686/PKGBUILD | 60 ++++++++++++++++-------------
extra-i686/shared-frontend.patch | 23 -----------
extra-x86_64/03_lame-ffmpeg.diff | 72 -----------------------------------
extra-x86_64/PKGBUILD | 60 ++++++++++++++++-------------
extra-x86_64/shared-frontend.patch | 23 -----------
6 files changed, 68 insertions(+), 242 deletions(-)
Deleted: extra-i686/03_lame-ffmpeg.diff
===================================================================
--- extra-i686/03_lame-ffmpeg.diff 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-i686/03_lame-ffmpeg.diff 2011-10-21 20:21:58 UTC (rev 141020)
@@ -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)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-i686/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=lame
-pkgver=3.98.4
-pkgrel=1
-pkgdesc="An MP3 encoder and graphical frame analyzer"
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --enable-nasm \
- --enable-shared
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
Copied: lame/repos/extra-i686/PKGBUILD (from rev 141019, lame/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=lame
+pkgver=3.99
+pkgrel=1
+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/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('7abacd1d0a65a63733335786015626db')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-nasm \
+ --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/shared-frontend.patch
===================================================================
--- extra-i686/shared-frontend.patch 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-i686/shared-frontend.patch 2011-10-21 20:21:58 UTC (rev 141020)
@@ -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@
Deleted: extra-x86_64/03_lame-ffmpeg.diff
===================================================================
--- extra-x86_64/03_lame-ffmpeg.diff 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-x86_64/03_lame-ffmpeg.diff 2011-10-21 20:21:58 UTC (rev 141020)
@@ -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)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-x86_64/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=lame
-pkgver=3.98.4
-pkgrel=1
-pkgdesc="An MP3 encoder and graphical frame analyzer"
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --enable-nasm \
- --enable-shared
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-}
Copied: lame/repos/extra-x86_64/PKGBUILD (from rev 141019, lame/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-21 20:21:58 UTC (rev 141020)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=lame
+pkgver=3.99
+pkgrel=1
+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/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('7abacd1d0a65a63733335786015626db')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-nasm \
+ --enable-shared
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/shared-frontend.patch
===================================================================
--- extra-x86_64/shared-frontend.patch 2011-10-21 20:02:46 UTC (rev 141019)
+++ extra-x86_64/shared-frontend.patch 2011-10-21 20:21:58 UTC (rev 141020)
@@ -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@
More information about the arch-commits
mailing list