Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at 2024-06-14 18:57:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-plugins (Old) and /work/SRC/openSUSE:Factory/.alsa-plugins.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-plugins" Fri Jun 14 18:57:47 2024 rev:117 rq:1180723 version:1.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-plugins/alsa-plugins.changes 2022-12-25 15:14:53.617386897 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-plugins.new.19518/alsa-plugins.changes 2024-06-14 18:57:59.674675738 +0200 @@ -1,0 +2,9 @@ +Thu Jun 13 15:00:17 UTC 2024 - Takashi Iwai <[email protected]> + +- Update to alsa-plugins 1.2.12: + * add support for FFMPEG 7.0 + * various compile fixes + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.11_v1.2.12#alsa-plugins + +------------------------------------------------------------------- Old: ---- alsa-plugins-1.2.7.1.tar.bz2 alsa-plugins-1.2.7.1.tar.bz2.sig New: ---- alsa-plugins-1.2.12.tar.bz2 alsa-plugins-1.2.12.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.NhJQUO/_old 2024-06-14 18:58:00.290697956 +0200 +++ /var/tmp/diff_new_pack.NhJQUO/_new 2024-06-14 18:58:00.294698101 +0200 @@ -1,7 +1,7 @@ # # spec file for package alsa-plugins # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %endif Name: alsa-plugins -Version: 1.2.7.1 +Version: 1.2.12 Release: 0 Summary: Extra Plug-Ins for ALSA Library License: LGPL-2.1-or-later @@ -41,9 +41,9 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(jack) >= 0.98 BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libpulse) >= 0.9.11 +BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(speexdsp) >= 1.2 %ifarch s390x ++++++ alsa-plugins-1.2.7.1.tar.bz2 -> alsa-plugins-1.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/a52/pcm_a52.c new/alsa-plugins-1.2.12/a52/pcm_a52.c --- old/alsa-plugins-1.2.7.1/a52/pcm_a52.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/a52/pcm_a52.c 2024-06-10 11:18:39.000000000 +0200 @@ -28,6 +28,10 @@ #include <libavcodec/avcodec.h> #include <libavutil/avutil.h> +#ifndef ESTRPIPE +#define ESTRPIPE ESPIPE +#endif + /* some compatibility wrappers */ #ifndef AV_VERSION_INT #define AV_VERSION_INT(a, b, c) (((a) << 16) | ((b) << 8) | (c)) @@ -78,6 +82,9 @@ #define av_frame_free avcodec_free_frame #endif +#define HAVE_AVCODEC_FREE_CONTEXT (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100)) +#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + struct a52_ctx { snd_pcm_ioplug_t io; snd_pcm_t *slave; @@ -628,7 +635,11 @@ static void a52_free(struct a52_ctx *rec) { if (rec->avctx) { - avcodec_close(rec->avctx); + #if HAVE_AVCODEC_FREE_CONTEXT + avcodec_free_context(&rec->avctx); + #else + avcodec_close(rec->avctx); + #endif av_free(rec->avctx); rec->avctx = NULL; } @@ -667,6 +678,21 @@ static void set_channel_layout(snd_pcm_ioplug_t *io) { struct a52_ctx *rec = io->private_data; +#if HAVE_CH_LAYOUT + switch (io->channels) { + case 2: + rec->avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; + break; + case 4: + rec->avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_QUAD; + break; + case 6: + rec->avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1; + break; + default: + break; + } +#else switch (io->channels) { case 2: rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; @@ -680,6 +706,7 @@ default: break; } +#endif } #else #define set_channel_layout(io) /* NOP */ @@ -695,8 +722,12 @@ rec->frame->nb_samples = rec->avctx->frame_size; #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 91, 0) rec->frame->format = rec->avctx->sample_fmt; +#if HAVE_CH_LAYOUT + av_channel_layout_from_mask(&rec->frame->ch_layout, rec->avctx->ch_layout.u.mask); +#else rec->frame->channels = rec->avctx->channels; rec->frame->channel_layout = rec->avctx->channel_layout; +#endif if (av_frame_get_buffer(rec->frame, 0)) return -ENOMEM; #else @@ -731,7 +762,11 @@ rec->avctx->bit_rate = rec->bitrate * 1000; rec->avctx->sample_rate = io->rate; +#if HAVE_CH_LAYOUT + rec->avctx->ch_layout.nb_channels = io->channels; +#else rec->avctx->channels = io->channels; +#endif rec->avctx->sample_fmt = rec->av_format; set_channel_layout(io); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/arcam-av/arcam_av.c new/alsa-plugins-1.2.12/arcam-av/arcam_av.c --- old/alsa-plugins-1.2.7.1/arcam-av/arcam_av.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/arcam-av/arcam_av.c 2024-06-10 11:18:39.000000000 +0200 @@ -27,6 +27,7 @@ #include <signal.h> #include <stddef.h> #include <stdio.h> +#include <string.h> #include <termios.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/config.h.in new/alsa-plugins-1.2.12/config.h.in --- old/alsa-plugins-1.2.7.1/config.h.in 2022-06-17 11:53:52.000000000 +0200 +++ new/alsa-plugins-1.2.12/config.h.in 2024-06-10 11:22:06.000000000 +0200 @@ -33,6 +33,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the <soundcard.h> header file. */ +#undef HAVE_SOUNDCARD_H + /* Define to 1 if you have the <speex/speexdsp_types.h> header file. */ #undef HAVE_SPEEX_SPEEXDSP_TYPES_H @@ -48,6 +51,9 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the <sys/soundcard.h> header file. */ +#undef HAVE_SYS_SOUNDCARD_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/configure new/alsa-plugins-1.2.12/configure --- old/alsa-plugins-1.2.7.1/configure 2022-06-17 11:53:55.000000000 +0200 +++ new/alsa-plugins-1.2.12/configure 2024-06-10 11:22:07.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for alsa-plugins 1.2.7.1. +# Generated by GNU Autoconf 2.69 for alsa-plugins 1.2.12. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='alsa-plugins' PACKAGE_TARNAME='alsa-plugins' -PACKAGE_VERSION='1.2.7.1' -PACKAGE_STRING='alsa-plugins 1.2.7.1' +PACKAGE_VERSION='1.2.12' +PACKAGE_STRING='alsa-plugins 1.2.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1421,7 +1421,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures alsa-plugins 1.2.7.1 to adapt to many kinds of systems. +\`configure' configures alsa-plugins 1.2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alsa-plugins 1.2.7.1:";; + short | recursive ) echo "Configuration of alsa-plugins 1.2.12:";; esac cat <<\_ACEOF @@ -1660,7 +1660,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alsa-plugins configure 1.2.7.1 +alsa-plugins configure 1.2.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2025,7 +2025,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alsa-plugins $as_me 1.2.7.1, which was +It was created by alsa-plugins $as_me 1.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2888,7 +2888,7 @@ # Define the identity of the package. PACKAGE='alsa-plugins' - VERSION='1.2.7.1' + VERSION='1.2.12' cat >>confdefs.h <<_ACEOF @@ -12497,7 +12497,58 @@ $as_echo "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_ioplug_create in -lasound" >&5 +case $host_os in +netbsd* | freebsd* | dragonfly* | openbsd*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_ioplug_create in -lasound" >&5 +$as_echo_n "checking for snd_pcm_ioplug_create in -lasound... " >&6; } +if ${ac_cv_lib_asound_snd_pcm_ioplug_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snd_pcm_ioplug_create (); +int +main () +{ +return snd_pcm_ioplug_create (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_asound_snd_pcm_ioplug_create=yes +else + ac_cv_lib_asound_snd_pcm_ioplug_create=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_ioplug_create" >&5 +$as_echo "$ac_cv_lib_asound_snd_pcm_ioplug_create" >&6; } +if test "x$ac_cv_lib_asound_snd_pcm_ioplug_create" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBASOUND 1 +_ACEOF + + LIBS="-lasound $LIBS" + +else + as_fn_error $? "*** libasound has no external plugin SDK" "$LINENO" 5 +fi + + ;; +*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_ioplug_create in -lasound" >&5 $as_echo_n "checking for snd_pcm_ioplug_create in -lasound... " >&6; } if ${ac_cv_lib_asound_snd_pcm_ioplug_create+:} false; then : $as_echo_n "(cached) " >&6 @@ -12544,14 +12595,16 @@ as_fn_error $? "*** libasound has no external plugin SDK" "$LINENO" 5 fi + ;; +esac # Check whether --enable-oss was given. if test "${enable_oss+set}" = set; then : enableval=$enable_oss; fi -if test "x$enable_oss" != "xno"; then : - if true; then +if test "x$enable_oss" != "xno"; then + if true; then HAVE_OSS_TRUE= HAVE_OSS_FALSE='#' else @@ -12559,8 +12612,21 @@ HAVE_OSS_FALSE= fi + for ac_header in sys/soundcard.h soundcard.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + else - if false; then + if false; then HAVE_OSS_TRUE= HAVE_OSS_FALSE='#' else @@ -14217,7 +14283,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alsa-plugins $as_me 1.2.7.1, which was +This file was extended by alsa-plugins $as_me 1.2.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14283,7 +14349,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -alsa-plugins config.status 1.2.7.1 +alsa-plugins config.status 1.2.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/configure.ac new/alsa-plugins-1.2.12/configure.ac --- old/alsa-plugins-1.2.7.1/configure.ac 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/configure.ac 2024-06-10 11:18:39.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-plugins, 1.2.7.1) +AC_INIT(alsa-plugins, 1.2.12) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) @@ -17,14 +17,25 @@ CC_NOUNDEFINED PKG_CHECK_MODULES(ALSA, alsa >= 1.1.6) -AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, +case $host_os in +netbsd* | freebsd* | dragonfly* | openbsd*) + AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, + AC_ERROR([*** libasound has no external plugin SDK])) + ;; +*) + AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, AC_ERROR([*** libasound has no external plugin SDK]), -ldl) + ;; +esac AC_ARG_ENABLE([oss], AS_HELP_STRING([--disable-oss], [Disable building of OSS plugin])) -AS_IF([test "x$enable_oss" != "xno"], - [AM_CONDITIONAL(HAVE_OSS, true)], - [AM_CONDITIONAL(HAVE_OSS, false)]) +if test "x$enable_oss" != "xno"; then + AM_CONDITIONAL(HAVE_OSS, true) + AC_CHECK_HEADERS([sys/soundcard.h soundcard.h]) +else + AM_CONDITIONAL(HAVE_OSS, false) +fi AC_ARG_ENABLE([mix], AS_HELP_STRING([--disable-mix], [Disable building of upmix and vdownmix plugins])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/jack/pcm_jack.c new/alsa-plugins-1.2.12/jack/pcm_jack.c --- old/alsa-plugins-1.2.7.1/jack/pcm_jack.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/jack/pcm_jack.c 2024-06-10 11:18:39.000000000 +0200 @@ -23,7 +23,6 @@ #define _GNU_SOURCE #include <stdbool.h> #include <errno.h> -#include <byteswap.h> #include <sys/shm.h> #include <sys/types.h> #include <sys/socket.h> @@ -603,7 +602,11 @@ } if (client_name == NULL) { +#if defined(_GNU_SOURCE) const char *pname = program_invocation_short_name; +#else + const char *pname = getprogname(); +#endif if (!pname[0]) { pname = "alsa-jack"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/oss/ctl_oss.c new/alsa-plugins-1.2.12/oss/ctl_oss.c --- old/alsa-plugins-1.2.7.1/oss/ctl_oss.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/oss/ctl_oss.c 2024-06-10 11:18:39.000000000 +0200 @@ -22,11 +22,18 @@ * TODO: implement the pseudo poll with thread (and pipe as pollfd)? */ +#include "config.h" #include <stdio.h> #include <sys/ioctl.h> #include <alsa/asoundlib.h> #include <alsa/control_external.h> +#if defined(__linux__) #include <linux/soundcard.h> +#elif HAVE_SYS_SOUNDCARD_H +#include <sys/soundcard.h> +#elif HAVE_SOUNDCARD_H +#include <soundcard.h> +#endif typedef struct snd_ctl_oss { snd_ctl_ext_t ext; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/oss/pcm_oss.c new/alsa-plugins-1.2.12/oss/pcm_oss.c --- old/alsa-plugins-1.2.7.1/oss/pcm_oss.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/oss/pcm_oss.c 2024-06-10 11:18:39.000000000 +0200 @@ -18,11 +18,18 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include <stdio.h> #include <sys/ioctl.h> #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> +#if defined(__linux__) #include <linux/soundcard.h> +#elif HAVE_SYS_SOUNDCARD_H +#include <sys/soundcard.h> +#elif HAVE_SOUNDCARD_H +#include <soundcard.h> +#endif typedef struct snd_pcm_oss { snd_pcm_ioplug_t io; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/pulse/pulse.h new/alsa-plugins-1.2.12/pulse/pulse.h --- old/alsa-plugins-1.2.7.1/pulse/pulse.h 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/pulse/pulse.h 2024-06-10 11:18:39.000000000 +0200 @@ -24,6 +24,10 @@ #include <pulse/pulseaudio.h> +#ifndef EBADFD +#define EBADFD EBADF +#endif + #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) typedef struct snd_pulse { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/rate/rate_samplerate.c new/alsa-plugins-1.2.12/rate/rate_samplerate.c --- old/alsa-plugins-1.2.7.1/rate/rate_samplerate.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/rate/rate_samplerate.c 2024-06-10 11:18:39.000000000 +0200 @@ -3,26 +3,6 @@ * * Copyright (c) 2006 by Takashi Iwai <[email protected]> * - * This plugin code is supposed to be used and distributed primarily - * under GPL v2 or later, in order to follow the license of libsamplerate. - * However, if you already own a commercial license to use libsamplerate - * for dynamic linking, this plugin code can be used and distributed also - * under LGPL v2.1 or later. - * - * For GPL-2.0+: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For LGPL-2.1+: - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/rate-lav/rate_lavrate.c new/alsa-plugins-1.2.12/rate-lav/rate_lavrate.c --- old/alsa-plugins-1.2.7.1/rate-lav/rate_lavrate.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/rate-lav/rate_lavrate.c 2024-06-10 11:18:39.000000000 +0200 @@ -18,11 +18,24 @@ #include <alsa/pcm_rate.h> #include <libswresample/swresample.h> +#include <libavcodec/avcodec.h> +#include <libavutil/avutil.h> #include <libavutil/channel_layout.h> #include <libavutil/opt.h> #include <libavutil/mathematics.h> #include <libavutil/samplefmt.h> +/* some compatibility wrappers */ +#ifndef AV_VERSION_INT +#define AV_VERSION_INT(a, b, c) (((a) << 16) | ((b) << 8) | (c)) +#endif +#ifndef LIBAVUTIL_VERSION_INT +#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ +LIBAVUTIL_VERSION_MINOR, \ +LIBAVUTIL_VERSION_MICRO) +#endif + +#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) static unsigned int filter_size = 16; @@ -95,10 +108,17 @@ if (!rate->avr) return -ENOMEM; +#if HAVE_CH_LAYOUT + AVChannelLayout layout; + av_channel_layout_default(&layout, rate->channels); + av_opt_set_chlayout(rate->avr, "in_chlayout", &layout, 0); + av_opt_set_chlayout(rate->avr, "out_chlayout", &layout, 0); +#else av_opt_set_channel_layout(rate->avr, "in_channel_layout", - av_get_default_channel_layout(rate->channels), 0); + av_get_default_channel_layout(rate->channels), 0); av_opt_set_channel_layout(rate->avr, "out_channel_layout", - av_get_default_channel_layout(rate->channels), 0); + av_get_default_channel_layout(rate->channels), 0); +#endif av_opt_set_int(rate->avr, "in_sample_rate", rate->in_rate, 0); av_opt_set_int(rate->avr, "out_sample_rate", rate->out_rate, 0); fmt = support_multi_format(rate) ? info->in.format : SND_PCM_FORMAT_S16; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/usb_stream/pcm_usb_stream.c new/alsa-plugins-1.2.12/usb_stream/pcm_usb_stream.c --- old/alsa-plugins-1.2.7.1/usb_stream/pcm_usb_stream.c 2022-06-17 11:44:44.000000000 +0200 +++ new/alsa-plugins-1.2.12/usb_stream/pcm_usb_stream.c 2024-06-10 11:18:39.000000000 +0200 @@ -19,7 +19,6 @@ */ #define _GNU_SOURCE -#include <byteswap.h> #include <sys/mman.h> #include <sys/shm.h> #include <sys/ioctl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-plugins-1.2.7.1/version new/alsa-plugins-1.2.12/version --- old/alsa-plugins-1.2.7.1/version 2022-06-17 11:53:59.000000000 +0200 +++ new/alsa-plugins-1.2.12/version 2024-06-10 11:22:11.000000000 +0200 @@ -1 +1 @@ -1.2.7.1 +1.2.12
