Update package to 0.13.0 (beta).

Major changes include:
 - The last complete audio frame should now be properly decoded even when
   it is not followed by other data
 - Ancillary data is now properly extracted from Layer III streams.
 - Rewrote the Layer III joint stereo decoding routine to correct a major
   MPEG-2 problem and a minor MPEG-1 problem decoding intensity stereo.

Other changes in the CHANGES file in the distribution.

4 files changed, 5 insertions, 92 deletions

diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index c15a0562486..1f8978daabf 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/04/13 06:20:22 simonb Exp $
 #
 
-DISTNAME=	mad-0.12.5b
+DISTNAME=	mad-0.13.0b
 PKGNAME=	${DISTNAME:S/mad/madplay/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mad/} \
diff --git a/audio/madplay/files/md5 b/audio/madplay/files/md5
index ba2dd695646..ca1d5834383 100644
--- a/audio/madplay/files/md5
+++ b/audio/madplay/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2001/02/13 06:10:11 simonb Exp $
+$NetBSD: md5,v 1.6 2001/04/13 06:20:23 simonb Exp $
 
-MD5 (mad-0.12.5b.tar.gz) = b156bec0dc7d134bf1a5acdb4216a36d
+SHA1 (mad-0.13.0b.tar.gz) = f0f64ee35e9ed013b78b7903d752ac5d57d6011c
diff --git a/audio/madplay/files/patch-sum b/audio/madplay/files/patch-sum
index b8d93010691..a2e552c3879 100644
--- a/audio/madplay/files/patch-sum
+++ b/audio/madplay/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.8 2001/03/25 12:51:24 simonb Exp $
+$NetBSD: patch-sum,v 1.9 2001/04/13 06:20:23 simonb Exp $
 
 SHA1 (patch-aa) = 3bf70a97e7adbc7cffd457bb93bfdd68b94aeeeb
