diff -Nru alsa-plugins-extra-1.0.28/a52/pcm_a52.c alsa-plugins-extra-1.1.0/a52/pcm_a52.c --- alsa-plugins-extra-1.0.28/a52/pcm_a52.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/a52/pcm_a52.c 2015-10-27 13:34:06.000000000 +0000 @@ -482,6 +482,12 @@ { struct a52_ctx *rec = io->private_data; + /* When trying to start a PCM that's already running, the result is + EBADFD. We might have implicitly started the buffer by filling it + up, so just ignore this request if we're already running. */ + if (snd_pcm_state(rec->slave) == SND_PCM_STATE_RUNNING) + return 0; + return snd_pcm_start(rec->slave); } @@ -650,7 +656,7 @@ return 0; } -#if SND_PCM_IOPLUG_VERSION >= 0x102 +#if SND_PCM_IOPLUG_VERSION >= 0x10002 static unsigned int chmap4[4] = { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, @@ -698,7 +704,7 @@ io->channels * sizeof(int)); return map; } -#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */ +#endif /* SND_PCM_IOPLUG_VERSION >= 0x10002 */ /* * callback table @@ -717,10 +723,10 @@ .poll_descriptors_count = a52_poll_descriptors_count, .poll_descriptors = a52_poll_descriptors, .poll_revents = a52_poll_revents, -#if SND_PCM_IOPLUG_VERSION >= 0x102 +#if SND_PCM_IOPLUG_VERSION >= 0x10002 .query_chmaps = a52_query_chmaps, .get_chmap = a52_get_chmap, -#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */ +#endif /* SND_PCM_IOPLUG_VERSION >= 0x10002 */ }; /* diff -Nru alsa-plugins-extra-1.0.28/arcam-av/arcam_av.c alsa-plugins-extra-1.1.0/arcam-av/arcam_av.c --- alsa-plugins-extra-1.0.28/arcam-av/arcam_av.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/arcam-av/arcam_av.c 2015-10-27 13:34:06.000000000 +0000 @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff -Nru alsa-plugins-extra-1.0.28/config.h.in alsa-plugins-extra-1.1.0/config.h.in --- alsa-plugins-extra-1.0.28/config.h.in 2014-06-13 09:23:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/config.h.in 2015-10-27 13:41:43.000000000 +0000 @@ -18,6 +18,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SPEEX_SPEEXDSP_TYPES_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff -Nru alsa-plugins-extra-1.0.28/configure alsa-plugins-extra-1.1.0/configure --- alsa-plugins-extra-1.0.28/configure 2014-06-13 09:23:47.000000000 +0000 +++ alsa-plugins-extra-1.1.0/configure 2015-10-27 13:41:44.000000000 +0000 @@ -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.0.28. +# Generated by GNU Autoconf 2.69 for alsa-plugins 1.1.0. # # # 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.0.28' -PACKAGE_STRING='alsa-plugins 1.0.28' +PACKAGE_VERSION='1.1.0' +PACKAGE_STRING='alsa-plugins 1.1.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1370,7 +1370,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.0.28 to adapt to many kinds of systems. +\`configure' configures alsa-plugins 1.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1440,7 +1440,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alsa-plugins 1.0.28:";; + short | recursive ) echo "Configuration of alsa-plugins 1.1.0:";; esac cat <<\_ACEOF @@ -1589,7 +1589,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alsa-plugins configure 1.0.28 +alsa-plugins configure 1.1.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1954,7 +1954,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.0.28, which was +It was created by alsa-plugins $as_me 1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2778,7 +2778,7 @@ # Define the identity of the package. PACKAGE='alsa-plugins' - VERSION='1.0.28' + VERSION='1.1.0' cat >>confdefs.h <<_ACEOF @@ -12493,6 +12493,21 @@ fi +if test "$PPH" = "lib"; then + for ac_header in speex/speexdsp_types.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "speex/speexdsp_types.h" "ac_cv_header_speex_speexdsp_types_h" "$ac_includes_default" +if test "x$ac_cv_header_speex_speexdsp_types_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SPEEX_SPEEXDSP_TYPES_H 1 +_ACEOF + +fi + +done + +fi + test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix @@ -13121,7 +13136,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.0.28, which was +This file was extended by alsa-plugins $as_me 1.1.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13187,7 +13202,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.0.28 +alsa-plugins config.status 1.1.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru alsa-plugins-extra-1.0.28/configure.ac alsa-plugins-extra-1.1.0/configure.ac --- alsa-plugins-extra-1.0.28/configure.ac 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/configure.ac 2015-10-27 13:34:06.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(alsa-plugins, 1.0.28) +AC_INIT(alsa-plugins, 1.1.0) AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) @@ -133,6 +133,10 @@ AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib") +if test "$PPH" = "lib"; then + AC_CHECK_HEADERS([speex/speexdsp_types.h]) +fi + test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix diff -Nru alsa-plugins-extra-1.0.28/debian/changelog alsa-plugins-extra-1.1.0/debian/changelog --- alsa-plugins-extra-1.0.28/debian/changelog 2015-09-01 18:12:04.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/changelog 2020-04-21 19:03:05.000000000 +0000 @@ -1,3 +1,49 @@ +alsa-plugins-extra (1.1.0-1ubuntu2~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + + -- Rob Savoury Tue, 21 Apr 2020 12:03:05 -0700 + +alsa-plugins-extra (1.1.0-1ubuntu2) cosmic; urgency=medium + + * No-change rebuild for ffmpeg soname changes. + + -- Matthias Klose Thu, 19 Jul 2018 08:46:00 +0000 + +alsa-plugins-extra (1.1.0-1ubuntu1) yakkety; urgency=medium + + * Merge with Debian; remaining changes: + - Drop libavcodec-dev, libavresample-dev and libavutil-dev build-deps. + + -- Matthias Klose Wed, 04 May 2016 18:27:16 +0200 + +alsa-plugins (1.1.0-1) unstable; urgency=medium + + [ Luke Yelavich ] + * New upstream release + * Update changelog.ALSA + + [ Elimar Riesebieter ] + * FTBFS with ffmpeg 2.9. Applied ffmpeg_2.9.patch provided by + Andreas Cadhalpun (closes: 803796). + + [ Jordi Mallach ] + * Use https for Vcs-Browser. + + -- Jordi Mallach Tue, 02 Feb 2016 00:04:04 +0100 + +alsa-plugins (1.0.29-1) unstable; urgency=medium + + [ Luke Yelavich ] + * New upstream release (closes: #793074) + * Update changelog.ALSA + + [ Jordi Mallach ] + * Bump Standards-Version to 3.9.6. + * Add Luke Yelavich to Uploaders. + + -- Jordi Mallach Wed, 22 Jul 2015 09:39:15 +0200 + alsa-plugins-extra (1.0.28-1ubuntu5) wily; urgency=medium * No-change rebuild against ffmpeg 2.7 diff -Nru alsa-plugins-extra-1.0.28/debian/changelog.ALSA alsa-plugins-extra-1.1.0/debian/changelog.ALSA --- alsa-plugins-extra-1.0.28/debian/changelog.ALSA 2014-08-05 04:47:50.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/changelog.ALSA 2016-05-04 16:29:57.000000000 +0000 @@ -1,3 +1,53 @@ +Changelog between 1.0.29 and 1.1.0 releases +(http://www.alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0) +(Reformatted as ASCII text) ++++++++++++++++++++++++++++++++++++++++++++ + +* alsa-plugins + + * Core + Release v1.1.0 + pph: Fix build with older speex + pph: include speexdsp_types.h, not speex_types.h + + * A52 Output plugin + a52: Fix ioplug version ifdef checks + + * Arcam AV control plugin + arcam-av: Include sys/select.h for fd_set definition + + * Automatic upmix / downmix plugins + mix: Fix extplug version ifdef checks + + * Jack PCM plugin + jack: Fixing a small memory leak + + * Public Parrot Hack rate converter + pph: Fix build with older speex + pph: include speexdsp_types.h, not speex_types.h + + * PulseAudio -> ALSA plugin + pulse: Add 24 bit data formats to Pulse plugin. + + * Rate Converter plugins + rate: Allow LGPL for libsamplerate commercial licensee + +Changelog between 1.0.28 and 1.0.29 releases +(http://www.alsa-project.org/main/index.php/Changes_v1.0.28_v1.0.29) +(Reformated as ASCII text) ++++++++++++++++++++++++++++++++++++++++++++ + +* alsa-plugins + + * Core + Release v1.0.29 + + * A52 Output plugin + a52: Ignore start request if we're already running + + * Jack PCM plugin + jack: Restore PID to jack client name when not specified explicitly + Changelog between 1.0.27 and 1.0.28 releases (http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28) (Reformated as ASCII text) diff -Nru alsa-plugins-extra-1.0.28/debian/control alsa-plugins-extra-1.1.0/debian/control --- alsa-plugins-extra-1.0.28/debian/control 2014-08-05 04:50:32.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/control 2016-05-04 16:29:57.000000000 +0000 @@ -4,7 +4,8 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian ALSA Maintainers Uploaders: Jordi Mallach , - Elimar Riesebieter + Elimar Riesebieter , + Luke Yelavich Build-Depends: autotools-dev, debhelper (>= 9), dh-autoreconf, @@ -17,10 +18,10 @@ libpulse-dev (>= 0.99.1-1~), libsamplerate0-dev | libsamplerate-dev, libspeexdsp-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.alsa-project.org/ XS-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-alsa/trunk/alsa-plugins -XS-Debian-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-plugins/ +XS-Debian-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-alsa/trunk/alsa-plugins/ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-plugins/ubuntu Package: libasound2-plugins-extra diff -Nru alsa-plugins-extra-1.0.28/debian/patches/ffmpeg_2.9.patch alsa-plugins-extra-1.1.0/debian/patches/ffmpeg_2.9.patch --- alsa-plugins-extra-1.0.28/debian/patches/ffmpeg_2.9.patch 1970-01-01 00:00:00.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/patches/ffmpeg_2.9.patch 2016-05-04 16:29:57.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-02> + +--- alsa-plugins-1.0.29.orig/a52/pcm_a52.c ++++ alsa-plugins-1.0.29/a52/pcm_a52.c +@@ -39,7 +39,7 @@ + #endif + + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0) +-#include ++#include + #include + #define USE_AVCODEC_FRAME + #endif +@@ -512,7 +512,9 @@ static void a52_free(struct a52_ctx *rec + av_freep(&rec->frame->data[0]); + rec->inbuf = NULL; + } +-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101) ++ av_frame_free(&rec->frame); ++#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) + avcodec_free_frame(&rec->frame); + #else + av_freep(&rec->frame); +@@ -557,7 +559,11 @@ static int alloc_input_buffer(snd_pcm_io + { + struct a52_ctx *rec = io->private_data; + #ifdef USE_AVCODEC_FRAME ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101) ++ rec->frame = av_frame_alloc(); ++#else + rec->frame = avcodec_alloc_frame(); ++#endif + if (!rec->frame) + return -ENOMEM; + if (av_samples_alloc(rec->frame->data, rec->frame->linesize, diff -Nru alsa-plugins-extra-1.0.28/debian/patches/libav10.patch alsa-plugins-extra-1.1.0/debian/patches/libav10.patch --- alsa-plugins-extra-1.0.28/debian/patches/libav10.patch 2014-08-05 04:47:50.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/patches/libav10.patch 2016-05-04 16:29:57.000000000 +0000 @@ -4,10 +4,10 @@ Provide lavcrate compatibility. -Index: alsa-plugins-1.0.28/configure.ac +Index: alsa-plugins-1.1.0/configure.ac =================================================================== ---- alsa-plugins-1.0.28.orig/configure.ac -+++ alsa-plugins-1.0.28/configure.ac +--- alsa-plugins-1.1.0.orig/configure.ac ++++ alsa-plugins-1.1.0/configure.ac @@ -66,7 +66,7 @@ if test "$use_maemo_rm" = "yes"; then fi @@ -47,7 +47,7 @@ PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") -@@ -181,7 +197,7 @@ AC_OUTPUT([ +@@ -185,7 +201,7 @@ AC_OUTPUT([ mix/Makefile rate/Makefile a52/Makefile @@ -56,10 +56,10 @@ maemo/Makefile doc/Makefile usb_stream/Makefile -Index: alsa-plugins-1.0.28/Makefile.am +Index: alsa-plugins-1.1.0/Makefile.am =================================================================== ---- alsa-plugins-1.0.28.orig/Makefile.am -+++ alsa-plugins-1.0.28/Makefile.am +--- alsa-plugins-1.1.0.orig/Makefile.am ++++ alsa-plugins-1.1.0/Makefile.am @@ -9,8 +9,14 @@ if HAVE_SAMPLERATE SUBDIRS += rate endif @@ -75,10 +75,10 @@ if HAVE_MAEMO_PLUGIN SUBDIRS += maemo endif -Index: alsa-plugins-1.0.28/rate-lavr/Makefile.am +Index: alsa-plugins-1.1.0/rate-lavr/Makefile.am =================================================================== --- /dev/null -+++ alsa-plugins-1.0.28/rate-lavr/Makefile.am ++++ alsa-plugins-1.1.0/rate-lavr/Makefile.am @@ -0,0 +1,22 @@ +asound_module_rate_lavr_LTLIBRARIES = libasound_module_rate_lavr.la + @@ -102,10 +102,10 @@ +uninstall-hook: + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate*.so + rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavr*.so -Index: alsa-plugins-1.0.28/rate-lavr/rate_lavr.c +Index: alsa-plugins-1.1.0/rate-lavr/rate_lavr.c =================================================================== --- /dev/null -+++ alsa-plugins-1.0.28/rate-lavr/rate_lavr.c ++++ alsa-plugins-1.1.0/rate-lavr/rate_lavr.c @@ -0,0 +1,227 @@ +/* + * Rate converter plugin using libavresample diff -Nru alsa-plugins-extra-1.0.28/debian/patches/series alsa-plugins-extra-1.1.0/debian/patches/series --- alsa-plugins-extra-1.0.28/debian/patches/series 2014-08-05 04:47:50.000000000 +0000 +++ alsa-plugins-extra-1.1.0/debian/patches/series 2016-05-04 16:29:57.000000000 +0000 @@ -1,2 +1,3 @@ arcam-av_uses_pthreads.patch libav10.patch +ffmpeg_2.9.patch diff -Nru alsa-plugins-extra-1.0.28/jack/pcm_jack.c alsa-plugins-extra-1.1.0/jack/pcm_jack.c --- alsa-plugins-extra-1.0.28/jack/pcm_jack.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/jack/pcm_jack.c 2015-10-27 13:34:06.000000000 +0000 @@ -103,6 +103,7 @@ if (jack->io.poll_fd >= 0) close(jack->io.poll_fd); free(jack->areas); + free(jack->ports); free(jack); } } @@ -372,6 +373,7 @@ } static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, + const char *client_name, snd_config_t *playback_conf, snd_config_t *capture_conf, snd_pcm_stream_t stream, int mode) @@ -405,14 +407,14 @@ return -EINVAL; } - if (name == NULL) + if (client_name == NULL) err = snprintf(jack_client_name, sizeof(jack_client_name), "alsa-jack.%s%s.%d.%d", name, stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", getpid(), num++); else err = snprintf(jack_client_name, sizeof(jack_client_name), - "%s", name); + "%s", client_name); if (err >= (int)sizeof(jack_client_name)) { fprintf(stderr, "%s: WARNING: JACK client name '%s' truncated to %d characters, might not be unique\n", @@ -470,6 +472,7 @@ snd_config_iterator_t i, next; snd_config_t *playback_conf = NULL; snd_config_t *capture_conf = NULL; + const char *client_name = NULL; int err; snd_config_for_each(i, next, conf) { @@ -480,7 +483,7 @@ if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) continue; if (strcmp(id, "name") == 0) { - snd_config_get_string(n, &name); + snd_config_get_string(n, &client_name); continue; } if (strcmp(id, "playback_ports") == 0) { @@ -503,7 +506,7 @@ return -EINVAL; } - err = snd_pcm_jack_open(pcmp, name, playback_conf, capture_conf, stream, mode); + err = snd_pcm_jack_open(pcmp, name, client_name, playback_conf, capture_conf, stream, mode); return err; } diff -Nru alsa-plugins-extra-1.0.28/mix/pcm_upmix.c alsa-plugins-extra-1.1.0/mix/pcm_upmix.c --- alsa-plugins-extra-1.0.28/mix/pcm_upmix.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/mix/pcm_upmix.c 2015-10-27 13:34:06.000000000 +0000 @@ -371,7 +371,7 @@ return 0; } -#if SND_PCM_EXTPLUG_VERSION >= 0x102 +#if SND_PCM_EXTPLUG_VERSION >= 0x10002 static unsigned int chmap[8][8] = { { SND_CHMAP_MONO }, { SND_CHMAP_FL, SND_CHMAP_FR }, @@ -418,13 +418,13 @@ memcpy(map->pos, &chmap[ext->channels - 1][0], ext->channels * sizeof(int)); return map; } -#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */ +#endif /* SND_PCM_EXTPLUG_VERSION >= 0x10002 */ static const snd_pcm_extplug_callback_t upmix_callback = { .transfer = upmix_transfer, .init = upmix_init, .close = upmix_close, -#if SND_PCM_EXTPLUG_VERSION >= 0x102 +#if SND_PCM_EXTPLUG_VERSION >= 0x10002 .query_chmaps = upmix_query_chmaps, .get_chmap = upmix_get_chmap, #endif diff -Nru alsa-plugins-extra-1.0.28/mix/pcm_vdownmix.c alsa-plugins-extra-1.1.0/mix/pcm_vdownmix.c --- alsa-plugins-extra-1.0.28/mix/pcm_vdownmix.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/mix/pcm_vdownmix.c 2015-10-27 13:34:06.000000000 +0000 @@ -277,7 +277,7 @@ return 0; } -#if SND_PCM_EXTPLUG_VERSION >= 0x102 +#if SND_PCM_EXTPLUG_VERSION >= 0x10002 static unsigned int chmap[6] = { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, @@ -319,13 +319,13 @@ memcpy(map->pos, chmap, ext->channels * sizeof(int)); return map; } -#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */ +#endif /* SND_PCM_EXTPLUG_VERSION >= 0x10002 */ static const snd_pcm_extplug_callback_t vdownmix_callback = { .transfer = vdownmix_transfer, .init = vdownmix_init, /* .dump = filr_dump, */ -#if SND_PCM_EXTPLUG_VERSION >= 0x102 +#if SND_PCM_EXTPLUG_VERSION >= 0x10002 .query_chmaps = vdownmix_query_chmaps, .get_chmap = vdownmix_get_chmap, #endif diff -Nru alsa-plugins-extra-1.0.28/pph/arch.h alsa-plugins-extra-1.1.0/pph/arch.h --- alsa-plugins-extra-1.0.28/pph/arch.h 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/pph/arch.h 2015-10-27 13:34:06.000000000 +0000 @@ -36,7 +36,7 @@ #define ARCH_H #ifndef OUTSIDE_SPEEX -#include "speex/speex_types.h" +#include "speex/speexdsp_types.h" #endif #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ diff -Nru alsa-plugins-extra-1.0.28/pph/speex_resampler.h alsa-plugins-extra-1.1.0/pph/speex_resampler.h --- alsa-plugins-extra-1.0.28/pph/speex_resampler.h 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/pph/speex_resampler.h 2015-10-27 13:34:06.000000000 +0000 @@ -82,7 +82,11 @@ #else /* OUTSIDE_SPEEX */ +#ifdef HAVE_SPEEX_SPEEXDSP_TYPES_H +#include "speex/speexdsp_types.h" +#else #include "speex/speex_types.h" +#endif #endif /* OUTSIDE_SPEEX */ diff -Nru alsa-plugins-extra-1.0.28/pulse/pcm_pulse.c alsa-plugins-extra-1.1.0/pulse/pcm_pulse.c --- alsa-plugins-extra-1.0.28/pulse/pcm_pulse.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/pulse/pcm_pulse.c 2015-10-27 13:34:06.000000000 +0000 @@ -994,7 +994,11 @@ SND_PCM_FORMAT_FLOAT_LE, SND_PCM_FORMAT_FLOAT_BE, SND_PCM_FORMAT_S32_LE, - SND_PCM_FORMAT_S32_BE + SND_PCM_FORMAT_S32_BE, + SND_PCM_FORMAT_S24_3LE, + SND_PCM_FORMAT_S24_3BE, + SND_PCM_FORMAT_S24_LE, + SND_PCM_FORMAT_S24_BE }; int err; diff -Nru alsa-plugins-extra-1.0.28/rate/rate_samplerate.c alsa-plugins-extra-1.1.0/rate/rate_samplerate.c --- alsa-plugins-extra-1.0.28/rate/rate_samplerate.c 2014-06-12 09:32:45.000000000 +0000 +++ alsa-plugins-extra-1.1.0/rate/rate_samplerate.c 2015-10-27 13:34:06.000000000 +0000 @@ -3,6 +3,14 @@ * * Copyright (c) 2006 by Takashi Iwai * + * 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 @@ -13,9 +21,17 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. */ #include diff -Nru alsa-plugins-extra-1.0.28/version alsa-plugins-extra-1.1.0/version --- alsa-plugins-extra-1.0.28/version 2014-06-13 09:23:48.000000000 +0000 +++ alsa-plugins-extra-1.1.0/version 2015-10-27 13:41:45.000000000 +0000 @@ -1 +1 @@ -1.0.28 +1.1.0