Hello community,
here is the log from the commit of package alsa-plugins
checked in at Tue Jun 5 12:47:10 CEST 2007.
--------
--- alsa-plugins/alsa-plugins-a52.changes 2007-05-24 15:34:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins-a52.changes 2007-06-05 11:32:17.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 5 11:32:08 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14-final:
+ including previous HG fixes
+
+-------------------------------------------------------------------
--- alsa-plugins/alsa-plugins.changes 2007-05-24 15:34:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2007-06-05 11:32:04.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 5 11:31:44 CEST 2007 - tiwai@suse.de
+
+- updated to version 1.0.14-final:
+ including previous HG fixes
+
+-------------------------------------------------------------------
Old:
----
alsa-plugins-1.0.14rc4.tar.bz2
alsa-plugins-hg-fixes.diff
New:
----
alsa-plugins-1.0.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-plugins-a52.spec ++++++
--- /var/tmp/diff_new_pack.A19824/_old 2007-06-05 12:46:55.000000000 +0200
+++ /var/tmp/diff_new_pack.A19824/_new 2007-06-05 12:46:55.000000000 +0200
@@ -12,16 +12,16 @@
Name: alsa-plugins-a52
BuildRequires: alsa-devel ffmpeg-devel pkg-config
-%define package_version 1.0.14rc4
+%define package_version 1.0.14
URL: http://www.alsa-project.org/
Summary: A52 Encoding Plug-In for the ALSA Library
Version: 1.0.13
-Release: 38
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Release: 44
+License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL), Some new plugins are GPL.
Group: System/Libraries
Autoreqprov: on
Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.bz2
-Patch: alsa-plugins-hg-fixes.diff
+# Patch: alsa-plugins-hg-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -35,7 +35,7 @@
%prep
%setup -q -n alsa-plugins-%{package_version}
-%patch -p1
+# %patch -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -47,6 +47,7 @@
%install
make -C a52 DESTDIR="$RPM_BUILD_ROOT" install
make -C rate-lavc DESTDIR="$RPM_BUILD_ROOT" install
+# modules don't need *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.la
%clean
@@ -61,6 +62,9 @@
%{_libdir}/alsa-lib/libasound_module_rate_*.so
%changelog
+* Tue Jun 05 2007 - tiwai@suse.de
+- updated to version 1.0.14-final:
+ including previous HG fixes
* Thu May 24 2007 - tiwai@suse.de
- HG snapshot as of 2007.05.24:
* configure option to specify plugin directory
++++++ alsa-plugins.spec ++++++
--- /var/tmp/diff_new_pack.A19824/_old 2007-06-05 12:46:55.000000000 +0200
+++ /var/tmp/diff_new_pack.A19824/_new 2007-06-05 12:46:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package alsa-plugins (Version 1.0.13)
+# spec file for package alsa-plugins (Version 1.0.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,16 @@
Name: alsa-plugins
BuildRequires: alsa-devel dbus-1-devel jack-devel libsamplerate-devel pulseaudio-devel
-%define package_version 1.0.14rc4
+%define package_version 1.0.14
URL: http://www.alsa-project.org/
Summary: Extra Plug-Ins for the ALSA Library
-Version: 1.0.13
-Release: 36
-License: BSD License and BSD-like, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Version: 1.0.14
+Release: 1
+License: BSD License and BSD-like, GNU Library General Public License v. 2.0 and 2.1 (LGPL), Some new plugins are GPL.
Group: System/Libraries
Autoreqprov: on
Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.bz2
-Patch: alsa-plugins-hg-fixes.diff
+# Patch: alsa-plugins-hg-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -36,7 +36,7 @@
%package jack
Summary: JACK I/O Plug-In for the ALSA Library
Group: System/Libraries
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Some new plugins are GPL.
Requires: jack
%description jack
@@ -53,7 +53,7 @@
%package pulse
Summary: Polypaudio Plug-In for the ALSA Library
Group: System/Libraries
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL), Some new plugins are GPL.
Requires: pulseaudio
%description pulse
@@ -68,7 +68,7 @@
%package maemo
Summary: Maemo Plug-Ins for the ALSA Library
Group: System/Libraries
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Some new plugins are GPL.
%description maemo
This package contains the ALSA-library plug-ins using maemo SDK for
@@ -83,7 +83,7 @@
%package samplerate
Summary: Samplerate Plug-In for the ALSA Library
Group: System/Libraries
-License: GNU General Public License (GPL)
+License: GNU General Public License (GPL), Some new plugins are GPL.
%description samplerate
This package contains the sample rate converter plugin for the ALSA
@@ -97,7 +97,7 @@
%prep
%setup -q -n %{name}-%{package_version}
-%patch -p1
+# %patch -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -107,6 +107,7 @@
%install
make DESTDIR="$RPM_BUILD_ROOT" install
+# modules don't need *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.la
%clean
@@ -152,6 +153,9 @@
%{_libdir}/alsa-lib/libasound_module_rate_samplerate*.so
%changelog
+* Tue Jun 05 2007 - tiwai@suse.de
+- updated to version 1.0.14-final:
+ including previous HG fixes
* Thu May 24 2007 - tiwai@suse.de
- HG snapshot as of 2007.05.24:
* configure option to specify plugin directory
++++++ alsa-plugins-1.0.14rc4.tar.bz2 -> alsa-plugins-1.0.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/a52/Makefile.am new/alsa-plugins-1.0.14/a52/Makefile.am
--- old/alsa-plugins-1.0.14rc4/a52/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/a52/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,6 +1,6 @@
asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la
-asound_module_pcm_a52dir = $(libdir)/alsa-lib
+asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/a52/Makefile.in new/alsa-plugins-1.0.14/a52/Makefile.in
--- old/alsa-plugins-1.0.14rc4/a52/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/a52/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -78,6 +78,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -117,6 +118,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -147,6 +150,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -197,10 +202,12 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la
-asound_module_pcm_a52dir = $(libdir)/alsa-lib
+asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_pcm_a52_la_SOURCES = pcm_a52.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/a52/pcm_a52.c new/alsa-plugins-1.0.14/a52/pcm_a52.c
--- old/alsa-plugins-1.0.14rc4/a52/pcm_a52.c 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/a52/pcm_a52.c 2007-05-31 10:06:51.000000000 +0200
@@ -676,6 +676,7 @@
rec->channels = channels;
rec->format = format;
+ avcodec_init();
avcodec_register_all();
rec->codec = avcodec_find_encoder(CODEC_ID_AC3);
if (! rec->codec) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/config.h.in new/alsa-plugins-1.0.14/config.h.in
--- old/alsa-plugins-1.0.14rc4/config.h.in 2007-05-02 13:31:39.000000000 +0200
+++ new/alsa-plugins-1.0.14/config.h.in 2007-05-31 10:06:55.000000000 +0200
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.in by autoheader. */
+/* directory containing ALSA add-on modules */
+#undef ALSA_PLUGIN_DIR
+
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
@@ -54,6 +57,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* "Link with libspeex for resampler" */
+#undef USE_LIBSPEEX
+
/* "Use dbus server as a resouce manager" */
#undef USE_RESOURCE_MANAGER
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/configure new/alsa-plugins-1.0.14/configure
--- old/alsa-plugins-1.0.14rc4/configure 2007-05-02 13:31:43.000000000 +0200
+++ new/alsa-plugins-1.0.14/configure 2007-05-31 10:06:59.000000000 +0200
@@ -876,6 +876,13 @@
AVCODEC_LIBS
HAVE_AVCODEC_TRUE
HAVE_AVCODEC_FALSE
+speex_CFLAGS
+speex_LIBS
+HAVE_PPH_TRUE
+HAVE_PPH_FALSE
+USE_LIBSPEEX_TRUE
+USE_LIBSPEEX_FALSE
+ALSA_PLUGIN_DIR
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -903,7 +910,9 @@
samplerate_CFLAGS
samplerate_LIBS
DBUS_CFLAGS
-DBUS_LIBS'
+DBUS_LIBS
+speex_CFLAGS
+speex_LIBS'
# Initialize some variables set by options.
@@ -1496,8 +1505,14 @@
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
---with-avcodec-includedir=dir AVcodec include directory
---with-avcodec-libdir=dir AVcodec library directory
+ --with-avcodec-includedir=dir
+ AVcodec include directory
+ --with-avcodec-libdir=dir
+ AVcodec library directory
+ --with-speex={builtin|lib|no}
+ build speex resampler (built-in code, link with
+ external lib, or no build)
+ --with-plugindir=dir path where ALSA plugin files are stored
Some influential environment variables:
CC C compiler command
@@ -1527,6 +1542,9 @@
linker flags for samplerate, overriding pkg-config
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config
+ speex_CFLAGS
+ C compiler flags for speex, overriding pkg-config
+ speex_LIBS linker flags for speex, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -2267,7 +2285,7 @@
# Define the identity of the package.
PACKAGE=alsa-plugins
- VERSION=1.0.14rc4
+ VERSION=1.0.14
cat >>confdefs.h <<_ACEOF
@@ -4469,7 +4487,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4472 "configure"' > conftest.$ac_ext
+ echo '#line 4490 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7428,11 +7446,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7431: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7449: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7435: \$? = $ac_status" >&5
+ echo "$as_me:7453: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7696,11 +7714,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7699: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7717: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7703: \$? = $ac_status" >&5
+ echo "$as_me:7721: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7800,11 +7818,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7803: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7821: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7807: \$? = $ac_status" >&5
+ echo "$as_me:7825: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10252,7 +10270,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12741: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12727: \$? = $ac_status" >&5
+ echo "$as_me:12745: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12824,11 +12842,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12827: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12845: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12831: \$? = $ac_status" >&5
+ echo "$as_me:12849: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14394,11 +14412,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14397: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14415: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14401: \$? = $ac_status" >&5
+ echo "$as_me:14419: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14498,11 +14516,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14501: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14519: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14505: \$? = $ac_status" >&5
+ echo "$as_me:14523: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16728,11 +16746,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16731: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16749: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16735: \$? = $ac_status" >&5
+ echo "$as_me:16753: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16996,11 +17014,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16999: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17017: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17003: \$? = $ac_status" >&5
+ echo "$as_me:17021: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17100,11 +17118,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17103: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17107: \$? = $ac_status" >&5
+ echo "$as_me:17125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20914,6 +20932,231 @@
CFLAGS="$CFLAGS_saved"
LDFLAGS="$LDFLAGS_saved"
+USE_LIBSPEEX=""
+
+# Check whether --with-speex was given.
+if test "${with_speex+set}" = set; then
+ withval=$with_speex; PPH=$withval
+else
+ PPH="lib"
+fi
+
+
+if test "$PPH" = "lib"; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for speex" >&5
+echo $ECHO_N "checking for speex... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$speex_CFLAGS"; then
+ pkg_cv_speex_CFLAGS="$speex_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "speex >= 1.2") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_speex_CFLAGS=`$PKG_CONFIG --cflags "speex >= 1.2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$speex_LIBS"; then
+ pkg_cv_speex_LIBS="$speex_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "speex >= 1.2") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_speex_LIBS=`$PKG_CONFIG --libs "speex >= 1.2" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ speex_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speex >= 1.2"`
+ else
+ speex_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speex >= 1.2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$speex_PKG_ERRORS" >&5
+
+ USE_LIBSPEEX=""
+elif test $pkg_failed = untried; then
+ USE_LIBSPEEX=""
+else
+ speex_CFLAGS=$pkg_cv_speex_CFLAGS
+ speex_LIBS=$pkg_cv_speex_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ USE_LIBSPEEX="yes"
+fi
+ if test "$USE_LIBSPEEX" = "yes"; then
+ { echo "$as_me:$LINENO: checking for speex_resampler_init in -lspeex" >&5
+echo $ECHO_N "checking for speex_resampler_init in -lspeex... $ECHO_C" >&6; }
+if test "${ac_cv_lib_speex_speex_resampler_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspeex $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char speex_resampler_init ();
+int
+main ()
+{
+return speex_resampler_init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_speex_speex_resampler_init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_speex_speex_resampler_init=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_resampler_init" >&5
+echo "${ECHO_T}$ac_cv_lib_speex_speex_resampler_init" >&6; }
+if test $ac_cv_lib_speex_speex_resampler_init = yes; then
+ USE_LIBSPEEX="yes"
+else
+ USE_LIBSPEEX=""
+fi
+
+ fi
+ if test "$USE_LIBSPEEX" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_LIBSPEEX 1
+_ACEOF
+
+ else
+ echo "No libspeex with resampler unit; use built-in code"
+ PPH="builtin"
+ fi
+fi
+
+
+
+if test "$PPH" = "builtin" -o "$PPH" = "lib"; then
+ HAVE_PPH_TRUE=
+ HAVE_PPH_FALSE='#'
+else
+ HAVE_PPH_TRUE='#'
+ HAVE_PPH_FALSE=
+fi
+
+
+
+if test "$PPH" = "lib"; then
+ USE_LIBSPEEX_TRUE=
+ USE_LIBSPEEX_FALSE='#'
+else
+ USE_LIBSPEEX_TRUE='#'
+ USE_LIBSPEEX_FALSE=
+fi
+
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+
+
+# Check whether --with-plugindir was given.
+if test "${with_plugindir+set}" = set; then
+ withval=$with_plugindir; plugindir="$withval"
+else
+ plugindir=""
+fi
+
+if test -z "$plugindir"; then
+ eval dir="$libdir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$dir"
+ esac
+ plugindir="$dir/alsa-lib"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define ALSA_PLUGIN_DIR "$plugindir"
+_ACEOF
+
+ALSA_PLUGIN_DIR="$plugindir"
+
+
{ echo "$as_me:$LINENO: checking for plugins version" >&5
echo $ECHO_N "checking for plugins version... $ECHO_C" >&6; }
@@ -21077,6 +21320,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_PPH_TRUE}" && test -z "${HAVE_PPH_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PPH\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_PPH\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${USE_LIBSPEEX_TRUE}" && test -z "${USE_LIBSPEEX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"USE_LIBSPEEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"USE_LIBSPEEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21769,11 +22026,18 @@
AVCODEC_LIBS!$AVCODEC_LIBS$ac_delim
HAVE_AVCODEC_TRUE!$HAVE_AVCODEC_TRUE$ac_delim
HAVE_AVCODEC_FALSE!$HAVE_AVCODEC_FALSE$ac_delim
+speex_CFLAGS!$speex_CFLAGS$ac_delim
+speex_LIBS!$speex_LIBS$ac_delim
+HAVE_PPH_TRUE!$HAVE_PPH_TRUE$ac_delim
+HAVE_PPH_FALSE!$HAVE_PPH_FALSE$ac_delim
+USE_LIBSPEEX_TRUE!$USE_LIBSPEEX_TRUE$ac_delim
+USE_LIBSPEEX_FALSE!$USE_LIBSPEEX_FALSE$ac_delim
+ALSA_PLUGIN_DIR!$ALSA_PLUGIN_DIR$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -22364,3 +22628,39 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
+
+
+echo
+echo "Plugin directory: $ALSA_PLUGIN_DIR"
+echo "ALSA_CFLAGS: $ALSA_CFLAGS"
+echo "ALSA_LIBS: $ALSA_LIBS"
+echo "JACK plugin: $HAVE_JACK"
+if test "$HAVE_JACK" = "yes"; then
+ echo " JACK_CFLAGS: $JACK_CFLAGS"
+ echo " JACK_LIBS: $JACK_LIBS"
+fi
+echo "Pulseaudio plugin: $HAVE_PULSE"
+if test "$HAVE_PULSE" = "yes"; then
+ echo " pulseaudio_CFLAGS: $pulseaudio_CFLAGS"
+ echo " pulseaudio_LIBS: $pulseaudio_LIBS"
+fi
+echo "Samplerate plugin: $HAVE_SAMPLERATE"
+if test "$HAVE_SAMPLERATE" = "yes"; then
+ echo " samplerate_CFLAGS: $samplerate_CFLAGS"
+ echo " samplerate_LIBS: $samplerate_LIBS"
+fi
+echo "Maemo plugin: $HAVE_DBUS"
+if test "$HAVE_DBUS" = "yes"; then
+ echo " DBUS_CFLAGS: $DBUS_CFLAGS"
+ echo " DBUS_LIBS: $DBUS_LIBS"
+fi
+echo "A52, lavc plugins: $HAVE_AVCODEC"
+if test "$HAVE_AVCODEC" = "yes"; then
+ echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS"
+ echo " AVCODEC_LIBS: $AVCODEC_LIBS"
+fi
+echo "Speex rate plugin: $PPH"
+if test "$PPH" = "lib"; then
+ echo " speex_CFLAGS: $speex_CFLAGS"
+ echo " speex_LIBS: $speex_LIBS"
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/configure.in new/alsa-plugins-1.0.14/configure.in
--- old/alsa-plugins-1.0.14rc4/configure.in 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/configure.in 2007-05-31 10:06:51.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
AC_INIT(oss/pcm_oss.c)
-AM_INIT_AUTOMAKE(alsa-plugins, 1.0.14rc4)
+AM_INIT_AUTOMAKE(alsa-plugins, 1.0.14)
AC_PREFIX_DEFAULT(/usr)
AC_CONFIG_HEADERS(config.h)
@@ -32,10 +32,12 @@
fi
AC_ARG_WITH([avcodec-includedir],
- [--with-avcodec-includedir=dir AVcodec include directory],
+ AS_HELP_STRING([--with-avcodec-includedir=dir],
+ [AVcodec include directory]),
[AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""])
AC_ARG_WITH([avcodec-libdir],
- [--with-avcodec-libdir=dir AVcodec library directory],
+ AS_HELP_STRING([--with-avcodec-libdir=dir],
+ [AVcodec library directory]),
[AVCODEC_LIBS="-L$withval"], [AVCODEC_LIBS=""])
CFLAGS_saved="$CFLAGS"
LDFLAGS_saved="$LDFLAGS"
@@ -52,6 +54,49 @@
CFLAGS="$CFLAGS_saved"
LDFLAGS="$LDFLAGS_saved"
+USE_LIBSPEEX=""
+AC_ARG_WITH([speex],
+ AS_HELP_STRING([--with-speex={builtin|lib|no}],
+ [build speex resampler (built-in code, link with external lib, or no build)]),
+ [PPH=$withval], [PPH="lib"])
+
+if test "$PPH" = "lib"; then
+ PKG_CHECK_MODULES(speex, [speex >= 1.2], [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""])
+ if test "$USE_LIBSPEEX" = "yes"; then
+ AC_CHECK_LIB([speex], [speex_resampler_init],
+ [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""])
+ fi
+ if test "$USE_LIBSPEEX" = "yes"; then
+ AC_DEFINE(USE_LIBSPEEX, 1, "Link with libspeex for resampler")
+ else
+ echo "No libspeex with resampler unit; use built-in code"
+ PPH="builtin"
+ fi
+fi
+
+AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib")
+AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib")
+
+dnl ALSA plugin directory
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+
+AC_ARG_WITH(plugindir,
+ AS_HELP_STRING([--with-plugindir=dir],
+ [path where ALSA plugin files are stored]),
+ plugindir="$withval", plugindir="")
+if test -z "$plugindir"; then
+ eval dir="$libdir"
+ case "$dir" in
+ /*) ;;
+ *) dir="$dir"
+ esac
+ plugindir="$dir/alsa-lib"
+fi
+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add-on modules])
+ALSA_PLUGIN_DIR="$plugindir"
+AC_SUBST(ALSA_PLUGIN_DIR)
+
SAVE_PLUGINS_VERSION
AC_OUTPUT([
@@ -67,3 +112,40 @@
maemo/Makefile
doc/Makefile
])
+
+dnl Show the build conditions
+
+echo
+echo "Plugin directory: $ALSA_PLUGIN_DIR"
+echo "ALSA_CFLAGS: $ALSA_CFLAGS"
+echo "ALSA_LIBS: $ALSA_LIBS"
+echo "JACK plugin: $HAVE_JACK"
+if test "$HAVE_JACK" = "yes"; then
+ echo " JACK_CFLAGS: $JACK_CFLAGS"
+ echo " JACK_LIBS: $JACK_LIBS"
+fi
+echo "Pulseaudio plugin: $HAVE_PULSE"
+if test "$HAVE_PULSE" = "yes"; then
+ echo " pulseaudio_CFLAGS: $pulseaudio_CFLAGS"
+ echo " pulseaudio_LIBS: $pulseaudio_LIBS"
+fi
+echo "Samplerate plugin: $HAVE_SAMPLERATE"
+if test "$HAVE_SAMPLERATE" = "yes"; then
+ echo " samplerate_CFLAGS: $samplerate_CFLAGS"
+ echo " samplerate_LIBS: $samplerate_LIBS"
+fi
+echo "Maemo plugin: $HAVE_DBUS"
+if test "$HAVE_DBUS" = "yes"; then
+ echo " DBUS_CFLAGS: $DBUS_CFLAGS"
+ echo " DBUS_LIBS: $DBUS_LIBS"
+fi
+echo "A52, lavc plugins: $HAVE_AVCODEC"
+if test "$HAVE_AVCODEC" = "yes"; then
+ echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS"
+ echo " AVCODEC_LIBS: $AVCODEC_LIBS"
+fi
+echo "Speex rate plugin: $PPH"
+if test "$PPH" = "lib"; then
+ echo " speex_CFLAGS: $speex_CFLAGS"
+ echo " speex_LIBS: $speex_LIBS"
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/doc/Makefile.in new/alsa-plugins-1.0.14/doc/Makefile.in
--- old/alsa-plugins-1.0.14rc4/doc/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/doc/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -51,6 +51,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -90,6 +91,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -120,6 +123,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -170,6 +175,8 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/jack/Makefile.am new/alsa-plugins-1.0.14/jack/Makefile.am
--- old/alsa-plugins-1.0.14rc4/jack/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/jack/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,6 +1,6 @@
asound_module_pcm_jack_LTLIBRARIES = libasound_module_pcm_jack.la
-asound_module_pcm_jackdir = $(libdir)/alsa-lib
+asound_module_pcm_jackdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @JACK_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/jack/Makefile.in new/alsa-plugins-1.0.14/jack/Makefile.in
--- old/alsa-plugins-1.0.14rc4/jack/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/jack/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -78,6 +78,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -117,6 +118,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -147,6 +150,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -197,10 +202,12 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_jack_LTLIBRARIES = libasound_module_pcm_jack.la
-asound_module_pcm_jackdir = $(libdir)/alsa-lib
+asound_module_pcm_jackdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @JACK_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_pcm_jack_la_SOURCES = pcm_jack.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/maemo/Makefile.am new/alsa-plugins-1.0.14/maemo/Makefile.am
--- old/alsa-plugins-1.0.14rc4/maemo/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/maemo/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,8 +1,8 @@
asound_module_pcm_alsa_dsp_LTLIBRARIES = libasound_module_pcm_alsa_dsp.la
asound_module_ctl_dsp_ctl_LTLIBRARIES = libasound_module_ctl_dsp_ctl.la
-asound_module_pcm_alsa_dspdir = $(libdir)/alsa-lib
-asound_module_ctl_dsp_ctldir = $(libdir)/alsa-lib
+asound_module_pcm_alsa_dspdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_dsp_ctldir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -fPIC -DPIC -O2 @ALSA_CFLAGS@ $(DBUS_CFLAGS)
AM_LDFLAGS = -shared -lm -ldl -lpthread -module -avoid-version -export-dynamic $(DBUS_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/maemo/Makefile.in new/alsa-plugins-1.0.14/maemo/Makefile.in
--- old/alsa-plugins-1.0.14rc4/maemo/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/maemo/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -92,6 +92,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -131,6 +132,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -161,6 +164,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -211,12 +216,14 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_alsa_dsp_LTLIBRARIES = libasound_module_pcm_alsa_dsp.la
asound_module_ctl_dsp_ctl_LTLIBRARIES = libasound_module_ctl_dsp_ctl.la
-asound_module_pcm_alsa_dspdir = $(libdir)/alsa-lib
-asound_module_ctl_dsp_ctldir = $(libdir)/alsa-lib
+asound_module_pcm_alsa_dspdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_dsp_ctldir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -fPIC -DPIC -O2 @ALSA_CFLAGS@ $(DBUS_CFLAGS)
AM_LDFLAGS = -shared -lm -ldl -lpthread -module -avoid-version -export-dynamic $(DBUS_LIBS)
libasound_module_pcm_alsa_dsp_la_SOURCES = dsp-protocol.c alsa-dsp.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/Makefile.am new/alsa-plugins-1.0.14/Makefile.am
--- old/alsa-plugins-1.0.14rc4/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -14,8 +14,11 @@
if HAVE_DBUS
MAEMODIR = maemo
endif
+if HAVE_PPH
+PPHDIR = pph
+endif
-SUBDIRS = oss mix pph $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
+SUBDIRS = oss mix $(PPHDIR) $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
EXTRA_DIST = hgcompile version COPYING.GPL
AUTOMAKE_OPTIONS = foreign
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/Makefile.in new/alsa-plugins-1.0.14/Makefile.in
--- old/alsa-plugins-1.0.14rc4/Makefile.in 2007-05-02 13:31:42.000000000 +0200
+++ new/alsa-plugins-1.0.14/Makefile.in 2007-05-31 10:06:58.000000000 +0200
@@ -75,6 +75,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -114,6 +115,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -144,6 +147,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -194,6 +199,8 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@HAVE_JACK_TRUE@JACKDIR = jack
@@ -202,7 +209,8 @@
@HAVE_AVCODEC_TRUE@A52DIR = a52
@HAVE_AVCODEC_TRUE@LAVCRATEDIR = rate-lavc
@HAVE_DBUS_TRUE@MAEMODIR = maemo
-SUBDIRS = oss mix pph $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
+@HAVE_PPH_TRUE@PPHDIR = pph
+SUBDIRS = oss mix $(PPHDIR) $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) doc
EXTRA_DIST = hgcompile version COPYING.GPL
AUTOMAKE_OPTIONS = foreign
all: config.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/mix/Makefile.am new/alsa-plugins-1.0.14/mix/Makefile.am
--- old/alsa-plugins-1.0.14rc4/mix/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/mix/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,8 +1,8 @@
asound_module_pcm_upmix_LTLIBRARIES = libasound_module_pcm_upmix.la
asound_module_pcm_vdownmix_LTLIBRARIES = libasound_module_pcm_vdownmix.la
-asound_module_pcm_upmixdir = $(libdir)/alsa-lib
-asound_module_pcm_vdownmixdir = $(libdir)/alsa-lib
+asound_module_pcm_upmixdir = @ALSA_PLUGIN_DIR@
+asound_module_pcm_vdownmixdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/mix/Makefile.in new/alsa-plugins-1.0.14/mix/Makefile.in
--- old/alsa-plugins-1.0.14rc4/mix/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/mix/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -87,6 +87,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -126,6 +127,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -156,6 +159,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -206,12 +211,14 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_upmix_LTLIBRARIES = libasound_module_pcm_upmix.la
asound_module_pcm_vdownmix_LTLIBRARIES = libasound_module_pcm_vdownmix.la
-asound_module_pcm_upmixdir = $(libdir)/alsa-lib
-asound_module_pcm_vdownmixdir = $(libdir)/alsa-lib
+asound_module_pcm_upmixdir = @ALSA_PLUGIN_DIR@
+asound_module_pcm_vdownmixdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_pcm_upmix_la_SOURCES = pcm_upmix.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/oss/Makefile.am new/alsa-plugins-1.0.14/oss/Makefile.am
--- old/alsa-plugins-1.0.14rc4/oss/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/oss/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,8 +1,8 @@
asound_module_pcm_oss_LTLIBRARIES = libasound_module_pcm_oss.la
asound_module_ctl_oss_LTLIBRARIES = libasound_module_ctl_oss.la
-asound_module_pcm_ossdir = $(libdir)/alsa-lib
-asound_module_ctl_ossdir = $(libdir)/alsa-lib
+asound_module_pcm_ossdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_ossdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/oss/Makefile.in new/alsa-plugins-1.0.14/oss/Makefile.in
--- old/alsa-plugins-1.0.14rc4/oss/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/oss/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -87,6 +87,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -126,6 +127,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -156,6 +159,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -206,12 +211,14 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_oss_LTLIBRARIES = libasound_module_pcm_oss.la
asound_module_ctl_oss_LTLIBRARIES = libasound_module_ctl_oss.la
-asound_module_pcm_ossdir = $(libdir)/alsa-lib
-asound_module_ctl_ossdir = $(libdir)/alsa-lib
+asound_module_pcm_ossdir = @ALSA_PLUGIN_DIR@
+asound_module_ctl_ossdir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_pcm_oss_la_SOURCES = pcm_oss.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/pph/Makefile.am new/alsa-plugins-1.0.14/pph/Makefile.am
--- old/alsa-plugins-1.0.14rc4/pph/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/pph/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,19 +1,25 @@
asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la
-asound_module_rate_speexratedir = $(libdir)/alsa-lib
+asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
-libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c resample.c
+libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c
libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@
+if USE_LIBSPEEX
+AM_CFLAGS += @speex_CFLAGS@
+libasound_module_rate_speexrate_la_LIBADD += @speex_LIBS@
+else
+libasound_module_rate_speexrate_la_SOURCES += resample.c
+endif
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
- $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_best.so
- $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_medium.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
+ $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_best.so
+ $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_medium.so
uninstall-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
noinst_HEADERS = speex_resampler.h arch.h fixed_generic.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/pph/Makefile.in new/alsa-plugins-1.0.14/pph/Makefile.in
--- old/alsa-plugins-1.0.14rc4/pph/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/pph/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -37,6 +37,9 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@USE_LIBSPEEX_TRUE@am__append_1 = @speex_CFLAGS@
+@USE_LIBSPEEX_TRUE@am__append_2 = @speex_LIBS@
+@USE_LIBSPEEX_FALSE@am__append_3 = resample.c
subdir = pph
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -57,9 +60,14 @@
am__installdirs = "$(DESTDIR)$(asound_module_rate_speexratedir)"
asound_module_rate_speexrateLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(asound_module_rate_speexrate_LTLIBRARIES)
-libasound_module_rate_speexrate_la_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+libasound_module_rate_speexrate_la_DEPENDENCIES = \
+ $(am__DEPENDENCIES_1)
+am__libasound_module_rate_speexrate_la_SOURCES_DIST = \
+ rate_speexrate.c resample.c
+@USE_LIBSPEEX_FALSE@am__objects_1 = resample.lo
am_libasound_module_rate_speexrate_la_OBJECTS = rate_speexrate.lo \
- resample.lo
+ $(am__objects_1)
libasound_module_rate_speexrate_la_OBJECTS = \
$(am_libasound_module_rate_speexrate_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -74,7 +82,7 @@
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libasound_module_rate_speexrate_la_SOURCES)
-DIST_SOURCES = $(libasound_module_rate_speexrate_la_SOURCES)
+DIST_SOURCES = $(am__libasound_module_rate_speexrate_la_SOURCES_DIST)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -82,6 +90,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -121,6 +130,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -151,6 +162,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -201,14 +214,19 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_rate_speexrate_LTLIBRARIES = libasound_module_rate_speexrate.la
-asound_module_rate_speexratedir = $(libdir)/alsa-lib
-AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
+asound_module_rate_speexratedir = @ALSA_PLUGIN_DIR@
+AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX \
+ -Wall -g @ALSA_CFLAGS@ $(am__append_1)
AM_LDFLAGS = -module -avoid-version -export-dynamic
-libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c resample.c
-libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@
+libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c \
+ $(am__append_3)
+libasound_module_rate_speexrate_la_LIBADD = @ALSA_LIBS@ \
+ $(am__append_2)
noinst_HEADERS = speex_resampler.h arch.h fixed_generic.h
all: all-am
@@ -492,12 +510,12 @@
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
- $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_best.so
- $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_medium.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
+ $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_best.so
+ $(LN_S) libasound_module_rate_speexrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_medium.so
uninstall-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_speexrate_*.so
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/pph/rate_speexrate.c new/alsa-plugins-1.0.14/pph/rate_speexrate.c
--- old/alsa-plugins-1.0.14rc4/pph/rate_speexrate.c 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/pph/rate_speexrate.c 2007-05-31 10:06:51.000000000 +0200
@@ -32,7 +32,11 @@
#include
#include
+#ifdef USE_LIBSPEEX
+#include
+#else
#include "speex_resampler.h"
+#endif
struct rate_src {
int quality;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/pulse/Makefile.am new/alsa-plugins-1.0.14/pulse/Makefile.am
--- old/alsa-plugins-1.0.14rc4/pulse/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/pulse/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,8 +1,8 @@
asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la
asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la
-asound_module_pcmdir = $(libdir)/alsa-lib
-asound_module_ctldir = $(libdir)/alsa-lib
+asound_module_pcmdir = @ALSA_PLUGIN_DIR@
+asound_module_ctldir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE
AM_LDFLAGS = -module -avoid-version -export-dynamic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/pulse/Makefile.in new/alsa-plugins-1.0.14/pulse/Makefile.in
--- old/alsa-plugins-1.0.14rc4/pulse/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/pulse/Makefile.in 2007-05-31 10:06:57.000000000 +0200
@@ -88,6 +88,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -127,6 +128,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -157,6 +160,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -207,12 +212,14 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_pcm_LTLIBRARIES = libasound_module_pcm_pulse.la
asound_module_ctl_LTLIBRARIES = libasound_module_ctl_pulse.la
-asound_module_pcmdir = $(libdir)/alsa-lib
-asound_module_ctldir = $(libdir)/alsa-lib
+asound_module_pcmdir = @ALSA_PLUGIN_DIR@
+asound_module_ctldir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(PTHREAD_CFLAGS) $(pulseaudio_CFLAGS) -D_GNU_SOURCE
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_pcm_pulse_la_SOURCES = pcm_pulse.c pulse.c pulse.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/rate/Makefile.am new/alsa-plugins-1.0.14/rate/Makefile.am
--- old/alsa-plugins-1.0.14rc4/rate/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/rate/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,6 +1,6 @@
asound_module_rate_samplerate_LTLIBRARIES = libasound_module_rate_samplerate.la
-asound_module_rate_sampleratedir = $(libdir)/alsa-lib
+asound_module_rate_sampleratedir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(samplerate_CFLAGS)
AM_LDFLAGS = -module -avoid-version -export-dynamic
@@ -9,11 +9,11 @@
libasound_module_rate_samplerate_la_LIBADD = @ALSA_LIBS@ @samplerate_LIBS@
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_best.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_medium.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_order.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_linear.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_*.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_best.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_medium.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_order.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_linear.so
uninstall-hook:
rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/rate/Makefile.in new/alsa-plugins-1.0.14/rate/Makefile.in
--- old/alsa-plugins-1.0.14rc4/rate/Makefile.in 2007-05-02 13:31:42.000000000 +0200
+++ new/alsa-plugins-1.0.14/rate/Makefile.in 2007-05-31 10:06:58.000000000 +0200
@@ -78,6 +78,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -117,6 +118,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -147,6 +150,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -197,10 +202,12 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_rate_samplerate_LTLIBRARIES = libasound_module_rate_samplerate.la
-asound_module_rate_sampleratedir = $(libdir)/alsa-lib
+asound_module_rate_sampleratedir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ $(samplerate_CFLAGS)
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_rate_samplerate_la_SOURCES = rate_samplerate.c
@@ -486,11 +493,11 @@
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_best.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_medium.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_order.so
- $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_linear.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_*.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_best.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_medium.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_order.so
+ $(LN_S) libasound_module_rate_samplerate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_samplerate_linear.so
uninstall-hook:
rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_samplerate_*.so
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.am new/alsa-plugins-1.0.14/rate-lavc/Makefile.am
--- old/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.am 2007-05-02 13:31:35.000000000 +0200
+++ new/alsa-plugins-1.0.14/rate-lavc/Makefile.am 2007-05-31 10:06:51.000000000 +0200
@@ -1,6 +1,6 @@
asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la
-asound_module_rate_lavcratedir = $(libdir)/alsa-lib
+asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
@@ -11,11 +11,11 @@
noinst_HEADERS = gcd.h
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_higher.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_high.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_fast.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_faster.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_higher.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_high.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_fast.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_faster.so
uninstall-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.in new/alsa-plugins-1.0.14/rate-lavc/Makefile.in
--- old/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.in 2007-05-02 13:31:41.000000000 +0200
+++ new/alsa-plugins-1.0.14/rate-lavc/Makefile.in 2007-05-31 10:06:58.000000000 +0200
@@ -81,6 +81,7 @@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@@ -120,6 +121,8 @@
HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
HAVE_JACK_FALSE = @HAVE_JACK_FALSE@
HAVE_JACK_TRUE = @HAVE_JACK_TRUE@
+HAVE_PPH_FALSE = @HAVE_PPH_FALSE@
+HAVE_PPH_TRUE = @HAVE_PPH_TRUE@
HAVE_PULSE_FALSE = @HAVE_PULSE_FALSE@
HAVE_PULSE_TRUE = @HAVE_PULSE_TRUE@
HAVE_SAMPLERATE_FALSE = @HAVE_SAMPLERATE_FALSE@
@@ -150,6 +153,8 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+USE_LIBSPEEX_FALSE = @USE_LIBSPEEX_FALSE@
+USE_LIBSPEEX_TRUE = @USE_LIBSPEEX_TRUE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -200,10 +205,12 @@
samplerate_LIBS = @samplerate_LIBS@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+speex_CFLAGS = @speex_CFLAGS@
+speex_LIBS = @speex_LIBS@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la
-asound_module_rate_lavcratedir = $(libdir)/alsa-lib
+asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@
AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_rate_lavcrate_la_SOURCES = rate_lavcrate.c
@@ -490,14 +497,14 @@
install-exec-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_higher.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_high.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_fast.so
- $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_faster.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_higher.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_high.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_fast.so
+ $(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_faster.so
uninstall-hook:
- rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
+ rm -f $(DESTDIR)@ALSA_PLUGIN_DIR@/libasound_module_rate_lavcrate_*.so
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-plugins-1.0.14rc4/version new/alsa-plugins-1.0.14/version
--- old/alsa-plugins-1.0.14rc4/version 2007-05-02 13:31:53.000000000 +0200
+++ new/alsa-plugins-1.0.14/version 2007-05-31 10:07:08.000000000 +0200
@@ -1 +1 @@
-1.0.14rc4
+1.0.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org