aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2012-10-12 15:17:33 +0800
committervanilla <vanilla@FreeBSD.org>2012-10-12 15:17:33 +0800
commitd49a377c4b6ae3c9a3d4a36f7bbececf4a7b6a02 (patch)
treef12a0257991b438ed5a2e829ab1c3dcfb839b59f /audio
parentf5a7d244f431f0f10dabaa1c2f406c7846a2afe8 (diff)
downloadfreebsd-ports-gnome-d49a377c4b6ae3c9a3d4a36f7bbececf4a7b6a02.tar.gz
freebsd-ports-gnome-d49a377c4b6ae3c9a3d4a36f7bbececf4a7b6a02.tar.zst
freebsd-ports-gnome-d49a377c4b6ae3c9a3d4a36f7bbececf4a7b6a02.zip
Fix build with clang.
Feature safe: yes
Diffstat (limited to 'audio')
-rw-r--r--audio/s3mod/Makefile6
-rw-r--r--audio/s3mod/files/patch-dsp.c (renamed from audio/s3mod/files/patch-ad)25
-rw-r--r--audio/s3mod/files/patch-dsp.h11
3 files changed, 32 insertions, 10 deletions
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index 45dfb85e1e49..9aa0b15321c0 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -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
diff --git a/audio/s3mod/files/patch-ad b/audio/s3mod/files/patch-dsp.c
index 3a331b6becc1..3ebf20cead1f 100644
--- a/audio/s3mod/files/patch-ad
+++ b/audio/s3mod/files/patch-dsp.c
@@ -1,6 +1,6 @@
---- dsp.c.orig Thu Aug 22 20:51:34 2002
-+++ dsp.c Thu Aug 22 20:54:31 2002
-@@ -22,14 +22,14 @@
+--- 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.
*/
@@ -18,7 +18,14 @@
#include "main.h"
#include "dsp.h"
-@@ -68,11 +68,6 @@
+ 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);
}
@@ -30,7 +37,15 @@
if (!(audio_start_buffer = (uint8 *) malloc(audio_buffer_size)))
{
printf("Could not get audio buffer memory!\n");
-@@ -93,5 +88,5 @@
+@@ -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;
}
diff --git a/audio/s3mod/files/patch-dsp.h b/audio/s3mod/files/patch-dsp.h
new file mode 100644
index 000000000000..f1c0a1a4eb8b
--- /dev/null
+++ b/audio/s3mod/files/patch-dsp.h
@@ -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 */