Attachment #127737 for bug #171601

Lines 1-2 Link Here

(-)audio/alsa-lib/distinfo (-2 / +2 lines)
1	SHA256 (alsa-lib-1.0.25.tar.bz2) =3D 5a1a805cf04106316d549ec650116ce6711a1=	1	SHA256 (alsa-lib-1.0.26.tar.bz2) =3D 8c9f8161603cc3db640619650401292c3e110=
2	SIZE (alsa-lib-1.0.25.tar.bz2) =3D 838403	2	SIZE (alsa-lib-1.0.26.tar.bz2) =3D 883076

Lines 154-166 Link Here

(-)audio/alsa-lib/files/patch-alsa-lib (-8 / +22 lines)
154	#if __BYTE_ORDER =3D=3D __LITTLE_ENDIAN	154	#if __BYTE_ORDER =3D=3D __LITTLE_ENDIAN
155	#define __cpu_to_le32(x) (x)	155	#define __cpu_to_le32(x) (x)
156	#define __cpu_to_be32(x) bswap_32(x)	156	#define __cpu_to_be32(x) bswap_32(x)
157	--- src/async.c.orig 2009-09-09 20:34:54.000000000 +0800	157	$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
158	+++ src/async.c 2009-09-15 00:49:34.000000000 +0800	158
159	@@ -51,6 +51,7 @@	159	--- src/async.c.orig 2008-12-25 08:18:22 +0200
		160	+++ src/async.c 2008-12-25 08:20:39 +0200
		161	@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
