Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at 2016-02-09 16:48:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-03 13:27:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-plugins.new/alsa-plugins.changes 2016-02-09 16:48:44.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 3 18:09:33 CET 2016 - [email protected] + +- Backport upstream fixes: build fixes with the recent ffmpeg + 0001-speex-Add-missing-include-config.h.patch + 0002-a52-fix-reported-input-channel-order.patch + 0003-pph-include-config.h-from-rate_speexrate.c.patch +- Drop the obsoleted patch: + alsa-plugins-include-config.h.patch + +------------------------------------------------------------------- Old: ---- alsa-plugins-include-config.h.patch New: ---- 0001-speex-Add-missing-include-config.h.patch 0002-a52-fix-reported-input-channel-order.patch 0003-pph-include-config.h-from-rate_speexrate.c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.PttP1j/_old 2016-02-09 16:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.PttP1j/_new 2016-02-09 16:48:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package alsa-plugins # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,9 @@ Source1: asound-pulse.conf Source2: alsa-pulse.conf Source3: baselibs.conf -Patch0: alsa-plugins-include-config.h.patch +Patch1: 0001-speex-Add-missing-include-config.h.patch +Patch2: 0002-a52-fix-reported-input-channel-order.patch +Patch3: 0003-pph-include-config.h-from-rate_speexrate.c.patch BuildRequires: alsa-devel BuildRequires: dbus-1-devel BuildRequires: libjack-devel @@ -132,7 +134,9 @@ %prep %setup -q -n %{name}-%{package_version} -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" ++++++ 0001-speex-Add-missing-include-config.h.patch ++++++ >From 4e98854b590db9fd8faab0fea262277805bc7769 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Mon, 9 Nov 2015 11:53:22 +0100 Subject: [PATCH] speex: Add missing include config.h Signed-off-by: Takashi Iwai <[email protected]> --- speex/pcm_speex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/speex/pcm_speex.c b/speex/pcm_speex.c index 757a400e5b1b..f1406d7a7774 100644 --- a/speex/pcm_speex.c +++ b/speex/pcm_speex.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include <alsa/asoundlib.h> #include <alsa/pcm_external.h> #include <speex/speex_preprocess.h> -- 2.7.0 ++++++ 0002-a52-fix-reported-input-channel-order.patch ++++++ >From cdff2e32537440bf16329c8440d0d02d7ac02d38 Mon Sep 17 00:00:00 2001 From: Tom Yan <[email protected]> Date: Tue, 12 Jan 2016 15:57:39 +0800 Subject: [PATCH] a52: fix reported input channel order a52 plugin expects the input to be in ALSA order and remaps it to general order when encoding. However it reports that the input it takes should be in general order. This fix should make programs (e.g. mpv) that is aware of channel layout reported by ALSA remap sources appropriately before sending when necessary. It should not cause any regression to programs (e.g. mplayer) that does not check the reported channel layout (hence not affected by the issue) and remaps sources anyway. Signed-off-by: Tom Yan <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- a52/pcm_a52.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c index 4e4c5f77aa92..88529eb84ace 100644 --- a/a52/pcm_a52.c +++ b/a52/pcm_a52.c @@ -663,8 +663,8 @@ static unsigned int chmap4[4] = { }; static unsigned int chmap6[6] = { SND_CHMAP_FL, SND_CHMAP_FR, - SND_CHMAP_FC, SND_CHMAP_LFE, SND_CHMAP_RL, SND_CHMAP_RR, + SND_CHMAP_FC, SND_CHMAP_LFE, }; static snd_pcm_chmap_query_t **a52_query_chmaps(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED) -- 2.7.0 ++++++ 0003-pph-include-config.h-from-rate_speexrate.c.patch ++++++ >From e1760840dc4710146a22458e4a804cbfc91e7630 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen <[email protected]> Date: Wed, 27 Jan 2016 13:45:51 +0200 Subject: [PATCH] pph: include config.h from rate_speexrate.c Fixes compilation against libspeexdsp 1.2rc3. rate_speexrate.c includes speex_resampler.h, which depends on config.h by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not a good idea to include config.h from headers (I don't know/remember why, though), which is why I include config.h from rate_speexrate.c instead of speex_resampler.h. Signed-off-by: Tanu Kaskinen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- pph/rate_speexrate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c index 0a1325c32368..8fc4cef00edd 100644 --- a/pph/rate_speexrate.c +++ b/pph/rate_speexrate.c @@ -28,6 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include <stdio.h> #include <alsa/asoundlib.h> #include <alsa/pcm_rate.h> -- 2.7.0
