Make csound-bath build and run in Linux.

4 files changed, 49 insertions, 24 deletions

diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index 8902c9a6efc..395c1d196d2 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/22 07:15:00 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/11 21:49:10 ben Exp $
 #
 
 DISTNAME=		Csound4.23
@@ -20,7 +20,30 @@ DIST_SUBDIR=		csound
 CONFLICTS=		csound-dev-4*
 USE_GNU_TOOLS+=		make
 
+.include "../../mk/bsd.prefs.mk"
+
 pre-patch:
 	 ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC}
 
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+=	rtaudio
+SUBST_MESSAGE.rtaudio=	"Configuring to use NetBSD real-time audio driver."
+SUBST_STAGE.rtaudio=	post-patch
+SUBST_FILES.rtaudio=	Makefile
+SUBST_SED.rtaudio=	-e 's,^AUDSRC.*,AUDSRC = rtNetBSD.c,' \
+			-e 's,^AUDOBJ.*,AUDOBJ = rtNetBSD.o,' \
+			-e 's,^\(DEFINES.*\),\1 -DRTAUDIO -DNETBSDAUDIO,'
+.endif
+
+.if ${OPSYS} == "Linux"
+SUBST_CLASSES+=	rtaudio
+SUBST_MESSAGE.rtaudio=	"Configuring to use Linux real-time audio driver."
+SUBST_STAGE.rtaudio=	post-patch
+SUBST_FILES.rtaudio=	Makefile
+SUBST_SED.rtaudio=	-e 's,^AUDSRC.*,AUDSRC = rtlinux.c LINUXaudio.c,' \
+			-e 's,^AUDOBJ.*,AUDOBJ = rtlinux.o LINUXaudio.o,' \
+			-e 's,^\(DEFINES.*\),\1 -DRTAUDIO,' \
+			-e 's,^\(LIBS.*\),\1 -ldl,'
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/distinfo b/audio/csound-bath/distinfo
index 0d5be16cfc2..1433a151c88 100644
--- a/audio/csound-bath/distinfo
+++ b/audio/csound-bath/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.6 2003/01/21 06:37:34 grant Exp $
+$NetBSD: distinfo,v 1.7 2004/04/11 21:49:10 ben Exp $
 
 SHA1 (csound/Csound4.23.tar.gz) = 15b18ee60b4690aa48593dc3b5d44a9473d0cb16
 Size (csound/Csound4.23.tar.gz) = 1172388 bytes
-SHA1 (patch-aa) = de2db03ecabf8d392eafaeb022d1122af264f23d
+SHA1 (patch-aa) = 6eeb263df9add94a79de7d6a67cb189e1dde3e5a
 SHA1 (patch-ab) = 3301b22ea79b0b87a4323835050f88eb3975c40e
 SHA1 (patch-ac) = 7b4838120b3337277732075fa4253090c6a892a4
 SHA1 (patch-ae) = 7a0840abf9bd6630205934fab8dd4a7b42d04e1a
 SHA1 (patch-af) = 59c0726958844315255f360f3ab6dfe2ed538d3d
 SHA1 (patch-ag) = 613350099e4890efa79de07c820325423fa8e13b
 SHA1 (patch-ai) = a66207be90ff96c975d906aa716b9ced63d021f2
-SHA1 (patch-ap) = da2f992df5be8a9eaf888aee70ba84bd82252965
+SHA1 (patch-ap) = 8547105765c6c0afa179869b87ce9db68a3afbab
 SHA1 (patch-aq) = ba44c4a8fb1ccb3bde72d1a28a7943b08e418bc2
 SHA1 (patch-ar) = 3219f640f11654b1502a4a9aebfadd4661efbcac
 SHA1 (patch-as) = a3c0097b29188c82432a07de9e5ef8ca7492feaf
diff --git a/audio/csound-bath/patches/patch-aa b/audio/csound-bath/patches/patch-aa
index 5c53249ecc6..91d9b505c54 100644
--- a/audio/csound-bath/patches/patch-aa
+++ b/audio/csound-bath/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/11 21:49:10 ben Exp $
 
---- Makefile.orig	Mon Dec 16 00:32:21 2002
+--- Makefile.orig	2002-12-16 00:32:21.000000000 -0800
 +++ Makefile
 @@ -1,10 +1,10 @@
  #								Csound Makefile
@@ -17,16 +17,16 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
  MAN1	= $(MAN)/man1
  CAT1	= $(MAN)/cat1
  # these directories must exist for stages beyond 'make csound'
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ CC = cc
  #	.c.o:
  #		$(CC) $(CFLAGS) -c $*.c -o $@
  
 -DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK -DIV_SCHED -DHAVE_FLTK
