diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 3fa4c416249c..dd7f404f7f0c 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -1,46 +1,45 @@ PORTNAME= alsa-plugins -PORTVERSION= 1.2.7.1 -PORTREVISION= 3 +PORTVERSION= 1.2.12 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= ALSA compatibility library plugins WWW= https://www.alsa-project.org/ LICENSE= LGPL21+ LIB_DEPENDS= libasound.so:audio/alsa-lib USES= alias libtool:keepla localbase pkgconfig tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/alsa-lib GNU_CONFIGURE= yes MAKE_ARGS+= RM="${RM}" INSTALL_TARGET= install-strip CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files OPTIONS_DEFINE= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX OPTIONS_SUB= yes FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= libav JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ON= --with-speex=lib SPEEX_CONFIGURE_OFF= --without-speex post-install: # sanitize links cd ${STAGEDIR}${PREFIX}/etc/alsa/conf.d && for i in [0-9][0-9]-*.conf ; do \ ${LN} -sf ../../../share/alsa/alsa.conf.d/$$i . ; done .include diff --git a/audio/alsa-plugins/distinfo b/audio/alsa-plugins/distinfo index 89ae30e80e4a..6627b261bd5a 100644 --- a/audio/alsa-plugins/distinfo +++ b/audio/alsa-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695516677 -SHA256 (alsa-plugins-1.2.7.1.tar.bz2) = 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 -SIZE (alsa-plugins-1.2.7.1.tar.bz2) = 408801 +TIMESTAMP = 1720213741 +SHA256 (alsa-plugins-1.2.12.tar.bz2) = 7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2 +SIZE (alsa-plugins-1.2.12.tar.bz2) = 409514 diff --git a/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c index 8f3167f854b7..39f026884fc4 100644 --- a/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c +++ b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c @@ -1,19 +1,11 @@ ---- arcam-av/arcam_av.c.orig 2016-03-31 13:11:29 UTC +--- arcam-av/arcam_av.c.orig 2024-06-10 09:18:39 UTC +++ arcam-av/arcam_av.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -37,6 +38,8 @@ - #include +@@ -39,6 +39,8 @@ #include #include -+ -+#define AF_FILE AF_UNIX ++#define AF_FILE AF_UNIX ++ #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) + diff --git a/audio/alsa-plugins/files/patch-configure b/audio/alsa-plugins/files/patch-configure index 8ca3ddc4b4a0..1c1791b6902a 100644 --- a/audio/alsa-plugins/files/patch-configure +++ b/audio/alsa-plugins/files/patch-configure @@ -1,219 +1,219 @@ ---- configure.orig 2022-03-17 16:36:30 UTC +--- configure.orig 2024-06-10 09:22:07 UTC +++ configure -@@ -743,6 +743,9 @@ +@@ -743,6 +743,9 @@ AM_V AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR -@@ -785,7 +788,6 @@ +@@ -785,7 +788,6 @@ includedir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir -@@ -909,7 +911,6 @@ +@@ -909,7 +911,6 @@ localstatedir='${prefix}/var' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1162,15 +1163,6 @@ +@@ -1162,15 +1163,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1308,7 +1300,7 @@ +@@ -1308,7 +1300,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexe for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. -@@ -1461,7 +1453,6 @@ +@@ -1461,7 +1453,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -2578,12 +2569,7 @@ +@@ -2578,12 +2569,7 @@ if test x"${MISSING+set}" != xset; then am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then -@@ -2938,7 +2924,21 @@ +@@ -2938,7 +2924,21 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${ +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile # recipes. So use an aggressive probe to check that the usage we want is -@@ -9015,7 +9015,7 @@ +@@ -9015,7 +9015,7 @@ $as_echo_n "checking whether the $compiler linker ($LD hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no - link_all_deplibs=unknown + link_all_deplibs=no module_cmds= module_expsym_cmds= old_archive_from_new_cmds= -@@ -9314,7 +9314,7 @@ +@@ -9314,7 +9314,7 @@ _LT_EOF wlarc= else archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' fi ;; -@@ -9333,7 +9333,7 @@ +@@ -9333,7 +9333,7 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi -@@ -9362,7 +9362,7 @@ +@@ -9362,7 +9362,7 @@ _LT_EOF if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi -@@ -9380,7 +9380,7 @@ +@@ -9380,7 +9380,7 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi -@@ -10028,7 +10028,7 @@ +@@ -10028,7 +10028,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_direct_absolute=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' hardcode_libdir_flag_spec='$wl-rpath,$libdir' export_dynamic_flag_spec='$wl-E' else -@@ -10877,7 +10877,7 @@ +@@ -10877,7 +10877,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no -@@ -11094,9 +11094,6 @@ +@@ -11094,9 +11094,6 @@ fi # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command -@@ -11105,7 +11102,7 @@ +@@ -11105,7 +11102,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12012,7 +12009,7 @@ +@@ -12012,7 +12009,7 @@ $as_echo_n "checking whether stripping libraries is po old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -13293,21 +13290,22 @@ +@@ -13359,21 +13356,22 @@ fi HAVE_SPEEXDSP="yes" fi fi - if test "$HAVE_SPEEXDSP" = "yes"; then - HAVE_SPEEXDSP_TRUE= - HAVE_SPEEXDSP_FALSE='#' -else - HAVE_SPEEXDSP_TRUE='#' - HAVE_SPEEXDSP_FALSE= -fi - # Check whether --with-speex was given. if test "${with_speex+set}" = set; then : withval=$with_speex; PPH=$withval else PPH="lib" +fi + + + if test "$HAVE_SPEEXDSP" = "yes"; then + HAVE_SPEEXDSP_TRUE= + HAVE_SPEEXDSP_FALSE='#' +else + HAVE_SPEEXDSP_TRUE='#' + HAVE_SPEEXDSP_FALSE= fi diff --git a/audio/alsa-plugins/files/patch-jack_pcm__jack.c b/audio/alsa-plugins/files/patch-jack_pcm__jack.c deleted file mode 100644 index 12ad92846719..000000000000 --- a/audio/alsa-plugins/files/patch-jack_pcm__jack.c +++ /dev/null @@ -1,11 +0,0 @@ ---- jack/pcm_jack.c.orig 2023-11-03 22:31:39 UTC -+++ jack/pcm_jack.c -@@ -603,7 +603,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const c - } - - if (client_name == NULL) { -- const char *pname = program_invocation_short_name; -+ const char *pname = getprogname(); - if (!pname[0]) { - pname = "alsa-jack"; - } diff --git a/audio/alsa-plugins/files/patch-oss_ctl__oss.c b/audio/alsa-plugins/files/patch-oss_ctl__oss.c index d36de65b15f0..c862b6d325c5 100644 --- a/audio/alsa-plugins/files/patch-oss_ctl__oss.c +++ b/audio/alsa-plugins/files/patch-oss_ctl__oss.c @@ -1,63 +1,51 @@ ---- oss/ctl_oss.c.orig 2022-01-29 13:06:39 UTC +--- oss/ctl_oss.c.orig 2024-06-10 09:18:39 UTC +++ oss/ctl_oss.c -@@ -26,7 +26,11 @@ - #include - #include - #include -+#ifdef __linux__ - #include -+#else -+#include -+#endif - - typedef struct snd_ctl_oss { - snd_ctl_ext_t ext; -@@ -52,7 +56,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV +@@ -59,7 +59,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV [SOUND_MIXER_CD] = "CD Playback Volume", [SOUND_MIXER_IMIX] = "Monitor Mix Playback Volume", [SOUND_MIXER_ALTPCM] = "Headphone Playback Volume", - [SOUND_MIXER_RECLEV] = "Capture Volume", + [SOUND_MIXER_RECLEV] = "Master Capture Volume", [SOUND_MIXER_IGAIN] = "Capture Volume", [SOUND_MIXER_OGAIN] = "Playback Volume", [SOUND_MIXER_LINE1] = "Aux Playback Volume", -@@ -362,7 +366,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) +@@ -369,7 +369,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) { 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 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) +@@ -406,19 +408,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss) 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; diff --git a/audio/alsa-plugins/files/patch-oss_pcm__oss.c b/audio/alsa-plugins/files/patch-oss_pcm__oss.c index df0d91c02417..8824efd6561d 100644 --- a/audio/alsa-plugins/files/patch-oss_pcm__oss.c +++ b/audio/alsa-plugins/files/patch-oss_pcm__oss.c @@ -1,644 +1,642 @@ ---- oss/pcm_oss.c.orig 2020-02-19 09:35:42 UTC +--- oss/pcm_oss.c.orig 2024-06-10 09:18:39 UTC +++ oss/pcm_oss.c -@@ -19,21 +19,42 @@ - */ +@@ -20,6 +20,7 @@ + #include "config.h" #include +#include #include #include #include -+#ifdef __linux__ - #include -+#else -+#include -+#endif +@@ -31,16 +32,32 @@ + #include + #endif +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#endif + +#define ALSA_OSS_RATE_MIN 1 +#define ALSA_OSS_RATE_MAX 384000 + +#define ALSA_OSS_CHANNELS_MIN 1 +#define ALSA_OSS_CHANNELS_MAX 8 + +#define ALSA_OSS_BUFSZ_MAX 131072 +#define ALSA_OSS_BLKCNT_MIN 2 +#define ALSA_OSS_BLKSZ_MIN 16 /* (ALSA_OSS_CHANNELS_MAX * 4) */ + +#define ALSA_OSS_BUFSZ_MIN (ALSA_OSS_BLKCNT_MIN * ALSA_OSS_BLKSZ_MIN) +#define ALSA_OSS_BLKCNT_MAX (ALSA_OSS_BUFSZ_MAX / ALSA_OSS_BUFSZ_MIN) +#define ALSA_OSS_BLKSZ_MAX (ALSA_OSS_BUFSZ_MAX / ALSA_OSS_BLKCNT_MIN) + typedef struct snd_pcm_oss { snd_pcm_ioplug_t io; char *device; int fd; - int fragment_set; - int caps; + int bufsz; int format; - unsigned int period_shift; - unsigned int periods; - unsigned int frame_bytes; + int frame_bytes; + bool buffer_used; } snd_pcm_oss_t; static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io, -@@ -49,8 +70,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i +@@ -56,8 +73,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; size *= oss->frame_bytes; result = write(oss->fd, buf, size); - if (result <= 0) - return result; +#ifdef __FreeBSD__ + if (result == -1) { + if (errno == EAGAIN) + return 0; + else + return -errno; + } +#else + if (result <= 0) { + if (result == -EAGAIN) + return 0; + else + return result; + } +#endif return result / oss->frame_bytes; } -@@ -67,37 +101,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io +@@ -74,37 +104,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; size *= oss->frame_bytes; result = read(oss->fd, buf, size); - if (result <= 0) - return result; +#ifdef __FreeBSD__ + if (result == -1) { + if (errno == EAGAIN) + return 0; + else + return -errno; + } +#else + if (result <= 0) { + if (result == -EAGAIN) + return 0; + else + return result; + } +#endif return result / oss->frame_bytes; } static snd_pcm_sframes_t oss_pointer(snd_pcm_ioplug_t *io) { snd_pcm_oss_t *oss = io->private_data; - struct count_info info; - int ptr; + snd_pcm_sframes_t frames; + audio_buf_info bi; - if (ioctl(oss->fd, io->stream == SND_PCM_STREAM_PLAYBACK ? - SNDCTL_DSP_GETOPTR : SNDCTL_DSP_GETIPTR, &info) < 0) { - fprintf(stderr, "*** OSS: oss_pointer error\n"); + switch (io->state) { + case SND_PCM_STATE_XRUN: + return -EPIPE; + case SND_PCM_STATE_RUNNING: + case SND_PCM_STATE_DRAINING: + break; + default: return 0; } - ptr = snd_pcm_bytes_to_frames(io->pcm, info.ptr); - return ptr; + + if (io->stream == SND_PCM_STREAM_PLAYBACK) { + if (ioctl(oss->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0) + return -EINVAL; + } else { + if (ioctl(oss->fd, SNDCTL_DSP_GETISPACE, &bi) < 0) + return -EINVAL; + } + + /* check for over- and under- run */ + if (bi.bytes != oss->bufsz) { + oss->buffer_used = true; + } else { + if (oss->buffer_used) + return -EPIPE; + } + + frames = bi.bytes / oss->frame_bytes; + + /* range check */ + if (frames < 0) + frames = 0; + else if (frames > io->buffer_size) + frames = io->buffer_size; + + /* set hw_ptr directly */ + if (io->stream == SND_PCM_STREAM_PLAYBACK) { + io->hw_ptr = io->appl_ptr + frames - io->buffer_size; + } else { + io->hw_ptr = io->appl_ptr + frames; + } + return 0; } +static int oss_prepare(snd_pcm_ioplug_t *io) +{ + snd_pcm_oss_t *oss = io->private_data; + snd_pcm_sw_params_t *swparams; + snd_pcm_uframes_t min_avail; + int tmp; + + snd_pcm_sw_params_alloca(&swparams); + + if (snd_pcm_sw_params_current(io->pcm, swparams) == 0) { + snd_pcm_sw_params_get_avail_min(swparams, &min_avail); + snd_pcm_sw_params_alloca(&swparams); + } else { + min_avail = io->period_size; + } + + tmp = min_avail * oss->frame_bytes; + if (tmp > oss->bufsz) + tmp = oss->bufsz; + else if (tmp < 1) + tmp = 1; + +#ifdef SNDCTL_DSP_LOW_WATER + if (ioctl(oss->fd, SNDCTL_DSP_LOW_WATER, &tmp) < 0) + return -EINVAL; +#endif + oss->buffer_used = false; + + return 0; +} + static int oss_start(snd_pcm_ioplug_t *io) { snd_pcm_oss_t *oss = io->private_data; int tmp = io->stream == SND_PCM_STREAM_PLAYBACK ? PCM_ENABLE_OUTPUT : PCM_ENABLE_INPUT; +#ifdef ALSA_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 +226,10 @@ static int oss_stop(snd_pcm_ioplug_t *io) +@@ -114,6 +229,10 @@ static int oss_stop(snd_pcm_ioplug_t *io) snd_pcm_oss_t *oss = io->private_data; int tmp = 0; +#ifdef ALSA_OSS_DEBUG_VERBOSE + fprintf(stderr, "%s()\n", __func__); +#endif + ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp); return 0; } -@@ -115,101 +238,164 @@ static int oss_drain(snd_pcm_ioplug_t *io) +@@ -122,101 +241,164 @@ static int oss_drain(snd_pcm_ioplug_t *io) { snd_pcm_oss_t *oss = io->private_data; +#ifdef ALSA_OSS_DEBUG_VERBOSE + fprintf(stderr, "%s()\n", __func__); +#endif + if (io->stream == SND_PCM_STREAM_PLAYBACK) - ioctl(oss->fd, SNDCTL_DSP_SYNC); + ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL); return 0; } -static int oss_prepare(snd_pcm_ioplug_t *io) +static int oss_delay(snd_pcm_ioplug_t *io, snd_pcm_sframes_t *delayp) { snd_pcm_oss_t *oss = io->private_data; int tmp; - ioctl(oss->fd, SNDCTL_DSP_RESET); + if (oss->fd < 0) + return -EBADFD; - tmp = io->channels; - if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) { - perror("SNDCTL_DSP_CHANNELS"); - return -EINVAL; + if (io->stream == SND_PCM_STREAM_PLAYBACK) { + if (ioctl(oss->fd, SNDCTL_DSP_GETODELAY, &tmp) < 0 || tmp < 0) + tmp = 0; + } else { + tmp = 0; } - tmp = oss->format; - if (ioctl(oss->fd, SNDCTL_DSP_SETFMT, &tmp) < 0) { - perror("SNDCTL_DSP_SETFMT"); - 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; - } - return 0; + *delayp = tmp / oss->frame_bytes; + + return (0); } +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 }, +}; + 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; - unsigned int period_bytes; + int blksz_shift, blkcnt; + audio_buf_info bi; long oflags, flags; +#ifdef ALSA_OSS_DEBUG_VERBOSE + fprintf(stderr, "%s()\n", __func__); +#endif + oss->frame_bytes = (snd_pcm_format_physical_width(io->format) * io->channels) / 8; - switch (io->format) { - case SND_PCM_FORMAT_U8: - oss->format = AFMT_U8; - break; - case SND_PCM_FORMAT_S16_LE: - oss->format = AFMT_S16_LE; - break; - case SND_PCM_FORMAT_S16_BE: - oss->format = AFMT_S16_BE; - break; - default: + 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) { fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format)); return -EINVAL; } - period_bytes = io->period_size * oss->frame_bytes; - oss->period_shift = 0; - for (i = 31; i >= 4; i--) { - if (period_bytes & (1U << i)) { - oss->period_shift = i; + + ioctl(oss->fd, SNDCTL_DSP_RESET); + + /* use a 8ms HW buffer by default */ + tmp = ((8 * io->rate) / 1000) * oss->frame_bytes; + + /* round up to nearest power of two */ + while (tmp & (tmp - 1)) + tmp += tmp & ~(tmp - 1); + + /* get logarithmic value */ + for (blksz_shift = 0; blksz_shift < 24; blksz_shift++) { + if (tmp == (1 << blksz_shift)) break; - } } - if (! oss->period_shift) { - fprintf(stderr, "*** OSS: invalid period size %d\n", (int)io->period_size); - return -EINVAL; + + tmp = io->buffer_size * oss->frame_bytes; + + /* compute HW buffer big enough to hold SW buffer */ + for (blkcnt = ALSA_OSS_BLKCNT_MIN; blkcnt != ALSA_OSS_BLKCNT_MAX; blkcnt *= 2) { + if ((blkcnt << blksz_shift) >= tmp) + break; } - oss->periods = io->buffer_size / io->period_size; - _retry: - tmp = oss->period_shift | (oss->periods << 16); + tmp = blksz_shift | (blkcnt << 16); if (ioctl(oss->fd, SNDCTL_DSP_SETFRAGMENT, &tmp) < 0) { - if (! oss->fragment_set) { - perror("SNDCTL_DSP_SETFRAGMENT"); - fprintf(stderr, "*** period shift = %d, periods = %d\n", oss->period_shift, oss->periods); - return -EINVAL; - } - /* OSS has no proper way to reinitialize the fragments */ - /* try to reopen the device */ - close(oss->fd); - oss->fd = open(oss->device, io->stream == SND_PCM_STREAM_PLAYBACK ? - O_WRONLY : O_RDONLY); - if (oss->fd < 0) { - err = -errno; - SNDERR("Cannot reopen the device %s", oss->device); - return err; - } - io->poll_fd = oss->fd; - io->poll_events = io->stream == SND_PCM_STREAM_PLAYBACK ? - POLLOUT : POLLIN; - snd_pcm_ioplug_reinit_status(io); - oss->fragment_set = 0; - goto _retry; + perror("SNDCTL_DSP_SETFRAGMENTS"); + return -EINVAL; } - oss->fragment_set = 1; + 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 ALSA_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 if ((flags = fcntl(oss->fd, F_GETFL)) < 0) { err = -errno; perror("F_GETFL"); -@@ -229,16 +415,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, +@@ -236,16 +418,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, 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 +#ifdef FREEBSD_OSS_BUFSZ_P2 + unsigned int bufsz_list[30]; +#endif unsigned int nformats; + unsigned int format[ARRAY_SIZE(oss_formats_tab)]; + int i, err, tmp; + +#ifdef ALSA_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, + ALSA_OSS_CHANNELS_MIN, ALSA_OSS_CHANNELS_MAX); + if (err < 0) + return err; + + /* supported rates */ + err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE, + ALSA_OSS_RATE_MIN, ALSA_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) > ALSA_OSS_BLKCNT_MAX) + break; + if ((1 << i) < ALSA_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, ALSA_OSS_BLKCNT_MIN, + ALSA_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, ALSA_OSS_BLKSZ_MIN, + ALSA_OSS_BLKSZ_MAX); + if (err < 0) + return err; + +#ifdef FREEBSD_OSS_BUFSZ_P2 + tmp = 0; + for (i = 1; i < 31 && tmp < ARRAY_SIZE(bufsz_list); i++) { + if ((1 << i) > ALSA_OSS_BUFSZ_MAX) + break; + if ((1 << i) < ALSA_OSS_BUFSZ_MIN) + continue; + bufsz_list[tmp++] = 1 << i; + } + + if (tmp > 0) + err = snd_pcm_ioplug_set_param_list(io, + SND_PCM_IOPLUG_HW_BUFFER_BYTES, tmp, bufsz_list); + else +#endif + /* buffer size , not strictly ^2 */ + err = snd_pcm_ioplug_set_param_minmax(io, + SND_PCM_IOPLUG_HW_BUFFER_BYTES, ALSA_OSS_BUFSZ_MIN, + ALSA_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, + SND_PCM_ACCESS_MMAP_INTERLEAVED + }; + unsigned int nformats; unsigned int format[5]; unsigned int nchannels; unsigned int channel[6]; -@@ -317,6 +635,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) +@@ -324,6 +638,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) return err; return 0; +#endif } -@@ -324,6 +643,10 @@ static int oss_close(snd_pcm_ioplug_t *io) +@@ -331,6 +646,10 @@ static int oss_close(snd_pcm_ioplug_t *io) { snd_pcm_oss_t *oss = io->private_data; +#ifdef ALSA_OSS_DEBUG_VERBOSE + fprintf(stderr, "%s()\n", __func__); +#endif + close(oss->fd); free(oss->device); free(oss); -@@ -339,6 +662,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca +@@ -346,6 +665,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca .hw_params = oss_hw_params, .prepare = oss_prepare, .drain = oss_drain, + .delay = oss_delay, }; static const snd_pcm_ioplug_callback_t oss_capture_callback = { -@@ -350,6 +674,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal +@@ -357,6 +677,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal .hw_params = oss_hw_params, .prepare = oss_prepare, .drain = oss_drain, + .delay = oss_delay, }; -@@ -360,6 +685,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) +@@ -367,6 +688,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss) int err; snd_pcm_oss_t *oss; +#ifdef ALSA_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; diff --git a/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c index 14c83dd206db..3d0d390e1606 100644 --- a/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c +++ b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c @@ -1,85 +1,85 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c ---- ./usb_stream/pcm_usb_stream.c.orig 2022-03-17 16:51:58 UTC -+++ ./usb_stream/pcm_usb_stream.c -@@ -78,6 +78,69 @@ +--- usb_stream/pcm_usb_stream.c.orig 2024-06-10 09:18:39 UTC ++++ usb_stream/pcm_usb_stream.c +@@ -77,6 +77,69 @@ static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITI static struct user_usb_stream *uus; static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER; +#ifndef __linux__ +/* + * Copyright (c) 2000-2011, Nick Black et al + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Nick Black nor the names of other contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +// This is suitable really only for use with libdank's mremap_and_ftruncate(), +// due to assumptions it makes about the flags to pass to mmap(2). The only +// mremap(2) use case addressed is that of MREMAP_MAYMOVE. oldaddr must be a +// valid previous return from mmap(); NULL is not acceptable (ala Linux's +// mremap(2)), resulting in undefined behavior, despite realloc(3) semantics. +// Similarly, oldlen and newlen must be non-zero (and page-aligned). +void *mremap_compat(int fd,void *oldaddr,size_t oldlen, + size_t newlen,int prot,int flags){ + void *ret; + + // From mmap(2) on freebsd 6.3: A successful FIXED mmap deletes any + // previous mapping in the allocated address range. This means: + // remapping over a current map will blow it away (unless FIXED isn't + // provided, in which case it can't overlap an old mapping. See bug + // 733 for extensive discussion of this issue for Linux and FreeBSD). + if((ret = mmap((char *)oldaddr + oldlen,newlen - oldlen,prot,flags,fd,oldlen)) == MAP_FAILED){ + // We couldn't get the memory whatsoever (or we were a fresh + // allocation that succeeded). Return the immediate result... + return ret; + } // ret != MAP_FAILED. Did we squash? + if(ret != (char *)oldaddr + oldlen){ + // We got the memory, but not where we wanted it. Copy over the + // old map, and then free it up... + munmap(ret,newlen - oldlen); + if((ret = mmap(NULL,newlen,prot,flags,fd,0)) == MAP_FAILED){ + return ret; + } + memcpy(ret,oldaddr,oldlen); + munmap(oldaddr,oldlen); // Free the old mapping + return ret; + } // We successfully squashed. Return a pointer to the first buf. + return oldaddr; +} +#endif + static struct user_usb_stream *get_uus(int card) { pthread_mutex_lock(&uus_mutex); -@@ -218,7 +281,11 @@ +@@ -217,7 +280,11 @@ static int snd_pcm_us_prepare(snd_pcm_ioplug_t *io) } +#ifdef __linux__ uus->s = mremap(uus->s, sizeof(struct usb_stream), uus->s->read_size, MREMAP_MAYMOVE); +#else + uus->s = mremap_compat(us->pfd.fd, uus->s, sizeof(struct usb_stream), uus->s->read_size, PROT_READ, MAP_SHARED); +#endif if (MAP_FAILED == uus->s) { perror("ALSA/USX2Y: mmap"); return -EPERM;