From 77e94e328730356d3aa20af386c2dcdaa9222af4 Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 22 Jul 2003 20:36:37 +0000 Subject: Use ossaudio.buildlink2.mk to get the right audio device and library. Patch provided by collver1@comcast.net in PR pkg/22180. --- audio/spiralloops/Makefile | 5 ++++- audio/spiralloops/distinfo | 8 ++++---- audio/spiralloops/patches/patch-aa | 18 +++++++++++------- audio/spiralloops/patches/patch-ab | 4 ++-- audio/spiralloops/patches/patch-ac | 4 ++-- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index 32f037544e3..f9abcef2083 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/21 16:30:47 martti Exp $ +# $NetBSD: Makefile,v 1.7 2003/07/22 20:36:37 jmmv Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -19,9 +19,12 @@ USE_BUILDLINK2= yes USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +CXXFLAGS+= -DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\"" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin .include "../../x11/fltk/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo index 9ec8e6fe8ab..ffc0a568924 100644 --- a/audio/spiralloops/distinfo +++ b/audio/spiralloops/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2002/09/21 00:54:39 jlam Exp $ +$NetBSD: distinfo,v 1.4 2003/07/22 20:36:37 jmmv Exp $ SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72 Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes -SHA1 (patch-aa) = e78de915a2d2480155aa01e2448a024a03ee6a01 -SHA1 (patch-ab) = 8d21e1615909f94c750f1cf3afbf46f7e0cfdb83 -SHA1 (patch-ac) = 4a1675489e169d8ce9090eeaabf8c30ceb047897 +SHA1 (patch-aa) = 6dcc532e44e03a7f4d9b2d1f3e2062308b2854be +SHA1 (patch-ab) = 9b276f356d2da5eda3b0ed49e58f1bde6cc87de6 +SHA1 (patch-ac) = 04946ad637a6e0a371e604ffaadd15c119f796da SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f SHA1 (patch-ae) = 757ca5ca1c4f50a7848c947962efbc0148f1ccdc diff --git a/audio/spiralloops/patches/patch-aa b/audio/spiralloops/patches/patch-aa index a563963fc72..81ef35eb5ae 100644 --- a/audio/spiralloops/patches/patch-aa +++ b/audio/spiralloops/patches/patch-aa @@ -1,18 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2002/09/21 00:54:40 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2003/07/22 20:36:37 jmmv Exp $ --- Makefile.in.orig Mon May 7 14:42:59 2001 +++ Makefile.in -@@ -11,10 +11,10 @@ +@@ -9,12 +9,12 @@ + + CC = gcc CXX = g++ - CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused - CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused +-CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused +-CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -INCPATH = -I/usr/X11R6/include -LINK = g++ -+INCPATH = -I${X11BASE}/include -+LINK = g++ -Wl,-R${X11BASE}/lib -Wl,-R${X11PREFIX}/lib ++CFLAGS += -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused ++CXXFLAGS+= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused ++INCPATH = ++LINK = g++ ${LDFLAGS} LFLAGS = -LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl -+LIBS = -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio ++LIBS = -lfltk -lGL -lXext -lX11 -lm ${LIBOSSAUDIO} MOC = moc UIC = TAR = tar -cf diff --git a/audio/spiralloops/patches/patch-ab b/audio/spiralloops/patches/patch-ab index 934c9d41aea..ce630115fc2 100644 --- a/audio/spiralloops/patches/patch-ab +++ b/audio/spiralloops/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: patch-ab,v 1.2 2003/07/22 20:36:37 jmmv Exp $ --- SpiralLoopsInfo.C.orig Thu Apr 19 13:48:19 2001 +++ SpiralLoopsInfo.C @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ bool SpiralInfo::WANTMIDI = false; int SpiralInfo::FILTERGRAN = 50; -string SpiralInfo::OUTPUTFILE = "/dev/dsp"; -+string SpiralInfo::OUTPUTFILE = "/dev/sound"; ++string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO; string SpiralInfo::MIDIFILE = "/dev/midi"; int SpiralInfo::POLY = 1; bool SpiralInfo::REALTIMEOUT = true; diff --git a/audio/spiralloops/patches/patch-ac b/audio/spiralloops/patches/patch-ac index 4f24cb4e9fb..ce23fbdf2ec 100644 --- a/audio/spiralloops/patches/patch-ac +++ b/audio/spiralloops/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ +$NetBSD: patch-ac,v 1.2 2003/07/22 20:36:37 jmmv Exp $ --- SpiralInfo.C.orig Thu Apr 19 13:48:08 2001 +++ SpiralInfo.C @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/08/12 22:27:05 zuntum Exp $ bool SpiralInfo::WANTMIDI = true; int SpiralInfo::FILTERGRAN = 50; -string SpiralInfo::OUTPUTFILE = "/dev/dsp"; -+string SpiralInfo::OUTPUTFILE = "/dev/sound"; ++string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO; string SpiralInfo::MIDIFILE = "/dev/midi"; int SpiralInfo::POLY = 2; bool SpiralInfo::REALTIMEOUT = true; -- cgit v1.2.3