160	static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *sigi=	162	static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *sigi=
161	{	163	{
162	+#ifndef __FreeBSD__	164	+#if defined(__DragonFly__) \|\| defined(__FreeBSD__)
		165	+ /* XXX XXX XXX */
		166	+ struct list_head *i;
		167	+ list_for_each(i, &snd_async_handlers) {
		168	+ snd_async_handler_t *h =3D list_entry(i, snd_async_handler_t, glist);
		169	+ if (h->callback)
		170	+ h->callback(h);
		171	+ }
		172	+#else
163	int fd;	173	int fd;
164	struct list_head *i;	174	struct list_head *i;
165	//assert(siginfo->si_code =3D=3D SI_SIGIO);	175	//assert(siginfo->si_code =3D=3D SI_SIGIO);
Lines 174-185 Link Here
174	/**	184	/**
175	--- src/compat/hsearch_r.c.orig 2009-09-09 20:34:54.000000000 +0800	185	--- src/compat/hsearch_r.c.orig 2009-09-09 20:34:54.000000000 +0800
176	+++ src/compat/hsearch_r.c 2009-09-15 00:22:11.000000000 +0800	186	+++ src/compat/hsearch_r.c 2009-09-15 00:22:11.000000000 +0800
177	@@ -18,7 +18,9 @@	187	@@ -18,7 +18,11 @@
178	Boston, MA 02111-1307, USA. */	188	Boston, MA 02111-1307, USA. */
179	#include <errno.h>	189	#include <errno.h>
180	+#ifndef __FreeBSD__	190	+#ifdef __GLIBC__
181	#include <malloc.h>	191	#include <malloc.h>
		192	+#else
		193	+#include <stdlib.h>
182	+#endif	194	+#endif
183	#include <string.h>	195	#include <string.h>
Lines 448-459 Link Here
448	#ifndef DOC_HIDDEN	460	#ifndef DOC_HIDDEN
449	--- src/shmarea.c.orig 2009-09-09 20:34:54.000000000 +0800	461	--- src/shmarea.c.orig 2009-09-09 20:34:54.000000000 +0800
450	+++ src/shmarea.c 2009-09-15 00:22:00.000000000 +0800	462	+++ src/shmarea.c 2009-09-15 00:22:00.000000000 +0800
451	@@ -19,7 +19,9 @@	463	@@ -19,7 +19,11 @@
452	*/	464	*/
453	#include <stdio.h>	465	#include <stdio.h>
454	+#ifndef __FreeBSD__	466	+#ifdef __GLIBC__
455	#include <malloc.h>	467	#include <malloc.h>
		468	+#else
		469	+#include <stdlib.h>
456	+#endif	470	+#endif
457	#include <string.h>	471	#include <string.h>
458	#include <errno.h>	472	#include <errno.h>




based on https://bugs.busybox.net/show_bug.cgi?id=3D3529

--- include/local.h.orig
+++ include/local.h
@@ -285,4 +285,125 @@ int snd_config_search_alias_hooks(snd_co
                                   const char *base, const char *key,
 				  snd_config_t **result);
=20
+#ifdef NEED_VERSIONSORT
+
+/* Compare strings while treating digits characters numerically.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jean-Fran=C3=A7ois Bignolles <bignolle@ecoledoc.ibp.fr>=
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <string.h>
+#include <ctype.h>
+
+
+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
+           fractionnal parts, S_Z: idem but with leading Zeroes only */
+#define  S_N    0x0
+#define  S_I    0x4
+#define  S_F    0x8
+#define  S_Z    0xC
+
+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
+#define  CMP    2
+#define  LEN    3
+
+/* Compare S1 and S2 as strings holding indices/version numbers,
+   returning less than, equal to or greater than zero if S1 is less than,
+   equal to or greater than S2 (for more info, see the texinfo doc).
+*/
+static inline
+int strverscmp (s1, s2)
+     const char *s1;
+     const char *s2;
+{
+  const unsigned char *p1 =3D (const unsigned char *) s1;
+  const unsigned char *p2 =3D (const unsigned char *) s2;
+  unsigned char c1, c2;
+  int state;
+  int diff;
+
+  /* Symbol(s)    0       [1-9]   others  (padding)
+     Transition   (10) 0  (01) d  (00) x  (11) -   */
+  static const unsigned int next_state[] =3D
+  {
+      /* state    x    d    0    - */
+      /* S_N */  S_N, S_I, S_Z, S_N,
+      /* S_I */  S_N, S_I, S_I, S_I,
+      /* S_F */  S_N, S_F, S_F, S_F,
+      /* S_Z */  S_N, S_F, S_Z, S_Z
+  };
+
+  static const int result_type[] =3D
+  {
+      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
+                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
+
+      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
+                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
+      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
+                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
+      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
+                 -1,  CMP, CMP, CMP
+  };
+
+  if (p1 =3D=3D p2)
+    return 0;
+
+  c1 =3D *p1++;
+  c2 =3D *p2++;
+  /* Hint: '0' is a digit too.  */
+  state =3D S_N | ((c1 =3D=3D '0') + (isdigit (c1) !=3D 0));
+
+  while ((diff =3D c1 - c2) =3D=3D 0 && c1 !=3D '\0')
+    {
+      state =3D next_state[state];
+      c1 =3D *p1++;
+      c2 =3D *p2++;
+      state |=3D (c1 =3D=3D '0') + (isdigit (c1) !=3D 0);
+    }
+
+  state =3D result_type[state << 2 | (((c2 =3D=3D '0') + (isdigit (c2) !=
+
+  switch (state)
+  {
+    case CMP:
+      return diff;
+
+    case LEN:
+      while (isdigit (*p1++))
+	if (!isdigit (*p2++))
+	  return 1;
+
+      return isdigit (*p2) ? -1 : diff;
+
+    default:
+      return state;
+  }
+}
+
+static inline
+int versionsort(const void * a, const void * b)
+{
+    return strverscmp ((*(const struct dirent **) a)->d_name,
+	    (*(const struct dirent **) b)->d_name);
+}
+
+#endif
 #endif
--- src/conf.c.orig
+++ src/conf.c
@@ -419,6 +419,9 @@ beginning:</P>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <locale.h>
+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ =3D=3D 0 && __UCLIBC_MINOR__=
=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30
+#define NEED_VERSIONSORT
+#endif
 #include "local.h"
 #ifdef HAVE_LIBPTHREAD
 #include <pthread.h>
--- src/ucm/parser.c.orig
+++ src/ucm/parser.c
@@ -30,8 +30,11 @@
  *               Jaroslav Kysela <perex@perex.cz>
  */
=20
-#include "ucm_local.h"
 #include <dirent.h>
+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ =3D=3D 0 && __UCLIBC_MINOR__=
=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30
+#define NEED_VERSIONSORT
+#endif
+#include "ucm_local.h"
=20
 /** The name of the environment variable containing the UCM directory */
 #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"

Lines 72-77 share/alsa/cards/EMU10K1X.conf Link Here

(-)audio/alsa-lib/pkg-plist (+1 lines)
72	share/alsa/cards/ENS1370.conf	72	share/alsa/cards/ENS1370.conf
73	share/alsa/cards/ENS1371.conf	73	share/alsa/cards/ENS1371.conf
74	share/alsa/cards/ES1968.conf	74	share/alsa/cards/ES1968.conf
		75	share/alsa/cards/Echo_Echo3G.conf
75	share/alsa/cards/FM801.conf	76	share/alsa/cards/FM801.conf
76	share/alsa/cards/FWSpeakers.conf	77	share/alsa/cards/FWSpeakers.conf
77	share/alsa/cards/FireWave.conf	78	share/alsa/cards/FireWave.conf

Lines 6-12 Link Here

(-)audio/alsa-lib/Makefile (-1 / +2 lines)
6	#	6	#
7	PORTNAME=3D alsa-lib	7	PORTNAME=3D alsa-lib
8	PORTVERSION=3D 1.0.25	8	PORTVERSION=3D 1.0.26
9	CATEGORIES=3D audio	9	CATEGORIES=3D audio
10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/lib/ \	10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/lib/ \
11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/lib/ \	11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/lib/ \
Lines 24-29 CONFIGURE_ARGS+=3D--disable-aload --disable-python \ Link Here
24	post-patch: .SILENT	24	post-patch: .SILENT
25	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \	25	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
		26	-e '/-D_GNU_SOURCE/d' \
26	-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure	27	-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
27	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \	28	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
28	${WRKSRC}/modules/mixer/simple/Makefile.in	29	${WRKSRC}/modules/mixer/simple/Makefile.in

Lines 1-2 Link Here

(-)audio/alsa-plugins/distinfo (-2 / +2 lines)
1	SHA256 (alsa-plugins-1.0.25.tar.bz2) =3D a0e374fd6d5ee9683473a5b6e73dadde6=
Line 1 Link Here
1	SIZE (alsa-plugins-1.0.25.tar.bz2) =3D 331568	54851066	SHA256 (alsa-plugins-1.0.26.tar.bz2) =3D 03515134d2009db4dfb2769e0ab0e1fb5=
Line 17 Link Here
		8140	SIZE (alsa-plugins-1.0.26.tar.bz2) =3D 361017




--- usb_stream/pcm_usb_stream.c.orig
+++ usb_stream/pcm_usb_stream.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 U=
  */
 #define _GNU_SOURCE
+#ifndef __FreeBSD__
 #include <byteswap.h>
+#endif
 #define _GNU_SOURCE
 #include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/ioctl.h>
@@ -79,6 +81,69 @@ typedef struct {
 static struct user_usb_stream *uus;
 static pthread_mutex_t uus_mutex =3D PTHREAD_MUTEX_INITIALIZER;

Lines 6-12 Link Here

(-)audio/alsa-plugins/Makefile (-2 / +1 lines)
6	#	6	#
7	PORTNAME=3D alsa-plugins	7	PORTNAME=3D alsa-plugins
8	PORTVERSION=3D 1.0.25	8	PORTVERSION=3D 1.0.26
9	CATEGORIES=3D audio	9	CATEGORIES=3D audio
10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/plugins/ \	10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/plugins/ \
11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \	11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \
Lines 25-31 LDFLAGS+=3D -L${LOCALBASE}/lib Link Here
25	USE_LDCONFIG=3D ${PREFIX}/lib/alsa-lib	25	USE_LDCONFIG=3D ${PREFIX}/lib/alsa-lib
26	OPTIONS_DEFINE=3D ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX	26	OPTIONS_DEFINE=3D ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
27	OPTIONS_DEFAULT=3DARIFF_OSS
28	ARIFF_OSS_DESC=3D FreeBSD-specific OSS plugin	27	ARIFF_OSS_DESC=3D FreeBSD-specific OSS plugin
29	.include <bsd.port.options.mk>	28	.include <bsd.port.options.mk>

Lines 1-2 Link Here

(-)audio/alsa-utils/distinfo (-2 / +2 lines)
1	SHA256 (alsa-utils-1.0.25.tar.bz2) =3D 2e676a2f634bbfe279b260e10a96f617cb7=	1	SHA256 (alsa-utils-1.0.26.tar.bz2) =3D f85f2a3aa6e78475bbe35b0cad3a8cabb99=
2	SIZE (alsa-utils-1.0.25.tar.bz2) =3D 1132780	2	SIZE (alsa-utils-1.0.26.tar.bz2) =3D 1134474

Lines 6-12 Link Here

(-)audio/alsa-utils/Makefile (-1 / +1 lines)
6	#	6	#
7	PORTNAME=3D alsa-utils	7	PORTNAME=3D alsa-utils
8	PORTVERSION=3D 1.0.25	8	PORTVERSION=3D 1.0.26
9	CATEGORIES=3D audio	9	CATEGORIES=3D audio
10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/utils/ \	10	MASTER_SITES=3D ftp://ftp.silug.org/pub/alsa/utils/ \
11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/ \	11	ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/ \

Return to bug 171601

Lines 1-157 Link Here

(-)audio/alsa-lib/files/patch-versionsort (-157 lines)
1	based on https://bugs.busybox.net/show_bug.cgi?id=3D3529
2
3	--- include/local.h.orig
4	+++ include/local.h
5	@@ -285,4 +285,125 @@ int snd_config_search_alias_hooks(snd_co
6	const char base, const char key,
7	snd_config_t **result);
8	=20
9	+#ifdef NEED_VERSIONSORT
10	+
11	+/* Compare strings while treating digits characters numerically.
12	+ Copyright (C) 1997, 2002 Free Software Foundation, Inc.
13	+ This file is part of the GNU C Library.
14	+ Contributed by Jean-Fran=C3=A7ois Bignolles <bignolle@ecoledoc.ibp.fr>=
15	+
16	+ The GNU C Library is free software; you can redistribute it and/or
17	+ modify it under the terms of the GNU Lesser General Public
18	+ License as published by the Free Software Foundation; either
19	+ version 2.1 of the License, or (at your option) any later version.
20	+
21	+ The GNU C Library is distributed in the hope that it will be useful,
22	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
23	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24	+ Lesser General Public License for more details.
25	+
26	+ You should have received a copy of the GNU Lesser General Public
27	+ License along with the GNU C Library; if not, write to the Free
28	+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
29	+ 02111-1307 USA. */
30	+
31	+#include <string.h>
32	+#include <ctype.h>
33	+
34	+
35	+/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
36	+ fractionnal parts, S_Z: idem but with leading Zeroes only */
37	+#define S_N 0x0
38	+#define S_I 0x4
39	+#define S_F 0x8
40	+#define S_Z 0xC
41	+
42	+/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
43	+#define CMP 2
44	+#define LEN 3
45	+
46	+/* Compare S1 and S2 as strings holding indices/version numbers,
47	+ returning less than, equal to or greater than zero if S1 is less than,
48	+ equal to or greater than S2 (for more info, see the texinfo doc).
49	+*/
50	+static inline
51	+int strverscmp (s1, s2)
52	+ const char *s1;
53	+ const char *s2;
54	+{
55	+ const unsigned char p1 =3D (const unsigned char ) s1;
56	+ const unsigned char p2 =3D (const unsigned char ) s2;
57	+ unsigned char c1, c2;
58	+ int state;
59	+ int diff;
60	+
61	+ /* Symbol(s) 0 [1-9] others (padding)
62	+ Transition (10) 0 (01) d (00) x (11) - */
63	+ static const unsigned int next_state[] =3D
64	+ {
65	+ /* state x d 0 - */
66	+ /* S_N */ S_N, S_I, S_Z, S_N,
67	+ /* S_I */ S_N, S_I, S_I, S_I,
68	+ /* S_F */ S_N, S_F, S_F, S_F,
69	+ /* S_Z */ S_N, S_F, S_Z, S_Z
70	+ };
71	+
72	+ static const int result_type[] =3D
73	+ {
74	+ /* state x/x x/d x/0 x/- d/x d/d d/0 d/-
75	+ 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */
76	+
77	+ /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
78	+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
79	+ /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP,
80	+ +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP,
81	+ /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
82	+ CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
83	+ /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP,
84	+ -1, CMP, CMP, CMP
85	+ };
86	+
87	+ if (p1 =3D=3D p2)
88	+ return 0;
89	+
90	+ c1 =3D *p1++;
91	+ c2 =3D *p2++;
92	+ /* Hint: '0' is a digit too. */
93	+ state =3D S_N \| ((c1 =3D=3D '0') + (isdigit (c1) !=3D 0));
94	+
95	+ while ((diff =3D c1 - c2) =3D=3D 0 && c1 !=3D '\0')
96	+ {
97	+ state =3D next_state[state];
98	+ c1 =3D *p1++;
99	+ c2 =3D *p2++;
100	+ state \|=3D (c1 =3D=3D '0') + (isdigit (c1) !=3D 0);
101	+ }
102	+
103	+ state =3D result_type[state << 2 \| (((c2 =3D=3D '0') + (isdigit (c2) !=
104	+
105	+ switch (state)
106	+ {
107	+ case CMP:
108	+ return diff;
109	+
110	+ case LEN:
111	+ while (isdigit (*p1++))
112	+ if (!isdigit (*p2++))
113	+ return 1;
114	+
115	+ return isdigit (*p2) ? -1 : diff;
116	+
117	+ default:
118	+ return state;
119	+ }
120	+}
121	+
122	+static inline
123	+int versionsort(const void * a, const void * b)
124	+{
125	+ return strverscmp (((const struct dirent *) a)->d_name,
126	+ ((const struct dirent *) b)->d_name);
127	+}
128	+
129	+#endif
130	#endif
131	--- src/conf.c.orig
132	+++ src/conf.c
133	@@ -419,6 +419,9 @@ beginning:</P>
134	#include <sys/stat.h>
135	#include <dirent.h>
136	#include <locale.h>
137	+#if defined(__FreeBSD__) \|\| __UCLIBC_MAJOR__ =3D=3D 0 && __UCLIBC_MINOR__=
138	=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30	0	=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30
139	+#define NEED_VERSIONSORT
140	+#endif
141	#include "local.h"
142	#ifdef HAVE_LIBPTHREAD
143	#include <pthread.h>
144	--- src/ucm/parser.c.orig
145	+++ src/ucm/parser.c
146	@@ -30,8 +30,11 @@
147	* Jaroslav Kysela <perex@perex.cz>
148	*/
149	=20
150	-#include "ucm_local.h"
151	#include <dirent.h>
152	+#if defined(__FreeBSD__) \|\| __UCLIBC_MAJOR__ =3D=3D 0 && __UCLIBC_MINOR__=
153	=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30	1	=3D=3D 9 && __UCLIBC_SUBLEVEL__ <=3D 30
154	+#define NEED_VERSIONSORT
155	+#endif
156	+#include "ucm_local.h"
157	=20
158	/** The name of the environment variable containing the UCM directory */
159	#define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"

Lines 2-17 based on https://github.com/dankamongmen/libdank/b Link Here

(-)audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c (-3 / +3 lines)
2	--- usb_stream/pcm_usb_stream.c.orig	2	--- usb_stream/pcm_usb_stream.c.orig
3	+++ usb_stream/pcm_usb_stream.c	3	+++ usb_stream/pcm_usb_stream.c
4	@@ -18,7 +18,9 @@	4	@@ -19,7 +19,9 @@
5	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U=
6	*/	5	*/
		6	#define _GNU_SOURCE
7	+#ifndef __FreeBSD__	7	+#ifndef __FreeBSD__
8	#include <byteswap.h>	8	#include <byteswap.h>
9	+#endif	9	+#endif
10	#define _GNU_SOURCE
11	#include <sys/mman.h>	10	#include <sys/mman.h>
12	#include <sys/shm.h>	11	#include <sys/shm.h>
		12	#include <sys/ioctl.h>
13	@@ -79,6 +81,69 @@ typedef struct {	13	@@ -79,6 +81,69 @@ typedef struct {
14	static struct user_usb_stream *uus;	14	static struct user_usb_stream *uus;
15	static pthread_mutex_t uus_mutex =3D PTHREAD_MUTEX_INITIALIZER;	15	static pthread_mutex_t uus_mutex =3D PTHREAD_MUTEX_INITIALIZER;