diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-07-22 20:43:04 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-07-22 20:43:04 +0000 |
| commit | b1ea0ff723c53d8ff07a2ced16d0236ba4c2294c (patch) | |
| tree | 5d5853d7500b1147f390259d95686497ef0bc0e1 /audio/spiralsynth | |
| parent | 968db7688d9f822b696395a721106dbfe02cc842 (diff) | |
| download | pkgsrc-b1ea0ff723c53d8ff07a2ced16d0236ba4c2294c.tar.gz | |
Use ossaudio.buildlink2.mk to get the right device and library.
Patch provided by collver1@comcast.net in PR pkg/22181.
Diffstat (limited to 'audio/spiralsynth')
| -rw-r--r-- | audio/spiralsynth/Makefile | 5 | ||||
| -rw-r--r-- | audio/spiralsynth/distinfo | 6 | ||||
| -rw-r--r-- | audio/spiralsynth/patches/patch-aa | 20 | ||||
| -rw-r--r-- | audio/spiralsynth/patches/patch-ab | 4 |
4 files changed, 21 insertions, 14 deletions
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 06e2ec8cfbd..b4f258c449f 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/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:43:04 jmmv Exp $ # DISTNAME= SpiralSynth-0.1.7 @@ -19,6 +19,8 @@ USE_BUILDLINK2= yes USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +CXXFLAGS+= -DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\"" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin @@ -27,4 +29,5 @@ do-install: ${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth .include "../../x11/fltk/buildlink2.mk" +.include "../../mk/ossaudio.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo index d88abe5891d..b77fe0c9655 100644 --- a/audio/spiralsynth/distinfo +++ b/audio/spiralsynth/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/09/21 00:56:03 jlam Exp $ +$NetBSD: distinfo,v 1.4 2003/07/22 20:43:04 jmmv Exp $ SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204 Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes -SHA1 (patch-aa) = 808568dac9ddd3331434a6a78bc9778fed635d13 -SHA1 (patch-ab) = eea5f0a97ccc796a176d48b2acfe61f6a455e51f +SHA1 (patch-aa) = f2c61de20ca47da2f64d4c8f78491519a7f0b94d +SHA1 (patch-ab) = 4e9ce3281a9f6b1dac3c120cbe600fb60ed379f7 SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24 diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa index 50f8856de1f..e7d03d95a75 100644 --- a/audio/spiralsynth/patches/patch-aa +++ b/audio/spiralsynth/patches/patch-aa @@ -1,18 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2002/09/21 00:56:03 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2003/07/22 20:43:04 jmmv Exp $ ---- Makefile.in.orig Tue Aug 14 20:12:55 2001 +--- Makefile.in.orig Sun Nov 26 08:06:47 2000 +++ 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 -+LIBS = -L${X11BASE}/lib -lfltk -lGL -lXext -lX11 -lm -lossaudio ++LIBS = -lfltk -lGL -lXext -lX11 -lm ${LIBOSSAUDIO} MOC = moc TAR = tar -cf diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab index c180d0fd6ee..57d7b4eb5c0 100644 --- a/audio/spiralsynth/patches/patch-ab +++ b/audio/spiralsynth/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/26 01:14:27 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/07/22 20:43:04 jmmv Exp $ --- SpiralInfo.C.orig Sun Nov 26 07:52:43 2000 +++ SpiralInfo.C @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/26 01:14:27 rh 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; |