Add mpg123 with EsounD. All modifications required for EsounD are merged to

mpg123/patches/*.
This closes PR pkg/12059.

3 files changed, 87 insertions, 46 deletions

diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 38c1a533394..ed3ba68d475 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2002/04/25 16:34:15 abs Exp $
+$NetBSD: distinfo,v 1.9 2002/06/22 17:56:37 kent Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = d48107632e452cf443710edbb6376ef381aba41c
+SHA1 (patch-aa) = c64e0173e1aaaab7e741c3b52aeac9c0c72d0a00
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
@@ -18,3 +18,4 @@ SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
 SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
 SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
 SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
+SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 6ce8e8b6cff..a1fa8214410 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $
+$NetBSD: patch-aa,v 1.18 2002/06/22 17:56:37 kent Exp $
 
---- Makefile.orig	Thu Feb 28 10:17:44 2002
-+++ Makefile	Thu Feb 28 10:19:04 2002
-@@ -54,6 +54,10 @@
+--- Makefile.orig	Sun Jun 23 02:08:27 2002
++++ Makefile
+@@ -54,6 +54,15 @@
  	@echo "make aix-tk3play    IBM AIX"
  	@echo "make os2            IBM OS/2"
  	@echo "make netbsd         NetBSD"
@@ -10,67 +10,83 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $
 +	@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"
++	@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"
  	@echo "make bsdos          BSDI BSD/OS"
  	@echo "make bsdos4         BSDI BSD/OS 4.0"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
-@@ -377,6 +381,34 @@
- 			-funroll-all-loops  -finline-functions' \
+@@ -496,18 +505,64 @@
+ 
+ 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-elf:
+-netbsd-i386:
++netbsd-esd:
+ 	$(MAKE) CC=cc LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
+-		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
++		AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
++		OBJECTS='decode.o dct64.o $(GETBITS) 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 $(GETBITS) 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:
++	echo GETBITS: $(GETBITS)
++	$(MAKE) CC=cc LDFLAGS= \
++		AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
 +		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
-+			audio_sun.o term.o' \
++			$(GETBITS) audio_esd.o term.o' \
 +		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-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' \
++			-DREAD_MMAP -DNETBSD -DTERM_CONTROL \
++			`$(ESD_CONFIG) --cflags`' \
 +		mpg123-make
 +
-+netbsd-m68k:
++netbsd-m68k-esd:
 +	$(MAKE) CC=cc LDFLAGS= \
-+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
++		AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
++		OBJECTS='decode.o dct64.o $(GETBITS) 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' \
++			-DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
++			`$(ESD_CONFIG) --cflags`' \
 +		mpg123-make
 +
-+netbsd-arm:
++netbsd-arm-esd:
 +	$(MAKE) CC=cc LDFLAGS= \
-+		OBJECTS='decode.o dct64.o audio_sun.o term.o' \
++		AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
++		OBJECTS='decode.o dct64.o $(GETBITS) 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' \
-+		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' \
++			-DNETBSD `$(ESD_CONFIG) --cflags`' \
  		mpg123-make
  
  bsdos:
diff --git a/audio/mpg123/patches/patch-ao b/audio/mpg123/patches/patch-ao
new file mode 100644
index 00000000000..46d3583e69d
--- /dev/null
+++ b/audio/mpg123/patches/patch-ao
@@ -0,0 +1,24 @@
+$NetBSD: patch-ao,v 1.1 2002/06/22 17:56:37 kent Exp $
+
+--- audio_esd.c.orig	Sat May 29 00:06:29 1999
++++ audio_esd.c
+@@ -8,6 +8,10 @@
+ #include <stropts.h>
+ #include <sys/conf.h>
+ #endif
++#ifdef NETBSD
++#include <sys/ioctl.h>
++#include <sys/audioio.h>
++#endif
+ 
+ static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
+ 
+@@ -75,7 +79,7 @@
+   else if (ai->rate > esd_rate)
+     return -1;
+ 
+-  ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123");
++  ai->fn = esd_play_stream_fallback(format, ai->rate, NULL/*esdserver*/, "mpg123");
+   return (ai->fn);
+ }
+