Date: Fri, 30 Nov 2012 13:33:13 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308010 - in head/audio/gsi: . files Message-ID: <201211301333.qAUDXD1r092121@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Nov 30 13:33:13 2012 New Revision: 308010 URL: http://svnweb.freebsd.org/changeset/ports/308010 Log: - Fix build with clang - Trim Makefile header Feature safe: yes Reported by: bapt Added: head/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y (contents, props changed) head/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c (contents, props changed) head/audio/gsi/files/patch-server::io.h (contents, props changed) Modified: head/audio/gsi/Makefile (contents, props changed) Modified: head/audio/gsi/Makefile ============================================================================== --- head/audio/gsi/Makefile Fri Nov 30 13:32:17 2012 (r308009) +++ head/audio/gsi/Makefile Fri Nov 30 13:33:13 2012 (r308010) @@ -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 Added: head/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gsi/files/patch-lib::gsimidi_pcm::instrument::patchgram.y Fri Nov 30 13:33:13 2012 (r308010) @@ -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" Added: head/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gsi/files/patch-lib::gsmimidi_pcm::midi_to_pcm.c Fri Nov 30 13:33:13 2012 (r308010) @@ -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); Added: head/audio/gsi/files/patch-server::io.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/gsi/files/patch-server::io.h Fri Nov 30 13:33:13 2012 (r308010) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211301333.qAUDXD1r092121>