Hello community,
here is the log from the commit of package alsa-plugins for openSUSE:Factory
checked in at 2015-11-12 19:38:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-20 15:14:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alsa-plugins.new/alsa-plugins.changes
2015-11-12 19:38:05.000000000 +0100
@@ -1,0 +2,15 @@
+Mon Nov 9 11:50:43 CET 2015 - ti...@suse.de
+
+- Update to alsa-plugins 1.1.0:
+ including all previous fixes, a small memory leak fix in jack
+ plugin
+- Dropped patches:
+ 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
+ 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
+
+-------------------------------------------------------------------
Old:
----
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
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
alsa-plugins-1.0.29.tar.bz2
New:
----
alsa-plugins-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-plugins.spec ++++++
--- /var/tmp/diff_new_pack.ZuXkvI/_old 2015-11-12 19:38:06.000000000 +0100
+++ /var/tmp/diff_new_pack.ZuXkvI/_new 2015-11-12 19:38:06.000000000 +0100
@@ -16,7 +16,7 @@
#
-%define package_version 1.0.29
+%define package_version 1.1.0
%if 0%{?suse_version} > 1030
%define build_pulse 1
%define build_speex 1
@@ -25,7 +25,7 @@
%define build_speex 0
%endif
Name: alsa-plugins
-Version: 1.0.29
+Version: 1.1.0
Release: 0
Summary: Extra Plug-Ins for the ALSA Library
License: LGPL-2.1+
@@ -36,14 +36,6 @@
Source2: alsa-pulse.conf
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
-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
@@ -141,13 +133,6 @@
%prep
%setup -q -n %{name}-%{package_version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
export AUTOMAKE_JOBS="%{?_smp_mflags}"
++++++ alsa-plugins-1.0.29.tar.bz2 -> alsa-plugins-1.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/a52/pcm_a52.c
new/alsa-plugins-1.1.0/a52/pcm_a52.c
--- old/alsa-plugins-1.0.29/a52/pcm_a52.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/a52/pcm_a52.c 2015-10-27 14:34:06.000000000
+0100
@@ -656,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,
@@ -704,7 +704,7 @@
io->channels * sizeof(int));
return map;
}
-#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */
+#endif /* SND_PCM_IOPLUG_VERSION >= 0x10002 */
/*
* callback table
@@ -723,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/arcam-av/arcam_av.c
new/alsa-plugins-1.1.0/arcam-av/arcam_av.c
--- old/alsa-plugins-1.0.29/arcam-av/arcam_av.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/arcam-av/arcam_av.c 2015-10-27 14:34:06.000000000
+0100
@@ -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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/config.h.in
new/alsa-plugins-1.1.0/config.h.in
--- old/alsa-plugins-1.0.29/config.h.in 2015-02-26 13:45:44.000000000 +0100
+++ new/alsa-plugins-1.1.0/config.h.in 2015-10-27 14:41:43.000000000 +0100
@@ -18,6 +18,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <speex/speexdsp_types.h> header file. */
+#undef HAVE_SPEEX_SPEEXDSP_TYPES_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/configure
new/alsa-plugins-1.1.0/configure
--- old/alsa-plugins-1.0.29/configure 2015-02-26 13:45:46.000000000 +0100
+++ new/alsa-plugins-1.1.0/configure 2015-10-27 14:41:44.000000000 +0100
@@ -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.29.
+# 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.29'
-PACKAGE_STRING='alsa-plugins 1.0.29'
+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.29 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.29:";;
+ 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.29
+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.29, 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.29'
+ 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.29, 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.29
+alsa-plugins config.status 1.1.0
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.0.29/configure.ac
new/alsa-plugins-1.1.0/configure.ac
--- old/alsa-plugins-1.0.29/configure.ac 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/configure.ac 2015-10-27 14:34:06.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT(alsa-plugins, 1.0.29)
+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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/jack/pcm_jack.c
new/alsa-plugins-1.1.0/jack/pcm_jack.c
--- old/alsa-plugins-1.0.29/jack/pcm_jack.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/jack/pcm_jack.c 2015-10-27 14:34:06.000000000
+0100
@@ -103,6 +103,7 @@
if (jack->io.poll_fd >= 0)
close(jack->io.poll_fd);
free(jack->areas);
+ free(jack->ports);
free(jack);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/mix/pcm_upmix.c
new/alsa-plugins-1.1.0/mix/pcm_upmix.c
--- old/alsa-plugins-1.0.29/mix/pcm_upmix.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/mix/pcm_upmix.c 2015-10-27 14:34:06.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/mix/pcm_vdownmix.c
new/alsa-plugins-1.1.0/mix/pcm_vdownmix.c
--- old/alsa-plugins-1.0.29/mix/pcm_vdownmix.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/mix/pcm_vdownmix.c 2015-10-27 14:34:06.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/pph/arch.h
new/alsa-plugins-1.1.0/pph/arch.h
--- old/alsa-plugins-1.0.29/pph/arch.h 2015-02-26 13:38:07.000000000 +0100
+++ new/alsa-plugins-1.1.0/pph/arch.h 2015-10-27 14:34:06.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/pph/speex_resampler.h
new/alsa-plugins-1.1.0/pph/speex_resampler.h
--- old/alsa-plugins-1.0.29/pph/speex_resampler.h 2015-02-26
13:38:07.000000000 +0100
+++ new/alsa-plugins-1.1.0/pph/speex_resampler.h 2015-10-27
14:34:06.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/pulse/pcm_pulse.c
new/alsa-plugins-1.1.0/pulse/pcm_pulse.c
--- old/alsa-plugins-1.0.29/pulse/pcm_pulse.c 2015-02-26 13:38:07.000000000
+0100
+++ new/alsa-plugins-1.1.0/pulse/pcm_pulse.c 2015-10-27 14:34:06.000000000
+0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/rate/rate_samplerate.c
new/alsa-plugins-1.1.0/rate/rate_samplerate.c
--- old/alsa-plugins-1.0.29/rate/rate_samplerate.c 2015-02-26
13:38:07.000000000 +0100
+++ new/alsa-plugins-1.1.0/rate/rate_samplerate.c 2015-10-27
14:34:06.000000000 +0100
@@ -3,6 +3,14 @@
*
* Copyright (c) 2006 by Takashi Iwai <ti...@suse.de>
*
+ * 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>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/alsa-plugins-1.0.29/version
new/alsa-plugins-1.1.0/version
--- old/alsa-plugins-1.0.29/version 2015-02-26 13:45:47.000000000 +0100
+++ new/alsa-plugins-1.1.0/version 2015-10-27 14:41:45.000000000 +0100
@@ -1 +1 @@
-1.0.29
+1.1.0
