Hello community,
here is the log from the commit of package alsa
checked in at Fri Oct 6 17:19:58 CEST 2006.
--------
--- alsa/alsa.changes 2006-09-21 18:36:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2006-10-05 16:39:38.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Oct 5 16:38:43 CEST 2006 - tiwai@suse.de
+
+- updated to ALSA 1.0.13-final:
+ * all patches have been merged
+ * fix inifinite-loop with alsa-lib config alias
+
+-------------------------------------------------------------------
Old:
----
alsa-lib-1.0.13rc2.tar.bz2
alsa-lib-hg-fixes.diff
alsa-utils-1.0.13rc2.tar.bz2
alsa-utils-hg-fixes.diff
New:
----
alsa-lib-1.0.13.tar.bz2
alsa-utils-1.0.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.HacK8a/_old 2006-10-06 17:19:48.000000000 +0200
+++ /var/tmp/diff_new_pack.HacK8a/_new 2006-10-06 17:19:48.000000000 +0200
@@ -12,7 +12,7 @@
Name: alsa
BuildRequires: doxygen
-%define package_version 1.0.13rc2
+%define package_version 1.0.13
License: GPL
Group: System/Libraries
Provides: alsa-lib alsa-utils alsa-conf
@@ -21,7 +21,7 @@
Autoreqprov: on
Summary: Advanced Linux Sound Architecture
Version: 1.0.13
-Release: 5
+Release: 7
Source1: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
Source2: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
# Source5: ftp://ftp.alsa-project.org/pub/oss/alsa-oss-%{package_version}.tar.bz2
@@ -41,8 +41,8 @@
Source30: all_notes_off
Source31: all_notes_off.bin
Source32: all_notes_off.mid
-Patch1: alsa-lib-hg-fixes.diff
-Patch2: alsa-utils-hg-fixes.diff
+# Patch1: alsa-lib-hg-fixes.diff
+# Patch2: alsa-utils-hg-fixes.diff
# Patch3: alsa-oss-hg-fixes.diff
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -96,12 +96,12 @@
%prep
%setup -c -n alsa -T -a 1 -a 2 -a 5
-cd alsa-lib*/.
-%patch1 -p1
-cd ..
-cd alsa-utils*/.
-%patch2 -p1
-cd ..
+# cd alsa-lib*/.
+# %patch1 -p1
+# cd ..
+# cd alsa-utils*/.
+# %patch2 -p1
+# cd ..
# cd alsa-oss*/.
# %patch3 -p1
# cd ..
@@ -381,6 +381,10 @@
%doc alsa-lib*/doc/doxygen/html/*
%changelog -n alsa
+* Thu Oct 05 2006 - tiwai@suse.de
+- updated to ALSA 1.0.13-final:
+ * all patches have been merged
+ * fix inifinite-loop with alsa-lib config alias
* Thu Sep 21 2006 - tiwai@suse.de
- updated to ALSA 1.0.13rc2:
* alisp disablement in configure
++++++ alsa-lib-1.0.13rc2.tar.bz2 -> alsa-lib-1.0.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/configure new/alsa-lib-1.0.13/configure
--- old/alsa-lib-1.0.13rc2/configure 2006-09-12 15:44:44.000000000 +0200
+++ new/alsa-lib-1.0.13/configure 2006-09-29 13:44:11.000000000 +0200
@@ -464,7 +464,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar INSTALL_M4_TRUE INSTALL_M4_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRU
E am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALSA_HSEARCH_R_TRUE ALSA_HSEARCH_R_FALSE SND_LIB_VERSION SND_LIB_MAJOR SND_LIB_MINOR SND_LIB_SUBMINOR SND_LIB_EXTRAVER LIBTOOL_VERSION_INFO VERSIONED_SYMBOLS_TRUE VERSIONED_SYMBOLS_FALSE BUILD_MIXER_TRUE BUILD_MIXER_FALSE BUILD_PCM_TRUE BUILD_PCM_FALSE BUILD_RAWMIDI_TRUE BUILD_RAWMIDI_FALSE BUILD_HWDEP_TRUE BUILD_HWDEP_FALSE BUILD_SEQ_TRUE BUILD_SEQ_FALSE BUILD_INSTR_TRUE BUILD_INSTR_FALSE BUILD_ALISP_TRUE BUILD_ALISP_FALSE BUILD_PCM_PLUGIN_TRUE BUILD_PCM_PLUGIN_FALSE BUILD_PCM_PLUGIN_COPY_TRUE BUILD_PCM_PLUGIN_COPY_FALSE BUILD_PCM_PLUGIN_LINEAR_TRUE BUILD_PCM_PLUGIN_LINEAR_FALSE BUILD_PCM_PLUGIN_ROUTE_TRUE BUILD_PCM_PLUGIN_ROUTE_FALSE BUILD_PCM_PLUGIN_MULAW_TRUE BUILD_PCM_PLUGIN_MULAW_FALSE BUILD_PCM_PLUGIN_ALAW_TRUE BUILD_PCM_PLUGIN_ALAW_FALSE BUILD_PCM_PLUGIN_ADPCM_TRUE BUILD_PCM_PLUGIN_ADPCM_FALSE BUILD_PCM_PLUGIN_RATE_TRUE BUILD_PCM_PLUGIN_RATE_FALSE BUILD_PCM_PLUGIN_PLUG_TRUE BUILD_PCM_PLUGIN_PLUG_FALSE BUILD_P
CM_PLUGIN_MULTI_TRUE BUILD_PCM_PLUGIN_MULTI_FALSE BUILD_PCM_PLUGIN_SHM_TRUE BUILD_PCM_PLUGIN_SHM_FALSE BUILD_PCM_PLUGIN_FILE_TRUE BUILD_PCM_PLUGIN_FILE_FALSE BUILD_PCM_PLUGIN_NULL_TRUE BUILD_PCM_PLUGIN_NULL_FALSE BUILD_PCM_PLUGIN_SHARE_TRUE BUILD_PCM_PLUGIN_SHARE_FALSE BUILD_PCM_PLUGIN_METER_TRUE BUILD_PCM_PLUGIN_METER_FALSE BUILD_PCM_PLUGIN_HOOKS_TRUE BUILD_PCM_PLUGIN_HOOKS_FALSE BUILD_PCM_PLUGIN_LFLOAT_TRUE BUILD_PCM_PLUGIN_LFLOAT_FALSE BUILD_PCM_PLUGIN_LADSPA_TRUE BUILD_PCM_PLUGIN_LADSPA_FALSE BUILD_PCM_PLUGIN_DMIX_TRUE BUILD_PCM_PLUGIN_DMIX_FALSE BUILD_PCM_PLUGIN_DSHARE_TRUE BUILD_PCM_PLUGIN_DSHARE_FALSE BUILD_PCM_PLUGIN_DSNOOP_TRUE BUILD_PCM_PLUGIN_DSNOOP_FALSE BUILD_PCM_PLUGIN_ASYM_TRUE BUILD_PCM_PLUGIN_ASYM_FALSE BUILD_PCM_PLUGIN_IEC958_TRUE BUILD_PCM_PLUGIN_IEC958_FALSE BUILD_PCM_PLUGIN_SOFTVOL_TRUE BUILD_PCM_PLUGIN_SOFTVOL_FALSE BUILD_PCM_PLUGIN_EXTPLUG_TRUE BUILD_PCM_PLUGIN_EXTPLUG_FALSE BUILD_PCM_PLUGIN_IOPLUG_TRUE BUILD_PCM_PLUGIN_IOPLUG_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar INSTALL_M4_TRUE INSTALL_M4_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRU
E am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALSA_HSEARCH_R_TRUE ALSA_HSEARCH_R_FALSE SND_LIB_VERSION SND_LIB_MAJOR SND_LIB_MINOR SND_LIB_SUBMINOR SND_LIB_EXTRAVER LIBTOOL_VERSION_INFO VERSIONED_SYMBOLS_TRUE VERSIONED_SYMBOLS_FALSE BUILD_MIXER_TRUE BUILD_MIXER_FALSE BUILD_PCM_TRUE BUILD_PCM_FALSE BUILD_RAWMIDI_TRUE BUILD_RAWMIDI_FALSE BUILD_HWDEP_TRUE BUILD_HWDEP_FALSE BUILD_SEQ_TRUE BUILD_SEQ_FALSE BUILD_INSTR_TRUE BUILD_INSTR_FALSE BUILD_ALISP_TRUE BUILD_ALISP_FALSE BUILD_PCM_PLUGIN_TRUE BUILD_PCM_PLUGIN_FALSE BUILD_PCM_PLUGIN_COPY_TRUE BUILD_PCM_PLUGIN_COPY_FALSE BUILD_PCM_PLUGIN_LINEAR_TRUE BUILD_PCM_PLUGIN_LINEAR_FALSE BUILD_PCM_PLUGIN_ROUTE_TRUE BUILD_PCM_PLUGIN_ROUTE_FALSE BUILD_PCM_PLUGIN_MULAW_TRUE BUILD_PCM_PLUGIN_MULAW_FALSE BUILD_PCM_PLUGIN_ALAW_TRUE BUILD_PCM_PLUGIN_ALAW_FALSE BUILD_PCM_PLUGIN_ADPCM_TRUE BUILD_PCM_PLUGIN_ADPCM_FALSE BUILD_PCM_PLUGIN_RATE_TRUE BUILD_PCM_PLUGIN_RATE_FALSE BUILD_PCM_PLUGIN_PLUG_TRUE BUILD_PCM_PLUGIN_PLUG_FALSE BUILD_P
CM_PLUGIN_MULTI_TRUE BUILD_PCM_PLUGIN_MULTI_FALSE BUILD_PCM_PLUGIN_SHM_TRUE BUILD_PCM_PLUGIN_SHM_FALSE BUILD_PCM_PLUGIN_FILE_TRUE BUILD_PCM_PLUGIN_FILE_FALSE BUILD_PCM_PLUGIN_NULL_TRUE BUILD_PCM_PLUGIN_NULL_FALSE BUILD_PCM_PLUGIN_SHARE_TRUE BUILD_PCM_PLUGIN_SHARE_FALSE BUILD_PCM_PLUGIN_METER_TRUE BUILD_PCM_PLUGIN_METER_FALSE BUILD_PCM_PLUGIN_HOOKS_TRUE BUILD_PCM_PLUGIN_HOOKS_FALSE BUILD_PCM_PLUGIN_LFLOAT_TRUE BUILD_PCM_PLUGIN_LFLOAT_FALSE BUILD_PCM_PLUGIN_LADSPA_TRUE BUILD_PCM_PLUGIN_LADSPA_FALSE BUILD_PCM_PLUGIN_DMIX_TRUE BUILD_PCM_PLUGIN_DMIX_FALSE BUILD_PCM_PLUGIN_DSHARE_TRUE BUILD_PCM_PLUGIN_DSHARE_FALSE BUILD_PCM_PLUGIN_DSNOOP_TRUE BUILD_PCM_PLUGIN_DSNOOP_FALSE BUILD_PCM_PLUGIN_ASYM_TRUE BUILD_PCM_PLUGIN_ASYM_FALSE BUILD_PCM_PLUGIN_IEC958_TRUE BUILD_PCM_PLUGIN_IEC958_FALSE BUILD_PCM_PLUGIN_SOFTVOL_TRUE BUILD_PCM_PLUGIN_SOFTVOL_FALSE BUILD_PCM_PLUGIN_EXTPLUG_TRUE BUILD_PCM_PLUGIN_EXTPLUG_FALSE BUILD_PCM_PLUGIN_IOPLUG_TRUE BUILD_PCM_PLUGIN_IOPLUG_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1901,7 +1901,7 @@
# Define the identity of the package.
PACKAGE=alsa-lib
- VERSION=1.0.13rc2
+ VERSION=1.0.13
cat >>confdefs.h <<_ACEOF
@@ -3166,6 +3166,240 @@
fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer to if __STDC__ is defined, since
+ # exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer to if __STDC__ is defined, since
+ # exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -3814,7 +4048,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3817 "configure"' > conftest.$ac_ext
+ echo '#line 4051 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3996,240 +4230,6 @@
need_locks="$enable_libtool_lock"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer to if __STDC__ is defined, since
- # exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include
-#else
-# include
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer to if __STDC__ is defined, since
- # exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include
-#else
-# include
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -19293,7 +19293,7 @@
fi;
if test "$versioned" = "yes"; then
# it seems that GNU ld versions since 2.10 are not broken
- xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2`
+ xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2 | cut -d \" -f 2`
major=`echo $xres | cut -d . -f 1`
minor=`echo $xres | cut -d . -f 2`
pass=0
@@ -19331,6 +19331,21 @@
fi
+echo "$as_me:$LINENO: checking for custom symbol prefixes" >&5
+echo $ECHO_N "checking for custom symbol prefixes... $ECHO_C" >&6
+SYMBOL_PREFIX=` \
+ echo "PREFIX=__USER_LABEL_PREFIX__" \
+ | ${CPP-${CC-gcc} -E} - 2>&1 \
+ | ${EGREP-grep} "^PREFIX=" \
+ | ${SED-sed} "s:^PREFIX=::"`
+
+cat >>confdefs.h <<_ACEOF
+#define __SYMBOL_PREFIX "$SYMBOL_PREFIX"
+_ACEOF
+
+echo "$as_me:$LINENO: result: $SYMBOL_PREFIX" >&5
+echo "${ECHO_T}$SYMBOL_PREFIX" >&6
+
echo "$as_me:$LINENO: checking for debug" >&5
echo $ECHO_N "checking for debug... $ECHO_C" >&6
@@ -21240,6 +21255,7 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@CPP@,$CPP,;t t
s,@LN_S@,$LN_S,;t t
s,@EGREP@,$EGREP,;t t
s,@ECHO@,$ECHO,;t t
@@ -21247,7 +21263,6 @@
s,@ac_ct_AR@,$ac_ct_AR,;t t
s,@RANLIB@,$RANLIB,;t t
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
s,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
s,@ac_ct_CXX@,$ac_ct_CXX,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/configure.in new/alsa-lib-1.0.13/configure.in
--- old/alsa-lib-1.0.13rc2/configure.in 2006-09-12 15:43:19.000000000 +0200
+++ new/alsa-lib-1.0.13/configure.in 2006-09-29 13:42:55.000000000 +0200
@@ -9,7 +9,7 @@
dnl remove API = c+1:0:0
dnl *************************************************
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.13rc2)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.13)
eval LIBTOOL_VERSION_INFO="2:0:0"
dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
@@ -34,6 +34,7 @@
AC_PROG_CC
+AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_DISABLE_STATIC
@@ -83,7 +84,7 @@
versioned="$withval", versioned="yes")
if test "$versioned" = "yes"; then
# it seems that GNU ld versions since 2.10 are not broken
- xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2`
+ xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2 | cut -d \" -f 2`
major=`echo $xres | cut -d . -f 1`
minor=`echo $xres | cut -d . -f 2`
pass=0
@@ -105,6 +106,16 @@
fi
AM_CONDITIONAL(VERSIONED_SYMBOLS, test x$versioned = xyes)
+dnl See if toolchain has a custom prefix for symbols ...
+AC_MSG_CHECKING(for custom symbol prefixes)
+SYMBOL_PREFIX=` \
+ echo "PREFIX=__USER_LABEL_PREFIX__" \
+ | ${CPP-${CC-gcc} -E} - 2>&1 \
+ | ${EGREP-grep} "^PREFIX=" \
+ | ${SED-sed} "s:^PREFIX=::"`
+AC_DEFINE_UNQUOTED([__SYMBOL_PREFIX], "$SYMBOL_PREFIX", [Toolchain Symbol Prefix])
+AC_MSG_RESULT($SYMBOL_PREFIX)
+
dnl Check for debug...
AC_MSG_CHECKING(for debug)
AC_ARG_WITH(debug,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/hgcompile new/alsa-lib-1.0.13/hgcompile
--- old/alsa-lib-1.0.13rc2/hgcompile 2006-09-12 15:43:19.000000000 +0200
+++ new/alsa-lib-1.0.13/hgcompile 2006-09-29 13:42:55.000000000 +0200
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
touch ltconfig
libtoolize --force --copy --automake
aclocal $ACLOCAL_FLAGS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/include/alsa-symbols.h new/alsa-lib-1.0.13/include/alsa-symbols.h
--- old/alsa-lib-1.0.13rc2/include/alsa-symbols.h 2006-09-12 15:43:19.000000000 +0200
+++ new/alsa-lib-1.0.13/include/alsa-symbols.h 2006-09-29 13:42:55.000000000 +0200
@@ -31,16 +31,16 @@
#ifdef __powerpc64__
# define symbol_version(real, name, version) \
- __asm__ (".symver " #real "," #name "@" #version); \
- __asm__ (".symver ." #real ",." #name "@" #version)
+ __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version); \
+ __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
# define default_symbol_version(real, name, version) \
- __asm__ (".symver " #real "," #name "@@" #version); \
- __asm__ (".symver ." #real ",." #name "@@" #version)
+ __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version); \
+ __asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
#else
# define symbol_version(real, name, version) \
- __asm__ (".symver " #real "," #name "@" #version)
+ __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
# define default_symbol_version(real, name, version) \
- __asm__ (".symver " #real "," #name "@@" #version)
+ __asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
#endif
#ifdef USE_VERSIONED_SYMBOLS
@@ -52,19 +52,19 @@
#define use_symbol_version(real, name, version) /* nothing */
#ifdef __powerpc64__
#define use_default_symbol_version(real, name, version) \
- __asm__ (".weak " #name); \
- __asm__ (".weak ." #name); \
- __asm__ (".set " #name "," #real); \
- __asm__ (".set ." #name ",." #real)
+ __asm__ (".weak " ASM_NAME(#name)); \
+ __asm__ (".weak ." ASM_NAME(#name)); \
+ __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real)); \
+ __asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
#else
#if defined(__alpha__) || defined(__mips__)
#define use_default_symbol_version(real, name, version) \
- __asm__ (".weak " #name); \
- __asm__ (#name " = " #real)
+ __asm__ (".weak " ASM_NAME(#name)); \
+ __asm__ (ASM_NAME(#name) " = " ASM_NAME(#real))
#else
#define use_default_symbol_version(real, name, version) \
- __asm__ (".weak " #name); \
- __asm__ (".set " #name "," #real)
+ __asm__ (".weak " ASM_NAME(#name)); \
+ __asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
#endif
#endif
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/include/config.h.in new/alsa-lib-1.0.13/include/config.h.in
--- old/alsa-lib-1.0.13rc2/include/config.h.in 2006-09-12 15:43:56.000000000 +0200
+++ new/alsa-lib-1.0.13/include/config.h.in 2006-09-29 13:43:30.000000000 +0200
@@ -126,6 +126,9 @@
/* compiled with versioned symbols */
#undef VERSIONED_SYMBOLS
+/* Toolchain Symbol Prefix */
+#undef __SYMBOL_PREFIX
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/include/local.h new/alsa-lib-1.0.13/include/local.h
--- old/alsa-lib-1.0.13rc2/include/local.h 2006-09-12 15:43:20.000000000 +0200
+++ new/alsa-lib-1.0.13/include/local.h 2006-09-29 13:42:55.000000000 +0200
@@ -192,6 +192,9 @@
/* When a reference to SYMBOL is encountered, the linker will emit a
warning message MSG. */
+
+#define ASM_NAME(name) __SYMBOL_PREFIX name
+
#ifdef HAVE_GNU_LD
# ifdef HAVE_ELF
@@ -210,19 +213,19 @@
section attributes on what looks like a comment to the assembler. */
# ifdef HAVE_SECTION_QUOTES
# define link_warning(symbol, msg) \
- __make_section_unallocated (".gnu.warning." #symbol) \
+ __make_section_unallocated (".gnu.warning." ASM_NAME(#symbol)) \
static const char __evoke_link_warning_##symbol[] \
- __attribute__ ((section (".gnu.warning." #symbol "\"\n\t#\""))) = msg;
+ __attribute__ ((section (".gnu.warning." ASM_NAME(#symbol) "\"\n\t#\""))) = msg;
# else
# define link_warning(symbol, msg) \
- __make_section_unallocated (".gnu.warning." #symbol) \
+ __make_section_unallocated (".gnu.warning." ASM_NAME(#symbol)) \
static const char __evoke_link_warning_##symbol[] \
- __attribute__ ((section (".gnu.warning." #symbol "\n\t#"))) = msg;
+ __attribute__ ((section (".gnu.warning." ASM_NAME(#symbol) "\n\t#"))) = msg;
# endif
# else
# define link_warning(symbol, msg) \
asm (".stabs \"" msg "\",30,0,0,0\n\t" \
- ".stabs \"" __SYMBOL_PREFIX #symbol "\",1,0,0,0\n");
+ ".stabs \"" ASM_NAME(#symbol) "\",1,0,0,0\n");
# endif
#else
/* We will never be heard; they will all die horribly. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/include/version.h new/alsa-lib-1.0.13/include/version.h
--- old/alsa-lib-1.0.13rc2/include/version.h 2006-09-12 15:45:48.000000000 +0200
+++ new/alsa-lib-1.0.13/include/version.h 2006-09-29 13:45:04.000000000 +0200
@@ -5,11 +5,11 @@
#define SND_LIB_MAJOR 1 /**< major number of library version */
#define SND_LIB_MINOR 0 /**< minor number of library version */
#define SND_LIB_SUBMINOR 13 /**< subminor number of library version */
-#define SND_LIB_EXTRAVER 100002 /**< extra version number, used mainly for betas */
+#define SND_LIB_EXTRAVER 1000000 /**< extra version number, used mainly for betas */
/** library version */
#define SND_LIB_VERSION ((SND_LIB_MAJOR<<16)|\
(SND_LIB_MINOR<<8)|\
SND_LIB_SUBMINOR)
/** library version (string) */
-#define SND_LIB_VERSION_STR "1.0.13rc2"
+#define SND_LIB_VERSION_STR "1.0.13"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/libtool new/alsa-lib-1.0.13/libtool
--- old/alsa-lib-1.0.13rc2/libtool 2006-09-12 15:45:16.000000000 +0200
+++ new/alsa-lib-1.0.13/libtool 2006-09-29 13:44:43.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# libtoolT - Provide generalized library-building support services.
-# Generated automatically by (GNU alsa-lib 1.0.13rc2)
+# Generated automatically by (GNU alsa-lib 1.0.13)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/alisp/alisp.c new/alsa-lib-1.0.13/src/alisp/alisp.c
--- old/alsa-lib-1.0.13rc2/src/alisp/alisp.c 2006-09-12 15:43:20.000000000 +0200
+++ new/alsa-lib-1.0.13/src/alisp/alisp.c 2006-09-29 13:42:56.000000000 +0200
@@ -30,7 +30,6 @@
#include
#include
#include
-#include
#define alisp_seq_iterator alisp_object
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/conf.c new/alsa-lib-1.0.13/src/conf.c
--- old/alsa-lib-1.0.13rc2/src/conf.c 2006-09-12 15:43:20.000000000 +0200
+++ new/alsa-lib-1.0.13/src/conf.c 2006-09-29 13:42:56.000000000 +0200
@@ -470,7 +470,7 @@
if (!*str)
return -EINVAL;
errno = 0;
- if (sscanf(str, "%Ld%n", &v, &endidx) < 1)
+ if (sscanf(str, "%Li%n", &v, &endidx) < 1)
return -EINVAL;
if (str[endidx])
return -EINVAL;
@@ -2404,9 +2404,16 @@
#define SND_CONFIG_SEARCH_ALIAS(config, base, key, result, fcn1, fcn2) \
{ \
snd_config_t *res = NULL; \
- int err, first = 1; \
+ char *old_key; \
+ int err, first = 1, maxloop = 1000; \
assert(config && key); \
- do { \
+ while (1) { \
+ old_key = strdup(key); \
+ if (old_key == NULL) { \
+ err = -ENOMEM; \
+ res = NULL; \
+ break; \
+ } \
err = first && base ? -EIO : fcn1(config, config, key, &res); \
if (err < 0) { \
if (!base) \
@@ -2415,8 +2422,22 @@
if (err < 0) \
break; \
} \
+ if (snd_config_get_string(res, &key) < 0) \
+ break; \
+ if (!first && (strcmp(key, old_key) == 0 || maxloop <= 0)) { \
+ if (maxloop == 0) \
+ SNDERR("maximum loop count reached (circular configuration?)"); \
+ else \
+ SNDERR("key %s refers to itself", key); \
+ err = -EINVAL; \
+ res = NULL; \
+ break; \
+ } \
+ free(old_key); \
first = 0; \
- } while (snd_config_get_string(res, &key) >= 0); \
+ maxloop--; \
+ } \
+ free(old_key); \
if (!res) \
return err; \
if (result) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/control/control.c new/alsa-lib-1.0.13/src/control/control.c
--- old/alsa-lib-1.0.13rc2/src/control/control.c 2006-09-12 15:43:20.000000000 +0200
+++ new/alsa-lib-1.0.13/src/control/control.c 2006-09-29 13:42:56.000000000 +0200
@@ -469,7 +469,7 @@
tlv[0] = -1;
tlv[1] = 0;
err = snd_ctl_tlv_do(ctl, 0, id, tlv, tlv_size);
- if (err >= 0 && tlv[0] == -1)
+ if (err >= 0 && tlv[0] == (unsigned int)-1)
err = -ENXIO;
return err;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/control/control_hw.c new/alsa-lib-1.0.13/src/control/control_hw.c
--- old/alsa-lib-1.0.13rc2/src/control/control_hw.c 2006-09-12 15:43:20.000000000 +0200
+++ new/alsa-lib-1.0.13/src/control/control_hw.c 2006-09-29 13:42:56.000000000 +0200
@@ -40,11 +40,12 @@
#ifndef DOC_HIDDEN
#define SNDRV_FILE_CONTROL ALSA_DEVICE_DIRECTORY "controlC%i"
-#define SNDRV_CTL_VERSION_MAX SNDRV_PROTOCOL_VERSION(2, 0, 3)
+#define SNDRV_CTL_VERSION_MAX SNDRV_PROTOCOL_VERSION(2, 0, 4)
typedef struct {
int card;
int fd;
+ unsigned int protocol;
} snd_ctl_hw_t;
#endif /* DOC_HIDDEN */
@@ -208,6 +209,10 @@
snd_ctl_hw_t *hw = handle->private_data;
struct sndrv_ctl_tlv *xtlv;
+ /* we don't support TLV on protocol ver 2.0.3 or earlier */
+ if (hw->protocol < SNDRV_PROTOCOL_VERSION(2, 0, 4))
+ return -ENXIO;
+
switch (op_flag) {
case -1: inum = SNDRV_CTL_IOCTL_TLV_COMMAND; break;
case 0: inum = SNDRV_CTL_IOCTL_TLV_READ; break;
@@ -407,6 +412,7 @@
}
hw->card = card;
hw->fd = fd;
+ hw->protocol = ver;
err = snd_ctl_new(&ctl, SND_CTL_TYPE_HW, name);
if (err < 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/names.c new/alsa-lib-1.0.13/src/names.c
--- old/alsa-lib-1.0.13rc2/src/names.c 2006-09-12 15:43:21.000000000 +0200
+++ new/alsa-lib-1.0.13/src/names.c 2006-09-29 13:42:56.000000000 +0200
@@ -31,12 +31,8 @@
*/
#include
-#include
-#include
#include
#include
-#include
-#include
#include "local.h"
#ifndef DOC_HIDDEN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/pcm/pcm_direct.c new/alsa-lib-1.0.13/src/pcm/pcm_direct.c
--- old/alsa-lib-1.0.13rc2/src/pcm/pcm_direct.c 2006-09-12 15:43:21.000000000 +0200
+++ new/alsa-lib-1.0.13/src/pcm/pcm_direct.c 2006-09-29 13:42:56.000000000 +0200
@@ -1555,20 +1555,17 @@
continue;
}
if (strcmp(id, "ipc_perm") == 0) {
- char *perm;
- char *endp;
- err = snd_config_get_ascii(n, &perm);
+ long perm;
+ err = snd_config_get_integer(n, &perm);
if (err < 0) {
- SNDERR("The field ipc_perm must be a valid file permission");
+ SNDERR("Invalid type for %s", id);
return err;
}
- if (isdigit(*perm) == 0) {
+ if ((perm & ~0777) != 0) {
SNDERR("The field ipc_perm must be a valid file permission");
- free(perm);
return -EINVAL;
}
- rec->ipc_perm = strtol(perm, &endp, 8);
- free(perm);
+ rec->ipc_perm = perm;
continue;
}
if (strcmp(id, "ipc_gid") == 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/pcm/pcm_file.c new/alsa-lib-1.0.13/src/pcm/pcm_file.c
--- old/alsa-lib-1.0.13rc2/src/pcm/pcm_file.c 2006-09-12 15:43:21.000000000 +0200
+++ new/alsa-lib-1.0.13/src/pcm/pcm_file.c 2006-09-29 13:42:57.000000000 +0200
@@ -535,7 +535,7 @@
const char *fname = NULL, *ifname = NULL;
const char *format = NULL;
long fd = -1, ifd = -1;
- int perm = 0600;
+ long perm = 0600;
snd_config_for_each(i, next, conf) {
snd_config_t *n = snd_config_iterator_entry(i);
const char *id;
@@ -578,20 +578,15 @@
continue;
}
if (strcmp(id, "perm") == 0) {
- char *str;
- char *endp;
- err = snd_config_get_ascii(n, &str);
+ err = snd_config_get_integer(n, &perm);
if (err < 0) {
- SNDERR("The field perm must be a valid file permission");
+ SNDERR("Invalid type for %s", id);
return err;
}
- if (isdigit(*str) == 0) {
+ if ((perm & ~0777) != 0) {
SNDERR("The field perm must be a valid file permission");
- free(str);
return -EINVAL;
}
- perm = strtol(str, &endp, 8);
- free(str);
continue;
}
SNDERR("Unknown field %s", id);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/pcm/pcm_rate.c new/alsa-lib-1.0.13/src/pcm/pcm_rate.c
--- old/alsa-lib-1.0.13rc2/src/pcm/pcm_rate.c 2006-09-12 15:43:21.000000000 +0200
+++ new/alsa-lib-1.0.13/src/pcm/pcm_rate.c 2006-09-29 13:42:57.000000000 +0200
@@ -364,10 +364,15 @@
snd_pcm_rate_t *rate = pcm->private_data;
snd_pcm_t *slave = rate->gen.slave;
snd_pcm_sw_params_t *sparams;
- snd_pcm_uframes_t boundary1, boundary2;
+ snd_pcm_uframes_t boundary1, boundary2, sboundary;
+ int err;
- rate->sw_params = *params;
sparams = &rate->sw_params;
+ err = snd_pcm_sw_params_current(slave, sparams);
+ if (err < 0)
+ return err;
+ sboundary = sparams->boundary;
+ *sparams = *params;
boundary1 = pcm->buffer_size;
boundary2 = slave->buffer_size;
while (boundary1 * 2 <= LONG_MAX - pcm->buffer_size &&
@@ -376,7 +381,7 @@
boundary2 *= 2;
}
params->boundary = boundary1;
- sparams->boundary = boundary2;
+ sparams->boundary = sboundary;
if (rate->ops.adjust_pitch)
rate->ops.adjust_pitch(rate->obj, &rate->info);
@@ -393,13 +398,17 @@
if (sparams->start_threshold > (slave->buffer_size / sparams->xfer_align) * sparams->xfer_align)
sparams->start_threshold = (slave->buffer_size / sparams->xfer_align) * sparams->xfer_align;
}
- if (sparams->stop_threshold >= sparams->boundary) {
+ if (sparams->stop_threshold >= params->boundary) {
sparams->stop_threshold = sparams->boundary;
} else {
recalc(pcm, &sparams->stop_threshold);
}
recalc(pcm, &sparams->silence_threshold);
- recalc(pcm, &sparams->silence_size);
+ if (sparams->silence_size >= params->boundary) {
+ sparams->silence_size = sparams->boundary;
+ } else {
+ recalc(pcm, &sparams->silence_size);
+ }
return snd_pcm_sw_params(slave, sparams);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/src/timer/timer_hw.c new/alsa-lib-1.0.13/src/timer/timer_hw.c
--- old/alsa-lib-1.0.13rc2/src/timer/timer_hw.c 2006-09-12 15:43:22.000000000 +0200
+++ new/alsa-lib-1.0.13/src/timer/timer_hw.c 2006-09-29 13:42:57.000000000 +0200
@@ -264,8 +264,8 @@
}
if (ioctl(fd, SNDRV_TIMER_IOCTL_TREAD, &arg) < 0) {
ret = -errno;
- close(fd);
__no_tread:
+ close(fd);
SNDMSG("extended read is not supported (SNDRV_TIMER_IOCTL_TREAD)");
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-lib-1.0.13rc2/version new/alsa-lib-1.0.13/version
--- old/alsa-lib-1.0.13rc2/version 2006-09-12 15:45:18.000000000 +0200
+++ new/alsa-lib-1.0.13/version 2006-09-29 13:44:45.000000000 +0200
@@ -1 +1 @@
-1.0.13rc2
+1.0.13
++++++ alsa-utils-1.0.13rc2.tar.bz2 -> alsa-utils-1.0.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.13rc2/alsaconf/alsaconf.in new/alsa-utils-1.0.13/alsaconf/alsaconf.in
--- old/alsa-utils-1.0.13rc2/alsaconf/alsaconf.in 2006-09-12 15:54:25.000000000 +0200
+++ new/alsa-utils-1.0.13/alsaconf/alsaconf.in 2006-09-29 13:53:26.000000000 +0200
@@ -402,15 +402,22 @@
set_mixers() {
amixer -s -q <>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.13rc2/configure.in new/alsa-utils-1.0.13/configure.in
--- old/alsa-utils-1.0.13rc2/configure.in 2006-09-12 15:54:38.000000000 +0200
+++ new/alsa-utils-1.0.13/configure.in 2006-09-29 13:53:39.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.59)
AC_INIT(alsamixer/alsamixer.c)
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.13rc2)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.13)
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.14])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.13rc2/include/version.h new/alsa-utils-1.0.13/include/version.h
--- old/alsa-utils-1.0.13rc2/include/version.h 2006-09-12 15:56:20.000000000 +0200
+++ new/alsa-utils-1.0.13/include/version.h 2006-09-29 13:55:17.000000000 +0200
@@ -4,9 +4,9 @@
#define SND_UTIL_MAJOR 1
#define SND_UTIL_MINOR 0
-#define SND_UTIL_SUBMINOR 13rc2
+#define SND_UTIL_SUBMINOR 13
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\
(SND_UTIL_MINOR<<8)|\
SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.0.13rc2"
+#define SND_UTIL_VERSION_STR "1.0.13"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.13rc2/po/alsa-utils.pot new/alsa-utils-1.0.13/po/alsa-utils.pot
--- old/alsa-utils-1.0.13rc2/po/alsa-utils.pot 2006-09-12 15:57:23.000000000 +0200
+++ new/alsa-utils-1.0.13/po/alsa-utils.pot 2006-09-29 13:56:14.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-12 15:57+0200\n"
+"POT-Creation-Date: 2006-09-29 13:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/alsa-utils-1.0.13rc2/po/ja.gmo and new/alsa-utils-1.0.13/po/ja.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/alsa-utils-1.0.13rc2/po/ja.po new/alsa-utils-1.0.13/po/ja.po
--- old/alsa-utils-1.0.13rc2/po/ja.po 2006-09-12 15:57:24.000000000 +0200
+++ new/alsa-utils-1.0.13/po/ja.po 2006-09-29 13:56:14.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: alsa-utils 1.0.9a\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-12 15:57+0200\n"
+"POT-Creation-Date: 2006-09-29 13:56+0200\n"
"PO-Revision-Date: 2006-04-18 15:51+0200\n"
"Last-Translator: Takashi Iwai \n"
"Language-Team: Japanese\n"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org