mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

- update to 1.0.26 [1]

Browse Source 
- use newly added alphasort() instead of LGPLv2.1+ patch
- fix async handler [2]
- fix implicit declarations of calloc/free [3]
- disable ARIFF_OSS option by default, except 7.x [4]
- add 3 more mirrors from alsa wiki + gentoo as a backup
- move alsa mirrors to bsd.sites.mk

Changes:	http://www.alsa-project.org/main/index.php/Changes_v1.0.25_v1.0.26
PR:		ports/171601 [1]
PR:		ports/169770 [2]
PR:		ports/170457 [3]
PR:		ports/170473 [4]
Obtained from:	PkgSrc [2]
Submitted by:	Jan Beich <jbeich@tormail.org>
Approved by:	maintainer
This commit is contained in:
Florian Smeets 2012-10-04 17:04:44 +00:00
parent 8abb759296
commit d3c505e600
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=305269
13 changed files with 56 additions and 757 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mk/bsd.sites.mk
View File

@ -51,6 +51,17 @@ MASTER_SITE_AFTERSTEP+= \
ftp://ftp.dti.ad.jp/pub/X/AfterStep/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_ALSA)
MASTER_SITE_ALSA+= \
ftp://ftp.silug.org/pub/alsa/%SUBDIR%/ \
ftp://ftp.task.gda.pl/pub/linux/misc/alsa/%SUBDIR%/ \
ftp://gd.tuwien.ac.at/opsys/linux/alsa/%SUBDIR%/ \
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/%SUBDIR%/ \
http://mirrors.zerg.biz/alsa/%SUBDIR%/ \
http://alsa.cybermirror.org/%SUBDIR%/ \
ftp://ftp.alsa-project.org/pub/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_APACHE)
MASTER_SITE_APACHE+= \
http://www.apache.org/dist/%SUBDIR%/ \

9
audio/alsa-lib/Makefile
View File