-SHA1 (patch-ab) = 355989db69d90d277dfcb938f4706901f4ae0685
diff --git a/audio/madplay/patches/patch-ab b/audio/madplay/patches/patch-ab
deleted file mode 100644
index 2a58d44c675..00000000000
--- a/audio/madplay/patches/patch-ab
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2001/03/25 12:51:25 simonb Exp $
-
-This patch should be in the next madplay release and can be
-deleted then - simonb (20010325).
-
---- libmad/imdct_l_arm.S.orig	Mon Sep 25 04:49:38 2000
-+++ libmad/imdct_l_arm.S	Sun Mar 25 19:02:43 2001
-@@ -1,5 +1,5 @@
- /*****************************************************************************
--* Copyright (C) 2000 Andre McCurdy  <armccurdy@yahoo.co.uk>
-+* Copyright (C) 2000-2001 Andre McCurdy  <armccurdy@yahoo.co.uk>
- *
- * This program is free software. you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -26,4 +26,7 @@
- *
-+* 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
-+*   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
-+*
- * 2000/09/20:  Robert Leslie <rob@mars.org>
- *   - Added a global symbol with leading underscore per suggestion of
- *     Simon Burge to support linking with the a.out format.
-@@ -465,7 +468,7 @@
- 
-     @----
- 
--    ldr     r2, =imdct36_long_karray    @ base address of Knn array
-+    add     r2, pc, #(imdct36_long_karray-.-8)  @ r2 = base address of Knn array (PIC safe ?)
- 
- 
- loop:
-@@ -515,12 +518,29 @@
- 
-     movs    r8, r8, lsl #8              @ push result location index off the top end
-     beq     loop                        @ loop back if completion flag not set
-+    b       imdct_l_windowing           @ branch to windowing stage if looping finished
-+
-+imdct36_long_karray:
-+
-+    .word   K17, -K13,  K10, -K06, -K05,  K01, -K00,  K04, -K07,  K11,  K12, -K16, 0x00000000
-+    .word   K13,  K07,  K16,  K01,  K10, -K05,  K04, -K11,  K00, -K17,  K06, -K12, 0x00200800
-+    .word   K11,  K17,  K05,  K12, -K01,  K06, -K07,  K00, -K13,  K04, -K16,  K10, 0x00200c00
-+    .word   K07,  K00, -K12,  K05, -K16, -K10,  K11, -K17,  K04,  K13,  K01,  K06, 0x00001400
-+    .word   K05,  K10, -K00, -K17,  K07, -K13,  K12,  K06, -K16,  K01, -K11, -K04, 0x00181800
-+    .word   K01,  K05, -K07, -K11,  K13,  K17, -K16, -K12,  K10,  K06, -K04, -K00, 0x00102000
-+    .word  -K16,  K12, -K11,  K07,  K04, -K00, -K01,  K05, -K06,  K10,  K13, -K17, 0x00284800
-+    .word  -K12,  K06,  K17, -K00, -K11,  K04,  K05, -K10,  K01,  K16, -K07, -K13, 0x00085000
-+    .word  -K10,  K16,  K04, -K13, -K00,  K07,  K06, -K01, -K12, -K05,  K17,  K11, 0x00105400
-+    .word  -K06, -K01,  K13,  K04,  K17, -K11, -K10, -K16, -K05,  K12,  K00,  K07, 0x00185c00
-+    .word  -K04, -K11, -K01,  K16,  K06,  K12,  K13, -K07, -K17, -K00, -K10, -K05, 0x00006000
-+    .word  -K00, -K04, -K06, -K10, -K12, -K16, -K17, -K13, -K11, -K07, -K05, -K01, 0x00206801
- 
- 
-     @----
-     @-------------------------------------------------------------------------
-     @----
- 
-+imdct_l_windowing:
- 
-     ldr     r11, [sp, #80]              @ fetch function parameter 3 from out of the stack
-     ldmia   r1!, { r0, r2 - r9 }        @ load 9 words from x0, update pointer
-@@ -973,24 +993,6 @@
- 
-     add     sp, sp, #(21*4)             @ return stack frame
-     ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
--
--    @----
--
--
--imdct36_long_karray:
--
--    .word   K17, -K13,  K10, -K06, -K05,  K01, -K00,  K04, -K07,  K11,  K12, -K16, 0x00000000
--    .word   K13,  K07,  K16,  K01,  K10, -K05,  K04, -K11,  K00, -K17,  K06, -K12, 0x00200800
--    .word   K11,  K17,  K05,  K12, -K01,  K06, -K07,  K00, -K13,  K04, -K16,  K10, 0x00200c00
--    .word   K07,  K00, -K12,  K05, -K16, -K10,  K11, -K17,  K04,  K13,  K01,  K06, 0x00001400
--    .word   K05,  K10, -K00, -K17,  K07, -K13,  K12,  K06, -K16,  K01, -K11, -K04, 0x00181800
--    .word   K01,  K05, -K07, -K11,  K13,  K17, -K16, -K12,  K10,  K06, -K04, -K00, 0x00102000
--    .word  -K16,  K12, -K11,  K07,  K04, -K00, -K01,  K05, -K06,  K10,  K13, -K17, 0x00284800
--    .word  -K12,  K06,  K17, -K00, -K11,  K04,  K05, -K10,  K01,  K16, -K07, -K13, 0x00085000
--    .word  -K10,  K16,  K04, -K13, -K00,  K07,  K06, -K01, -K12, -K05,  K17,  K11, 0x00105400
--    .word  -K06, -K01,  K13,  K04,  K17, -K11, -K10, -K16, -K05,  K12,  K00,  K07, 0x00185c00
--    .word  -K04, -K11, -K01,  K16,  K06,  K12,  K13, -K07, -K17, -K00, -K10, -K05, 0x00006000
--    .word  -K00, -K04, -K06, -K10, -K12, -K16, -K17, -K13, -K11, -K07, -K05, -K01, 0x00206801
- 
-     @----
-     @END