From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 12 07:17:34 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 685F9100;
 Fri, 12 Oct 2012 07:17:34 +0000 (UTC)
 (envelope-from vanilla@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 477688FC12;
 Fri, 12 Oct 2012 07:17:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9C7HYCN060846;
 Fri, 12 Oct 2012 07:17:34 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9C7HYo3060842;
 Fri, 12 Oct 2012 07:17:34 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201210120717.q9C7HYo3060842@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Fri, 12 Oct 2012 07:17:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305762 - in head/audio/s3mod: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Oct 2012 07:17:34 -0000

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 */