Date: Fri, 26 Jul 2024 02:09:04 +0200 From: Daniel Engberg <daniel.engberg.lists@pyret.net> To: Vladimir Druzenko <vvd@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 1a782b315786 - main - audio/alsa-plugins: update 1.2.7.1 =?utf-8?Q?=E2=86=92?= 1.2.12 Message-ID: <79eb4b1dbb9539a678a08299da1c96bb@mail.infomaniak.com> In-Reply-To: <202407251851.46PIpwGw072861@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2024-07-25T20:51:58.000+02:00, Vladimir Druzenko <vvd@FreeBSD.org> wrote: > The branch main has been updated by vvd: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=1a782b3157860d35e79a7b9dceb50bee7a7b7684 > > commit 1a782b3157860d35e79a7b9dceb50bee7a7b7684 > > Author: Vladimir Druzenko <vvd@FreeBSD.org> > > AuthorDate: 2024-07-25 18:45:39 +0000 > > Commit: Vladimir Druzenko <vvd@FreeBSD.org> > > CommitDate: 2024-07-25 18:50:52 +0000 > > audio/alsa-plugins: update 1.2.7.1 [http://1.2.7.1] → 1.2.12 > > > > Also: > > * refresh patches; > > * change maintainer from ports@ to rodrigo@ - maintainer other alsa > > ports: audio/alsa-lib audio/alsa-utils (if he is against changing the > > maintainer, then I will return the old value ports@). > > > > PR: 280144 > > Approved by: rodrigo (maintainer, timeout > 2 weeks) > > --- > > audio/alsa-plugins/Makefile | 5 ++- > > audio/alsa-plugins/distinfo | 6 ++-- > > .../alsa-plugins/files/patch-arcam-av_arcam__av.c | 18 +++------- > > audio/alsa-plugins/files/patch-configure | 40 +++++++++++----------- > > audio/alsa-plugins/files/patch-jack_pcm__jack.c | 11 ------ > > audio/alsa-plugins/files/patch-oss_ctl__oss.c | 20 +++-------- > > audio/alsa-plugins/files/patch-oss_pcm__oss.c | 34 +++++++++--------- > > .../files/patch-usb__stream_pcm__usb__stream.c | 8 ++--- > > 8 files changed, 54 insertions(+), 88 deletions(-) > > 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,10 +1,9 @@ > > PORTNAME= alsa-plugins > > -PORTVERSION= 1.2.7.1 [http://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/ > > > > 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 [http://1.2.7.1.tar.bz2]) = 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 > > -SIZE (alsa-plugins-1.2.7.1.tar.bz2 [http://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 <signal.h> > > - #include <stddef.h> > > - #include <stdio.h> > > -+#include <string.h> > > - #include <termios.h> > > - #include <unistd.h> > > - > > -@@ -37,6 +38,8 @@ > > - #include <sys/stat.h> > > +@@ -39,6 +39,8 @@ > > #include <sys/socket.h> > > #include <sys/un.h> > > -+ > > -+#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,6 +1,6 @@ > > ---- 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 > > @@ -10,7 +10,7 @@ > > am__untar > > am__tar > > AMTAR > > -@@ -785,7 +788,6 @@ > > +@@ -785,7 +788,6 @@ includedir > > docdir > > oldincludedir > > includedir > > @@ -18,7 +18,7 @@ > > localstatedir > > sharedstatedir > > sysconfdir > > -@@ -909,7 +911,6 @@ > > +@@ -909,7 +911,6 @@ localstatedir='${prefix}/var' > > sysconfdir='${prefix}/etc' > > sharedstatedir='${prefix}/com' > > localstatedir='${prefix}/var' > > @@ -26,7 +26,7 @@ > > 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 ;; > > > > @@ -42,7 +42,7 @@ > > -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 \ > > @@ -51,7 +51,7 @@ > > 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] > > @@ -59,7 +59,7 @@ > > --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 > > @@ -73,7 +73,7 @@ > > 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='$${ > > > > > > > > @@ -95,7 +95,7 @@ > > # 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 > > @@ -104,7 +104,7 @@ > > 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' > > @@ -113,7 +113,7 @@ > > 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' > > @@ -122,7 +122,7 @@ > > 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' > > @@ -131,7 +131,7 @@ > > 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' > > @@ -140,7 +140,7 @@ > > 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' > > @@ -149,7 +149,7 @@ > > 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*) > > @@ -158,7 +158,7 @@ > > 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 > > > > @@ -168,7 +168,7 @@ > > # 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 [http://ld.so.conf] contents (and includes) to the search path. > > if test -f /etc/ld.so.conf [http://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 [http://ld.so.conf] | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` > > @@ -177,7 +177,7 @@ > > fi > > > > # We used to test for /lib/ld.so.1 [http://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; } > > @@ -186,7 +186,7 @@ > > 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 > > 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,18 +1,6 @@ > > ---- 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 <sys/ioctl.h> > > - #include <alsa/asoundlib.h> > > - #include <alsa/control_external.h> > > -+#ifdef __linux__ > > - #include <linux/soundcard.h> > > -+#else > > -+#include <sys/soundcard.h> > > -+#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", > > @@ -21,7 +9,7 @@ > > [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"; > > @@ -31,7 +19,7 @@ > > 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; > > } > > > > 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,18 +1,16 @@ > > ---- 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 <stdio.h> > > +#include <stdbool.h> > > #include <sys/ioctl.h> > > #include <alsa/asoundlib.h> > > #include <alsa/pcm_external.h> > > -+#ifdef __linux__ > > - #include <linux/soundcard.h> > > -+#else > > -+#include <sys/soundcard.h> > > -+#endif > > +@@ -31,16 +32,32 @@ > > + #include <soundcard.h> > > + #endif > > > > +#ifndef ARRAY_SIZE > > +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) > > @@ -48,7 +46,7 @@ > > } 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); > > @@ -72,7 +70,7 @@ > > 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); > > @@ -204,7 +202,7 @@ > > } > > 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; > > > > @@ -215,7 +213,7 @@ > > 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; > > > > @@ -445,7 +443,7 @@ > > 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; > > } > > > > @@ -596,7 +594,7 @@ > > 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; > > @@ -604,7 +602,7 @@ > > } > > > > > > -@@ -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; > > > > @@ -615,7 +613,7 @@ > > 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, > > @@ -623,7 +621,7 @@ > > }; > > > > 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, > > @@ -631,7 +629,7 @@ > > }; > > > > > > -@@ -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; > > > > 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,7 +1,7 @@ > > 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; > > > > @@ -71,7 +71,7 @@ based on https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free > > 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) > > } Hi, Revert the maintainer bit, do not assign prots to others without their consent and as it's (un)maintained by ports@ there's no maintainer timeout. Best regards, Daniel (diizzy@) [-- Attachment #2 --] <html><body><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">On 2024-07-25T20:51:58.000+02:00, Vladimir Druzenko <vvd@FreeBSD.org> wrote:<br></div><div ><div><br></div></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div class="ik_mail_quote answerContentMessage"><blockquote class="ws-ng-quote"><pre style="white-space: normal;"><div>The branch main has been updated by vvd:<br></div><div><br></div><div>URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=1a782b3157860d35e79a7b9dceb50bee7a7b7684" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=1a782b3157860d35e79a7b9dceb50bee7a7b7684</a><br></div><div><br></div><div>commit 1a782b3157860d35e79a7b9dceb50bee7a7b7684<br></div><div>Author: Vladimir Druzenko <<a href="mailto:vvd@FreeBSD.org" class="defaultMailLink">vvd@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-07-25 18:45:39 +0000<br></div><div>Commit: Vladimir Druzenko <<a href="mailto:vvd@FreeBSD.org" class="defaultMailLink">vvd@FreeBSD.org</a>><br></div><div>CommitDate: 2024-07-25 18:50:52 +0000<br></div><div><br></div><div> audio/alsa-plugins: update <a href="http://1.2.7.1" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">1.2.7.1</a> → 1.2.12<br></div><div> <br></div><div> Also:<br></div><div> * refresh patches;<br></div><div> * change maintainer from ports@ to rodrigo@ - maintainer other alsa<br></div><div> ports: audio/alsa-lib audio/alsa-utils (if he is against changing the<br></div><div> maintainer, then I will return the old value ports@).<br></div><div> <br></div><div> PR: 280144<br></div><div> Approved by: rodrigo (maintainer, timeout > 2 weeks)<br></div><div>---<br></div><div> audio/alsa-plugins/Makefile | 5 ++-<br></div><div> audio/alsa-plugins/distinfo | 6 ++--<br></div><div> .../alsa-plugins/files/patch-arcam-av_arcam__av.c | 18 +++-------<br></div><div> audio/alsa-plugins/files/patch-configure | 40 +++++++++++-----------<br></div><div> audio/alsa-plugins/files/patch-jack_pcm__jack.c | 11 ------<br></div><div> audio/alsa-plugins/files/patch-oss_ctl__oss.c | 20 +++--------<br></div><div> audio/alsa-plugins/files/patch-oss_pcm__oss.c | 34 +++++++++---------<br></div><div> .../files/patch-usb__stream_pcm__usb__stream.c | 8 ++---<br></div><div> 8 files changed, 54 insertions(+), 88 deletions(-)<br></div><div><br></div><div>diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile<br></div><div>index 3fa4c416249c..dd7f404f7f0c 100644<br></div><div>--- a/audio/alsa-plugins/Makefile<br></div><div>+++ b/audio/alsa-plugins/Makefile<br></div><div>@@ -1,10 +1,9 @@<br></div><div> PORTNAME= alsa-plugins<br></div><div>-PORTVERSION= <a href="http://1.2.7.1" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">1.2.7.1</a><br></div><div>-PORTREVISION= 3<br></div><div>+PORTVERSION= 1.2.12<br></div><div> CATEGORIES= audio<br></div><div> MASTER_SITES= <a href="https://www.alsa-project.org/files/pub/plugins/" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://www.alsa-project.org/files/pub/plugins/</a><br></div><div>; <br></div><div>-MAINTAINER= <a href="mailto:ports@FreeBSD.org" class="defaultMailLink">ports@FreeBSD.org</a><br></div><div>+MAINTAINER= <a href="mailto:rodrigo@FreeBSD.org" class="defaultMailLink">rodrigo@FreeBSD.org</a><br></div><div> COMMENT= ALSA compatibility library plugins<br></div><div> WWW= <a href="https://www.alsa-project.org/" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://www.alsa-project.org/</a><br></div><div>; <br></div><div>diff --git a/audio/alsa-plugins/distinfo b/audio/alsa-plugins/distinfo<br></div><div>index 89ae30e80e4a..6627b261bd5a 100644<br></div><div>--- a/audio/alsa-plugins/distinfo<br></div><div>+++ b/audio/alsa-plugins/distinfo<br></div><div>@@ -1,3 +1,3 @@<br></div><div>-TIMESTAMP = 1695516677<br></div><div>-SHA256 (alsa-plugins-<a href="http://1.2.7.1.tar.bz2" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">1.2.7.1.tar.bz2</a>) = 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511<br></div><div>-SIZE (alsa-plugins-<a href="http://1.2.7.1.tar.bz2" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">1.2.7.1.tar.bz2</a>) = 408801<br></div><div>+TIMESTAMP = 1720213741<br></div><div>+SHA256 (alsa-plugins-1.2.12.tar.bz2) = 7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2<br></div><div>+SIZE (alsa-plugins-1.2.12.tar.bz2) = 409514<br></div><div>diff --git a/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c<br></div><div>index 8f3167f854b7..39f026884fc4 100644<br></div><div>--- a/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c<br></div><div>+++ b/audio/alsa-plugins/files/patch-arcam-av_arcam__av.c<br></div><div>@@ -1,19 +1,11 @@<br></div><div>---- arcam-av/arcam_av.c.orig 2016-03-31 13:11:29 UTC<br></div><div>+--- arcam-av/arcam_av.c.orig 2024-06-10 09:18:39 UTC<br></div><div> +++ arcam-av/arcam_av.c<br></div><div>-@@ -27,6 +27,7 @@<br></div><div>- #include <signal.h><br></div><div>- #include <stddef.h><br></div><div>- #include <stdio.h><br></div><div>-+#include <string.h><br></div><div>- #include <termios.h><br></div><div>- #include <unistd.h><br></div><div>- <br></div><div>-@@ -37,6 +38,8 @@<br></div><div>- #include <sys/stat.h><br></div><div>+@@ -39,6 +39,8 @@<br></div><div> #include <sys/socket.h><br></div><div> #include <sys/un.h><br></div><div>-+<br></div><div>-+#define AF_FILE AF_UNIX<br></div><div> <br></div><div>++#define AF_FILE AF_UNIX<br></div><div>++<br></div><div> #define MIN(a, b) ((a) < (b) ? (a) : (b))<br></div><div> #define MAX(a, b) ((a) > (b) ? (a) : (b))<br></div><div>+ <br></div><div>diff --git a/audio/alsa-plugins/files/patch-configure b/audio/alsa-plugins/files/patch-configure<br></div><div>index 8ca3ddc4b4a0..1c1791b6902a 100644<br></div><div>--- a/audio/alsa-plugins/files/patch-configure<br></div><div>+++ b/audio/alsa-plugins/files/patch-configure<br></div><div>@@ -1,6 +1,6 @@<br></div><div>---- configure.orig 2022-03-17 16:36:30 UTC<br></div><div>+--- configure.orig 2024-06-10 09:22:07 UTC<br></div><div> +++ configure<br></div><div>-@@ -743,6 +743,9 @@<br></div><div>+@@ -743,6 +743,9 @@ AM_V<br></div><div> AM_DEFAULT_VERBOSITY<br></div><div> AM_DEFAULT_V<br></div><div> AM_V<br></div><div>@@ -10,7 +10,7 @@<br></div><div> am__untar<br></div><div> am__tar<br></div><div> AMTAR<br></div><div>-@@ -785,7 +788,6 @@<br></div><div>+@@ -785,7 +788,6 @@ includedir<br></div><div> docdir<br></div><div> oldincludedir<br></div><div> includedir<br></div><div>@@ -18,7 +18,7 @@<br></div><div> localstatedir<br></div><div> sharedstatedir<br></div><div> sysconfdir<br></div><div>-@@ -909,7 +911,6 @@<br></div><div>+@@ -909,7 +911,6 @@ localstatedir='${prefix}/var'<br></div><div> sysconfdir='${prefix}/etc'<br></div><div> sharedstatedir='${prefix}/com'<br></div><div> localstatedir='${prefix}/var'<br></div><div>@@ -26,7 +26,7 @@<br></div><div> includedir='${prefix}/include'<br></div><div> oldincludedir='/usr/include'<br></div><div> docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'<br></div><div>-@@ -1162,15 +1163,6 @@<br></div><div>+@@ -1162,15 +1163,6 @@ do<br></div><div> | -silent | --silent | --silen | --sile | --sil)<br></div><div> silent=yes ;;<br></div><div> <br></div><div>@@ -42,7 +42,7 @@<br></div><div> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)<br></div><div> ac_prev=sbindir ;;<br></div><div> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \<br></div><div>-@@ -1308,7 +1300,7 @@<br></div><div>+@@ -1308,7 +1300,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexe<br></div><div> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \<br></div><div> datadir sysconfdir sharedstatedir localstatedir includedir \<br></div><div> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \<br></div><div>@@ -51,7 +51,7 @@<br></div><div> do<br></div><div> eval ac_val=\$$ac_var<br></div><div> # Remove trailing slashes.<br></div><div>-@@ -1461,7 +1453,6 @@<br></div><div>+@@ -1461,7 +1453,6 @@ Fine tuning of the installation directories:<br></div><div> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]<br></div><div> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]<br></div><div> --localstatedir=DIR modifiable single-machine data [PREFIX/var]<br></div><div>@@ -59,7 +59,7 @@<br></div><div> --libdir=DIR object code libraries [EPREFIX/lib]<br></div><div> --includedir=DIR C header files [PREFIX/include]<br></div><div> --oldincludedir=DIR C header files for non-gcc [/usr/include]<br></div><div>-@@ -2578,12 +2569,7 @@<br></div><div>+@@ -2578,12 +2569,7 @@ if test x"${MISSING+set}" != xset; then<br></div><div> am_aux_dir=`cd "$ac_aux_dir" && pwd`<br></div><div> <br></div><div> if test x"${MISSING+set}" != xset; then<br></div><div>@@ -73,7 +73,7 @@<br></div><div> fi<br></div><div> # Use eval to expand $SHELL<br></div><div> if eval "$MISSING --is-lightweight"; then<br></div><div>-@@ -2938,7 +2924,21 @@<br></div><div>+@@ -2938,7 +2924,21 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${<br></div><div> <br></div><div> <br></div><div> <br></div><div>@@ -95,7 +95,7 @@<br></div><div> # POSIX will say in a future version that running "rm -f" with no argument<br></div><div> # is OK; and we want to be able to make that assumption in our Makefile<br></div><div> # recipes. So use an aggressive probe to check that the usage we want is<br></div><div>-@@ -9015,7 +9015,7 @@<br></div><div>+@@ -9015,7 +9015,7 @@ $as_echo_n "checking whether the $compiler linker ($LD<br></div><div> hardcode_minus_L=no<br></div><div> hardcode_shlibpath_var=unsupported<br></div><div> inherit_rpath=no<br></div><div>@@ -104,7 +104,7 @@<br></div><div> module_cmds=<br></div><div> module_expsym_cmds=<br></div><div> old_archive_from_new_cmds=<br></div><div>-@@ -9314,7 +9314,7 @@<br></div><div>+@@ -9314,7 +9314,7 @@ _LT_EOF<br></div><div> wlarc=<br></div><div> else<br></div><div> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'<br></div><div>@@ -113,7 +113,7 @@<br></div><div> fi<br></div><div> ;;<br></div><div> <br></div><div>-@@ -9333,7 +9333,7 @@<br></div><div>+@@ -9333,7 +9333,7 @@ _LT_EOF<br></div><div> _LT_EOF<br></div><div> elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then<br></div><div> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'<br></div><div>@@ -122,7 +122,7 @@<br></div><div> else<br></div><div> ld_shlibs=no<br></div><div> fi<br></div><div>-@@ -9362,7 +9362,7 @@<br></div><div>+@@ -9362,7 +9362,7 @@ _LT_EOF<br></div><div> if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then<br></div><div> hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'<br></div><div> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'<br></div><div>@@ -131,7 +131,7 @@<br></div><div> else<br></div><div> ld_shlibs=no<br></div><div> fi<br></div><div>-@@ -9380,7 +9380,7 @@<br></div><div>+@@ -9380,7 +9380,7 @@ _LT_EOF<br></div><div> *)<br></div><div> if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then<br></div><div> archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'<br></div><div>@@ -140,7 +140,7 @@<br></div><div> else<br></div><div> ld_shlibs=no<br></div><div> fi<br></div><div>-@@ -10028,7 +10028,7 @@<br></div><div>+@@ -10028,7 +10028,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }<br></div><div> hardcode_direct_absolute=yes<br></div><div> if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then<br></div><div> archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'<br></div><div>@@ -149,7 +149,7 @@<br></div><div> hardcode_libdir_flag_spec='$wl-rpath,$libdir'<br></div><div> export_dynamic_flag_spec='$wl-E'<br></div><div> else<br></div><div>-@@ -10877,7 +10877,7 @@<br></div><div>+@@ -10877,7 +10877,7 @@ freebsd* | dragonfly*)<br></div><div> version_type=freebsd-$objformat<br></div><div> case $version_type in<br></div><div> freebsd-elf*)<br></div><div>@@ -158,7 +158,7 @@<br></div><div> soname_spec='$libname$release$shared_ext$major'<br></div><div> need_version=no<br></div><div> need_lib_prefix=no<br></div><div>-@@ -11094,9 +11094,6 @@<br></div><div>+@@ -11094,9 +11094,6 @@ fi<br></div><div> # before this can be enabled.<br></div><div> hardcode_into_libs=yes<br></div><div> <br></div><div>@@ -168,7 +168,7 @@<br></div><div> # Ideally, we could use ldconfig to report *all* directores which are<br></div><div> # searched for libraries, however this is still not possible. Aside from not<br></div><div> # being certain /sbin/ldconfig is available, command<br></div><div>-@@ -11105,7 +11102,7 @@<br></div><div>+@@ -11105,7 +11102,7 @@ fi<br></div><div> # appending <a href="http://ld.so.conf" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">ld.so.conf</a> contents (and includes) to the search path.<br></div><div> if test -f /etc/<a href="http://ld.so.conf" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">ld.so.conf</a>; then<br></div><div> lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/<a href="http://ld.so.conf" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">ld.so.conf</a> | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`<br></div><div>@@ -177,7 +177,7 @@<br></div><div> fi<br></div><div> <br></div><div> # We used to test for /lib/<a href="http://ld.so.1" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">ld.so.1</a> and disable shared libraries on<br></div><div>-@@ -12012,7 +12009,7 @@<br></div><div>+@@ -12012,7 +12009,7 @@ $as_echo_n "checking whether stripping libraries is po<br></div><div> old_striplib=<br></div><div> { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5<br></div><div> $as_echo_n "checking whether stripping libraries is possible... " >&6; }<br></div><div>@@ -186,7 +186,7 @@<br></div><div> test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"<br></div><div> test -z "$striplib" && striplib="$STRIP --strip-unneeded"<br></div><div> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br></div><div>-@@ -13293,21 +13290,22 @@<br></div><div>+@@ -13359,21 +13356,22 @@ fi<br></div><div> HAVE_SPEEXDSP="yes"<br></div><div> fi<br></div><div> fi<br></div><div>diff --git a/audio/alsa-plugins/files/patch-jack_pcm__jack.c b/audio/alsa-plugins/files/patch-jack_pcm__jack.c<br></div><div>deleted file mode 100644<br></div><div>index 12ad92846719..000000000000<br></div><div>--- a/audio/alsa-plugins/files/patch-jack_pcm__jack.c<br></div><div>+++ /dev/null<br></div><div>@@ -1,11 +0,0 @@<br></div><div>---- jack/pcm_jack.c.orig 2023-11-03 22:31:39 UTC<br></div><div>-+++ jack/pcm_jack.c<br></div><div>-@@ -603,7 +603,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const c<br></div><div>- }<br></div><div>- <br></div><div>- if (client_name == NULL) {<br></div><div>-- const char *pname = program_invocation_short_name;<br></div><div>-+ const char *pname = getprogname();<br></div><div>- if (!pname[0]) {<br></div><div>- pname = "alsa-jack";<br></div><div>- }<br></div><div>diff --git a/audio/alsa-plugins/files/patch-oss_ctl__oss.c b/audio/alsa-plugins/files/patch-oss_ctl__oss.c<br></div><div>index d36de65b15f0..c862b6d325c5 100644<br></div><div>--- a/audio/alsa-plugins/files/patch-oss_ctl__oss.c<br></div><div>+++ b/audio/alsa-plugins/files/patch-oss_ctl__oss.c<br></div><div>@@ -1,18 +1,6 @@<br></div><div>---- oss/ctl_oss.c.orig 2022-01-29 13:06:39 UTC<br></div><div>+--- oss/ctl_oss.c.orig 2024-06-10 09:18:39 UTC<br></div><div> +++ oss/ctl_oss.c<br></div><div>-@@ -26,7 +26,11 @@<br></div><div>- #include <sys/ioctl.h><br></div><div>- #include <alsa/asoundlib.h><br></div><div>- #include <alsa/control_external.h><br></div><div>-+#ifdef __linux__<br></div><div>- #include <linux/soundcard.h><br></div><div>-+#else<br></div><div>-+#include <sys/soundcard.h><br></div><div>-+#endif<br></div><div>- <br></div><div>- typedef struct snd_ctl_oss {<br></div><div>- snd_ctl_ext_t ext;<br></div><div>-@@ -52,7 +56,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV<br></div><div>+@@ -59,7 +59,7 @@ static const char *const vol_devices[SOUND_MIXER_NRDEV<br></div><div> [SOUND_MIXER_CD] = "CD Playback Volume",<br></div><div> [SOUND_MIXER_IMIX] = "Monitor Mix Playback Volume",<br></div><div> [SOUND_MIXER_ALTPCM] = "Headphone Playback Volume",<br></div><div>@@ -21,7 +9,7 @@<br></div><div> [SOUND_MIXER_IGAIN] = "Capture Volume",<br></div><div> [SOUND_MIXER_OGAIN] = "Playback Volume",<br></div><div> [SOUND_MIXER_LINE1] = "Aux Playback Volume",<br></div><div>-@@ -362,7 +366,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)<br></div><div>+@@ -369,7 +369,9 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)<br></div><div> {<br></div><div> snd_config_iterator_t it, next;<br></div><div> const char *device = "/dev/mixer";<br></div><div>@@ -31,7 +19,7 @@<br></div><div> int i, err, val;<br></div><div> snd_ctl_oss_t *oss;<br></div><div> <br></div><div>-@@ -399,19 +405,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)<br></div><div>+@@ -406,19 +408,29 @@ SND_CTL_PLUGIN_DEFINE_FUNC(oss)<br></div><div> goto error;<br></div><div> }<br></div><div> <br></div><div>diff --git a/audio/alsa-plugins/files/patch-oss_pcm__oss.c b/audio/alsa-plugins/files/patch-oss_pcm__oss.c<br></div><div>index df0d91c02417..8824efd6561d 100644<br></div><div>--- a/audio/alsa-plugins/files/patch-oss_pcm__oss.c<br></div><div>+++ b/audio/alsa-plugins/files/patch-oss_pcm__oss.c<br></div><div>@@ -1,18 +1,16 @@<br></div><div>---- oss/pcm_oss.c.orig 2020-02-19 09:35:42 UTC<br></div><div>+--- oss/pcm_oss.c.orig 2024-06-10 09:18:39 UTC<br></div><div> +++ oss/pcm_oss.c<br></div><div>-@@ -19,21 +19,42 @@<br></div><div>- */<br></div><div>+@@ -20,6 +20,7 @@<br></div><div> <br></div><div>+ #include "config.h"<br></div><div> #include <stdio.h><br></div><div> +#include <stdbool.h><br></div><div> #include <sys/ioctl.h><br></div><div> #include <alsa/asoundlib.h><br></div><div> #include <alsa/pcm_external.h><br></div><div>-+#ifdef __linux__<br></div><div>- #include <linux/soundcard.h><br></div><div>-+#else<br></div><div>-+#include <sys/soundcard.h><br></div><div>-+#endif<br></div><div>+@@ -31,16 +32,32 @@<br></div><div>+ #include <soundcard.h><br></div><div>+ #endif<br></div><div> <br></div><div> +#ifndef ARRAY_SIZE<br></div><div> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))<br></div><div>@@ -48,7 +46,7 @@<br></div><div> } snd_pcm_oss_t;<br></div><div> <br></div><div> static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *io,<br></div><div>-@@ -49,8 +70,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i<br></div><div>+@@ -56,8 +73,21 @@ static snd_pcm_sframes_t oss_write(snd_pcm_ioplug_t *i<br></div><div> buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;<br></div><div> size *= oss->frame_bytes;<br></div><div> result = write(oss->fd, buf, size);<br></div><div>@@ -72,7 +70,7 @@<br></div><div> return result / oss->frame_bytes;<br></div><div> }<br></div><div> <br></div><div>-@@ -67,37 +101,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io<br></div><div>+@@ -74,37 +104,122 @@ static snd_pcm_sframes_t oss_read(snd_pcm_ioplug_t *io<br></div><div> buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8;<br></div><div> size *= oss->frame_bytes;<br></div><div> result = read(oss->fd, buf, size);<br></div><div>@@ -204,7 +202,7 @@<br></div><div> }<br></div><div> return 0;<br></div><div> }<br></div><div>-@@ -107,6 +226,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)<br></div><div>+@@ -114,6 +229,10 @@ static int oss_stop(snd_pcm_ioplug_t *io)<br></div><div> snd_pcm_oss_t *oss = io->private_data;<br></div><div> int tmp = 0;<br></div><div> <br></div><div>@@ -215,7 +213,7 @@<br></div><div> ioctl(oss->fd, SNDCTL_DSP_SETTRIGGER, &tmp);<br></div><div> return 0;<br></div><div> }<br></div><div>-@@ -115,101 +238,164 @@ static int oss_drain(snd_pcm_ioplug_t *io)<br></div><div>+@@ -122,101 +241,164 @@ static int oss_drain(snd_pcm_ioplug_t *io)<br></div><div> {<br></div><div> snd_pcm_oss_t *oss = io->private_data;<br></div><div> <br></div><div>@@ -445,7 +443,7 @@<br></div><div> if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {<br></div><div> err = -errno;<br></div><div> perror("F_GETFL");<br></div><div>-@@ -229,16 +415,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,<br></div><div>+@@ -236,16 +418,148 @@ static int oss_hw_params(snd_pcm_ioplug_t *io,<br></div><div> return 0;<br></div><div> }<br></div><div> <br></div><div>@@ -596,7 +594,7 @@<br></div><div> unsigned int format[5];<br></div><div> unsigned int nchannels;<br></div><div> unsigned int channel[6];<br></div><div>-@@ -317,6 +635,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)<br></div><div>+@@ -324,6 +638,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss)<br></div><div> return err;<br></div><div> <br></div><div> return 0;<br></div><div>@@ -604,7 +602,7 @@<br></div><div> }<br></div><div> <br></div><div> <br></div><div>-@@ -324,6 +643,10 @@ static int oss_close(snd_pcm_ioplug_t *io)<br></div><div>+@@ -331,6 +646,10 @@ static int oss_close(snd_pcm_ioplug_t *io)<br></div><div> {<br></div><div> snd_pcm_oss_t *oss = io->private_data;<br></div><div> <br></div><div>@@ -615,7 +613,7 @@<br></div><div> close(oss->fd);<br></div><div> free(oss->device);<br></div><div> free(oss);<br></div><div>-@@ -339,6 +662,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca<br></div><div>+@@ -346,6 +665,7 @@ static const snd_pcm_ioplug_callback_t oss_playback_ca<br></div><div> .hw_params = oss_hw_params,<br></div><div> .prepare = oss_prepare,<br></div><div> .drain = oss_drain,<br></div><div>@@ -623,7 +621,7 @@<br></div><div> };<br></div><div> <br></div><div> static const snd_pcm_ioplug_callback_t oss_capture_callback = {<br></div><div>-@@ -350,6 +674,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal<br></div><div>+@@ -357,6 +677,7 @@ static const snd_pcm_ioplug_callback_t oss_capture_cal<br></div><div> .hw_params = oss_hw_params,<br></div><div> .prepare = oss_prepare,<br></div><div> .drain = oss_drain,<br></div><div>@@ -631,7 +629,7 @@<br></div><div> };<br></div><div> <br></div><div> <br></div><div>-@@ -360,6 +685,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)<br></div><div>+@@ -367,6 +688,10 @@ SND_PCM_PLUGIN_DEFINE_FUNC(oss)<br></div><div> int err;<br></div><div> snd_pcm_oss_t *oss;<br></div><div> <br></div><div>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<br></div><div>index 14c83dd206db..3d0d390e1606 100644<br></div><div>--- a/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c<br></div><div>+++ b/audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c<br></div><div>@@ -1,7 +1,7 @@<br></div><div> based on <a href="https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://github.com/dankamongmen/libdank/blob/master/libdank/compat-FreeBSD.c</a><br></div><div>---- ./usb_stream/pcm_usb_stream.c.orig 2022-03-17 16:51:58 UTC<br></div><div>-+++ ./usb_stream/pcm_usb_stream.c<br></div><div>-@@ -78,6 +78,69 @@<br></div><div>+--- usb_stream/pcm_usb_stream.c.orig 2024-06-10 09:18:39 UTC<br></div><div>++++ usb_stream/pcm_usb_stream.c<br></div><div>+@@ -77,6 +77,69 @@ static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITI<br></div><div> static struct user_usb_stream *uus;<br></div><div> static pthread_mutex_t uus_mutex = PTHREAD_MUTEX_INITIALIZER;<br></div><div> <br></div><div>@@ -71,7 +71,7 @@ based on <a href="https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free" class="defaultMailLink" rel="noopener noreferrer" data-ik="ik-secure" target="_blank">https://github.com/dankamongmen/libdank/blob/master/libdank/compat-Free</a><br></div><div>; static struct user_usb_stream *get_uus(int card)<br></div><div> {<br></div><div> pthread_mutex_lock(&uus_mutex);<br></div><div>-@@ -218,7 +281,11 @@<br></div><div>+@@ -217,7 +280,11 @@ static int snd_pcm_us_prepare(snd_pcm_ioplug_t *io)<br></div><div> }<br></div></pre></blockquote></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Hi,<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Revert the maintainer bit, do not assign prots to others without their consent and as it's (un)maintained by ports@ there's no maintainer timeout.<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px"><br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Best regards,<br></div><div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 14px">Daniel (diizzy@)<br></div></body></html>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?79eb4b1dbb9539a678a08299da1c96bb>