FreeBSD Bugzilla – Attachment 251890 Details for
Bug 280144
audio/alsa-plugins: update 1.2.7.1 → 1.2.12
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update to 1.2.12
alsa-plugins.diff (text/plain), 14.77 KB, created by
Vladimir Druzenko
on 2024-07-05 21:34:24 UTC
(
hide
)
Description:
update to 1.2.12
Filename:
MIME Type:
Creator:
Vladimir Druzenko
Created:
2024-07-05 21:34:24 UTC
Size:
14.77 KB
patch
obsolete
>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 >-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) = 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 <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 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' ' '` >@@ -177,7 +177,7 @@ > 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; } >@@ -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) > } > >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=251890">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
vvd
:
maintainer-approval?
Actions:
View
|
Diff
Attachments on
bug 280144
: 251890