View | Details | Raw Unified | Return to bug 169767 | Differences between
and this patch

Collapse All | Expand All

(-)audio/alsa-plugins/Makefile (+3 lines)
Lines 25-30 LDFLAGS+= -L${LOCALBASE}/lib Link Here
25
OPTIONS=	JACK		"JACK audio support (requires SAMPLERATE)"	Off \
25
OPTIONS=	JACK		"JACK audio support (requires SAMPLERATE)"	Off \
26
		LAVC		"libavcodec support"	Off \
26
		LAVC		"libavcodec support"	Off \
27
		SAMPLERATE	"libsamplerate support"	Off \
27
		SAMPLERATE	"libsamplerate support"	Off \
28
		FREEBSD_PATCH	"FreeBSD-specific OSS plugin" Off \
28
		PULSE		"PulseAudio support"	Off \
29
		PULSE		"PulseAudio support"	Off \
29
		SPEEX		"Speex support"		Off
30
		SPEEX		"Speex support"		Off
30
31
Lines 76-81 CONFIGURE_ARGS+= --without-speex Link Here
76
PLIST_SUB+=		SPEEX="@comment "
77
PLIST_SUB+=		SPEEX="@comment "
77
.endif
78
.endif
78
79
80
.if defined(WITH_FREEBSD_PATCH)
79
.if	${OSVERSION} > 900036 \
81
.if	${OSVERSION} > 900036 \
80
     || ${OSVERSION} > 802503 && ${OSVERSION} < 900000 \
82
     || ${OSVERSION} > 802503 && ${OSVERSION} < 900000 \
81
     || ${OSVERSION} > 704000 && ${OSVERSION} < 800000
83
     || ${OSVERSION} > 704000 && ${OSVERSION} < 800000
Lines 83-88 EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins Link Here
83
.else # ${OSVERSION} <= 704000
85
.else # ${OSVERSION} <= 704000
84
EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
86
EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
85
.endif
87
.endif
88
.endif
86
89
87
post-patch:	.SILENT
90
post-patch:	.SILENT
88
	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
91
	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
(-)audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch (-29 / +2 lines)
Lines 1-29 Link Here
1
--- jack/pcm_jack.c.orig	2009-09-16 04:33:36.000000000 +0800
2
+++ jack/pcm_jack.c	2009-09-16 04:33:55.000000000 +0800
3
@@ -20,7 +20,9 @@
4
  *
5
  */
6
 
7
+#ifndef __FreeBSD__
8
 #include <byteswap.h>
9
+#endif
10
 #include <sys/shm.h>
11
 #include <sys/types.h>
12
 #include <sys/socket.h>
13
--- oss/ctl_oss.c.orig	2009-08-31 21:09:41.000000000 +0800
1
--- oss/ctl_oss.c.orig	2009-08-31 21:09:41.000000000 +0800
14
+++ oss/ctl_oss.c	2009-09-15 01:07:51.000000000 +0800
2
+++ oss/ctl_oss.c	2009-09-15 01:07:51.000000000 +0800
15
@@ -26,7 +26,11 @@
16
 #include <sys/ioctl.h>
17
 #include <alsa/asoundlib.h>
18
 #include <alsa/control_external.h>
19
+#ifdef __FreeBSD__
20
+#include <sys/soundcard.h>
21
+#else
22
 #include <linux/soundcard.h>
23
+#endif
24
 
