From a6bdea9a25c3cf4b67218624abd1a07551966bbd Mon Sep 17 00:00:00 2001 From: mrauch Date: Sun, 18 Jan 2004 13:59:25 +0000 Subject: Fix compilation on -current (gcc3 issues). Use the original master tarball, not a copy from somewhere which isn't reachable any longer. --- audio/maplay/Makefile | 7 ++++--- audio/maplay/distinfo | 14 +++++++------- audio/maplay/patches/patch-ah | 38 ++++++++++++++++++++++++++++++-------- audio/maplay/patches/patch-ak | 17 +++++++++++++---- audio/maplay/patches/patch-al | 36 +++++++++++++++++++++++++++--------- audio/maplay/patches/patch-an | 38 +++++++++++++++++++++++++++++--------- 6 files changed, 110 insertions(+), 40 deletions(-) (limited to 'audio') diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile index e0fc7ea7a04..41db6131f86 100644 --- a/audio/maplay/Makefile +++ b/audio/maplay/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:22:50 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/01/18 13:59:25 mrauch Exp $ # FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp # DISTNAME= maplay1_2 PKGNAME= maplay-1.2 +PKGREVISION= 1 WRKSRC= ${WRKDIR} CATEGORIES= audio -MASTER_SITES= http://www.iuma.com/IUMA/ftp/audio_utils/mpeg_players/Workstations/ -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/misc/maplay1.2/ +EXTRACT_SUFX= .tar MAINTAINER= tech-pkg@NetBSD.org COMMENT= MPEG audio player/decoder for layer I and II MPEG audio streams diff --git a/audio/maplay/distinfo b/audio/maplay/distinfo index 10813b6e83c..7d541146b1d 100644 --- a/audio/maplay/distinfo +++ b/audio/maplay/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/06/27 15:52:11 agc Exp $ +$NetBSD: distinfo,v 1.4 2004/01/18 13:59:25 mrauch Exp $ -SHA1 (maplay1_2.tar.Z) = 9fa65fc8028ce36c039786a517a49707dc4c7158 -Size (maplay1_2.tar.Z) = 95597 bytes +SHA1 (maplay1_2.tar) = faeac51cfbf011956a17721e2077d0ed11f8d8dd +Size (maplay1_2.tar) = 286720 bytes SHA1 (patch-aa) = 12dfda39d9c451b4ba197aab637f234cbd255649 SHA1 (patch-ab) = 92582f6a9b87ca4c61aaf42a1d03349b455997dc SHA1 (patch-ac) = 8f935cc8c3b0a1dd62ae58af67cf6333e522ce28 @@ -9,11 +9,11 @@ SHA1 (patch-ad) = 389c418dac740b6959b441439cc4660ed28daee0 SHA1 (patch-ae) = 4579d1dc9dbae73c0d33f0fc5fe038733640bcef SHA1 (patch-af) = 843b8fad21e2feeee07feb3292a34456f88c639f SHA1 (patch-ag) = 582bec6631acd1478dacc19feba60e4bed9062ab -SHA1 (patch-ah) = 72dad44d543fbdf67d60e5697943e1ba83dc66bf +SHA1 (patch-ah) = fa050751a8d88ad247c024ad20a575a03e67e298 SHA1 (patch-ai) = 2d7cc43f33db4f60549e2be27f388b92c7b0b4a8 SHA1 (patch-aj) = 9b44b0e3b85adfe24419d8fa4dac9253fbf9c36d -SHA1 (patch-ak) = 6ad1edff4dc6b5e7fdd913fd85a63c27a6947941 -SHA1 (patch-al) = 7acf2837506b65a1fe6016bd9a5527588e81d313 +SHA1 (patch-ak) = 3edf1fb29f243eb5e0507f57fee2e200e9214045 +SHA1 (patch-al) = a59b2f93c01dd9ca83ebd655b63ce0b8327eaa3c SHA1 (patch-am) = f517221b15e69e20af1a3868e04870448490a841 -SHA1 (patch-an) = 95b414c0a48fc941ac6a9baba9bc1eb6c0917083 +SHA1 (patch-an) = 392078e383d68c290c049e9524904ee6b2010a93 SHA1 (patch-ao) = 742110dd6e021f86cca5f57634c78d19dd08fb9f diff --git a/audio/maplay/patches/patch-ah b/audio/maplay/patches/patch-ah index 4bbf4978a40..8dc89c3ca30 100644 --- a/audio/maplay/patches/patch-ah +++ b/audio/maplay/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ +$NetBSD: patch-ah,v 1.2 2004/01/18 13:59:25 mrauch Exp $ ---- maplay.cc 2002/06/27 15:41:04 1.1 -+++ maplay.cc 2002/06/27 15:41:40 +--- maplay.cc.orig 1994-06-23 14:14:36.000000000 +0200 ++++ maplay.cc @@ -54,14 +54,14 @@ // data extracted from commandline arguments: @@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ static real scalefactor; // data extracted from header of first frame: -@@ -93,7 +93,7 @@ +@@ -93,7 +93,7 @@ static void Exit (int returncode) main (int argc, char *argv[]) { int i; @@ -31,7 +31,7 @@ $NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ if (argc < 2 || !strncmp (argv[1], "-h", 2)) { -@@ -146,6 +146,9 @@ +@@ -146,6 +146,9 @@ usage: #ifdef Solaris "SPARC Solaris 2.x" #else @@ -41,7 +41,7 @@ $NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ #ifdef LINUX "Linux" #else -@@ -159,6 +162,7 @@ +@@ -159,6 +162,7 @@ usage: #endif #endif #endif @@ -49,7 +49,29 @@ $NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ " version)\n" "@(#) Copyright (C) 1993, 1994 Tobias Bading (bading@cs.tu-berlin.de)\n" "@(#) Berlin University of Technology\n" -@@ -319,6 +323,17 @@ +@@ -180,10 +184,10 @@ usage: + stdout_mode = True; + break; + case 'l': +- which_channels = left; ++ which_channels = maplay_left; + break; + case 'r': +- which_channels = right; ++ which_channels = maplay_right; + break; + #ifdef SPARC + case 'u': +@@ -250,7 +254,7 @@ usage: + // get info from header of first frame: + layer = header->layer (); + if ((mode = header->mode ()) == single_channel) +- which_channels = left; ++ which_channels = maplay_left; + sample_frequency = header->sample_frequency (); + + // create filter(s): +@@ -319,6 +323,17 @@ usage: Exit (0); } #else @@ -67,7 +89,7 @@ $NetBSD: patch-ah,v 1.1 2002/06/27 15:52:18 agc Exp $ //#ifdef your_machine // { // if (mode == single_channel || which_channels != both) -@@ -333,6 +348,7 @@ +@@ -333,6 +348,7 @@ usage: Exit (0); } //#endif // !your_machine diff --git a/audio/maplay/patches/patch-ak b/audio/maplay/patches/patch-ak index 10497f8826d..2893a8ce579 100644 --- a/audio/maplay/patches/patch-ak +++ b/audio/maplay/patches/patch-ak @@ -1,8 +1,17 @@ -$NetBSD: patch-ak,v 1.1 2002/06/27 15:52:20 agc Exp $ +$NetBSD: patch-ak,v 1.2 2004/01/18 13:59:25 mrauch Exp $ ---- subband.h 2002/06/27 15:41:04 1.1 -+++ subband.h 2002/06/27 15:41:40 -@@ -35,8 +35,8 @@ +--- subband.h.orig 1994-06-23 14:14:40.000000000 +0200 ++++ subband.h +@@ -27,7 +27,7 @@ + #include "synthesis_filter.h" + #include "crc.h" + +-enum e_channels { both, left, right }; ++enum e_channels { both, maplay_left, maplay_right }; + + // abstract base class for subband classes of layer I and II: + class Subband +@@ -35,8 +35,8 @@ class Subband public: virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; virtual void read_scalefactor (Ibitstream *, Header *) = 0; diff --git a/audio/maplay/patches/patch-al b/audio/maplay/patches/patch-al index efa9324de16..34f2afa2e46 100644 --- a/audio/maplay/patches/patch-al +++ b/audio/maplay/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ +$NetBSD: patch-al,v 1.2 2004/01/18 13:59:25 mrauch Exp $ ---- subband_layer_1.cc 2002/06/27 15:41:04 1.1 -+++ subband_layer_1.cc 2002/06/27 15:41:40 -@@ -86,7 +86,7 @@ +--- subband_layer_1.cc.orig 1994-06-23 14:14:36.000000000 +0200 ++++ subband_layer_1.cc +@@ -86,7 +86,7 @@ void SubbandLayer1::read_scalefactor (Ib } @@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ { if (allocation) { -@@ -105,7 +105,7 @@ +@@ -105,10 +105,10 @@ bool SubbandLayer1::read_sampledata (Ibi } @@ -19,8 +19,12 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ +boolean SubbandLayer1::put_next_sample (e_channels channels, SynthesisFilter *filter1, SynthesisFilter *) { - if (allocation && channels != right) -@@ -142,7 +142,7 @@ +- if (allocation && channels != right) ++ if (allocation && channels != maplay_right) + { + register real scaled_sample = (sample * factor + offset) * scalefactor; + #ifdef DEBUG +@@ -142,7 +142,7 @@ void SubbandLayer1IntensityStereo::read_ } @@ -29,7 +33,16 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *filter2) { if (allocation) -@@ -231,9 +231,9 @@ +@@ -160,7 +160,7 @@ bool SubbandLayer1IntensityStereo::put_n + filter1->input_sample (sample1, subbandnumber); + filter2->input_sample (sample2, subbandnumber); + } +- else if (channels == left) ++ else if (channels == maplay_left) + { + register real sample1 = sample * scalefactor; + #ifdef DEBUG +@@ -231,9 +231,9 @@ void SubbandLayer1Stereo::read_scalefact } @@ -41,7 +54,7 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ if (channel2_allocation) { channel2_sample = real (stream->get_bits (channel2_samplelength)); -@@ -246,7 +246,7 @@ +@@ -246,11 +246,11 @@ bool SubbandLayer1Stereo::read_sampledat } @@ -50,3 +63,8 @@ $NetBSD: patch-al,v 1.1 2002/06/27 15:52:21 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *filter2) { SubbandLayer1::put_next_sample (channels, filter1, filter2); +- if (channel2_allocation && channels != left) ++ if (channel2_allocation && channels != maplay_left) + { + register float sample2 = (channel2_sample * channel2_factor + channel2_offset) * + channel2_scalefactor; diff --git a/audio/maplay/patches/patch-an b/audio/maplay/patches/patch-an index c5f81c53400..f280c7a7911 100644 --- a/audio/maplay/patches/patch-an +++ b/audio/maplay/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ +$NetBSD: patch-an,v 1.2 2004/01/18 13:59:25 mrauch Exp $ ---- subband_layer_2.cc 2002/06/27 15:41:04 1.1 -+++ subband_layer_2.cc 2002/06/27 15:41:40 -@@ -591,7 +591,7 @@ +--- subband_layer_2.cc.orig 1994-06-23 14:14:36.000000000 +0200 ++++ subband_layer_2.cc +@@ -591,7 +591,7 @@ void SubbandLayer2::read_scalefactor (Ib } @@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ { if (allocation) if (groupingtable) -@@ -633,7 +633,7 @@ +@@ -633,7 +633,7 @@ bool SubbandLayer2::read_sampledata (Ibi } @@ -20,7 +20,16 @@ $NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *) { #ifdef DEBUG -@@ -726,7 +726,7 @@ +@@ -644,7 +644,7 @@ bool SubbandLayer2::put_next_sample (e_c + exit (1); + } + #endif +- if (allocation && channels != right) ++ if (allocation && channels != maplay_right) + { + register real sample = samples[samplenumber]; + +@@ -726,7 +726,7 @@ void SubbandLayer2IntensityStereo::read_ } @@ -29,7 +38,16 @@ $NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *filter2) { #ifdef DEBUG -@@ -880,9 +880,9 @@ +@@ -769,7 +769,7 @@ bool SubbandLayer2IntensityStereo::put_n + filter1->input_sample (sample, subbandnumber); + filter2->input_sample (sample2, subbandnumber); + } +- else if (channels == left) ++ else if (channels == maplay_left) + { + if (groupnumber <= 4) + sample *= scalefactor1; +@@ -880,9 +880,9 @@ void SubbandLayer2Stereo::read_scalefact } @@ -41,7 +59,7 @@ $NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ if (channel2_allocation) if (channel2_groupingtable) -@@ -919,10 +919,10 @@ +@@ -919,11 +919,11 @@ bool SubbandLayer2Stereo::read_sampledat } @@ -50,7 +68,9 @@ $NetBSD: patch-an,v 1.1 2002/06/27 15:52:23 agc Exp $ SynthesisFilter *filter1, SynthesisFilter *filter2) { - bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); +- if (channel2_allocation && channels != left) + boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); - if (channel2_allocation && channels != left) ++ if (channel2_allocation && channels != maplay_left) { register real sample = channel2_samples[samplenumber - 1]; + -- cgit v1.2.3