Add ESound support to the mpg123 port.

Requested by:	"Daniel O'Connor" <doconnor@gsoft.com.au> and
		Oh Junseon <hollywar@holywar.net>

3 files changed, 55 insertions, 4 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index b4f903de90ea..9036b9b4d34e 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -15,15 +15,28 @@ MASTER_SITES=	http://www.mpg123.de/mpg123/ \
 
 MAINTAINER=	jkoshy@freebsd.org
 
+.if defined(OPT_ESOUND)
+LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
+.endif
+
 ONLY_FOR_ARCHS=	i386
 
 MAN1=		mpg123.1
 
 .include <bsd.port.pre.mk>
 
+.if defined(OPT_ESOUND)
+ALL_TARGET=	freebsd-esd
+.else
 ALL_TARGET=	freebsd
+.endif
 
 pre-configure:
+.if !defined(OPT_ESOUND) && exists(${PREFIX}/lib/libesd.a)
+	@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+	@${ECHO_MSG} "Note: you can set OPT_ESOUND to \"yes\" to compile mpg123 with esd support."
+	@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+.endif
 .if $(MACHINE_ARCH) == "i386"
 .if !defined(OPT_ARCH) || (($(OPT_ARCH) != "i486") && ($(OPT_ARCH) != "i586"))
 	@${ECHO_MSG} "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@@ -50,4 +63,8 @@ OPT_ARCH?=	i486
 MAKE_ARGS+=	OPT_ARCH=$(OPT_ARCH)
 .endif
 
+.if defined(OPT_ESOUND)
+MAKE_ARGS+=	OPT_ESOUND=$(OPT_ESOUND)
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
index 6babb8e7164e..a4c7c77010fd 100644
--- a/audio/mpg123/files/patch-aa
+++ b/audio/mpg123/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.orig	Wed Jun 16 02:09:06 1999
-+++ Makefile	Tue Aug 17 16:05:45 1999
++++ Makefile	Thu Nov 11 10:21:40 1999
 @@ -4,7 +4,7 @@
  
  # Where to install binary and manpage on "make install":
@@ -9,7 +9,7 @@
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/man
  SECTION=1
-@@ -285,14 +285,28 @@
+@@ -285,35 +285,42 @@
  #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'
  
@@ -32,6 +32,11 @@
 +	-DREAD_MMAP \
 +	-DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DTERM_CONTROL
 +
++.if defined(OPT_ESOUND)
++CFLAGS +=-I${PREFIX}/include
++LDFLAGS+=-L${PREFIX}/lib
++.endif
++
  freebsd:
 -	$(MAKE) CC=cc LDFLAGS= \
 -		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
@@ -44,8 +49,17 @@
 + 		mpg123-make
  
  freebsd-esd:
- 	$(MAKE) CC=cc LDFLAGS= \
-@@ -307,13 +321,8 @@
+-	$(MAKE) CC=cc LDFLAGS= \
+-		AUDIO_LIB='-lesd -laudiofile' \
+-		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
+-		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+-			-funroll-all-loops -ffast-math -DROT_I386 \
+-			-DREAD_MMAP \
+-			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
+-			-I/usr/local/include -L/usr/local/lib \
+-			$(CFLAGS)' \
++	$(MAKE) AUDIO_LIB='-lesd -laudiofile' \
++		OBJECTS='decode_i386.o ${ARCHFILES} dct64_i386.o audio_esd.o term.o' \
  		mpg123-make
  
  freebsd-frontend:
@@ -60,3 +74,12 @@
  		$(FRONTEND)
   
  
+@@ -552,7 +559,7 @@
+ 	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
+ 
+ mpg123-make:
+-	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123
++	@ $(MAKE) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123
+ 
+ mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
+ 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
diff --git a/audio/mpg123/files/patch-ac b/audio/mpg123/files/patch-ac
new file mode 100644
index 000000000000..aab75fe98f8b
--- /dev/null
+++ b/audio/mpg123/files/patch-ac
@@ -0,0 +1,11 @@
+--- audio_esd.c--	Fri May 28 20:36:29 1999
++++ audio_esd.c	Thu Nov 11 10:14:30 1999
+@@ -75,7 +75,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, getenv("ESPEAKER"), "mpg123");
+   return (ai->fn);
+ }
+