-+DEFINES = -DNETBSDRTAUDIO -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DPREFIX=\"$(PREFIX)\"
++DEFINES = -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DPREFIX=\"$(PREFIX)\"
  # choose any of -
  #	-DSYS5	    invoke System 5 headers (e.g. 'string.h' for 'strings.h')
  #	-DWINDOWS   include window system calls (X11, SGI, or FG graphics)
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM 
  # (e.g., Linux on SPARC [not tested]), you should also define -
  #       -DLINUX_BE      Linux audio device handler for big-endian samples
  
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
  #	-O		Simple optimisation
  #	-O2		to be more specific about the optimization level
  #	-f		compile single-precision floats (4.3,VAX,DEC-RISC)
-@@ -90,12 +90,12 @@
+@@ -90,12 +90,12 @@ CFLAGS = -Wall -O2 -malign-loops=4 -mali
  #
  CXX = g++
  CXXFLAGS = -fno-exceptions -fno-rtti
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
  # libraries required by widgets.cpp
  #	-lfltk -lpthread -lg++			use dynamic libraries
  #
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ FLTKLIB = /usr/local/lib/libfltk.a /usr/
  #						directiories and version
  #						numbers are system-dependent)
  
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
  #	-lefence
  #	-lm		    		required
  #	-lX11				for X window calls
-@@ -124,8 +124,8 @@
+@@ -124,8 +124,8 @@ LIBS =	$(FLTKLIB) -L /usr/X11R6/lib -lX1
  # note: SuSE 7.3 users should use -ltcl8.3 -ltk8.3, but another
  # (probably better) solution is to create symbolic links
  
@@ -72,16 +72,18 @@ $NetBSD: patch-aa,v 1.3 2003/01/19 21:31:10 hubertf Exp $
  # ;if WINDOWS enabled in DEFINES, choose one of -
  #	winX11.o	for X11 window graphics
  #	winSGI.o	for SGI window graphics
-@@ -135,8 +135,10 @@
+@@ -133,10 +133,12 @@ WINOBJ = winFLTK.o FL_graph.o
+ #	winFLTK.o and FL_graph.o for `improved' X graphics
+ #	and many others....winbor, wincwin 
  
++AUDSRC =
++AUDOBJ =
  #AUDSRC = rtlinux.c LINUXaudio.c
  #AUDOBJ = rtlinux.o LINUXaudio.o
 -AUDSRC = rtalsa.c
 -AUDOBJ = rtalsa.c
 +#AUDSRC = rtalsa.c
 +#AUDOBJ = rtalsa.c
-+AUDSRC = rtNetBSD.c
-+AUDOBJ = rtNetBSD.o
  # ;if RTAUDIO enabled in DEFINES, include one of
  #	rtaudio.o		general interface to audio handlers & libraries
  #	rtDEC.c		rtSGI.c		rtHP.c		rtSUN.c
diff --git a/audio/csound-bath/patches/patch-ap b/audio/csound-bath/patches/patch-ap
index e8a04a3356e..e002cbdd03a 100644
--- a/audio/csound-bath/patches/patch-ap
+++ b/audio/csound-bath/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2003/01/19 21:31:12 hubertf Exp $
+$NetBSD: patch-ap,v 1.4 2004/04/11 21:49:10 ben Exp $
 
---- cs.h.orig	Mon Dec 16 04:28:30 2002
+--- cs.h.orig	2002-12-16 04:28:30.000000000 -0800
 +++ cs.h
-@@ -15,6 +15,24 @@
+@@ -15,6 +15,24 @@ extern "C" {
  
  #include "version.h"
  
@@ -27,17 +27,17 @@ $NetBSD: patch-ap,v 1.3 2003/01/19 21:31:12 hubertf Exp $
  #define VMSGS 1
  #if VMSGS
  #define VMSG(x) if (O.odebug) x
-@@ -782,10 +800,10 @@
+@@ -782,11 +800,8 @@ typedef struct GLOBALS_
  # define POLL_EVENTS() STasks()
  # define __cdecl
  #else
 -#ifdef LINUX
 -  extern int POLL_EVENTS(void);
 -#else
-+#if !defined(LINUX) || defined(__NetBSD__)
- # define POLL_EVENTS()     (1)
-+#else
-+  extern int POLL_EVENTS(void);
- #endif
+-# define POLL_EVENTS()     (1)
+-#endif
++/* #define POLL_EVENTS() csoundYield() */
++#define POLL_EVENTS() (1)
  # if !defined(__BEOS__) || defined(__MWERKS__)
  #  define __cdecl
+ # endif