25
 typedef struct snd_ctl_oss {
26
 	snd_ctl_ext_t ext;
27
@@ -362,7 +366,9 @@
3
@@ -362,7 +366,9 @@
28
 {
4
 {
29
 	snd_config_iterator_t it, next;
5
 	snd_config_iterator_t it, next;
Lines 66-80 Link Here
66
 	oss->ext.private_data = oss;
42
 	oss->ext.private_data = oss;
67
--- oss/pcm_oss.c.orig	2010-04-16 14:11:10.000000000 +0300
43
--- oss/pcm_oss.c.orig	2010-04-16 14:11:10.000000000 +0300
68
+++ oss/pcm_oss.c	2012-02-14 19:27:15.833934348 +0200
44
+++ oss/pcm_oss.c	2012-02-14 19:27:15.833934348 +0200
69
@@ -22,17 +22,55 @@
45
@@ -27,16 +27,52 @@
70
 #include <sys/ioctl.h>
71
 #include <alsa/asoundlib.h>
46
 #include <alsa/asoundlib.h>
72
 #include <alsa/pcm_external.h>
47
 #include <alsa/pcm_external.h>
48
 #include <linux/soundcard.h>
73
+#ifdef __FreeBSD__
49
+#ifdef __FreeBSD__
74
+#include <sys/param.h>
50
+#include <sys/param.h>
75
+#include <sys/soundcard.h>
76
+#else
77
 #include <linux/soundcard.h>
78
+#endif
51
+#endif
79
+
52
+
80
+#define ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))
53
+#define ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))
(-)audio/alsa-plugins/files/alsa-plugins.patch (-24 lines)
Lines 1-29 Link Here
1
--- jack/pcm_jack.c.orig	2009-09-16 04:33:36.000000000 +0800
2
+++ jack/pcm_jack.c	2009-09-16 04:33:55.000000000 +0800
3
@@ -20,7 +20,9 @@
4
  *
5
  */
6
 
7
+#ifndef __FreeBSD__
8
 #include <byteswap.h>
9
+#endif
10
 #include <sys/shm.h>
11
 #include <sys/types.h>
12
 #include <sys/socket.h>
13
--- oss/ctl_oss.c.orig	2009-08-31 21:09:41.000000000 +0800
1
--- oss/ctl_oss.c.orig	2009-08-31 21:09:41.000000000 +0800
14
+++ oss/ctl_oss.c	2009-09-15 01:07:51.000000000 +0800
2
+++ oss/ctl_oss.c	2009-09-15 01:07:51.000000000 +0800
15
@@ -26,7 +26,11 @@
16
 #include <sys/ioctl.h>
17
 #include <alsa/asoundlib.h>
18
 #include <alsa/control_external.h>
19
+#ifdef __FreeBSD__
20
+#include <sys/soundcard.h>
21
+#else
22
 #include <linux/soundcard.h>
23
+#endif
24
 
25
 typedef struct snd_ctl_oss {
26
 	snd_ctl_ext_t ext;
27
@@ -362,7 +366,9 @@
3
@@ -362,7 +366,9 @@
28
 {
4
 {
29
 	snd_config_iterator_t it, next;
5
 	snd_config_iterator_t it, next;
(-)audio/alsa-plugins/files/patch-jack-pcm_jack.c (+12 lines)
Added Link Here
1
--- jack/pcm_jack.c.orig	2009-09-16 04:33:36.000000000 +0800
2
+++ jack/pcm_jack.c	2009-09-16 04:33:55.000000000 +0800
3
@@ -20,7 +20,9 @@
4
  *
5
  */
6
 
7
+#ifndef __FreeBSD__
8
 #include <byteswap.h>
9
+#endif
10
 #include <sys/shm.h>
11
 #include <sys/types.h>
12
 #include <sys/socket.h>
(-)audio/alsa-plugins/files/patch-oss-ctl_oss.c (+16 lines)
Added Link Here
1
$NetBSD: patch-ab,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
2
3
--- oss/ctl_oss.c.orig	2008-10-29 08:42:13.000000000 -0400
4
+++ oss/ctl_oss.c
5
@@ -26,7 +26,11 @@
6
 #include <sys/ioctl.h>
7
 #include <alsa/asoundlib.h>
8
 #include <alsa/control_external.h>
9
+#ifdef __linux__
10
 #include <linux/soundcard.h>
11
+#else
12
+#include <sys/soundcard.h>
13
+#endif
14
 
15
 typedef struct snd_ctl_oss {
16
 	snd_ctl_ext_t ext;
(-)audio/alsa-plugins/files/patch-oss-pcm_oss.c (+31 lines)
Added Link Here
1
$NetBSD: patch-ac,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
2
3
--- oss/pcm_oss.c.orig	2008-10-29 08:42:13.000000000 -0400
4
+++ oss/pcm_oss.c
5
@@ -22,4 +22,8 @@
6
 #include <sys/ioctl.h>
7
 #include <alsa/asoundlib.h>
8
 #include <alsa/pcm_external.h>
9
+#ifdef __linux__
10
 #include <linux/soundcard.h>
11
+#else
12
+#include <sys/soundcard.h>
13
+#endif
14
@@ -116,7 +120,7 @@ static int oss_drain(snd_pcm_ioplug_t *i
15
 	snd_pcm_oss_t *oss = io->private_data;
16
 
17
 	if (io->stream == SND_PCM_STREAM_PLAYBACK)
18
-		ioctl(oss->fd, SNDCTL_DSP_SYNC);
19
+		ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL);
20
 	return 0;
21
 }
22
 
23
@@ -125,7 +129,7 @@ static int oss_prepare(snd_pcm_ioplug_t 
24
 	snd_pcm_oss_t *oss = io->private_data;
25
 	int tmp;
26
 
27
-	ioctl(oss->fd, SNDCTL_DSP_RESET);
28
+	ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
29
 
30
 	tmp = io->channels;
31
 	if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) {

Return to bug 169767