[arch-commits] CVS update of extra/multimedia/madplay (2 files)

[Dan McGee]

    Date: Friday, October 26, 2007 @ 20:28:13
  Author: dan
    Path: /home/cvs-extra/extra/multimedia/madplay

   Added: madplay-lame-tag-0.15.2b.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4)

upgpkg: madplay 0.15.2b-2


--------------------------------+
 PKGBUILD                       |   15 +++++++++++----
 madplay-lame-tag-0.15.2b.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)


Index: extra/multimedia/madplay/PKGBUILD
diff -u extra/multimedia/madplay/PKGBUILD:1.3 extra/multimedia/madplay/PKGBUILD:1.4
--- extra/multimedia/madplay/PKGBUILD:1.3	Tue May 16 13:10:41 2006
+++ extra/multimedia/madplay/PKGBUILD	Fri Oct 26 20:28:13 2007
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD,v 1.3 2006/05/16 17:10:41 uid1016 Exp $
+# $Id: PKGBUILD,v 1.4 2007/10/27 00:28:13 dan Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=madplay
 pkgver=0.15.2b
-pkgrel=1
+pkgrel=2
 pkgdesc="A curses front-end for various audio players."
 arch=(i686 x86_64)
+license=('GPL')
 depends=('libmad' 'libid3tag' 'esd')
-source=(ftp://ftp.mars.org/pub/mpeg/$pkgname-$pkgver.tar.gz)
+source=(ftp://ftp.mars.org/pub/mpeg/$pkgname-$pkgver.tar.gz
+        madplay-lame-tag-0.15.2b.patch)
 url="http://www.underbit.com/products/mad/"
-md5sums=('6814b47ceaa99880c754c5195aa1aac1')
+md5sums=('6814b47ceaa99880c754c5195aa1aac1'
+         '542004033df04a062ced737cdbe986e0')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+
+  # apply patch to fix LAME decoding
+  patch -p0 < ../madplay-lame-tag-0.15.2b.patch
+
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install
Index: extra/multimedia/madplay/madplay-lame-tag-0.15.2b.patch
diff -u /dev/null extra/multimedia/madplay/madplay-lame-tag-0.15.2b.patch:1.1
--- /dev/null	Fri Oct 26 20:28:13 2007
+++ extra/multimedia/madplay/madplay-lame-tag-0.15.2b.patch	Fri Oct 26 20:28:13 2007
@@ -0,0 +1,24 @@
+
+The following patch corrects a problem in madplay that can cause it to fail to
+decode some frames encoded with LAME (ancillary data contains a LAME tag
+marker, but without any tag data).
+
+Robert Leslie <rob at mars.org>
+20-Nov-2006
+
+
+--- player.c.orig	2006-11-20 00:42:12.609647678 -0800
++++ player.c	2006-11-20 00:43:05.741871716 -0800
+@@ -1156,8 +1156,10 @@
+ 	       stream->next_frame - stream->this_frame)
+ 	player->stats.total_bytes -= frame_size;
+ 
+-      return (player->options & PLAYER_OPTION_SHOWTAGSONLY) ?
+-	MAD_FLOW_STOP : MAD_FLOW_IGNORE;
++      if (player->options & PLAYER_OPTION_SHOWTAGSONLY)
++	return MAD_FLOW_STOP;
++      else if (tag->flags)
++	return MAD_FLOW_IGNORE;
+     }
+     else if (player->options & PLAYER_OPTION_SHOWTAGSONLY)
+       return MAD_FLOW_STOP;