Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at 2015-05-23 12:54:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-plugins (Old) and /work/SRC/openSUSE:Factory/.alsa-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-plugins/alsa-plugins.changes 2015-03-16 06:57:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-plugins.new/alsa-plugins.changes 2015-05-23 12:54:26.000000000 +0200 @@ -1,0 +2,11 @@ +Fri May 22 14:19:53 CEST 2015 - [email protected] + +- Backport upstream fixes: fixes for A52 plugin, mix plugin protocol + version fix, and enhancement for JACK plugin to support 24bit + formats: + 0001-rate-Allow-LGPL-for-libsamplerate-commercial-license.patch + 0002-mix-Fix-extplug-version-ifdef-checks.patch + 0003-a52-Fix-ioplug-version-ifdef-checks.patch + 0004-pulse-Add-24-bit-data-formats-to-Pulse-plugin.patch + +------------------------------------------------------------------- New: ---- 0001-rate-Allow-LGPL-for-libsamplerate-commercial-license.patch 0002-mix-Fix-extplug-version-ifdef-checks.patch 0003-a52-Fix-ioplug-version-ifdef-checks.patch 0004-pulse-Add-24-bit-data-formats-to-Pulse-plugin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.HQW35t/_old 2015-05-23 12:54:27.000000000 +0200 +++ /var/tmp/diff_new_pack.HQW35t/_new 2015-05-23 12:54:27.000000000 +0200 @@ -37,6 +37,10 @@ Source3: baselibs.conf Patch0: alsa-plugins-include-config.h.patch # upstream fixes +Patch1: 0001-rate-Allow-LGPL-for-libsamplerate-commercial-license.patch +Patch2: 0002-mix-Fix-extplug-version-ifdef-checks.patch +Patch3: 0003-a52-Fix-ioplug-version-ifdef-checks.patch +Patch4: 0004-pulse-Add-24-bit-data-formats-to-Pulse-plugin.patch BuildRequires: alsa-devel BuildRequires: dbus-1-devel BuildRequires: libjack-devel @@ -130,6 +134,10 @@ %prep %setup -q -n %{name}-%{package_version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" ++++++ 0001-rate-Allow-LGPL-for-libsamplerate-commercial-license.patch ++++++ >From f576eaedf18c279357654f071678e873bce14727 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Thu, 12 Mar 2015 09:13:44 +0100 Subject: [PATCH 1/4] rate: Allow LGPL for libsamplerate commercial licensee alsa-plugins-rate is tagged with GPL just for following the license of libsamplerate. However, libsamplerate provides a commercial license to allow it used with less restrictions. In that case, we also don't have to stick with GPL. Instead, the code follows LGPL like other plugin codes in this package. Signed-off-by: Takashi Iwai <[email protected]> --- rate/rate_samplerate.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/rate/rate_samplerate.c b/rate/rate_samplerate.c index 53a0627b21dc..0b14a59000bf 100644 --- a/rate/rate_samplerate.c +++ b/rate/rate_samplerate.c @@ -3,6 +3,14 @@ * * 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 @@ -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 <stdio.h> -- 2.4.1 ++++++ 0002-mix-Fix-extplug-version-ifdef-checks.patch ++++++ >From 2b7dac75a76301ad2fb270e07ca15935ce48f1ea Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Wed, 18 Mar 2015 17:05:16 +0100 Subject: [PATCH 2/4] mix: Fix extplug version ifdef checks SND_PCM_EXTPLUG_VERSION must be checked with 0x10002, not 0x102. Reported-by: Ethan Grammatikidis <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- mix/pcm_upmix.c | 6 +++--- mix/pcm_vdownmix.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mix/pcm_upmix.c b/mix/pcm_upmix.c index de5be41f717c..86d2d9d8a734 100644 --- a/mix/pcm_upmix.c +++ b/mix/pcm_upmix.c @@ -371,7 +371,7 @@ static int upmix_close(snd_pcm_extplug_t *ext) 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 @@ static snd_pcm_chmap_t *upmix_get_chmap(snd_pcm_extplug_t *ext) 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 --git a/mix/pcm_vdownmix.c b/mix/pcm_vdownmix.c index 03e5adba9ddc..77c274af82f6 100644 --- a/mix/pcm_vdownmix.c +++ b/mix/pcm_vdownmix.c @@ -277,7 +277,7 @@ static int vdownmix_init(snd_pcm_extplug_t *ext) 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 @@ static snd_pcm_chmap_t *vdownmix_get_chmap(snd_pcm_extplug_t *ext) 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 -- 2.4.1 ++++++ 0003-a52-Fix-ioplug-version-ifdef-checks.patch ++++++ >From 1e32ee9a63d5d6a623d072684cdf4871734da13b Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Wed, 18 Mar 2015 17:08:57 +0100 Subject: [PATCH 3/4] a52: Fix ioplug version ifdef checks SND_PCM_IOPLUG_VERSION must be checked with 0x10002, not 0x102. Signed-off-by: Takashi Iwai <[email protected]> --- a52/pcm_a52.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c index 59e25cbd5f46..4e4c5f77aa92 100644 --- a/a52/pcm_a52.c +++ b/a52/pcm_a52.c @@ -656,7 +656,7 @@ static int a52_close(snd_pcm_ioplug_t *io) 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, @@ -704,7 +704,7 @@ static snd_pcm_chmap_t *a52_get_chmap(snd_pcm_ioplug_t *io) io->channels * sizeof(int)); return map; } -#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */ +#endif /* SND_PCM_IOPLUG_VERSION >= 0x10002 */ /* * callback table @@ -723,10 +723,10 @@ static snd_pcm_ioplug_callback_t a52_ops = { .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 */ }; /* -- 2.4.1 ++++++ 0004-pulse-Add-24-bit-data-formats-to-Pulse-plugin.patch ++++++ >From b6834730b75008da924288cb8d4b01d7c26ec1ce Mon Sep 17 00:00:00 2001 From: Alex Wiggins <[email protected]> Date: Tue, 12 May 2015 01:09:34 +0100 Subject: [PATCH 4/4] pulse: Add 24 bit data formats to Pulse plugin. Signed-off-by: Alex Wiggins <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- pulse/pcm_pulse.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 0d3704bd79f4..5cb3452f2484 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -994,7 +994,11 @@ static int pulse_hw_constraint(snd_pcm_pulse_t * pcm) 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; -- 2.4.1
