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

Collapse All | Expand All

(-)Mk/bsd.sites.mk (+11 lines)
Lines 51-56 MASTER_SITE_AFTERSTEP+= \ Link Here
51
	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/
51
	ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/
52
.endif
52
.endif
53
53
54
.if !defined(IGNORE_MASTER_SITE_ALSA)
55
MASTER_SITE_ALSA+= \
56
	ftp://ftp.silug.org/pub/alsa/%SUBDIR%/ \
57
	ftp://ftp.task.gda.pl/pub/linux/misc/alsa/%SUBDIR%/ \
58
	ftp://gd.tuwien.ac.at/opsys/linux/alsa/%SUBDIR%/ \
59
	http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/%SUBDIR%/ \
60
	http://mirrors.zerg.biz/alsa/%SUBDIR%/ \
61
	http://alsa.cybermirror.org/%SUBDIR%/ \
62
	ftp://ftp.alsa-project.org/pub/%SUBDIR%/
63
.endif
64
54
.if !defined(IGNORE_MASTER_SITE_APACHE)
65
.if !defined(IGNORE_MASTER_SITE_APACHE)
55
MASTER_SITE_APACHE+= \
66
MASTER_SITE_APACHE+= \
56
	http://www.apache.org/dist/%SUBDIR%/ \
67
	http://www.apache.org/dist/%SUBDIR%/ \
