diff options
| author | gahr <gahr@FreeBSD.org> | 2012-11-30 21:33:13 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2012-11-30 21:33:13 +0800 |
| commit | 8a40aa1692dec918c5896d37b541bd919cb3adf1 (patch) | |
| tree | ae600f206843ebc20ecdf920b788bc51f4730927 | |
| parent | 8ec1feb7839e1a144df0371aac9e7c37539211b4 (diff) | |
| download | freebsd-ports-gnome-8a40aa1692dec918c5896d37b541bd919cb3adf1.tar.gz freebsd-ports-gnome-8a40aa1692dec918c5896d37b541bd919cb3adf1.tar.zst freebsd-ports-gnome-8a40aa1692dec918c5896d37b541bd919cb3adf1.zip | |
- Fix build with clang
- Trim Makefile header
Feature safe: yes
Reported by: bapt
| -rw-r--r-- | audio/gsi/Makefile | 6 | ||||
| -rw-r--r-- | audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y | 10 | ||||
| -rw-r--r-- | audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c | 11 | ||||
| -rw-r--r-- | audio/gsi/files/patch-server::io.h | 15 |
4 files changed, 37 insertions, 5 deletions
diff --git a/audio/gsi/Makefile b/audio/gsi/Makefile index 6987fd08e286..8183ccc46d6a 100644 --- a/audio/gsi/Makefile +++ b/audio/gsi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: gsi -# Date created: 3 October 2000 -# Whom: Sean Farley <sean-freebsd@farley.org> -# +# Created by: Sean Farley <sean-freebsd@farley.org> # $FreeBSD$ -# PORTNAME= gsi PORTVERSION= 0.9.6 diff --git a/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y b/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y new file mode 100644 index 000000000000..212be9bd0e3f --- /dev/null +++ b/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y @@ -0,0 +1,10 @@ +--- lib/gsimidi_pcm/instrument/patchgram.y.orig 2012-11-30 14:15:59.000000000 +0100 ++++ lib/gsimidi_pcm/instrument/patchgram.y 2012-11-30 14:16:10.000000000 +0100 +@@ -26,6 +26,7 @@ + + %{ + #include <stdio.h> ++#include <stdlib.h> + #include "../kpmidi.h" + #include "../utils/log.h" + #include "../midi_to_pcm.h" diff --git a/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c b/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c new file mode 100644 index 000000000000..4643ab04babf --- /dev/null +++ b/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c @@ -0,0 +1,11 @@ +--- lib/gsimidi_pcm/midi_to_pcm.c.orig 2012-11-30 14:13:53.000000000 +0100 ++++ lib/gsimidi_pcm/midi_to_pcm.c 2012-11-30 14:14:47.000000000 +0100 +@@ -820,7 +820,7 @@ + for (t = 0; t < d->reverbCount; t++) { + if (d->reverbTaps[t].offset == offset) { + d->reverbTaps[t].amount = amount; +- return; // WHS: Return what?? False ?? ++ return False; // WHS: Return what?? False ?? + } + } + taps = calloc (sizeof (MidiReverbTap), d->reverbCount + 1); diff --git a/audio/gsi/files/patch-server::io.h b/audio/gsi/files/patch-server::io.h new file mode 100644 index 000000000000..982d2b14ec78 --- /dev/null +++ b/audio/gsi/files/patch-server::io.h @@ -0,0 +1,15 @@ +--- server/io.h.orig 2012-11-30 14:10:22.000000000 +0100 ++++ server/io.h 2012-11-30 14:10:31.000000000 +0100 +@@ -34,9 +34,9 @@ + #define msb_int32_at(buf) msb_from_native_int32(*((int32 *) (buf))) + #define msb_int16_at(buf) msb_from_native_int16(*((int16 *) (buf))) + +-#define next_msb_int32(buf) ( ((((byte *) (buf))++)[0] << 24) | ((((byte *) (buf))++)[1] << 16) | ((((byte *) (buf))++)[2] << 8) | (((byte *) (buf))++)[3] ) +-#define next_msb_int16(buf) ( ((((byte *) (buf))++)[0] << 8) | (((byte *) (buf))++)[1] ) +-#define next_byte(buf) ((((byte *) (buf))++)[0]) ++#define next_msb_int32(buf) (((buf)++)[0] << 24 | ((buf)++)[1] << 16 | ((buf)++)[2] << 8 | ((buf)++)[3]) ++#define next_msb_int16(buf) (((buf)++)[0] << 8 | ((buf)++)[1]) ++#define next_byte(buf) (((buf)++)[0]) + + + /* writing to clients */ |