@ -6,12 +6,10 @@
#
PORTNAME= alsa-lib
PORTVERSION= 1.0.25
PORTVERSION= 1.0.26
CATEGORIES= audio
MASTER_SITES= ftp://ftp.silug.org/pub/alsa/lib/ \
ftp://gd.tuwien.ac.at/opsys/linux/alsa/lib/ \
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/ \
ftp://ftp.alsa-project.org/pub/lib/
MASTER_SITES= ALSA/lib \
GENTOO/distfiles
MAINTAINER= aragon@phat.za.net
COMMENT= ALSA compatibility library
@ -24,6 +22,7 @@ CONFIGURE_ARGS+=--disable-aload --disable-python \
post-patch: .SILENT
${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
-e '/-D_GNU_SOURCE/d' \
-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
${WRKSRC}/modules/mixer/simple/Makefile.in

4
audio/alsa-lib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (alsa-lib-1.0.25.tar.bz2) = 5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6
SIZE (alsa-lib-1.0.25.tar.bz2) = 838403
SHA256 (alsa-lib-1.0.26.tar.bz2) = 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d
SIZE (alsa-lib-1.0.26.tar.bz2) = 883076

30
audio/alsa-lib/files/patch-alsa-lib
View File

@ -154,13 +154,23 @@
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define __cpu_to_le32(x) (x)
#define __cpu_to_be32(x) bswap_32(x)
--- src/async.c.orig 2009-09-09 20:34:54.000000000 +0800
+++ src/async.c 2009-09-15 00:49:34.000000000 +0800
@@ -51,6 +51,7 @@
$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
--- src/async.c.orig 2008-12-25 08:18:22 +0200
+++ src/async.c 2008-12-25 08:20:39 +0200
@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
{
+#ifndef __FreeBSD__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+ /* XXX XXX XXX */
+ struct list_head *i;
+ list_for_each(i, &snd_async_handlers) {
+ snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
+ if (h->callback)
+ h->callback(h);
+ }
+#else
int fd;
struct list_head *i;
//assert(siginfo->si_code == SI_SIGIO);
@ -174,12 +184,14 @@
/**
--- src/compat/hsearch_r.c.orig 2009-09-09 20:34:54.000000000 +0800
+++ src/compat/hsearch_r.c 2009-09-15 00:22:11.000000000 +0800
@@ -18,7 +18,9 @@
@@ -18,7 +18,11 @@
Boston, MA 02111-1307, USA. */
#include <errno.h>
+#ifndef __FreeBSD__
+#ifdef __GLIBC__
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <string.h>
@ -448,12 +460,14 @@
#ifndef DOC_HIDDEN
--- src/shmarea.c.orig 2009-09-09 20:34:54.000000000 +0800
+++ src/shmarea.c 2009-09-15 00:22:00.000000000 +0800
@@ -19,7 +19,9 @@
@@ -19,7 +19,11 @@
*/
#include <stdio.h>
+#ifndef __FreeBSD__
+#ifdef __GLIBC__
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <string.h>
#include <errno.h>

157
audio/alsa-lib/files/patch-versionsort
View File

@ -1,157 +0,0 @@
based on https://bugs.busybox.net/show_bug.cgi?id=3529
--- 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);
+#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çois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+
+ 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 = (const unsigned char *) s1;
+ const unsigned char *p2 = (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[] =
+ {
+ /* 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[] =
+ {
+ /* 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 == p2)
+ return 0;
+
+ c1 = *p1++;
+ c2 = *p2++;
+ /* Hint: '0' is a digit too. */
+ state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
+
+ while ((diff = c1 - c2) == 0 && c1 != '\0')
+ {
+ state = next_state[state];
+ c1 = *p1++;
+ c2 = *p2++;
+ state |= (c1 == '0') + (isdigit (c1) != 0);
+ }
+
+ state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
+
+ 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__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 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>
*/
-#include "ucm_local.h"
#include <dirent.h>
+#if defined(__FreeBSD__) || __UCLIBC_MAJOR__ == 0 && __UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 30
+#define NEED_VERSIONSORT
+#endif
+#include "ucm_local.h"
/** The name of the environment variable containing the UCM directory */
#define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"

1
audio/alsa-lib/pkg-plist
View File

@ -72,6 +72,7 @@ share/alsa/cards/EMU10K1X.conf
share/alsa/cards/ENS1370.conf
share/alsa/cards/ENS1371.conf
share/alsa/cards/ES1968.conf
share/alsa/cards/Echo_Echo3G.conf
share/alsa/cards/FM801.conf
share/alsa/cards/FWSpeakers.conf
share/alsa/cards/FireWave.conf

11
audio/alsa-plugins/Makefile
View File

@ -6,12 +6,10 @@
#
PORTNAME= alsa-plugins
PORTVERSION= 1.0.25
PORTVERSION= 1.0.26
CATEGORIES= audio
MASTER_SITES= ftp://ftp.silug.org/pub/alsa/plugins/ \
ftp://gd.tuwien.ac.at/opsys/linux/alsa/plugins/ \
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/plugins/ \
ftp://ftp.alsa-project.org/pub/plugins/
MASTER_SITES= ALSA/plugins \
GENTOO/distfiles
MAINTAINER= aragon@phat.za.net
COMMENT= ALSA compatibility library plugins
@ -25,12 +23,11 @@ LDFLAGS+= -L${LOCALBASE}/lib
USE_LDCONFIG= ${PREFIX}/lib/alsa-lib
OPTIONS_DEFINE= ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
OPTIONS_DEFAULT=ARIFF_OSS
ARIFF_OSS_DESC= FreeBSD-specific OSS plugin
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MARIFF_OSS}
.if ${PORT_OPTIONS:MARIFF_OSS} || ${OSVERSION} < 800097
EXTRA_PATCHES+= ${FILESDIR}/alsa-plugins.patch
.endif

4
audio/alsa-plugins/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (alsa-plugins-1.0.25.tar.bz2) = a0e374fd6d5ee9683473a5b6e73dadde61d54851065ed670d6627d344b565aab
SIZE (alsa-plugins-1.0.25.tar.bz2) = 331568
SHA256 (alsa-plugins-1.0.26.tar.bz2) = 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f
SIZE (alsa-plugins-1.0.26.tar.bz2) = 361017

564
audio/alsa-plugins/files/alsa-plugins-getiptrfix.patch
View File

@ -1,564 +0,0 @@
--- jack/pcm_jack.c.orig 2009-09-16 04:33:36.000000000 +0800
+++ jack/pcm_jack.c 2009-09-16 04:33:55.000000000 +0800
@@ -20,7 +20,9 @@
*
*/
+#ifndef __FreeBSD__
#include <byteswap.h>
+#endif
#include <sys/shm.h>
#include <sys/types.h>
#include <sys/socket.h>
--- oss/ctl_oss.c.orig 2009-08-31 21:09:41.000000000 +0800
+++ oss/ctl_oss.c 2009-09-15 01:07:51.000000000 +0800
@@ -26,7 +26,11 @@
#include <sys/ioctl.h>
#include <alsa/asoundlib.h>
#include <alsa/control_external.h>
+#ifdef __FreeBSD__
+#include <sys/soundcard.h>
+#else
#include <linux/soundcard.h>
+#endif
typedef struct snd_ctl_oss {
snd_ctl_ext_t ext;
@@ -362,7 +366,9 @@
{
snd_config_iterator_t it, next;
const char *device = "/dev/mixer";
+#ifndef __FreeBSD__
struct mixer_info mixinfo;
+#endif
int i, err, val;
snd_ctl_oss_t *oss;
@@ -399,19 +405,29 @@
goto error;
}
+#ifndef __FreeBSD__
if (ioctl(oss->fd, SOUND_MIXER_INFO, &mixinfo) < 0) {
err = -errno;
SNDERR("Cannot get mixer info for device %s", device);
goto error;
}
+#endif
oss->ext.version = SND_CTL_EXT_VERSION;
oss->ext.card_idx = 0; /* FIXME */
+#ifdef __FreeBSD__
+ strncpy(oss->ext.id, "fbsd", sizeof(oss->ext.id) - 1);
+ strcpy(oss->ext.driver, "FreeBSD/OSS plugin");
+ strncpy(oss->ext.name, "FreeBSD/OSS", sizeof(oss->ext.name) - 1);
+ strncpy(oss->ext.longname, "FreeBSD/OSS", sizeof(oss->ext.longname) - 1);
+ strncpy(oss->ext.mixername, "FreeBSD/OSS", sizeof(oss->ext.mixername) - 1);
+#else
strncpy(oss->ext.id, mixinfo.id, sizeof(oss->ext.id) - 1);
strcpy(oss->ext.driver, "OSS-Emulation");
strncpy(oss->ext.name, mixinfo.name, sizeof(oss->ext.name) - 1);
strncpy(oss->ext.longname, mixinfo.name, sizeof(oss->ext.longname) - 1);
strncpy(oss->ext.mixername, mixinfo.name, sizeof(oss->ext.mixername) - 1);
+#endif
oss->ext.poll_fd = -1;
oss->ext.callback = &oss_ext_callback;
oss->ext.private_data = oss;
--- oss/pcm_oss.c.orig 2010-04-16 14:11:10.000000000 +0300
+++ oss/pcm_oss.c 2012-02-14 19:27:15.833934348 +0200
@@ -22,17 +22,55 @@
#include <sys/ioctl.h>
#include <alsa/asoundlib.h>
#include <alsa/pcm_external.h>
+#ifdef __FreeBSD__
+#include <sys/param.h>
+#include <sys/soundcard.h>
+#else
#include <linux/soundcard.h>
+#endif
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
+
+#ifdef __FreeBSD__
+/* #define FREEBSD_OSS_BLKCNT_P2 1 */
+/* #define FREEBSD_OSS_DEBUG_VERBOSE 1 */
+#undef FREEBSD_OSS_BLKCNT_P2
+#undef FREEBSD_OSS_DEBUG_VERBOSE
+
+#define FREEBSD_OSS_RATE_MIN 1
+#define FREEBSD_OSS_RATE_MAX 384000
+
+#define FREEBSD_OSS_CHANNELS_MIN 1
+#if __FreeBSD_version >= 800096
+#define FREEBSD_OSS_CHANNELS_MAX 8
+#else
+#define FREEBSD_OSS_CHANNELS_MAX 2
+#endif
+
+#define FREEBSD_OSS_BUFSZ_MAX 131072
+#define FREEBSD_OSS_BLKCNT_MIN 2
+#define FREEBSD_OSS_BLKSZ_MIN 16 /* (FREEBSD_OSS_CHANNEL_MAX * 4) */
+
+#define FREEBSD_OSS_BUFSZ_MIN (FREEBSD_OSS_BLKCNT_MIN * FREEBSD_OSS_BLKSZ_MIN)
+#define FREEBSD_OSS_BLKCNT_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BUFSZ_MIN)
+#define FREEBSD_OSS_BLKSZ_MAX (FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BLKCNT_MIN)
+#endif
typedef struct snd_pcm_oss {
snd_pcm_ioplug_t io;
char *device;
int fd;
+#ifdef __FreeBSD__
+ int bufsz, ptr, ptr_align, last_bytes;
+#else
int fragment_set;
int caps;
+#endif
int format;
+#ifndef __FreeBSD__
unsigned int period_shift;
unsigned int periods;
+#endif
unsigned int frame_bytes;
} snd_pcm_oss_t;
@@ -49,8 +87,13 @@
buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
size *= oss->frame_bytes;
result = write(oss->fd, buf, size);
+#ifdef __FreeBSD__
+ if (result == -1)
+ return -errno;
+#else
if (result <= 0)
return result;
+#endif
return result / oss->frame_bytes;
}
@@ -67,8 +110,13 @@
buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;
size *= oss->frame_bytes;
result = read(oss->fd, buf, size);
+#ifdef __FreeBSD__
+ if (result == -1)
+ return -errno;
+#else
if (result <= 0)
return result;
+#endif
return result / oss->frame_bytes;
}
@@ -93,12 +141,21 @@
int tmp = io->stream == SND_PCM_STREAM_PLAYBACK ?
PCM_ENABLE_OUTPUT : PCM_ENABLE_INPUT;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
if (ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp) < 0) {
fprintf(stderr, "*** OSS: trigger failed\n");
+#ifdef __FreeBSD__
+ return -EINVAL;
+#else
if (io->stream == SND_PCM_STREAM_CAPTURE)
/* fake read to trigger */
read(oss->fd, &tmp, 0);
+#endif
}
+
return 0;
}
@@ -107,6 +164,10 @@
snd_pcm_oss_t *oss = io->private_data;
int tmp = 0;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);
return 0;
}
@@ -115,16 +176,25 @@
{
snd_pcm_oss_t *oss = io->private_data;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
if (io->stream == SND_PCM_STREAM_PLAYBACK)
ioctl(oss->fd, SNDCTL_DSP_SYNC);
return 0;
}
+#ifndef __FreeBSD__
static int oss_prepare(snd_pcm_ioplug_t *io)
{
snd_pcm_oss_t *oss = io->private_data;
int tmp;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
ioctl(oss->fd, SNDCTL_DSP_RESET);
tmp = io->channels;
@@ -145,16 +215,75 @@
}
return 0;
}
+#endif
+
+#ifdef __FreeBSD__
+static const struct {
+ int oss_format;
+ snd_pcm_format_t alsa_format;
+} oss_formats_tab[] = {
+ { AFMT_U8, SND_PCM_FORMAT_U8 },
+ { AFMT_S8, SND_PCM_FORMAT_S8 },
+ { AFMT_MU_LAW, SND_PCM_FORMAT_MU_LAW },
+ { AFMT_A_LAW, SND_PCM_FORMAT_A_LAW },
+ { AFMT_S16_LE, SND_PCM_FORMAT_S16_LE },
+ { AFMT_S16_BE, SND_PCM_FORMAT_S16_BE },
+ { AFMT_U16_LE, SND_PCM_FORMAT_U16_LE },
+ { AFMT_U16_BE, SND_PCM_FORMAT_U16_BE },
+ { AFMT_S24_LE, SND_PCM_FORMAT_S24_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S24_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U24_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U24_3BE },
+ { AFMT_S32_LE, SND_PCM_FORMAT_S32_LE },
+ { AFMT_S32_BE, SND_PCM_FORMAT_S32_BE },
+ { AFMT_U32_LE, SND_PCM_FORMAT_U32_LE },
+ { AFMT_U32_BE, SND_PCM_FORMAT_U32_BE },
+ /* Special */
+ { AFMT_S24_LE, SND_PCM_FORMAT_S20_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S20_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U20_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U20_3BE },
+ { AFMT_S24_LE, SND_PCM_FORMAT_S18_3LE },
+ { AFMT_S24_BE, SND_PCM_FORMAT_S18_3BE },
+ { AFMT_U24_LE, SND_PCM_FORMAT_U18_3LE },
+ { AFMT_U24_BE, SND_PCM_FORMAT_U18_3BE },
+ { AFMT_S32_LE, SND_PCM_FORMAT_S24_LE },
+ { AFMT_S32_BE, SND_PCM_FORMAT_S24_BE },
+ { AFMT_U32_LE, SND_PCM_FORMAT_U24_LE },
+ { AFMT_U32_BE, SND_PCM_FORMAT_U24_BE },
+};
+#endif
static int oss_hw_params(snd_pcm_ioplug_t *io,
snd_pcm_hw_params_t *params ATTRIBUTE_UNUSED)
{
snd_pcm_oss_t *oss = io->private_data;
int i, tmp, err;
+#ifdef __FreeBSD__
+ int blksz_shift, blkcnt;
+ audio_buf_info bi;
+#else
unsigned int period_bytes;
+#endif
long oflags, flags;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
oss->frame_bytes = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;
+#ifdef __FreeBSD__
+ oss->ptr_align = io->buffer_size * oss->frame_bytes;
+
+ oss->format = 0;
+ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
+ if (oss_formats_tab[i].alsa_format == io->format) {
+ oss->format = oss_formats_tab[i].oss_format;
+ break;
+ }
+ }
+ if (oss->format == 0) {
+#else
switch (io->format) {
case SND_PCM_FORMAT_U8:
oss->format = AFMT_U8;
@@ -166,9 +295,87 @@
oss->format = AFMT_S16_BE;
break;
default:
+#endif
fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format));
return -EINVAL;
}
+#ifdef __FreeBSD__
+
+ ioctl(oss->fd, SNDCTL_DSP_RESET);
+
+#define blksz_aligned() ((1 << blksz_shift) - \
+ ((1 << blksz_shift) % oss->frame_bytes))
+ blksz_shift = 16;
+ tmp = io->period_size * oss->frame_bytes;
+
+ while (blksz_shift > 4 && blksz_aligned() > tmp)
+ blksz_shift--;
+
+ blkcnt = 2;
+ tmp = io->buffer_size * oss->frame_bytes;
+
+ while (blkcnt < 4096 && (blksz_aligned() * blkcnt) < tmp &&
+ ((1 << blksz_shift) * blkcnt) < 131072)
+ blkcnt <<= 1;
+
+ tmp = blksz_shift | (blkcnt << 16);
+ if (ioctl(oss->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) {
+ perror("SNDCTL_DSP_SETFRAGMENTS");
+ return -EINVAL;
+ }
+
+ tmp = oss->format;
+ if (ioctl(oss->fd, SNDCTL_DSP_SETFMT, &tmp) < 0 ||
+ tmp != oss->format) {
+ perror("SNDCTL_DSP_SETFMT");
+ return -EINVAL;
+ }
+
+ tmp = io->channels;
+ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0 ||
+ tmp != io->channels) {
+ perror("SNDCTL_DSP_CHANNELS");
+ return -EINVAL;
+ }
+
+ tmp = io->rate;
+ if (ioctl(oss->fd, SNDCTL_DSP_SPEED, &tmp) < 0 ||
+ tmp > io->rate * 1.01 || tmp < io->rate * 0.99) {
+ perror("SNDCTL_DSP_SPEED");
+ return -EINVAL;
+ }
+
+ if (ioctl(oss->fd, (io->stream == SND_PCM_STREAM_PLAYBACK) ?
+ SNDCTL_DSP_GETOSPACE : SNDCTL_DSP_GETISPACE, &bi) < 0) {
+ perror("SNDCTL_DSP_GET[I/O]SPACE");
+ return -EINVAL;
+ }
+
+ oss->bufsz = bi.fragsize * bi.fragstotal;
+
+#ifdef SNDCTL_DSP_LOW_WATER
+ tmp = ((io->period_size * oss->frame_bytes) * 3) / 4;
+ tmp -= tmp % oss->frame_bytes;
+ if (tmp < oss->frame_bytes)
+ tmp = oss->frame_bytes;
+ if (tmp > bi.fragsize)
+ tmp = bi.fragsize;
+ if (ioctl(oss->fd, SNDCTL_DSP_LOW_WATER, &tmp) < 0)
+ perror("SNDCTL_DSP_LOW_WATER");
+#endif
+
+#ifdef FREEBSD_OSS_DEBUG_VERBOSE
+ fprintf(stderr,
+ "\n\n[%lu -> %d] %lu ~ %d -> %d, %lu ~ %d -> %d [d:%ld lw:%d]\n\n",
+ io->buffer_size / io->period_size, bi.fragstotal,
+ io->buffer_size * oss->frame_bytes,
+ (1 << blksz_shift) * blkcnt, oss->bufsz,
+ io->period_size * oss->frame_bytes, 1 << blksz_shift,
+ bi.fragsize,
+ (long)(io->buffer_size * oss->frame_bytes) -
+ oss->bufsz, tmp);
+#endif
+#else
period_bytes = io->period_size * oss->frame_bytes;
oss->period_shift = 0;
for (i = 31; i >= 4; i--) {
@@ -209,6 +416,7 @@
goto _retry;
}
oss->fragment_set = 1;
+#endif
if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
err = -errno;
@@ -229,10 +437,128 @@
return 0;
}
-#define ARRAY_SIZE(ary) (sizeof(ary)/sizeof(ary[0]))
-
static int oss_hw_constraint(snd_pcm_oss_t *oss)
{
+#ifdef __FreeBSD__
+ snd_pcm_ioplug_t *io = &oss->io;
+ static const snd_pcm_access_t access_list[] = {
+ SND_PCM_ACCESS_RW_INTERLEAVED,
+ SND_PCM_ACCESS_MMAP_INTERLEAVED
+ };
+#ifdef FREEBSD_OSS_BLKCNT_P2
+ unsigned int period_list[30];
+#endif
+ unsigned int nformats;
+ unsigned int format[ARRAY_SIZE(oss_formats_tab)];
+#if 0
+ unsigned int nchannels;
+ unsigned int channel[FREEBSD_OSS_CHANNELS_MAX];
+#endif
+ int i, err, tmp;
+
+#ifdef FREEBSD_OSS_DEBUG_VERBOSE
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
+ /* check trigger */
+ tmp = 0;
+ if (ioctl(oss->fd, SNDCTL_DSP_GETCAPS, &tmp) >= 0) {
+ if (!(tmp & DSP_CAP_TRIGGER))
+ fprintf(stderr, "*** OSS: trigger is not supported!\n");
+ }
+
+ /* access type - interleaved only */
+ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS,
+ ARRAY_SIZE(access_list), access_list)) < 0)
+ return err;
+
+ /* supported formats. */
+ tmp = 0;
+ ioctl(oss->fd, SNDCTL_DSP_GETFMTS, &tmp);
+ nformats = 0;
+ for (i = 0; i < ARRAY_SIZE(oss_formats_tab); i++) {
+ if (tmp & oss_formats_tab[i].oss_format)
+ format[nformats++] = oss_formats_tab[i].alsa_format;
+ }
+ if (! nformats)
+ format[nformats++] = SND_PCM_FORMAT_S16;
+ if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT,
+ nformats, format)) < 0)
+ return err;
+
+#if 0
+ /* supported channels */
+ nchannels = 0;
+ for (i = 0; i < ARRAY_SIZE(channel); i++) {
+ tmp = i + 1;
+ if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) >= 0 &&
+ 1 + i == tmp)
+ channel[nchannels++] = tmp;
+ }
+ if (! nchannels) /* assume 2ch stereo */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_CHANNELS, 2, 2);
+ else
+ err = snd_pcm_ioplug_set_param_list(io,
+ SND_PCM_IOPLUG_HW_CHANNELS, nchannels, channel);
+ if (err < 0)
+ return err;
+#endif
+ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,
+ FREEBSD_OSS_CHANNELS_MIN, FREEBSD_OSS_CHANNELS_MAX);
+ if (err < 0)
+ return err;
+
+ /* supported rates */
+ err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE,
+ FREEBSD_OSS_RATE_MIN, FREEBSD_OSS_RATE_MAX);
+ if (err < 0)
+ return err;
+
+ /*
+ * Maximum buffer size on FreeBSD can go up to 131072 bytes without
+ * strict ^2 alignment so that s24le in 3bytes packing can be fed
+ * directly.
+ */
+
+#ifdef FREEBSD_OSS_BLKCNT_P2
+ tmp = 0;
+ for (i = 1; i < 31 && tmp < ARRAY_SIZE(period_list); i++) {
+ if ((1 << i) > FREEBSD_OSS_BLKCNT_MAX)
+ break;
+ if ((1 << i) < FREEBSD_OSS_BLKCNT_MIN)
+ continue;
+ period_list[tmp++] = 1 << i;
+ }
+
+ if (tmp > 0)
+ err = snd_pcm_ioplug_set_param_list(io,
+ SND_PCM_IOPLUG_HW_PERIODS, tmp, period_list);
+ else
+#endif
+ /* periods , not strictly ^2 but later on will be refined */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_PERIODS, FREEBSD_OSS_BLKCNT_MIN,
+ FREEBSD_OSS_BLKCNT_MAX);
+ if (err < 0)
+ return err;
+
+ /* period size , not strictly ^2 */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_PERIOD_BYTES, FREEBSD_OSS_BLKSZ_MIN,
+ FREEBSD_OSS_BLKSZ_MAX);
+ if (err < 0)
+ return err;
+
+ /* buffer size , not strictly ^2 */
+ err = snd_pcm_ioplug_set_param_minmax(io,
+ SND_PCM_IOPLUG_HW_BUFFER_BYTES, FREEBSD_OSS_BUFSZ_MIN,
+ FREEBSD_OSS_BUFSZ_MAX);
+ if (err < 0)
+ return err;
+
+ return 0;
+#else
snd_pcm_ioplug_t *io = &oss->io;
static const snd_pcm_access_t access_list[] = {
SND_PCM_ACCESS_RW_INTERLEAVED,
@@ -317,6 +643,7 @@
return err;
return 0;
+#endif
}
@@ -324,6 +651,10 @@
{
snd_pcm_oss_t *oss = io->private_data;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
close(oss->fd);
free(oss->device);
free(oss);
@@ -337,7 +668,9 @@
.pointer = oss_pointer,
.close = oss_close,
.hw_params = oss_hw_params,
+#ifndef __FreeBSD__
.prepare = oss_prepare,
+#endif
.drain = oss_drain,
};
@@ -348,7 +681,9 @@
.pointer = oss_pointer,
.close = oss_close,
.hw_params = oss_hw_params,
+#ifndef __FreeBSD__
.prepare = oss_prepare,
+#endif
.drain = oss_drain,
};
@@ -360,6 +695,10 @@
int err;
snd_pcm_oss_t *oss;
+#if defined(__FreeBSD__) && defined(FREEBSD_OSS_DEBUG_VERBOSE)
+ fprintf(stderr, "%s()\n", __func__);
+#endif
+
snd_config_for_each(i, next, conf) {
snd_config_t *n = snd_config_iterator_entry(i);
const char *id;

6
audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
View File

@ -2,16 +2,16 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free
--- usb_stream/pcm_usb_stream.c.orig
+++ usb_stream/pcm_usb_stream.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -19,7 +19,9 @@
*/
#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 = PTHREAD_MUTEX_INITIALIZER;

10
audio/alsa-utils/Makefile
View File

@ -6,12 +6,10 @@
#
PORTNAME= alsa-utils
PORTVERSION= 1.0.25
PORTVERSION= 1.0.26
CATEGORIES= audio
MASTER_SITES= ftp://ftp.silug.org/pub/alsa/utils/ \
ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/ \
http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/utils/ \
ftp://ftp.alsa-project.org/pub/utils/
MASTER_SITES= ALSA/utils \
GENTOO/distfiles
MAINTAINER= aragon@phat.za.net
COMMENT= ALSA compatibility utils
@ -62,7 +60,5 @@ post-patch: .SILENT
'.*\.([[:digit:]]|spec\.in|csv|xml)' -exec \
${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
-e 's|/etc/asound\.conf|${LOCALBASE}&|g' {} +
${REINPLACE_CMD} 's|/etc/asound\.state|${PREFIX}&|g' \
${WRKSRC}/alsactl/alsactl.[1c]
.include <bsd.port.mk>

4
audio/alsa-utils/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (alsa-utils-1.0.25.tar.bz2) = 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c
SIZE (alsa-utils-1.0.25.tar.bz2) = 1132780
SHA256 (alsa-utils-1.0.26.tar.bz2) = f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7
SIZE (alsa-utils-1.0.26.tar.bz2) = 1134474

2
audio/alsa-utils/pkg-plist
View File

@ -42,3 +42,5 @@ share/sounds/alsa/Side_Right.wav
@dirrmtry share/alsa/speaker-test
@dirrmtry share/alsa/init
@dirrmtry share/alsa
@cwd /var
@dirrmtry lib/alsa