Date: Sun, 27 Jul 2014 13:35:15 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363063 - in head/audio/maplay: . files Message-ID: <201407271335.s6RDZFVk011268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Jul 27 13:35:15 2014 New Revision: 363063 URL: http://svnweb.freebsd.org/changeset/ports/363063 QAT: https://qat.redports.org/buildarchive/r363063/ Log: Fix build and clean up, mostly by renaming patches. Interestingly, the build failure and one of the sed commands in the post-patch target were both due to problems introduced by one of the patches. Added: head/audio/maplay/files/patch-Makefile - copied unchanged from r363060, head/audio/maplay/files/patch-ab head/audio/maplay/files/patch-all.h - copied unchanged from r363060, head/audio/maplay/files/patch-ap head/audio/maplay/files/patch-configuration.sh - copied, changed from r363060, head/audio/maplay/files/patch-ad head/audio/maplay/files/patch-header.h - copied unchanged from r363060, head/audio/maplay/files/patch-af head/audio/maplay/files/patch-ibitstream.h - copied unchanged from r363060, head/audio/maplay/files/patch-ah head/audio/maplay/files/patch-subband.h - copied unchanged from r363060, head/audio/maplay/files/patch-ak head/audio/maplay/files/patch-subband_layer_1.h - copied unchanged from r363060, head/audio/maplay/files/patch-am head/audio/maplay/files/patch-subband_layer_2.cc - copied unchanged from r363060, head/audio/maplay/files/patch-an head/audio/maplay/files/patch-subband_layer_2.h - copied unchanged from r363060, head/audio/maplay/files/patch-ao Deleted: head/audio/maplay/files/patch-ab head/audio/maplay/files/patch-ad head/audio/maplay/files/patch-af head/audio/maplay/files/patch-ah head/audio/maplay/files/patch-ak head/audio/maplay/files/patch-am head/audio/maplay/files/patch-an head/audio/maplay/files/patch-ao head/audio/maplay/files/patch-ap Modified: head/audio/maplay/Makefile head/audio/maplay/files/patch-maplay.cc Modified: head/audio/maplay/Makefile ============================================================================== --- head/audio/maplay/Makefile Sun Jul 27 13:28:48 2014 (r363062) +++ head/audio/maplay/Makefile Sun Jul 27 13:35:15 2014 (r363063) @@ -6,7 +6,6 @@ PORTVERSION= 1.2 CATEGORIES= audio MASTER_SITES= ftp://ftp.tnt.uni-hannover.de/pub/MPEG/audio/other-servers/Maplay-Mirror/ DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/} -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= MPEG audio player/decoder decoding layer I and II MPEG audio streams @@ -14,20 +13,16 @@ COMMENT= MPEG audio player/decoder decod LICENSE= GPLv2 NO_WRKSUBDIR= yes +USES= tar:Z PLIST_FILES= bin/maplay PORTDOCS= README OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's,^main,int main,g' ${WRKSRC}/maplay.cc - @${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \ - ${WRKSRC}/configuration.sh - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/maplay ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Copied: head/audio/maplay/files/patch-Makefile (from r363060, head/audio/maplay/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-Makefile Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-ab) @@ -0,0 +1,47 @@ +*** Makefile.orig Thu Jun 23 21:14:46 1994 +--- Makefile Thu Dec 9 06:09:27 1999 +*************** +*** 27,33 **** + # + + +! CFLAGS = $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling +--- 27,33 ---- + # + + +! CFLAGS += $(COMPILERFLAGS) + # debugging: -ggdb -DDEBUG + # profiling: -pg (gprof) or -p (prof) + # strip command has to be removed for debugging or profiling +*************** +*** 39,52 **** + + .SUFFIXES: .cc + +! install: + @./configuration.sh + +- all: maplay +- + maplay: $(OBJS) + $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm +- -strip $@ + + .cc.o: + $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ +--- 39,49 ---- + + .SUFFIXES: .cc + +! all: + @./configuration.sh + + maplay: $(OBJS) + $(COMPILER) $(CFLAGS) $(OBJS) -o $@ $(LIBRARIES) -lm + + .cc.o: + $(COMPILER) -c $(CFLAGS) $(INCLUDEDIRS) $*.cc -o $@ Copied: head/audio/maplay/files/patch-all.h (from r363060, head/audio/maplay/files/patch-ap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-all.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-ap) @@ -0,0 +1,19 @@ +*** all.h.orig Thu Jun 23 21:14:39 1994 +--- all.h Thu Dec 9 05:32:18 1999 +*************** +*** 22,28 **** + #define ALL_H + + typedef float real; // float should be enough +! typedef short bool; + typedef unsigned uint32; // 32 Bit unsigned integer + // some compilers may need "typedef unsigned long uint32" instead + typedef int int32; // 32 Bit signed integer +--- 22,28 ---- + #define ALL_H + + typedef float real; // float should be enough +! typedef short boolean; + typedef unsigned uint32; // 32 Bit unsigned integer + // some compilers may need "typedef unsigned long uint32" instead + typedef int int32; // 32 Bit signed integer Copied and modified: head/audio/maplay/files/patch-configuration.sh (from r363060, head/audio/maplay/files/patch-ad) ============================================================================== --- head/audio/maplay/files/patch-ad Sun Jul 27 13:04:21 2014 (r363060, copy source) +++ head/audio/maplay/files/patch-configuration.sh Sun Jul 27 13:35:15 2014 (r363063) @@ -9,13 +9,13 @@ + FreeBSD*) + COMPILER='${CXX}' + if [ ${ARCH} = "i386" ]; then -+ COMPILERFLAGS='-m486 -DLINUX -DDAMN_INTEL_BYTE_ORDER' ++ COMPILERFLAGS='-DLINUX -DDAMN_INTEL_BYTE_ORDER' + else + COMPILERFLAGS='-DLINUX' + fi + INCLUDEDIRS= + LIBRARIES= -+ AUDIO_INCLUDES='#include <machine/soundcard.h>' ;; ++ AUDIO_INCLUDES='#include <sys/soundcard.h>' ;; Linux*) COMPILER=g++ COMPILERFLAGS='-O2 -m486 -funroll-loops -DLINUX -DDAMN_INTEL_BYTE_ORDER' Copied: head/audio/maplay/files/patch-header.h (from r363060, head/audio/maplay/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-header.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-af) @@ -0,0 +1,61 @@ +*** header.h.orig Thu Jun 23 21:14:40 1994 +--- header.h Thu Dec 9 05:45:44 1999 +*************** +*** 39,45 **** + e_mode h_mode; + e_sample_frequency h_sample_frequency; + uint32 h_number_of_subbands, h_intensity_stereo_bound; +! bool h_copyright, h_original; + Crc16 *crc; + uint16 checksum; + +--- 39,45 ---- + e_mode h_mode; + e_sample_frequency h_sample_frequency; + uint32 h_number_of_subbands, h_intensity_stereo_bound; +! boolean h_copyright, h_original; + Crc16 *crc; + uint16 checksum; + +*************** +*** 48,54 **** + public: + Header (void) { crc = (Crc16 *)0; } + ~Header (void) { if (crc) delete crc; } +! bool read_header (Ibitstream *, Crc16 **); + // read a 32-bit header from the bitstream + + // functions to query header contents: +--- 48,54 ---- + public: + Header (void) { crc = (Crc16 *)0; } + ~Header (void) { if (crc) delete crc; } +! boolean read_header (Ibitstream *, Crc16 **); + // read a 32-bit header from the bitstream + + // functions to query header contents: +*************** +*** 58,68 **** + uint32 frequency (void) { return frequencies[h_sample_frequency]; } + static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } + e_mode mode (void) { return h_mode; }; +! bool checksums (void) { return !h_protection_bit; } +! bool copyright (void) { return h_copyright; } +! bool original (void) { return h_original; } + +! bool checksum_ok (void) { return checksum == crc->checksum (); } + // compares computed checksum with stream checksum + + // functions which return header informations as strings: +--- 58,68 ---- + uint32 frequency (void) { return frequencies[h_sample_frequency]; } + static uint32 frequency (e_sample_frequency rate) { return frequencies[rate]; } + e_mode mode (void) { return h_mode; }; +! boolean checksums (void) { return !h_protection_bit; } +! boolean copyright (void) { return h_copyright; } +! boolean original (void) { return h_original; } + +! boolean checksum_ok (void) { return checksum == crc->checksum (); } + // compares computed checksum with stream checksum + + // functions which return header informations as strings: Copied: head/audio/maplay/files/patch-ibitstream.h (from r363060, head/audio/maplay/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-ibitstream.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-ah) @@ -0,0 +1,25 @@ +*** ibitstream.h.orig Thu Jun 23 21:14:40 1994 +--- ibitstream.h Thu Dec 9 05:32:18 1999 +*************** +*** 43,52 **** + ~Ibitstream (void); + int filedescriptor (void) { return fd; }; + +! bool get_header (uint32 *); + // get next 32 bits from bitstream in an unsigned int, + // returned value False => end of stream +! bool read_frame (uint32 bytesize); + // fill buffer with data from bitstream, returned value False => end of stream + uint32 get_bits (uint32 number_of_bits); + // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits +--- 43,52 ---- + ~Ibitstream (void); + int filedescriptor (void) { return fd; }; + +! boolean get_header (uint32 *); + // get next 32 bits from bitstream in an unsigned int, + // returned value False => end of stream +! boolean read_frame (uint32 bytesize); + // fill buffer with data from bitstream, returned value False => end of stream + uint32 get_bits (uint32 number_of_bits); + // read bits (1 <= number_of_bits <= 16) from buffer into the lower bits Modified: head/audio/maplay/files/patch-maplay.cc ============================================================================== --- head/audio/maplay/files/patch-maplay.cc Sun Jul 27 13:28:48 2014 (r363062) +++ head/audio/maplay/files/patch-maplay.cc Sun Jul 27 13:35:15 2014 (r363063) @@ -1,5 +1,5 @@ ---- maplay.cc.orig Thu Jun 23 22:14:36 1994 -+++ maplay.cc Thu Nov 21 16:40:21 2002 +--- maplay.cc.orig 1994-06-23 08:14:36.000000000 -0400 ++++ maplay.cc 2014-07-27 09:22:27.000000000 -0400 @@ -39,8 +39,8 @@ #include <stdlib.h> #include <string.h> @@ -34,8 +34,12 @@ static real scalefactor; // data extracted from header of first frame: -@@ -93,12 +92,12 @@ - main (int argc, char *argv[]) +@@ -90,15 +89,15 @@ + } + + +-main (int argc, char *argv[]) ++int main (int argc, char *argv[]) { int i; - bool read_ready = False, write_ready = False; Copied: head/audio/maplay/files/patch-subband.h (from r363060, head/audio/maplay/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-subband.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-ak) @@ -0,0 +1,21 @@ +*** subband.h.orig Thu Jun 23 21:14:40 1994 +--- subband.h Thu Dec 9 05:45:45 1999 +*************** +*** 35,42 **** + public: + virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; + virtual void read_scalefactor (Ibitstream *, Header *) = 0; +! virtual bool read_sampledata (Ibitstream *) = 0; +! virtual bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; + }; + + #endif +--- 35,42 ---- + public: + virtual void read_allocation (Ibitstream *, Header *, Crc16 *) = 0; + virtual void read_scalefactor (Ibitstream *, Header *) = 0; +! virtual boolean read_sampledata (Ibitstream *) = 0; +! virtual boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *) = 0; + }; + + #endif Copied: head/audio/maplay/files/patch-subband_layer_1.h (from r363060, head/audio/maplay/files/patch-am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-subband_layer_1.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-am) @@ -0,0 +1,65 @@ +*** subband_layer_1.h.orig Thu Jun 23 21:14:40 1994 +--- subband_layer_1.h Thu Dec 9 05:32:19 1999 +*************** +*** 42,49 **** + SubbandLayer1 (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +--- 42,49 ---- + SubbandLayer1 (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +*************** +*** 60,70 **** + SubbandLayer1::read_allocation (stream, header, crc); + } + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *stream) + { + return SubbandLayer1::read_sampledata (stream); + } +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +--- 60,70 ---- + SubbandLayer1::read_allocation (stream, header, crc); + } + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer1::read_sampledata (stream); + } +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +*************** +*** 82,89 **** + SubbandLayer1Stereo (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif +--- 82,89 ---- + SubbandLayer1Stereo (uint32 subbandnumber); + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif Copied: head/audio/maplay/files/patch-subband_layer_2.cc (from r363060, head/audio/maplay/files/patch-an) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-subband_layer_2.cc Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-an) @@ -0,0 +1,97 @@ +*** subband_layer_2.cc.orig Thu Jun 23 21:14:36 1994 +--- subband_layer_2.cc Thu Dec 9 05:32:19 1999 +*************** +*** 591,597 **** + } + + +! bool SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +--- 591,597 ---- + } + + +! boolean SubbandLayer2::read_sampledata (Ibitstream *stream) + { + if (allocation) + if (groupingtable) +*************** +*** 633,639 **** + } + + +! bool SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +--- 633,639 ---- + } + + +! boolean SubbandLayer2::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *) + { + #ifdef DEBUG +*************** +*** 726,732 **** + } + + +! bool SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +--- 726,732 ---- + } + + +! boolean SubbandLayer2IntensityStereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { + #ifdef DEBUG +*************** +*** 880,888 **** + } + + +! bool SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +! bool returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +--- 880,888 ---- + } + + +! boolean SubbandLayer2Stereo::read_sampledata (Ibitstream *stream) + { +! boolean returnvalue = SubbandLayer2::read_sampledata (stream); + + if (channel2_allocation) + if (channel2_groupingtable) +*************** +*** 919,928 **** + } + + +! bool SubbandLayer2Stereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { +! bool returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); + if (channel2_allocation && channels != left) + { + register real sample = channel2_samples[samplenumber - 1]; +--- 919,928 ---- + } + + +! boolean SubbandLayer2Stereo::put_next_sample (e_channels channels, + SynthesisFilter *filter1, SynthesisFilter *filter2) + { +! boolean returnvalue = SubbandLayer2::put_next_sample (channels, filter1, filter2); + if (channel2_allocation && channels != left) + { + register real sample = channel2_samples[samplenumber - 1]; Copied: head/audio/maplay/files/patch-subband_layer_2.h (from r363060, head/audio/maplay/files/patch-ao) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/maplay/files/patch-subband_layer_2.h Sun Jul 27 13:35:15 2014 (r363063, copy of r363060, head/audio/maplay/files/patch-ao) @@ -0,0 +1,82 @@ +*** subband_layer_2.h.orig Thu Jun 23 21:14:40 1994 +--- subband_layer_2.h Thu Dec 9 05:32:19 1999 +*************** +*** 55,62 **** + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +--- 55,62 ---- + void read_allocation (Ibitstream *, Header *, Crc16 *); + virtual void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter * = NULL); + }; + + +*************** +*** 75,85 **** + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +--- 75,85 ---- + } + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *stream) + { + return SubbandLayer2::read_sampledata (stream); + } +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + +*************** +*** 90,96 **** + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +! bool channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +--- 90,96 ---- + uint32 channel2_allocation; + uint32 channel2_scfsi; + real channel2_scalefactor1, channel2_scalefactor2, channel2_scalefactor3; +! boolean channel2_grouping; + uint32 channel2_codelength; + const real *channel2_groupingtable; + real channel2_factor; +*************** +*** 102,109 **** + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! bool read_sampledata (Ibitstream *); +! bool put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif +--- 102,109 ---- + void read_allocation (Ibitstream *, Header *, Crc16 *); + void read_scalefactor_selection (Ibitstream *, Crc16 *); + void read_scalefactor (Ibitstream *, Header *); +! boolean read_sampledata (Ibitstream *); +! boolean put_next_sample (e_channels, SynthesisFilter *, SynthesisFilter *); + }; + + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407271335.s6RDZFVk011268>