head 1.32; access; symbols pkgsrc-2021Q1:1.31.0.36 pkgsrc-2021Q1-base:1.31 pkgsrc-2020Q4:1.31.0.34 pkgsrc-2020Q4-base:1.31 pkgsrc-2020Q3:1.31.0.32 pkgsrc-2020Q3-base:1.31 pkgsrc-2020Q2:1.31.0.28 pkgsrc-2020Q2-base:1.31 pkgsrc-2020Q1:1.31.0.8 pkgsrc-2020Q1-base:1.31 pkgsrc-2019Q4:1.31.0.30 pkgsrc-2019Q4-base:1.31 pkgsrc-2019Q3:1.31.0.26 pkgsrc-2019Q3-base:1.31 pkgsrc-2019Q2:1.31.0.24 pkgsrc-2019Q2-base:1.31 pkgsrc-2019Q1:1.31.0.22 pkgsrc-2019Q1-base:1.31 pkgsrc-2018Q4:1.31.0.20 pkgsrc-2018Q4-base:1.31 pkgsrc-2018Q3:1.31.0.18 pkgsrc-2018Q3-base:1.31 pkgsrc-2018Q2:1.31.0.16 pkgsrc-2018Q2-base:1.31 pkgsrc-2018Q1:1.31.0.14 pkgsrc-2018Q1-base:1.31 pkgsrc-2017Q4:1.31.0.12 pkgsrc-2017Q4-base:1.31 pkgsrc-2017Q3:1.31.0.10 pkgsrc-2017Q3-base:1.31 pkgsrc-2017Q2:1.31.0.6 pkgsrc-2017Q2-base:1.31 pkgsrc-2017Q1:1.31.0.4 pkgsrc-2017Q1-base:1.31 pkgsrc-2016Q4:1.31.0.2 pkgsrc-2016Q4-base:1.31 pkgsrc-2016Q3:1.30.0.20 pkgsrc-2016Q3-base:1.30 pkgsrc-2016Q2:1.30.0.18 pkgsrc-2016Q2-base:1.30 pkgsrc-2016Q1:1.30.0.16 pkgsrc-2016Q1-base:1.30 pkgsrc-2015Q4:1.30.0.14 pkgsrc-2015Q4-base:1.30 pkgsrc-2015Q3:1.30.0.12 pkgsrc-2015Q3-base:1.30 pkgsrc-2015Q2:1.30.0.10 pkgsrc-2015Q2-base:1.30 pkgsrc-2015Q1:1.30.0.8 pkgsrc-2015Q1-base:1.30 pkgsrc-2014Q4:1.30.0.6 pkgsrc-2014Q4-base:1.30 pkgsrc-2014Q3:1.30.0.4 pkgsrc-2014Q3-base:1.30 pkgsrc-2014Q2:1.30.0.2 pkgsrc-2014Q2-base:1.30 pkgsrc-2014Q1:1.29.0.34 pkgsrc-2014Q1-base:1.29 pkgsrc-2013Q4:1.29.0.32 pkgsrc-2013Q4-base:1.29 pkgsrc-2013Q3:1.29.0.30 pkgsrc-2013Q3-base:1.29 pkgsrc-2013Q2:1.29.0.28 pkgsrc-2013Q2-base:1.29 pkgsrc-2013Q1:1.29.0.26 pkgsrc-2013Q1-base:1.29 pkgsrc-2012Q4:1.29.0.24 pkgsrc-2012Q4-base:1.29 pkgsrc-2012Q3:1.29.0.22 pkgsrc-2012Q3-base:1.29 pkgsrc-2012Q2:1.29.0.20 pkgsrc-2012Q2-base:1.29 pkgsrc-2012Q1:1.29.0.18 pkgsrc-2012Q1-base:1.29 pkgsrc-2011Q4:1.29.0.16 pkgsrc-2011Q4-base:1.29 pkgsrc-2011Q3:1.29.0.14 pkgsrc-2011Q3-base:1.29 pkgsrc-2011Q2:1.29.0.12 pkgsrc-2011Q2-base:1.29 pkgsrc-2011Q1:1.29.0.10 pkgsrc-2011Q1-base:1.29 pkgsrc-2010Q4:1.29.0.8 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.6 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.29.0.4 pkgsrc-2010Q2-base:1.29 pkgsrc-2010Q1:1.29.0.2 pkgsrc-2010Q1-base:1.29 pkgsrc-2009Q4:1.28.0.6 pkgsrc-2009Q4-base:1.28 pkgsrc-2009Q3:1.28.0.4 pkgsrc-2009Q3-base:1.28 pkgsrc-2009Q2:1.28.0.2 pkgsrc-2009Q2-base:1.28 pkgsrc-2009Q1:1.27.0.12 pkgsrc-2009Q1-base:1.27 pkgsrc-2008Q4:1.27.0.10 pkgsrc-2008Q4-base:1.27 pkgsrc-2008Q3:1.27.0.8 pkgsrc-2008Q3-base:1.27 cube-native-xorg:1.27.0.6 cube-native-xorg-base:1.27 pkgsrc-2008Q2:1.27.0.4 pkgsrc-2008Q2-base:1.27 cwrapper:1.27.0.2 pkgsrc-2008Q1:1.26.0.20 pkgsrc-2008Q1-base:1.26 pkgsrc-2007Q4:1.26.0.18 pkgsrc-2007Q4-base:1.26 pkgsrc-2007Q3:1.26.0.16 pkgsrc-2007Q3-base:1.26 pkgsrc-2007Q2:1.26.0.14 pkgsrc-2007Q2-base:1.26 pkgsrc-2007Q1:1.26.0.12 pkgsrc-2007Q1-base:1.26 pkgsrc-2006Q4:1.26.0.10 pkgsrc-2006Q4-base:1.26 pkgsrc-2006Q3:1.26.0.8 pkgsrc-2006Q3-base:1.26 pkgsrc-2006Q2:1.26.0.6 pkgsrc-2006Q2-base:1.26 pkgsrc-2006Q1:1.26.0.4 pkgsrc-2006Q1-base:1.26 pkgsrc-2005Q4:1.26.0.2 pkgsrc-2005Q4-base:1.26 pkgsrc-2005Q3:1.24.0.14 pkgsrc-2005Q3-base:1.24 pkgsrc-2005Q2:1.24.0.12 pkgsrc-2005Q2-base:1.24 pkgsrc-2005Q1:1.24.0.10 pkgsrc-2005Q1-base:1.24 pkgsrc-2004Q4:1.24.0.8 pkgsrc-2004Q4-base:1.24 pkgsrc-2004Q3:1.24.0.6 pkgsrc-2004Q3-base:1.24 pkgsrc-2004Q2:1.24.0.4 pkgsrc-2004Q2-base:1.24 pkgsrc-2004Q1:1.24.0.2 pkgsrc-2004Q1-base:1.24 pkgsrc-2003Q4:1.23.0.4 pkgsrc-2003Q4-base:1.23 netbsd-1-6-1:1.23.0.2 netbsd-1-6-1-base:1.23 netbsd-1-6:1.21.0.6 netbsd-1-6-RELEASE-base:1.21 pkgviews:1.21.0.2 pkgviews-base:1.21 buildlink2:1.17.0.2 buildlink2-base:1.20 netbsd-1-5-PATCH003:1.16 netbsd-1-5-PATCH001:1.15 netbsd-1-5-RELEASE:1.14 netbsd-1-4-PATCH003:1.14 netbsd-1-4-PATCH002:1.13 comdex-fall-1999:1.12 netbsd-1-4-PATCH001:1.11 netbsd-1-4-RELEASE:1.9 netbsd-1-3-PATCH003:1.7 netbsd-1-3-PATCH002:1.5; locks; strict; comment @# @; 1.32 date 2021.05.25.10.44.22; author thor; state dead; branches; next 1.31; commitid NC0jDZEqqBVO7wUC; 1.31 date 2016.12.18.22.58.34; author adam; state Exp; branches; next 1.30; commitid lm2gzQdnR0tEgwyz; 1.30 date 2014.05.20.19.59.09; author adam; state Exp; branches; next 1.29; commitid 2muyseoaSr6pAjBx; 1.29 date 2010.03.14.14.19.19; author martin; state Exp; branches; next 1.28; 1.28 date 2009.05.19.22.16.08; author abs; state Exp; branches; next 1.27; 1.27 date 2008.05.20.18.36.47; author tnn; state Exp; branches; next 1.26; 1.26 date 2005.12.11.21.59.29; author joerg; state Exp; branches; next 1.25; 1.25 date 2005.10.03.15.25.14; author joerg; state Exp; branches; next 1.24; 1.24 date 2004.03.17.04.49.48; author danw; state Exp; branches; next 1.23; 1.23 date 2002.11.28.12.24.07; author markd; state Exp; branches; next 1.22; 1.22 date 2002.09.06.11.51.59; author wiz; state Exp; branches; next 1.21; 1.21 date 2002.06.23.08.45.09; author kent; state Exp; branches; next 1.20; 1.20 date 2002.06.22.19.03.11; author kent; state Exp; branches; next 1.19; 1.19 date 2002.06.22.18.47.30; author kent; state Exp; branches; next 1.18; 1.18 date 2002.06.22.17.56.37; author kent; state Exp; branches; next 1.17; 1.17 date 2002.04.25.16.34.16; author abs; state Exp; branches 1.17.2.1; next 1.16; 1.16 date 2002.02.27.23.22.49; author simonb; state Exp; branches; next 1.15; 1.15 date 2001.02.26.16.30.19; author jlam; state Exp; branches; next 1.14; 1.14 date 2000.03.01.22.03.37; author pooka; state Exp; branches; next 1.13; 1.13 date 2000.02.18.11.04.11; author itojun; state Exp; branches; next 1.12; 1.12 date 99.10.12.04.43.12; author simonb; state Exp; branches; next 1.11; 1.11 date 99.07.10.10.39.03; author tron; state Exp; branches; next 1.10; 1.10 date 99.06.28.00.35.33; author thorpej; state Exp; branches; next 1.9; 1.9 date 99.02.06.12.24.30; author mycroft; state Exp; branches; next 1.8; 1.8 date 98.10.30.03.11.52; author mycroft; state Exp; branches; next 1.7; 1.7 date 98.08.15.10.58.41; author frueauf; state Exp; branches; next 1.6; 1.6 date 98.08.07.10.35.59; author agc; state Exp; branches; next 1.5; 1.5 date 98.03.07.13.55.38; author mycroft; state Exp; branches; next 1.4; 1.4 date 98.02.28.14.59.32; author augustss; state Exp; branches; next 1.3; 1.3 date 98.02.26.20.01.53; author augustss; state Exp; branches; next 1.2; 1.2 date 97.10.31.12.04.56; author mycroft; state Exp; branches; next 1.1; 1.1 date 97.10.29.00.00.02; author augustss; state Exp; branches; next ; 1.17.2.1 date 2002.06.23.18.38.37; author jlam; state Exp; branches; next ; desc @@ 1.32 log @audio/mpg123*: update to 1.27.2, simplify things This updates the mpg123 version and also removes packaging cruft. Among that, a never-working patch for madvise and a very old i586 assembly source are gone. The output modules are now installed without libtool files, just as .so (or .dylib). A future update to 1.28 will probably also get rid of the static libraries (upstream fixed the build to work around pkgsrc's wrapped libtool which ignores the autoconf macros to trigger non-static default build). These are the upstream changes: 1.27.2 ------ (Trying some svn tag discipline: 1.27.1 has been tagged before, but not released. Let's increment for any change.) - Removed ports/Xcode, ports/cmake should handle that case. - Ensure debug.h is included last where it matters to avoid conflicts with debug/warning macros in system headers (bug 308). - Fix some debug/printf integer casts for 32 bit platforms (bug 309). 1.27.0 ------ - libmpg123: -- Running on precomputed tables now, no need to call mpg123_init() anymore. That and mpg123_exit() are both just empty shells. You can omit them if you do not care about earlier libmpg123. You can check for MPG123_API_VERSION >= 46. -- Added API that avoids enums, mapped-to by default unless MPG123_ENUM_API is defined. - libout123: -- Added API that avoids enums, mapped-to by default unless MPG123_ENUM_API is defined. -- Added device enumeration for win32, win32_wasapi, alsa, pulse. This increments the output module ABI version to 3. -- You can choose output devices now on Windows. -- Changed default output module order to put pulse before alsa since we now ensure that pulse is not inadvertedly started by the autospawn feature. This improves the experience on desktop systems with pulse where the alsa to pulse use causes glitches. Note that on a modern Linux desktop (Ubuntu), you will not escape an instance of pulseaudio being started, with even the enumeration of the ALSA default device summoning the daemon. If you _want_ sound daemon autospawn behaviour on other platforms, you need to trigger it outside of libout123. - examples: Update for dropped mpg123_init(), more sensible copyright notes. - out123: -- safer limiting of maximum playback rate -- Added --list-devices. - mpg123: -- Fix --continue output to print track_count+1 as continue position after hitting the end of playlist. Makes scripts/conplay go to back to the beginning again (regression in 1.24.0, bug 250). -- Remote control API version 9 with @@I { .. @@I } wrapping of ID3 and playlist display. -- Added --list-devices. -- Fix console printout on Windows. -- Fix terminal control logic to better handle cases where stdin or stderr is not a terminal, also avoid enabling control if you specify stdin as input file. - Updated debugging/warning/error message macros to include the function name. @ text @$NetBSD: patch-aa,v 1.31 2016/12/18 22:58:34 adam Exp $ Handle modules by pkgsrc. --- configure.orig 2016-09-26 21:21:39.000000000 +0000 +++ configure @@@@ -17124,7 +17124,7 @@@@ fi # The full list of supported modules to check, first come, first serve. -check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy" +check_modules="${MPG123_MODULE}" # Only check qsa before all else on QNX. # It would mask ALSA otherwise. case $host in @ 1.31 log @Changes 1.23.8: - Fix long-standing bad memory read (via integer underflow) in ID3 parser for crafted ID3v2 tags with tiny size information @ text @d1 1 a1 1 $NetBSD$ @ 1.30 log @Changes 1.19.0: - Support float and 32/24 bit integer output also with fixed-point decoders (conversion from 16 bit precision). - A-Law output encoding is actually implemented now (Michael introduced the encoding back in the old days without ever implementing theconversion table, apparently). - Added --with-cpu=arm_fpu as decoder choice for runtime switch between plain fpu code and NEON. - Fix ARM builds to work properly on debian systems without special CFLAGS (NEON decoder, specifically). - Make scripts/benchmark-cpu.pl check the return value instead of delivering crazy timings for crashed mpg123. - Trigger track initialization in mpg123_info() to avoid use of uninitialized variables (watch out for MPG123_NEED_MORE return value!). - Fix integer code to 32 bit numbers where it would waste 64 bit on modern systems. - Add non-executable stack marking also to ARM assembly. @ text @d3 3 a5 1 --- configure.orig 2014-03-08 12:12:59.000000000 +0000 d7 1 a7 1 @@@@ -16363,7 +16363,7 @@@@ fi @ 1.29 log @Update mpg123 to version 1.10.1. Thanks to for answering lots of stupid questions and general guidance. @ text @d3 3 a5 3 --- configure.orig 2009-12-05 21:30:40.000000000 +0100 +++ configure 2010-02-05 23:01:19.000000000 +0100 @@@@ -14622,7 +14622,7 @@@@ d9 5 a13 5 -check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy" +check_modules=${MPG123_MODULE} # The final list. output_modules= @ 1.28 log @+PKG_DESTDIR_SUPPORT @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.27 2008/05/20 18:36:47 tnn Exp $ d3 3 a5 3 --- Makefile.orig 2009-05-19 23:13:41.000000000 +0100 +++ Makefile @@@@ -6,7 +6,7 @@@@ a6 5 PREFIX=/usr/local BINDIR=$(PREFIX)/bin -MANDIR=$(PREFIX)/man +MANDIR=$(PREFIX)/$(PKGMANDIR) SECTION=1 d8 5 a12 28 # Enable the below line If your plathome support IPv6 @@@@ -54,6 +54,23 @@@@ nothing-specified: @@echo "make aix-tk3play IBM AIX" @@echo "make os2 IBM OS/2" @@echo "make netbsd NetBSD" + @@echo "make netbsd-arm NetBSD for strongarm (32bit fixedpoint)" + @@echo "make netbsd-arm-64 NetBSD for strongarm (64bit fixedpoint)" + @@echo "make netbsd-i386 NetBSD optimized for i386" + @@echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format" + @@echo "make netbsd-m68k NetBSD optimized for m68k" + @@echo "make netbsd-esd NetBSD with EsounD" + @@echo "make netbsd-arm-esd NetBSD for strongarm (32bit fixedpoint) with EsounD" + @@echo "make netbsd-arm-64-esd NetBSD for strongarm (64bit fixedpoint) with EsounD" + @@echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD" + @@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD" + @@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD" + @@echo "make netbsd-nas NetBSD with NAS" + @@echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS" + @@echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS" + @@echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS" + @@echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS" + @@echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS" @@echo "make bsdos BSDI BSD/OS" @@echo "make bsdos4 BSDI BSD/OS 4.0" @@echo "make bsdos-nas BSDI BSD/OS with NAS support" @@@@ -300,7 +317,7 @@@@ linux-nas: #CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g' #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2' a13 275 -freebsd: +dragonfly freebsd: $(MAKE) CC=cc LDFLAGS= \ OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ @@@@ -309,11 +326,11 @@@@ freebsd: -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \ mpg123-make -freebsd-esd: +dragonfly-esd freebsd-esd: $(MAKE) CC=cc LDFLAGS= \ - AUDIO_LIB='-lesd -laudiofile' \ + AUDIO_LIB="`esd-config --libs`" \ OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ -funroll-all-loops -ffast-math -DROT_I386 \ -DREAD_MMAP \ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \ @@@@ -321,7 +338,7 @@@@ freebsd-esd: $(CFLAGS)' \ mpg123-make -freebsd-frontend: +dragonfly-frontend freebsd-frontend: $(MAKE) CC=cc LDFLAGS= \ OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \ control_sajber.o control_tk3play.o' \ @@@@ -398,7 +415,7 @@@@ solaris-x86-gcc-oss: solaris-gcc-nas: $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ - AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\ + AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\ OBJECTS='decode.o dct64.o audio_nas.o' \ CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \ -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \ @@@@ -496,18 +513,194 @@@@ os2: netbsd: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode.o dct64.o audio_sun.o' \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ - -funroll-all-loops -ffast-math \ - -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ mpg123-make netbsd-i386: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ + mpg123-make + +netbsd-i386-elf: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \ + mpg123-make + +netbsd-m68k: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \ + mpg123-make + +netbsd-arm: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ + -DNETBSD' \ + mpg123-make + +netbsd-arm-64: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \ + -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \ + -DTERM_CONTROL -DNETBSD' \ + mpg123-make + +netbsd-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + `esd-config --cflags`' \ + mpg123-make + +netbsd-i386-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + `esd-config --cflags`' \ + mpg123-make + +netbsd-i386-elf-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ + `esd-config --cflags`' \ + mpg123-make + +netbsd-m68k-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ + `esd-config --cflags`' \ + mpg123-make + +netbsd-arm-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ + -DNETBSD `esd-config --cflags`' \ + mpg123-make + +netbsd-arm-64-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \ + -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \ + -DTERM_CONTROL -DNETBSD `esd-config --cflags`' \ + mpg123-make + +netbsd-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode.o dct64.o audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + -DNAS' \ + mpg123-make + +dragonfly-nas freebsd-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_nas.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNAS' \ + mpg123-make + +netbsd-i386-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode_i386.o dct64_i386.o audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + -DNAS' \ + mpg123-make + +netbsd-i386-elf-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ + -DNAS' \ + mpg123-make + +netbsd-m68k-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode.o dct64.o audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ + -DNAS' \ + mpg123-make + +netbsd-arm-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode.o dct64.o audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ + -DNETBSD -DNAS' \ + mpg123-make + +netbsd-arm-64-nas: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \ + OBJECTS='decode.o dct64.o audio_nas.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \ + -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \ + -DTERM_CONTROL -DNETBSD -DNAS' \ mpg123-make bsdos: @@@@ -556,6 +749,16 @@@@ generic: CFLAGS='$(CFLAGS) -O -DGENERIC -DNOXFERMEM' \ mpg123-make +darwin-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`esd-config --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL \ + `esd-config --cflags`' \ + mpg123-make + ########################################################################### ########################################################################### ########################################################################### @@@@ -644,12 +847,12 @@@@ system: mpg123.h system.c install: prepared-for-install strip mpg123 if [ -x /usr/ccs/bin/mcs ]; then /usr/ccs/bin/mcs -d mpg123; fi - mkdir -p $(BINDIR) - mkdir -p $(MANDIR)/man$(SECTION) - cp -f mpg123 $(BINDIR) - chmod 755 $(BINDIR)/mpg123 - cp -f mpg123.1 $(MANDIR)/man$(SECTION) - chmod 644 $(MANDIR)/man$(SECTION)/mpg123.1 + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man$(SECTION) + cp -f mpg123 $(DESTDIR)$(BINDIR) + chmod 755 $(DESTDIR)$(BINDIR)/mpg123 + cp -f mpg123.1 $(DESTDIR)$(MANDIR)/man$(SECTION) + chmod 644 $(DESTDIR)$(MANDIR)/man$(SECTION)/mpg123.1 dist: clean DISTNAME="`basename \`pwd\``" ; \ @ 1.27 log @Honour PKGMANDIR @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2008-05-20 20:33:45.000000000 +0200 d298 19 @ 1.26 log @Provide nsd target and fix esd target for FreeBSD and DragonFly. @ text @d3 1 a3 1 --- Makefile.orig 2005-12-11 21:33:57.000000000 +0000 d5 9 d108 1 a108 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d241 2 a242 1 + -funroll-all-loops -ffast-math -DROT_I386 \ @ 1.25 log @Use the FreeBSD rules for DragonFly as well. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.24 2004/03/17 04:49:48 danw Exp $ d3 3 a5 3 --- Makefile.orig 2005-10-03 17:03:06.000000000 +0200 +++ Makefile 2005-10-03 17:03:06.000000000 +0200 @@@@ -54,6 +54,23 @@@@ d29 1 a29 1 @@@@ -300,7 +317,7 @@@@ d38 1 a38 1 @@@@ -309,7 +326,7 @@@@ d45 2 a46 1 AUDIO_LIB='-lesd -laudiofile' \ d48 6 a53 1 @@@@ -321,7 +338,7 @@@@ d62 1 a62 1 @@@@ -398,7 +415,7 @@@@ d71 1 a71 1 @@@@ -496,18 +513,184 @@@@ d99 2 a100 1 + -funroll-all-loops -ffast-math -DROT_I386 \ d207 10 d233 1 a233 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d272 1 a272 1 @@@@ -556,6 +739,16 @@@@ @ 1.24 log @add a darwin-esd target @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.23 2002/11/28 12:24:07 markd Exp $ d3 2 a4 2 --- Makefile.orig Mon Nov 25 22:42:10 2002 +++ Makefile d29 27 d152 1 a152 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d216 2 a217 1 + -funroll-all-loops -ffast-math -DROT_I386 \ d256 1 a256 3 @@@@ -554,6 +737,16 @@@@ generic: $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_dummy.o' \ d258 2 a259 2 + mpg123-make + d268 4 a271 2 mpg123-make @ 1.23 log @Use the mpg123 Makefile.common to build mpg123-nas. Based on PR 18532 from Greg A. Woods. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $ d229 17 @ 1.22 log @Convert to buildlink2. Share distinfo between mpg123 and mpg123-esound. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.21 2002/06/23 08:45:09 kent Exp $ d3 1 a3 1 --- Makefile.orig Sun Jun 23 16:56:17 2002 d5 1 a5 1 @@@@ -54,6 +54,17 @@@@ d20 6 d29 10 a38 1 @@@@ -496,18 +507,120 @@@@ d162 64 @ 1.21 log @Integrate ARM 64bit fixedpoint patch submitted by Tim Deegan in pkg/16479. This feature is enabled by MPG123_ARM_FIXED64. mpg123/Makefile.common contains common stuff of mpg123 and mpg123-esound. @ text @d1 1 a1 1 $NetBSD$ d86 1 a86 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d91 1 a91 1 + `$(ESD_CONFIG) --cflags`' \ d96 1 a96 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d101 1 a101 1 + `$(ESD_CONFIG) --cflags`' \ d106 1 a106 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d114 1 a114 1 + `$(ESD_CONFIG) --cflags`' \ d119 1 a119 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d124 1 a124 1 + `$(ESD_CONFIG) --cflags`' \ d129 1 a129 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d135 1 a135 1 + -DNETBSD `$(ESD_CONFIG) --cflags`' \ d140 1 a140 1 + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ d146 1 a146 1 + -DTERM_CONTROL -DNETBSD `$(ESD_CONFIG) --cflags`' \ @ 1.20 log @Rescue Makefile entries removed accidentaly. @ text @d3 1 a3 1 --- Makefile.orig Sun Jun 23 03:50:48 2002 d5 1 a5 1 @@@@ -54,6 +54,15 @@@@ d9 2 a10 1 + @@echo "make netbsd-arm NetBSD for strongarm" d15 2 a16 1 + @@echo "make netbsd-arm-esd NetBSD for strongarm with EsounD" d19 1 a19 1 + @@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD" d23 1 a23 1 @@@@ -496,18 +505,100 @@@@ d51 1 a51 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d74 10 a104 1 + echo GETBITS: $(GETBITS) d110 2 a111 1 + -funroll-all-loops -ffast-math -DROT_I386 \ d136 11 @ 1.19 log @Remove unnecessary macro. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 2002/06/22 17:56:37 kent Exp $ d3 1 a3 1 --- Makefile.orig Sun Jun 23 02:08:27 2002 d21 1 a21 1 @@@@ -496,18 +505,64 @@@@ d34 1 a34 2 -netbsd-i386: +netbsd-esd: d38 37 d100 1 a100 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ @ 1.18 log @Add mpg123 with EsounD. All modifications required for EsounD are merged to mpg123/patches/*. This closes PR pkg/12059. @ text @d1 1 a1 1 $NetBSD$ d13 5 a17 5 + @@echo "make netbsd-esd NetBSD" + @@echo "make netbsd-arm-esd NetBSD for strongarm" + @@echo "make netbsd-i386-esd NetBSD optimized for i386" + @@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format" + @@echo "make netbsd-m68k-esd NetBSD optimized for m68k" d40 1 a40 1 + OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \ d50 1 a50 1 + OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o term.o' \ d62 1 a62 1 + $(GETBITS) audio_esd.o term.o' \ d74 1 a74 1 + OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \ d84 1 a84 1 + OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \ @ 1.17 log @Check for arm and arm32, not just arm32. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16 2002/02/27 23:22:49 simonb Exp $ d3 3 a5 3 --- Makefile.orig Thu Feb 28 10:17:44 2002 +++ Makefile Thu Feb 28 10:19:04 2002 @@@@ -54,6 +54,10 @@@@ d13 5 d21 11 a31 2 @@@@ -377,6 +381,34 @@@@ -funroll-all-loops -finline-functions' \ d34 14 a47 1 +netbsd-i386-elf: d49 12 d62 1 a62 1 + audio_sun.o term.o' \ d64 2 a65 1 + -funroll-all-loops -ffast-math -DROT_I386 \ d67 2 a68 1 + -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \ d71 1 a71 1 +netbsd-m68k: d73 2 a74 1 + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ d77 2 a78 1 + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \ d81 1 a81 1 +netbsd-arm: d83 2 a84 1 + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ d89 1 a89 29 + -DNETBSD' \ + mpg123-make + solaris-gcc-esd: $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ AUDIO_LIB='-lesd -lresolv' \ @@@@ -496,18 +528,18 @@@@ netbsd: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode.o dct64.o audio_sun.o' \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ - -funroll-all-loops -ffast-math \ - -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ mpg123-make netbsd-i386: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ - -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ @ 1.17.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.20 2002/06/22 19:03:11 kent Exp $ d3 3 a5 3 --- Makefile.orig Sun Jun 23 03:50:48 2002 +++ Makefile @@@@ -54,6 +54,15 @@@@ a12 5 + @@echo "make netbsd-esd NetBSD with EsounD" + @@echo "make netbsd-arm-esd NetBSD for strongarm with EsounD" + @@echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD" + @@echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD" + @@echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD" d16 2 a17 11 @@@@ -496,18 +505,100 @@@@ netbsd: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode.o dct64.o audio_sun.o' \ + OBJECTS='decode.o dct64.o audio_sun.o term.o' \ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ - -funroll-all-loops -ffast-math \ - -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -funroll-all-loops -ffast-math -DREAD_MMAP \ + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ a19 10 netbsd-i386: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \ - CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \ + mpg123-make + d25 1 a25 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d48 12 a59 5 +netbsd-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ d61 10 a70 8 + -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + `$(ESD_CONFIG) --cflags`' \ + mpg123-make + +netbsd-i386-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + OBJECTS='decode_i386.o dct64_i386.o audio_esd.o term.o' \ d73 1 a73 36 + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \ + `$(ESD_CONFIG) --cflags`' \ + mpg123-make + +netbsd-i386-elf-esd: + echo GETBITS: $(GETBITS) + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ + audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \ + -DREAD_MMAP -DNETBSD -DTERM_CONTROL \ + `$(ESD_CONFIG) --cflags`' \ + mpg123-make + +netbsd-m68k-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \ + -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \ + -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \ + `$(ESD_CONFIG) --cflags`' \ + mpg123-make + +netbsd-arm-esd: + $(MAKE) CC=cc LDFLAGS= \ + AUDIO_LIB="`$(ESD_CONFIG) --libs`" \ + OBJECTS='decode.o dct64.o audio_esd.o term.o' \ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \ + -funroll-all-loops -finline-functions -ffast-math \ + -march=armv4 -mtune=strongarm -mcpu=strongarm \ + -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \ + -DNETBSD `$(ESD_CONFIG) --cflags`' \ @ 1.16 log @Use -DREAD_MMAP on all NetBSD targets. Fixes problems with mis-decoding ID3 tags. Reported by Martin Husemann. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 + @@echo "make netbsd-arm32 NetBSD for strongarm" d38 1 a38 1 +netbsd-arm32: @ 1.15 log @Honor CFLAGS passed in from environment, and for NetBSD/i386, don't explicitly pass -m486 flag to compiler. @ text @d3 2 a4 2 --- Makefile.orig Mon Feb 26 10:58:56 2001 +++ Makefile d34 1 a34 1 + -ffast-math -DREAL_IS_FLOAT \ d58 1 a58 1 -funroll-all-loops -ffast-math \ d60 1 d68 2 d72 1 a72 2 -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ @ 1.14 log @Give the VM system a hint that we'll be using the mmap()ed data for sequential read. add RCS tag to patch-aa @ text @d3 2 a4 2 --- Makefile.orig Fri Feb 18 19:45:31 2000 +++ Makefile Fri Feb 18 19:46:51 2000 d24 1 a24 1 + CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ d33 1 a33 1 + CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ d41 1 a41 1 + CFLAGS='-Wall -O6 -fomit-frame-pointer \ d66 1 d68 1 a68 1 CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ @ 1.13 log @make the pkgsrc IPv6 ready. % mpg123 http://www.v6.foo.com/ @ text @d1 2 @ 1.12 log @Add fixed-point support used by the arm32. XXX: Uses strongarm C-compiler options to use 32x32=64 int multiply. @ text @d1 3 a3 5 $NetBSD$ --- Makefile.orig Wed Jun 16 06:39:06 1999 +++ Makefile Tue Oct 12 13:57:53 1999 @@@@ -39,6 +39,10 @@@@ d14 1 a14 1 @@@@ -362,6 +366,34 @@@@ d49 1 a49 1 @@@@ -481,18 +513,18 @@@@ d55 1 a55 1 CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ d65 1 a65 1 CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ @ 1.11 log @Update "mpg123" package version 0.59r. Changes since version 0.59q: - applied audio_alib changes from Ralf Hildebrandt - some 'paetsches' from DK - minor optimizations in layer3 (dequantize/huffman) - BSDOS 4.0 with gcc added to Makefile () - Solaris-ESD patch from Ryan Prosser - Added Frontend changes from Bertrand Petit - more DK 'paetsches' (final dk7-clubhaus edition), includes extended term control - SGI audio fix for non RAD machines from Erik Mouw - fixed ugly bug in layer3 dequant for bt==2 (may cause high frequency clitchs) - AMD-3DNow optimizations in decode and dct64 - OS/2 reworked from Samuel Audet (see audio_os2.c for more) - added freebsd-esd make-entry from Daniel O'Connor (darius@@guppy.dons.net.au) - added enhanced head_check from D. Skarda <0rfelyus@@atrey.karlin.mff.cuni.cz> - applied 'xterm-title-patch' from "Wilson, Jeff D" - more esd changes from Robert Bihlmeyer - applied Hannu Napari's SGI audio patches - minor changes in httpget.c and mpg123.c - added native AIX support from Juergen.Schoew@@unix-ag.uni-siegen.de - applied playlist patch from - more SGI audio patches from Gilles Zunino - applied esdserver patch from Matthew Parslow - added some fixes for control_generic @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 1999/06/28 00:35:33 thorpej Exp $ d3 4 a6 4 --- Makefile.orig Tue Jan 26 06:35:18 1999 +++ Makefile Wed Jun 23 19:45:35 1999 @@@@ -34,6 +34,9 @@@@ @@echo "make aix IBM AIX (tested: 4.2)" d9 1 d14 1 d16 2 a17 4 @@echo "make mint MiNT on Atari" @@@@ -365,6 +368,33 @@@@ -funroll-all-loops -ffast-math -DROT_I386 \ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d19 1 a19 1 + d23 1 a23 1 + audio_sun.o' \ d27 1 a27 1 + -DREAD_MMAP -DNETBSD' \ a29 8 +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 + d32 1 a32 1 + OBJECTS='decode.o dct64.o audio_sun.o' \ d35 11 a45 1 + -DUSE_MMAP -DNETBSD -DM68K_ASSEM' \ d48 24 a73 1 $(MAKE) CC=shlicc2 LDFLAGS= \ @ 1.10 log @Make this build on i386/ELF systems. @ text @d1 1 a1 1 $NetBSD$ d22 1 a22 1 + OBJECTS='decode_i386.o dct64_i386.o getbits.o decode_i586.o \ @ 1.9 log @Use READ_MMAP on all platforms. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 1998/10/30 03:11:52 mycroft Exp $ d3 3 a5 3 --- Makefile.orig Sun Feb 8 13:23:04 1998 +++ Makefile Sat Feb 6 07:19:22 1999 @@@@ -32,6 +32,7 @@@@ d10 2 d13 5 a17 8 @@echo "make generic try this one if your system isn't listed above" @@echo "" @@@@ -213,15 +214,17 @@@@ OBJECTS='decode.o dct64.o audio_sun.o' \ CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \ -funroll-all-loops -ffast-math \ - -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + -DREAL_IS_FLOAT -DUSE_MMAP -DREAD_MMAP -DNETBSD' \ d19 4 a22 5 netbsd-i386: $(MAKE) CC=cc LDFLAGS= \ - OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_sun.o' \ + OBJECTS='decode_i386.o dct64_i386.o getbits_.o decode_i586_.o \ d24 2 a25 3 CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ -funroll-all-loops -ffast-math -DROT_I386 \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ d28 18 a45 1 mpg123-make d48 1 @ 1.8 log @Use the Pentium-optimized decoding routines. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ Makefile Thu Oct 29 22:01:30 1998 d13 7 a19 1 @@@@ -218,10 +219,12 @@@@ @ 1.7 log @Split patches into one-per-file patch for better maintainance. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 1998/08/07 10:35:59 agc Exp $ d3 2 a4 2 --- Makefile.orig Sun Feb 8 19:23:04 1998 +++ Makefile Sat Aug 15 12:18:14 1998 d13 7 a19 2 @@@@ -221,7 +222,8 @@@@ OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_sun.o' \ d23 2 a24 2 + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DREAD_MMAP \ + -DNETBSD' \ @ 1.6 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig Sun Feb 8 13:23:04 1998 +++ Makefile Sat Mar 7 08:39:36 1998 d13 8 a20 3 --- audio_sun.c.orig Mon Jan 5 06:41:31 1998 +++ audio_sun.c Sat Mar 7 08:43:50 1998 @@@@ -17,6 +17,8 @@@@ d22 1 a22 32 #include "mpg123.h" +extern int outburst; + #include #ifdef SUNOS #include @@@@ -74,6 +76,13 @@@@ } #ifndef NETBSD + AUDIO_INITINFO(&ainfo); + if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) + return -1; + outburst = ainfo.blocksize; + if(outburst > MAXOUTBURST) + outburst = MAXOUTBURST; + AUDIO_INITINFO(&ainfo); switch(ai->output) { --- buffer.c.orig Wed Feb 11 15:55:18 1998 +++ buffer.c Sat Mar 7 08:40:43 1998 @@@@ -48,7 +48,7 @@@@ for (;;) { if (intflag) { intflag = FALSE; -#if defined(SOLARIS) || defined(__NetBSD__) +#if defined(SOLARIS) || defined(NETBSD) if (param.outmode == DECODE_AUDIO) audio_queueflush (ai); #endif @ 1.5 log @Update to 0.59o. @ text @d1 2 @ 1.4 log @Fix a bug that caused mpg123 to loop on a bad header. @ text @d1 46 a46 88 *** Makefile.old Thu Feb 26 20:21:13 1998 --- Makefile Thu Feb 26 20:21:56 1998 *************** *** 34,40 **** @@echo "make ultrix DEC Ultrix (tested: 4.4)" @@echo "make aix IBM AIX (tested: 4.2)" @@echo "make os2 IBM OS/2" ! @@echo "make netbsd NetBSD" @@echo "make bsdos BSDI BSD/OS" @@echo "make generic try this one if your system isn't listed above" @@echo "" --- 34,41 ---- @@echo "make ultrix DEC Ultrix (tested: 4.4)" @@echo "make aix IBM AIX (tested: 4.2)" @@echo "make os2 IBM OS/2" ! @@echo "make netbsd NetBSD generic" ! @@echo "make netbsd-i386 NetBSD optimized for i386" @@echo "make bsdos BSDI BSD/OS" @@echo "make generic try this one if your system isn't listed above" @@echo "" *** audio_sun.c.old Thu Feb 26 20:10:37 1998 --- audio_sun.c Thu Feb 26 20:18:46 1998 *************** *** 17,22 **** --- 17,24 ---- #include "mpg123.h" + extern int outburst; + #include #ifdef SUNOS #include *************** *** 74,79 **** --- 76,88 ---- } #ifndef NETBSD + AUDIO_INITINFO(&ainfo); + if (ioctl(ai->fn, AUDIO_SETINFO, &ainfo) == -1) + return -1; + outburst = ainfo.blocksize; + if(outburst > MAXOUTBURST) + outburst = MAXOUTBURST; + AUDIO_INITINFO(&ainfo); switch(ai->output) { *** buffer.c.old Thu Feb 26 20:20:37 1998 --- buffer.c Thu Feb 26 20:20:45 1998 *************** *** 48,54 **** for (;;) { if (intflag) { intflag = FALSE; ! #if defined(SOLARIS) || defined(__NetBSD__) if (param.outmode == DECODE_AUDIO) audio_queueflush (ai); #endif --- 48,54 ---- for (;;) { if (intflag) { intflag = FALSE; ! #if defined(SOLARIS) || defined(NETBSD) if (param.outmode == DECODE_AUDIO) audio_queueflush (ai); #endif *** common.c.old Sat Feb 28 15:42:24 1998 --- common.c Sat Feb 28 15:42:36 1998 *************** *** 587,593 **** too much distortion in the audio output). */ do { try++; ! rd->head_shift(hbuf,&newhead); if (!oldhead) goto init_resync; /* "considered harmful", eh? */ --- 587,594 ---- too much distortion in the audio output). */ do { try++; ! if (rd->head_shift(hbuf,&newhead) == 0) ! return 0; if (!oldhead) goto init_resync; /* "considered harmful", eh? */ @ 1.3 log @Upgrade to mpg123-0.59n. @ text @d69 20 @ 1.2 log @Implement audio_queueflush(). @ text @d1 68 a68 125 --- Makefile.orig Sun Jul 13 02:44:41 1997 +++ Makefile Fri Oct 31 06:55:33 1997 @@@@ -74,6 +74,22 @@@@ #CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g' #CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2' +netbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode_i386.o dct64_i386.o getbits_.o' \ + CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + mpg123 + +netbsd: + $(MAKE) CC=cc LDFLAGS= \ + OBJECTS='decode.o dct64.o' \ + CFLAGS='-Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math \ + -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \ + mpg123 + freebsd: $(MAKE) CC=cc LDFLAGS= \ OBJECTS='decode_i386.o dct64_i386.o getbits_.o' \ --- audio.c.orig Sat Jul 12 18:12:01 1997 +++ audio.c Fri Oct 31 06:58:54 1997 @@@@ -214,7 +214,11 @@@@ return 0; } -#elif defined(SOLARIS) || defined(SUNOS) +#elif defined(SOLARIS) || defined(SUNOS) || defined(NETBSD) + +#ifdef NETBSD +#include +#endif #include #ifdef SUNOS @@@@ -258,9 +262,7 @@@@ return -1; } - if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) - return -1; - + AUDIO_INITINFO(&ainfo); switch(ai->output) { case AUDIO_OUT_INTERNAL_SPEAKER: @@@@ -305,8 +307,7 @@@@ if(ai->rate != -1) { - if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) - return -1; + AUDIO_INITINFO(&ainfo); ainfo.play.sample_rate = ai->rate; if(ioctl(ai->fn, AUDIO_SETINFO, &ainfo) == -1) return -1; @@@@ -319,8 +320,7 @@@@ { audio_info_t ainfo; - if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) - return -1; + AUDIO_INITINFO(&ainfo); ainfo.play.channels = ai->channels; if(ioctl(ai->fn, AUDIO_SETINFO, &ainfo) == -1) return -1; @@@@ -331,8 +331,7 @@@@ { audio_info_t ainfo; - if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) - return -1; + AUDIO_INITINFO(&ainfo); switch(ai->format) { case -1: @@@@ -386,6 +385,13 @@@@ void audio_queueflush (struct audio_info_struct *ai) { ioctl (ai->fn, I_FLUSH, FLUSHRW); +} +#endif + +#ifdef NETBSD +void audio_queueflush (struct audio_info_struct *ai) +{ + ioctl (ai->fn, AUDIO_FLUSH, 0); } #endif --- audio.h.orig Sun Jul 13 02:11:14 1997 +++ audio.h Fri Oct 31 06:59:11 1997 @@@@ -11,7 +11,7 @@@@ #define AUDIO_FORMAT_ULAW_8 0x8 #define AUDIO_FORMAT_ALAW_8 0x10 -#if defined(HPUX) || defined(SUNOS) || defined(SOLARIS) || defined(VOXWARE) +#if defined(HPUX) || defined(SUNOS) || defined(SOLARIS) || defined(VOXWARE) || defined(NETBSD) #define AUDIO_USES_FD #endif @@@@ -43,6 +43,6 @@@@ extern int audio_write_sample(struct audio_info_struct *,short *,int); extern int audio_close(struct audio_info_struct *); extern void audio_info_struct_init(struct audio_info_struct *); -#ifdef SOLARIS +#if defined(SOLARIS) || defined(NETBSD) extern void audio_queueflush(struct audio_info_struct *ai); #endif --- buffer.c.orig Fri Oct 31 06:59:55 1997 +++ buffer.c Fri Oct 31 06:59:21 1997 @@@@ -45,7 +45,7 @@@@ for (;;) { if (intflag) { intflag = FALSE; -#ifdef SOLARIS +#if defined(SOLARIS) || defined(NETBSD) if (outmode == DECODE_AUDIO) audio_queueflush (ai); #endif @ 1.1 log @NetBSD port. @ text @d1 3 a3 5 diff -u ../mpg123-0.59k/Makefile ./Makefile --- ../mpg123-0.59k/Makefile Sun Jul 13 08:44:41 1997 +++ ./Makefile Sat Oct 25 22:20:55 1997 @@@@ -73,6 +79,22 @@@@ #CFLAGS='-pg -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -funroll-all-loops -finline-functions -ffast-math' mpg123 d6 1 a6 1 + d22 1 a22 1 d25 3 a27 3 diff -u ../mpg123-0.59k/audio.c ./audio.c --- ../mpg123-0.59k/audio.c Sun Jul 13 00:12:01 1997 +++ ./audio.c Sat Oct 25 22:22:16 1997 d82 16 a97 3 diff -u ../mpg123-0.59k/audio.h ./audio.h --- ../mpg123-0.59k/audio.h Sun Jul 13 08:11:14 1997 +++ ./audio.h Sat Oct 25 22:18:01 1997 d107 19 a125 2 Common subdirectories: ../mpg123-0.59k/jukebox and ./jukebox Only in .: ut @