head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.5.0.62 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.60 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.58 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.56 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.54 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.52 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.50 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.48 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.46 pkgsrc-2008Q1:1.5.0.44 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.42 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.40 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.38 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.36 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.34 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.32 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.30 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.28 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.26 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.24 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.22 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.20 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.18 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.16 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.14 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.12 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.10 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.5 netbsd-1-4-RELEASE:1.2; locks; strict; comment @# @; 1.6 date 2010.03.14.14.19.19; author martin; state dead; branches; next 1.5; 1.5 date 99.10.12.04.43.13; author simonb; state Exp; branches; next 1.4; 1.4 date 99.06.28.00.35.33; author thorpej; state dead; branches; next 1.3; 1.3 date 99.05.16.11.00.16; author simonb; state Exp; branches; next 1.2; 1.2 date 99.02.18.17.43.32; author is; state Exp; branches; next 1.1; 1.1 date 99.02.15.23.57.49; author is; state Exp; branches; next ; desc @@ 1.6 log @Update mpg123 to version 1.10.1. Thanks to for answering lots of stupid questions and general guidance. @ text @$NetBSD: patch-ae,v 1.5 1999/10/12 04:43:13 simonb Exp $ --- dct64_i486.c.orig Thu Nov 19 21:42:36 1998 +++ dct64_i486.c Mon Aug 16 01:49:16 1999 @@@@ -47,7 +47,11 @@@@ #define SETOUT(out,n,expr) out[FIR_BUFFER_SIZE*(n)]=(expr) #define MUL(a,b) (((a)*(b)) >> 15) #define MULL(a,b) (((long long)(a)*(long long)(b)) >> 15) +#ifdef REAL_IS_FIXED +#define TOINT(a) ((a) * 32768 / (int)REAL_FACTOR) +#else #define TOINT(a) ((int)((a)*32768.0)) +#endif void dct64_1_486(int *out0,int *out1,int *b1,int *b2) { @ 1.5 log @Add fixed-point support used by the arm32. XXX: Uses strongarm C-compiler options to use 32x32=64 int multiply. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Make this build on i386/ELF systems. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 1999/05/16 11:00:16 simonb Exp $ d3 11 a13 30 --- Makefile.mid Thu Feb 18 18:37:11 1999 +++ Makefile Thu Feb 18 18:37:48 1999 @@@@ -33,6 +33,7 @@@@ @@echo "make os2 IBM OS/2" @@echo "make netbsd NetBSD" @@echo "make netbsd-i386 NetBSD optimized for i386" + @@echo "make netbsd-m68k NetBSD optimized for m68k" @@echo "make bsdos BSDI BSD/OS" @@echo "make generic try this one if your system isn't listed above" @@echo "" @@@@ -226,6 +227,22 @@@@ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ -DREAD_MMAP -DNETBSD' \ mpg123-make +netbsd-profile: + $(MAKE) CC=cc LDFLAGS='-pg -static'\ + OBJECTS='decode.o dct64.o audio_sun.o' \ + CFLAGS='-Wall -ansi -pedantic -O3 -pg \ + -funroll-all-loops -ffast-math \ + -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD -DM68K_ASSEM' \ + mpg123-make + +netbsd-m68k: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o' \ + CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM' \ + mpg123-make + d15 2 a16 2 bsdos: $(MAKE) CC=shlicc2 LDFLAGS= \ @ 1.3 log @Remove trailing space after a \ continuation so that it actually works. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 1999/02/18 17:43:32 is Exp $ @ 1.2 log @Fix the patch (was corrupt). @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +netbsd-profile: d20 1 a20 1 + CFLAGS='-Wall -ansi -pedantic -O3 -pg \ @ 1.1 log @Use the inlined bfextu opcode for get1bit() on m68k. Makes mp3 decoding about 6% faster, which gives us a bit more of safety margin on the MC68060 at 50 MHz. @ text @d1 4 a4 3 diff -ur ../../work/mpg123-0.59o/Makefile ./Makefile --- ../../work/mpg123-0.59o/Makefile Mon Feb 15 13:29:13 1999 +++ ./Makefile Mon Feb 15 13:36:44 1999 d13 5 a17 7 @@@@ -215,6 +216,22 @@@@ CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ -funroll-all-loops -ffast-math \ -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + mpg123-make + +netbsd-profile: d20 1 a20 1 + CFLAGS='-Wall -ansi -pedantic -O3 -pg \ d24 1 a24 1 + d31 2 a32 84 mpg123-make netbsd-i386: diff -ur ../../work/mpg123-0.59o/common.c ./common.c --- ../../work/mpg123-0.59o/common.c Wed Feb 11 22:36:25 1998 +++ ./common.c Sun Feb 14 13:49:42 1999 @@@@ -31,7 +31,7 @@@@ long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 }; -#ifdef I386_ASSEM +#if defined(I386_ASSEM) || defined(M68K_ASSEM) int bitindex; unsigned char *wordpointer; #else @@@@ -1040,6 +1040,7 @@@@ return rval; } +#ifndef M68K_ASSEM #ifdef _gcc_ inline #endif @@@@ -1068,9 +1069,14 @@@@ return rval>>7; } #endif +#endif void set_pointer(long backstep) { +#if defined(M68K_ASSEM) + wordpointer += (bitindex >> 3); + bitindex &= 7; +#endif wordpointer = bsbuf + ssize - backstep; if (backstep) memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep); diff -ur ../../work/mpg123-0.59o/get1bit.h ./get1bit.h --- ../../work/mpg123-0.59o/get1bit.h Sun Jul 13 00:12:03 1997 +++ ./get1bit.h Sun Feb 14 15:45:00 1999 @@@@ -25,4 +25,18 @@@@ #endif +#ifdef M68K_ASSEM +static __inline__ int get1bit(void) { + extern int bitindex; + extern unsigned char *wordpointer; + int ret; + __asm__ __volatile__ ("| XXX is:\n\t" + "bfextu %2@@{%1:#1},%0" + : "=d" (ret) + : "d" (bitindex), "a" (wordpointer) + : "memory" ); + bitindex += 1; + return ret; +} +#endif diff -ur ../../work/mpg123-0.59o/layer3.c ./layer3.c --- ../../work/mpg123-0.59o/layer3.c Sun Feb 8 19:46:56 1998 +++ ./layer3.c Sun Feb 14 13:35:53 1999 @@@@ -16,7 +16,7 @@@@ #include "mpg123.h" #include "huffman.h" -#if 0 +#if defined(M68K_ASSEM) #include "get1bit.h" #endif diff -ur ../../work/mpg123-0.59o/mpg123.h ./mpg123.h --- ../../work/mpg123-0.59o/mpg123.h Wed Feb 11 21:44:32 1998 +++ ./mpg123.h Sun Feb 14 13:36:43 1999 @@@@ -184,7 +184,9 @@@@ extern int split_dir_file(const char *path, char **dname, char **fname); +#ifndef M68K_ASSEM extern unsigned int get1bit(void); +#endif extern unsigned int getbits(int); extern unsigned int getbits_fast(int); d34 2 @