Date: Fri, 12 Oct 2012 07:17:34 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305762 - in head/audio/s3mod: . files Message-ID: <201210120717.q9C7HYo3060842@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Oct 12 07:17:33 2012 New Revision: 305762 URL: http://svn.freebsd.org/changeset/ports/305762 Log: Fix build with clang. Feature safe: yes Added: head/audio/s3mod/files/patch-dsp.c (contents, props changed) head/audio/s3mod/files/patch-dsp.h (contents, props changed) Deleted: head/audio/s3mod/files/patch-ad Modified: head/audio/s3mod/Makefile Modified: head/audio/s3mod/Makefile ============================================================================== --- head/audio/s3mod/Makefile Fri Oct 12 07:08:52 2012 (r305761) +++ head/audio/s3mod/Makefile Fri Oct 12 07:17:33 2012 (r305762) @@ -1,9 +1,5 @@ -# New ports collection makefile for: s3mod -# Date created: 9 March 1995 -# Whom: ugen -# +# Created by: ugen # $FreeBSD$ -# PORTNAME= s3mod PORTVERSION= 1.09 Added: head/audio/s3mod/files/patch-dsp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/s3mod/files/patch-dsp.c Fri Oct 12 07:17:33 2012 (r305762) @@ -0,0 +1,54 @@ +--- dsp.c.orig 2012-10-10 23:29:01.000000000 +0800 ++++ dsp.c 2012-10-10 23:30:54.000000000 +0800 +@@ -22,20 +22,20 @@ + * linux_dsp.c - Support for the Linux DSP driver from the Voxware(C) Drivers. + */ + +-#ifdef LINUX ++#ifdef __FreeBSD__ + #include "config.h" + #include <unistd.h> + #include <stdio.h> + #include <fcntl.h> + #include <sys/types.h> +-#include <linux/soundcard.h> +-#include <bytesex.h> ++#include <sys/soundcard.h> ++#include <machine/endian.h> + #include "main.h" + #include "dsp.h" + + static int audio; + +-int get_dsp_device(void) ++void get_dsp_device(void) + { + uint32 j; + +@@ -68,11 +68,6 @@ int get_dsp_device(void) + printf("Unable to get audio blocksize\n"); + exit(1); + } +- if ((audio_buffer_size < 4096) || (audio_buffer_size > 131072)) +- { +- printf("Invalid audio buffer size: %d\n",audio_buffer_size); +- exit(1); +- } + if (!(audio_start_buffer = (uint8 *) malloc(audio_buffer_size))) + { + printf("Could not get audio buffer memory!\n"); +@@ -80,7 +75,6 @@ int get_dsp_device(void) + } + audio_end_buffer = &audio_start_buffer[audio_buffer_size]; + audio_curptr = audio_start_buffer; +- return; + } + + void write_dsp_device(void *buf, int size) { +@@ -93,5 +87,5 @@ void close_dsp_device() { + return; + } + +-#endif /* ?LINUX */ ++#endif /* ?__FreeBSD__ */ + Added: head/audio/s3mod/files/patch-dsp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/s3mod/files/patch-dsp.h Fri Oct 12 07:17:33 2012 (r305762) @@ -0,0 +1,11 @@ +--- dsp.h.orig 2012-10-10 23:31:11.000000000 +0800 ++++ dsp.h 2012-10-10 23:31:22.000000000 +0800 +@@ -34,7 +34,7 @@ extern uint8 *audio_sta + extern uint8 *audio_end_buffer; + extern uint8 *audio_curptr; + +-int get_dsp_device(void); ++void get_dsp_device(void); + void write_dsp_device(void *buf, int size); + void close_dsp_device(void); + #endif /* DSP */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210120717.q9C7HYo3060842>