(-)audio/alsa-lib/Makefile (-5 / +4 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	alsa-lib
8
PORTNAME=	alsa-lib
9
PORTVERSION=	1.0.25
9
PORTVERSION=	1.0.26
10
CATEGORIES=	audio
10
CATEGORIES=	audio
11
MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/lib/ \
11
MASTER_SITES=	ALSA/lib \
12
		ftp://gd.tuwien.ac.at/opsys/linux/alsa/lib/ \
12
		GENTOO/distfiles
13
		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/ \
14
		ftp://ftp.alsa-project.org/pub/lib/
15
13
16
MAINTAINER=	aragon@phat.za.net
14
MAINTAINER=	aragon@phat.za.net
17
COMMENT=	ALSA compatibility library
15
COMMENT=	ALSA compatibility library
Lines 24-29 CONFIGURE_ARGS+=--disable-aload --disable-python \ Link Here
24
22
25
post-patch:	.SILENT
23
post-patch:	.SILENT
26
	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
24
	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
25
		-e '/-D_GNU_SOURCE/d' \
27
		-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
26
		-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
28
	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
27
	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
29
		${WRKSRC}/modules/mixer/simple/Makefile.in
28
		${WRKSRC}/modules/mixer/simple/Makefile.in
(-)audio/alsa-lib/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (alsa-lib-1.0.25.tar.bz2) = 5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6
1
SHA256 (alsa-lib-1.0.26.tar.bz2) = 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d
2
SIZE (alsa-lib-1.0.25.tar.bz2) = 838403
2
SIZE (alsa-lib-1.0.26.tar.bz2) = 883076
(-)audio/alsa-lib/files/patch-alsa-lib (-8 / +22 lines)
Lines 154-166 Link Here
154
 #if __BYTE_ORDER == __LITTLE_ENDIAN
154
 #if __BYTE_ORDER == __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
 
162
 
161
 static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
163
 static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
162
 {
164
 {
163
+#ifndef __FreeBSD__
165
+#if defined(__DragonFly__) || defined(__FreeBSD__)
166
+	/* XXX XXX XXX */
167
+	struct list_head *i;
168
+	list_for_each(i, &snd_async_handlers) {
169
+		snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
170
+		if (h->callback)
171
+			h->callback(h);
172
+	}
173
+#else
164
 	int fd;
174
 	int fd;
165
 	struct list_head *i;
175
 	struct list_head *i;
166
 	//assert(siginfo->si_code == SI_SIGIO);
176
 	//assert(siginfo->si_code == 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
 
189
 
180
 #include <errno.h>
190
 #include <errno.h>
181
+#ifndef __FreeBSD__
191
+#ifdef __GLIBC__
182
 #include <malloc.h>
192
 #include <malloc.h>
193
+#else
194
+#include <stdlib.h>
183
+#endif
195
+#endif
184
 #include <string.h>
196
 #include <string.h>
185
 
197
 
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
   
465
   
454
 #include <stdio.h>
466
 #include <stdio.h>
455
+#ifndef __FreeBSD__
467
+#ifdef __GLIBC__
456
 #include <malloc.h>
468
 #include <malloc.h>
469
+#else
470
+#include <stdlib.h>
457
+#endif
471
+#endif
458
 #include <string.h>
472
 #include <string.h>
459
 #include <errno.h>
473
 #include <errno.h>
(-)audio/alsa-lib/files/patch-versionsort (-157 lines)
Lines 1-157 Link Here
1
based on https://bugs.busybox.net/show_bug.cgi?id=3529
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
 
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├žois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
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 = (const unsigned char *) s1;
56
+  const unsigned char *p2 = (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[] =
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[] =
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 == p2)
88
+    return 0;
89
+
90
+  c1 = *p1++;
91
+  c2 = *p2++;
92
+  /* Hint: '0' is a digit too.  */
93
+  state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
94
+
95
+  while ((diff = c1 - c2) == 0 && c1 != '\0')
96
+    {
97
+      state = next_state[state];
98
+      c1 = *p1++;
99
+      c2 = *p2++;
100
+      state |= (c1 == '0') + (isdigit (c1) != 0);
101
+    }
102
+
103
+  state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
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__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30
138
+#define NEED_VERSIONSORT
139
+#endif
140
 #include "local.h"
141
 #ifdef HAVE_LIBPTHREAD
142
 #include <pthread.h>
143
--- src/ucm/parser.c.orig
144
+++ src/ucm/parser.c
145
@@ -30,8 +30,11 @@
146
  *               Jaroslav Kysela <perex@perex.cz>
147
  */
148
 
149
-#include "ucm_local.h"
150
 #include <dirent.h>
151
+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30
152
+#define NEED_VERSIONSORT
153
+#endif
154
+#include "ucm_local.h"
155
 
156
 /** The name of the environment variable containing the UCM directory */
157
 #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
(-)audio/alsa-lib/pkg-plist (+1 lines)
Lines 72-77 share/alsa/cards/EMU10K1X.conf Link Here
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
(-)audio/alsa-plugins/Makefile (-6 / +3 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	alsa-plugins
8
PORTNAME=	alsa-plugins
9
PORTVERSION=	1.0.25
9
PORTVERSION=	1.0.26
10
CATEGORIES=	audio
10
CATEGORIES=	audio
11
MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/plugins/ \
11
MASTER_SITES=	ALSA/plugins \
12
		ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \
12
		GENTOO/distfiles
13
		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/plugins/ \
14
		ftp://ftp.alsa-project.org/pub/plugins/
15
13
16
MAINTAINER=	aragon@phat.za.net
14
MAINTAINER=	aragon@phat.za.net
17
COMMENT=	ALSA compatibility library plugins
15
COMMENT=	ALSA compatibility library plugins
Lines 25-31 LDFLAGS+= -L${LOCALBASE}/lib Link Here
25
USE_LDCONFIG=	${PREFIX}/lib/alsa-lib
23
USE_LDCONFIG=	${PREFIX}/lib/alsa-lib
26
24
27
OPTIONS_DEFINE=	ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
25
OPTIONS_DEFINE=	ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
28
OPTIONS_DEFAULT=ARIFF_OSS
29
ARIFF_OSS_DESC=	FreeBSD-specific OSS plugin
26
ARIFF_OSS_DESC=	FreeBSD-specific OSS plugin
30
27
31
.include <bsd.port.options.mk>
28
.include <bsd.port.options.mk>
(-)audio/alsa-plugins/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (alsa-plugins-1.0.25.tar.bz2) = a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
1
SHA256 (alsa-plugins-1.0.26.tar.bz2) = 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f
2
SIZE (alsa-plugins-1.0.25.tar.bz2) = 331568
2
SIZE (alsa-plugins-1.0.26.tar.bz2) = 361017
(-)audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c (-3 / +3 lines)
Lines 2-17 based on https://github.com/dankamongmen/libdank/b Link Here
2
2
3
--- usb_stream/pcm_usb_stream.c.orig
3
--- usb_stream/pcm_usb_stream.c.orig
4
+++ usb_stream/pcm_usb_stream.c
4
+++ usb_stream/pcm_usb_stream.c
5
@@ -18,7 +18,9 @@
5
@@ -19,7 +19,9 @@
6
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
7
  */
6
  */
8
 
7
 
8
 #define _GNU_SOURCE
9
+#ifndef __FreeBSD__
9
+#ifndef __FreeBSD__
10
 #include <byteswap.h>
10
 #include <byteswap.h>
11
+#endif
11
+#endif
12
 #define _GNU_SOURCE
13
 #include <sys/mman.h>
12
 #include <sys/mman.h>
14
 #include <sys/shm.h>
13
 #include <sys/shm.h>
14
 #include <sys/ioctl.h>
15
@@ -79,6 +81,69 @@ typedef struct {
15
@@ -79,6 +81,69 @@ typedef struct {
16
 static struct user_usb_stream *uus;
16
 static struct user_usb_stream *uus;
17
 static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
17
 static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;
(-)audio/alsa-utils/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (alsa-utils-1.0.25.tar.bz2) = 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c
1
SHA256 (alsa-utils-1.0.26.tar.bz2) = f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7
2
SIZE (alsa-utils-1.0.25.tar.bz2) = 1132780
2
SIZE (alsa-utils-1.0.26.tar.bz2) = 1134474
(-)audio/alsa-utils/Makefile (-5 / +3 lines)
Lines 6-17 Link Here
6
#
6
#
7
7
8
PORTNAME=	alsa-utils
8
PORTNAME=	alsa-utils
9
PORTVERSION=	1.0.25
9
PORTVERSION=	1.0.26
10
CATEGORIES=	audio
10
CATEGORIES=	audio
11
MASTER_SITES=	ftp://ftp.silug.org/pub/alsa/utils/ \
11
MASTER_SITES=	ALSA/utils \
12
		ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/ \
12
		GENTOO/distfiles
13
		http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/ \
14
		ftp://ftp.alsa-project.org/pub/utils/
15
13
16
MAINTAINER=	aragon@phat.za.net
14
MAINTAINER=	aragon@phat.za.net
17
COMMENT=	ALSA compatibility utils
15
COMMENT=	ALSA compatibility utils

Return to bug 171601