diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-05 15:33:00 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-05 15:33:00 +0000 |
| commit | 14135bfa97489307a721335879e3f360c10aff83 (patch) | |
| tree | b961ca51719b314af97b1ea5552747264c5c7432 /audio/spiralsynth/patches | |
| parent | 04c09b3756973f9216b6f90910b8fa0d448699b9 (diff) | |
| download | pkgsrc-14135bfa97489307a721335879e3f360c10aff83.tar.gz | |
Fallback to O_FSYNC on DragonFly, if O_SYNC doesn't exist.
Use PTHREAD_* instead of -lpthread for linkage.
Diffstat (limited to 'audio/spiralsynth/patches')
| -rw-r--r-- | audio/spiralsynth/patches/patch-aa | 4 | ||||
| -rw-r--r-- | audio/spiralsynth/patches/patch-an | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa index 9e4f155f68d..3a66e7869e3 100644 --- a/audio/spiralsynth/patches/patch-aa +++ b/audio/spiralsynth/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2004/11/25 17:24:27 ben Exp $ +$NetBSD: patch-aa,v 1.6 2006/01/05 15:33:00 joerg Exp $ --- Makefile.in.orig Thu Jun 13 14:56:01 2002 +++ Makefile.in @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2004/11/25 17:24:27 ben Exp $ +LINK = g++ ${LDFLAGS} LFLAGS = -LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -lpthread -+LIBS = -lfltk -lGL -lXext -lX11 -lm -lpthread ${LIBOSSAUDIO} ++LIBS = -lfltk -lGL -lXext -lX11 -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${LIBOSSAUDIO} MOC = moc UIC = diff --git a/audio/spiralsynth/patches/patch-an b/audio/spiralsynth/patches/patch-an index d36052ac1d8..1b533c75090 100644 --- a/audio/spiralsynth/patches/patch-an +++ b/audio/spiralsynth/patches/patch-an @@ -1,8 +1,19 @@ -$NetBSD: patch-an,v 1.2 2005/04/24 14:41:28 ben Exp $ +$NetBSD: patch-an,v 1.3 2006/01/05 15:33:00 joerg Exp $ ---- SpiralSound/Midi.C.orig 2002-06-11 15:08:56.000000000 -0700 +--- SpiralSound/Midi.C.orig 2002-06-11 22:08:56.000000000 +0000 +++ SpiralSound/Midi.C -@@ -76,12 +76,12 @@ MidiDevice::~MidiDevice() +@@ -27,6 +27,10 @@ + #include <FL/Fl.h> + #endif + ++#if defined(__DragonFly__) && !defined(O_SYNC) ++#define O_SYNC O_FSYNC ++#endif ++ + static const int MIDI_SCANBUFSIZE=256; + static const int MIDI_KEYOFFSET=0; + +@@ -76,12 +80,12 @@ MidiDevice::~MidiDevice() void MidiDevice::Close() { pthread_mutex_lock(m_Mutex); @@ -17,7 +28,7 @@ $NetBSD: patch-an,v 1.2 2005/04/24 14:41:28 ben Exp $ cerr<<"Closed midi device"<<endl; } -@@ -90,24 +90,19 @@ void MidiDevice::Open() +@@ -90,24 +94,19 @@ void MidiDevice::Open() { //if (!SpiralInfo::WANTMIDI) return; |