Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at 2015-07-20 15:14:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-23 12:54:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-plugins.new/alsa-plugins.changes 2015-07-20 15:14:24.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jul 9 15:30:28 CEST 2015 - [email protected] + +- Backport upstream fixes: just minor build fix issues that don't + hit us, but kept here for consistency + 0005-arcam-av-Include-sys-select.h-for-fd_set-definition.patch + 0006-pph-include-speexdsp_types.h-not-speex_types.h.patch + 0007-pph-Fix-build-with-older-speex.patch +- Fix build error with SLE11-SP3 due to lack of speexdsp pkgconfig. + +------------------------------------------------------------------- New: ---- 0005-arcam-av-Include-sys-select.h-for-fd_set-definition.patch 0006-pph-include-speexdsp_types.h-not-speex_types.h.patch 0007-pph-Fix-build-with-older-speex.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.uOAbJ9/_old 2015-07-20 15:14:25.000000000 +0200 +++ /var/tmp/diff_new_pack.uOAbJ9/_new 2015-07-20 15:14:25.000000000 +0200 @@ -41,6 +41,9 @@ 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 +Patch5: 0005-arcam-av-Include-sys-select.h-for-fd_set-definition.patch +Patch6: 0006-pph-include-speexdsp_types.h-not-speex_types.h.patch +Patch7: 0007-pph-Fix-build-with-older-speex.patch BuildRequires: alsa-devel BuildRequires: dbus-1-devel BuildRequires: libjack-devel @@ -52,7 +55,11 @@ BuildRequires: libpulse-devel %endif %if %{build_speex} +%if 0%{?suse_version} > 1230 BuildRequires: pkgconfig(speexdsp) >= 1.2 +%else +BuildRequires: speex-devel +%endif %endif %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -138,6 +145,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" ++++++ 0005-arcam-av-Include-sys-select.h-for-fd_set-definition.patch ++++++ >From d5c8a625639a25eb1d4ba2465b6a4542aeaacb43 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 29 May 2015 15:38:49 -0700 Subject: [PATCH] arcam-av: Include sys/select.h for fd_set definition fixes build errors on non-glibc based systems arcam-av/arcam_av.c:389:2: error: unknown type name 'fd_set' Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- arcam-av/arcam_av.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c index 0491fc6b8a63..fff96f999012 100644 --- a/arcam-av/arcam_av.c +++ b/arcam-av/arcam_av.c @@ -31,6 +31,7 @@ #include <unistd.h> #include <sys/ipc.h> +#include <sys/select.h> #include <sys/shm.h> #include <sys/stat.h> #include <sys/stat.h> -- 2.4.5 ++++++ 0006-pph-include-speexdsp_types.h-not-speex_types.h.patch ++++++ >From e5ac3c6d0ee71725ebfac25ea66fd58119570a8b Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen <[email protected]> Date: Thu, 9 Jul 2015 12:43:29 +0300 Subject: [PATCH] pph: include speexdsp_types.h, not speex_types.h Speexdsp was separated from speex in 1.2rc2. speex_types.h is not shipped by speexdsp, so alsa-plugins shouldn't use that file. speexdsp has speexdsp_types.h, which has the same contents as speex_types.h. speexdsp_types.h is a new file introduced in 1.2rc2, so this change bumps the minimum supported speexdsp version. The version check in configure.ac will actually break if speexdsp 1.2 ever gets released, because pkg-config thinks that "1.2" < "1.2rc2", but I think it's useful to fail if the installed speexdsp version is 1.2rc1 (which I believe is very common on current distributions). If a non-rc version of speexdsp will ever get released, I hope version number 1.2 will be skipped for this reason. (A non-rc version seems unlikely, since 1.2rc1 was released years ago, so it's pretty likely that the project is stuck on so called "release candidates" forever...) Signed-off-by: Tanu Kaskinen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> --- configure.ac | 2 +- pph/arch.h | 2 +- pph/speex_resampler.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 902a6d77cfbd..c554d2260b63 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ AC_SUBST(AVCODEC_CFLAGS) AC_SUBST(AVCODEC_LIBS) AC_SUBST(AVCODEC_HEADER) -PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) +PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2rc2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") AC_ARG_WITH([speex], diff --git a/pph/arch.h b/pph/arch.h index e2d731acc043..a07d0d9bede5 100644 --- a/pph/arch.h +++ b/pph/arch.h @@ -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 --git a/pph/speex_resampler.h b/pph/speex_resampler.h index c44fbcd0d1d3..aa85abb8cc65 100644 --- a/pph/speex_resampler.h +++ b/pph/speex_resampler.h @@ -82,7 +82,7 @@ #else /* OUTSIDE_SPEEX */ -#include "speex/speex_types.h" +#include "speex/speexdsp_types.h" #endif /* OUTSIDE_SPEEX */ -- 2.4.5 ++++++ 0007-pph-Fix-build-with-older-speex.patch ++++++ >From 9784abe1c0497a62ccb9c0050c75f15cc09df732 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <[email protected]> Date: Thu, 9 Jul 2015 16:08:59 +0200 Subject: [PATCH] pph: Fix build with older speex The previous commit fixed the build of the recent speexdsp, but it also broke the build with the old library. Actually the only needed change is the inclusion of speex/speex_types.h instead of speex/speexdsp_types.h, so it can be easily worked around via the check in configure script. Along with this change, make the version check back to 1.2 from 1.2rc2, as 1.2rc1 works fine now again, too. Signed-off-by: Takashi Iwai <[email protected]> --- configure.ac | 6 +++++- pph/speex_resampler.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c554d2260b63..e786d8e7194b 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ AC_SUBST(AVCODEC_CFLAGS) AC_SUBST(AVCODEC_LIBS) AC_SUBST(AVCODEC_HEADER) -PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2rc2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) +PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") AC_ARG_WITH([speex], @@ -133,6 +133,10 @@ fi 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 --git a/pph/speex_resampler.h b/pph/speex_resampler.h index aa85abb8cc65..0e5ced45c580 100644 --- a/pph/speex_resampler.h +++ b/pph/speex_resampler.h @@ -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 */ -- 2.4.5
