Hello community,
here is the log from the commit of package alsa for openSUSE:Factory
checked in at Mon Dec 21 23:15:04 CET 2009.
--------
--- alsa/alsa.changes 2009-11-03 09:15:23.000000000 +0100
+++ alsa/alsa.changes 2009-12-18 17:37:18.000000000 +0100
@@ -1,0 +2,17 @@
+Fri Dec 18 17:36:49 CET 2009 - tiwai@suse.de
+
+- set AUTOMAKE_JOBS for parallel automake
+
+-------------------------------------------------------------------
+Fri Dec 18 17:18:17 CET 2009 - tiwai@suse.de
+
+- updated to version 1.0.22:
+ * including previous fixes
+ * a few fixes for alsactl init
+
+-------------------------------------------------------------------
+Wed Dec 16 09:59:50 CET 2009 - jengelh@medozas.de
+
+- add baselibs.conf as a source
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
alsa-lib-1.0.21.tar.bz2
alsa-lib-dmix-snd_pcm_info-fix.diff
alsa-lib-fix-namehint-corruption.diff
alsa-lib-fix-pcm-hw-delay.diff
alsa-lib-git-fixes.diff
alsa-lib-hcontrol-fix-compare-default.diff
New:
----
alsa-lib-1.0.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.3elvpK/_old 2009-12-21 23:13:09.000000000 +0100
+++ /var/tmp/diff_new_pack.3elvpK/_new 2009-12-21 23:13:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package alsa (Version 1.0.21)
+# spec file for package alsa (Version 1.0.22)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,8 +20,8 @@
Name: alsa
BuildRequires: doxygen
-%define package_version 1.0.21
-License: GPL v2 or later
+%define package_version 1.0.22
+License: GPLv2+
Group: System/Libraries
Requires: alsa-utils
Recommends: alsa-plugins alsa-oss
@@ -33,9 +33,10 @@
%endif
#
Summary: Advanced Linux Sound Architecture
-Version: 1.0.21
-Release: 4
+Version: 1.0.22
+Release: 1
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
+Source2: baselibs.conf
Source8: 40-alsa.rules
Source11: alsasound
Source12: sysconfig.sound
@@ -50,11 +51,7 @@
Source32: all_notes_off.mid
Source33: alsa-info.sh
Source34: alsa-init.sh
-Patch: alsa-lib-git-fixes.diff
-Patch1: alsa-lib-fix-pcm-hw-delay.diff
-Patch2: alsa-lib-dmix-snd_pcm_info-fix.diff
-Patch3: alsa-lib-hcontrol-fix-compare-default.diff
-Patch4: alsa-lib-fix-namehint-corruption.diff
+# Patch: alsa-lib-git-fixes.diff
Url: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -75,7 +72,7 @@
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Requires: glibc-devel, libasound2 = %{version}
Obsoletes: alsadev
Provides: alsadev alsa-lib-devel
@@ -94,7 +91,7 @@
%package docs
Summary: Additional Package Documentation
Group: Documentation/Other
-License: GPL v2 or later
+License: GPLv2+
%if %suse_version > 1110
BuildArch: noarch
%endif
@@ -114,7 +111,7 @@
Summary: Advanced Linux Sound Architecture Library
Group: System/Libraries
Provides: alsa-lib
-License: LGPL v2.1 or later
+License: LGPLv2.1+
%description -n libasound2
This package contains the library for ALSA, Advanced Linux Sound
@@ -129,11 +126,7 @@
%prep
%setup -q -n alsa-lib-%{package_version}
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+# %patch -p1
# hack to fix build on older distros
%if %suse_version < 1100
%ifarch %ix86
@@ -143,6 +136,7 @@
%endif
%build
+export AUTOMAKE_JOBS=%{?jobs:%jobs}
# build alsa-lib
autoreconf -fi
%configure \
++++++ alsa-lib-1.0.21.tar.bz2 -> alsa-lib-1.0.22.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/configure new/alsa-lib-1.0.22/configure
--- old/alsa-lib-1.0.21/configure 2009-08-31 15:15:44.000000000 +0200
+++ new/alsa-lib-1.0.22/configure 2009-12-16 16:27:29.000000000 +0100
@@ -2449,7 +2449,7 @@
# Define the identity of the package.
PACKAGE=alsa-lib
- VERSION=1.0.21
+ VERSION=1.0.22
cat >>confdefs.h <<_ACEOF
@@ -2607,6 +2607,9 @@
fi
+# Test for new silent rules and enable only if they are available
+
+
@@ -2625,6 +2628,8 @@
echo "${ECHO_T}$CC" >&6; }
fi
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -4854,7 +4859,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4857 "configure"' > conftest.$ac_ext
+ echo '#line 4862 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7555,11 +7560,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:7558: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7563: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7562: \$? = $ac_status" >&5
+ echo "$as_me:7567: \$? = $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.
@@ -7823,11 +7828,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:7826: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7831: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7830: \$? = $ac_status" >&5
+ echo "$as_me:7835: \$? = $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.
@@ -7927,11 +7932,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:7930: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7935: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7934: \$? = $ac_status" >&5
+ echo "$as_me:7939: \$? = $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
@@ -10379,7 +10384,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:12855: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12854: \$? = $ac_status" >&5
+ echo "$as_me:12859: \$? = $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.
@@ -12951,11 +12956,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:12954: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12959: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12958: \$? = $ac_status" >&5
+ echo "$as_me:12963: \$? = $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
@@ -14521,11 +14526,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:14524: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14529: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14528: \$? = $ac_status" >&5
+ echo "$as_me:14533: \$? = $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.
@@ -14625,11 +14630,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:14628: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14632: \$? = $ac_status" >&5
+ echo "$as_me:14637: \$? = $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
@@ -16855,11 +16860,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:16858: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16863: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16862: \$? = $ac_status" >&5
+ echo "$as_me:16867: \$? = $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.
@@ -17123,11 +17128,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:17126: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17131: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17130: \$? = $ac_status" >&5
+ echo "$as_me:17135: \$? = $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.
@@ -17227,11 +17232,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:17230: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17235: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17234: \$? = $ac_status" >&5
+ echo "$as_me:17239: \$? = $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
@@ -20821,15 +20826,18 @@
# Check whether --with-softfloat was given.
if test "${with_softfloat+set}" = set; then
- withval=$with_softfloat;
+ withval=$with_softfloat; case "$withval" in
+ y|yes) softfloat=yes ;;
+ *) softfloat=no ;;
+ esac
+fi
+
+if test "$softfloat" = "yes" ; then
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_SOFT_FLOAT "1"
_ACEOF
- softfloat=yes
-fi
-
-if test "$softfloat" = "yes" ; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/configure.in new/alsa-lib-1.0.22/configure.in
--- old/alsa-lib-1.0.21/configure.in 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/configure.in 2009-12-16 16:18:51.000000000 +0100
@@ -12,11 +12,14 @@
dnl remove API = c+1:0:0
dnl *************************************************
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.21)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.22)
eval LIBTOOL_VERSION_INFO="2:0:0"
dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
+# Test for new silent rules and enable only if they are available
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
AC_PREFIX_DEFAULT(/usr)
dnl Checks for programs.
@@ -35,6 +38,8 @@
AC_MSG_RESULT($CC)
fi
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
AC_PROG_CC
AC_PROG_CPP
@@ -201,9 +206,12 @@
AC_ARG_WITH(softfloat,
AS_HELP_STRING([--with-softfloat],
[do you have floating point unit on this machine? (optional)]),
- [ AC_DEFINE(HAVE_SOFT_FLOAT, "1", [Avoid calculation in float])
- softfloat=yes ],)
+ [case "$withval" in
+ y|yes) softfloat=yes ;;
+ *) softfloat=no ;;
+ esac],)
if test "$softfloat" = "yes" ; then
+ AC_DEFINE(HAVE_SOFT_FLOAT, "1", [Avoid calculation in float])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/include/local.h new/alsa-lib-1.0.22/include/local.h
--- old/alsa-lib-1.0.21/include/local.h 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/include/local.h 2009-12-16 16:18:51.000000000 +0100
@@ -230,22 +230,28 @@
# define link_warning(symbol, msg)
#endif
-/* open with resmgr */
-#ifdef SUPPORT_RESMGR
static inline int snd_open_device(const char *filename, int fmode)
{
- int fd = open(filename, fmode);
+ int fd;
+
+#ifdef O_CLOEXEC
+ fmode |= O_CLOEXEC;
+#endif
+ fd = open(filename, fmode);
+
+/* open with resmgr */
+#ifdef SUPPORT_RESMGR
+ if (fd < 0) {
+ if (errno == EAGAIN || errno == EBUSY)
+ return fd;
+ if (! access(filename, F_OK))
+ fd = rsm_open_device(filename, fmode);
+ }
+#endif
if (fd >= 0)
- return fd;
- if (errno == EAGAIN || errno == EBUSY)
- return fd;
- if (! access(filename, F_OK))
- return rsm_open_device(filename, fmode);
- return -1;
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+ return fd;
}
-#else
-#define snd_open_device(filename, fmode) open(filename, fmode);
-#endif
/* make local functions really local */
#define snd_dlobj_cache_lookup \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/include/sound/asound.h new/alsa-lib-1.0.22/include/sound/asound.h
--- old/alsa-lib-1.0.21/include/sound/asound.h 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/include/sound/asound.h 2009-12-16 16:18:51.000000000 +0100
@@ -593,6 +593,7 @@
#define SNDRV_TIMER_GLOBAL_SYSTEM 0
#define SNDRV_TIMER_GLOBAL_RTC 1
#define SNDRV_TIMER_GLOBAL_HPET 2
+#define SNDRV_TIMER_GLOBAL_HRTIMER 3
/* info flags */
#define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/include/timer.h new/alsa-lib-1.0.22/include/timer.h
--- old/alsa-lib-1.0.21/include/timer.h 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/include/timer.h 2009-12-16 16:18:51.000000000 +0100
@@ -115,6 +115,8 @@
#define SND_TIMER_GLOBAL_RTC 1
/** global timer - HPET */
#define SND_TIMER_GLOBAL_HPET 2
+/** global timer - HRTIMER */
+#define SND_TIMER_GLOBAL_HRTIMER 3
/** timer open mode flag - non-blocking behaviour */
#define SND_TIMER_OPEN_NONBLOCK (1<<0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/include/version.h new/alsa-lib-1.0.22/include/version.h
--- old/alsa-lib-1.0.21/include/version.h 2009-08-31 15:15:53.000000000 +0200
+++ new/alsa-lib-1.0.22/include/version.h 2009-12-16 16:27:39.000000000 +0100
@@ -4,12 +4,12 @@
#define SND_LIB_MAJOR 1 /**< major number of library version */
#define SND_LIB_MINOR 0 /**< minor number of library version */
-#define SND_LIB_SUBMINOR 21 /**< subminor number of library version */
+#define SND_LIB_SUBMINOR 22 /**< subminor number of library version */
#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.21"
+#define SND_LIB_VERSION_STR "1.0.22"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/libtool new/alsa-lib-1.0.22/libtool
--- old/alsa-lib-1.0.21/libtool 2009-08-31 15:15:50.000000000 +0200
+++ new/alsa-lib-1.0.22/libtool 2009-12-16 16:27:36.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# libtoolT - Provide generalized library-building support services.
-# Generated automatically by (GNU alsa-lib 1.0.21)
+# Generated automatically by (GNU alsa-lib 1.0.22)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
@@ -85,7 +85,7 @@
LTCC="gcc"
# LTCC compiler flags.
-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe"
+LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE"
# A language-specific compiler.
CC="gcc"
@@ -7256,7 +7256,7 @@
LTCC="gcc"
# LTCC compiler flags.
-LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe"
+LTCFLAGS="-O2 -fomit-frame-pointer -Wall -pipe -D_GNU_SOURCE"
# A language-specific compiler.
CC="g++"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/alisp/alisp.c new/alsa-lib-1.0.22/src/alisp/alisp.c
--- old/alsa-lib-1.0.21/src/alisp/alisp.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/alisp/alisp.c 2009-12-16 16:18:51.000000000 +0100
@@ -233,6 +233,9 @@
return incref_object(instance, p);
}
+/* Function not used yet. Leave it commented out until we actually use it to
+ * avoid compiler complaints */
+#if 0
static struct alisp_object * incref_tree_explicit(struct alisp_instance *instance, struct alisp_object * p, struct alisp_object * e)
{
if (p == NULL)
@@ -250,6 +253,7 @@
return incref_object(instance, p);
return p;
}
+#endif
static void free_objects(struct alisp_instance *instance)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/conf/pcm/dmix.conf new/alsa-lib-1.0.22/src/conf/pcm/dmix.conf
--- old/alsa-lib-1.0.21/src/conf/pcm/dmix.conf 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/conf/pcm/dmix.conf 2009-12-16 16:18:51.000000000 +0100
@@ -63,12 +63,12 @@
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.period_size"
+ ".period_size"
]
}
default 1024
@@ -78,12 +78,12 @@
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.period_time"
+ ".period_time"
]
}
default -1
@@ -93,12 +93,12 @@
name {
@func concat
strings [
- "cards."
+ "defaults.dmix."
{
@func card_driver
card $CARD
}
- ".pcm.dmix.periods"
+ ".periods"
]
}
default 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/conf.c new/alsa-lib-1.0.22/src/conf.c
--- old/alsa-lib-1.0.21/src/conf.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/conf.c 2009-12-16 16:18:51.000000000 +0100
@@ -3477,8 +3477,9 @@
err = snd_determine_driver(card, &fdriver);
if (err < 0)
return err;
- if (snd_config_search(root, fdriver, &n) >= 0 &&
- snd_config_get_string(n, &driver) >= 0) {
+ if (snd_config_search(root, fdriver, &n) >= 0) {
+ if (snd_config_get_string(n, &driver) < 0)
+ goto __err;
assert(driver);
while (1) {
char *s = strchr(driver, '.');
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/control/control.c new/alsa-lib-1.0.22/src/control/control.c
--- old/alsa-lib-1.0.21/src/control/control.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/control/control.c 2009-12-16 16:18:51.000000000 +0100
@@ -675,7 +675,7 @@
{
struct pollfd *pfd;
unsigned short revents;
- int i, npfds, err, err_poll;
+ int npfds, err, err_poll;
npfds = snd_ctl_poll_descriptors_count(ctl);
if (npfds <= 0 || npfds >= 16) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/control/control_hw.c new/alsa-lib-1.0.22/src/control/control_hw.c
--- old/alsa-lib-1.0.21/src/control/control_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/control/control_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -392,17 +392,6 @@
if (fd < 0)
return -errno;
}
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- SYSERR("fcntl FD_CLOEXEC failed");
- err = -errno;
- close(fd);
- return err;
- }
-#endif
if (ioctl(fd, SNDRV_CTL_IOCTL_PVERSION, &ver) < 0) {
err = -errno;
close(fd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/control/hcontrol.c new/alsa-lib-1.0.22/src/control/hcontrol.c
--- old/alsa-lib-1.0.21/src/control/hcontrol.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/control/hcontrol.c 2009-12-16 16:18:51.000000000 +0100
@@ -48,9 +48,6 @@
#include
#include
#include
-#ifndef DOC_HIDDEN
-#define __USE_GNU
-#endif
#include "control_local.h"
#ifdef HAVE_LIBPTHREAD
#include
@@ -471,8 +468,9 @@
static int snd_hctl_compare_default(const snd_hctl_elem_t *c1,
const snd_hctl_elem_t *c2)
{
- int res;
- int d = c1->id.iface - c2->id.iface;
+ int res, d;
+
+ d = c1->id.iface - c2->id.iface;
if (d != 0)
return d;
if (c1->id.iface == SNDRV_CTL_ELEM_IFACE_MIXER) {
@@ -480,11 +478,16 @@
if (d != 0)
return d;
}
+ d = c1->id.device - c2->id.device;
+ if (d != 0)
+ return d;
+ d = c1->id.subdevice - c2->id.subdevice;
+ if (d != 0)
+ return d;
res = strcmp((const char *)c1->id.name, (const char *)c2->id.name);
if (res != 0)
return res;
- d = c1->id.index - c2->id.index;
- return d;
+ return c1->id.index - c2->id.index;
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/control/namehint.c new/alsa-lib-1.0.22/src/control/namehint.c
--- old/alsa-lib-1.0.21/src/control/namehint.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/control/namehint.c 2009-12-16 16:18:51.000000000 +0100
@@ -219,6 +219,7 @@
const char *str;
int err = 0, level;
long dev = list->device;
+ int cleanup_res = 0;
list->device_input = -1;
list->device_output = -1;
@@ -244,6 +245,7 @@
snd_lib_error_set_handler(eh);
if (err < 0)
goto __skip_add;
+ cleanup_res = 1;
err = -EINVAL;
if (snd_config_get_type(res) != SND_CONFIG_TYPE_COMPOUND)
goto __cleanup;
@@ -330,6 +332,7 @@
goto __hint;
snd_config_delete(res);
res = NULL;
+ cleanup_res = 0;
if (strchr(buf, ':') != NULL)
goto __ok;
/* find, if all parameters have a default, */
@@ -379,7 +382,7 @@
err = hint_list_add(list, buf, buf1);
}
__skip_add:
- if (res)
+ if (res && cleanup_res)
snd_config_delete(res);
if (buf1)
free(buf1);
@@ -450,13 +453,10 @@
if (err == -EXDEV)
continue;
if (err < 0) {
+ list->card = card;
list->device = -1;
err = try_config(list, list->siface, str);
}
- if (err < 0) {
- list->card = -1;
- err = try_config(list, list->siface, str);
- }
if (err == -ENOMEM)
goto __error;
}
@@ -482,6 +482,29 @@
return 0;
}
+static int add_software_devices(struct hint_list *list)
+{
+ int err;
+ snd_config_t *conf, *n;
+ snd_config_iterator_t i, next;
+ const char *str;
+
+ err = snd_config_search(snd_config, list->siface, &conf);
+ if (err < 0)
+ return err;
+ snd_config_for_each(i, next, conf) {
+ n = snd_config_iterator_entry(i);
+ if (snd_config_get_id(n, &str) < 0)
+ continue;
+ list->card = -1;
+ list->device = -1;
+ err = try_config(list, list->siface, str);
+ if (err == -ENOMEM)
+ return -ENOMEM;
+ }
+ return 0;
+}
+
/**
* \brief Return string list with device name hints.
* \param card Card number or -1 (means all cards)
@@ -532,6 +555,8 @@
list.iface = SND_CTL_ELEM_IFACE_SEQUENCER;
else if (strcmp(iface, "hwdep") == 0)
list.iface = SND_CTL_ELEM_IFACE_HWDEP;
+ else if (strcmp(iface, "ctl") == 0)
+ list.iface = SND_CTL_ELEM_IFACE_MIXER;
else
return -EINVAL;
list.show_all = 0;
@@ -543,6 +568,7 @@
if (err >= 0)
err = add_card(&list, card);
} else {
+ add_software_devices(&list);
err = snd_card_next(&card);
if (err < 0)
goto __error;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/dlmisc.c new/alsa-lib-1.0.22/src/dlmisc.c
--- old/alsa-lib-1.0.21/src/dlmisc.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/dlmisc.c 2009-12-16 16:18:51.000000000 +0100
@@ -27,7 +27,6 @@
*
*/
-#define _GNU_SOURCE
#include "list.h"
#include "local.h"
@@ -54,9 +53,13 @@
#else
#ifdef HAVE_LIBDL
if (name == NULL) {
- Dl_info dlinfo;
- if (dladdr(snd_dlopen, &dlinfo) > 0)
- name = dlinfo.dli_fname;
+ static const char * self = NULL;
+ if (self == NULL) {
+ Dl_info dlinfo;
+ if (dladdr(snd_dlopen, &dlinfo) > 0)
+ self = dlinfo.dli_fname;
+ }
+ name = self;
}
#endif
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/hwdep/hwdep_hw.c new/alsa-lib-1.0.22/src/hwdep/hwdep_hw.c
--- old/alsa-lib-1.0.21/src/hwdep/hwdep_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/hwdep/hwdep_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -122,17 +122,6 @@
if (fd < 0)
return -errno;
}
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- SYSERR("fcntl FD_CLOEXEC failed");
- ret = -errno;
- close(fd);
- return ret;
- }
-#endif
if (ioctl(fd, SNDRV_HWDEP_IOCTL_PVERSION, &ver) < 0) {
ret = -errno;
close(fd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/mixer/simple.c new/alsa-lib-1.0.22/src/mixer/simple.c
--- old/alsa-lib-1.0.21/src/mixer/simple.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/mixer/simple.c 2009-12-16 16:18:51.000000000 +0100
@@ -103,7 +103,7 @@
}
#define CHECK_ENUM(xelem) \
- if (!((sm_selem_t *)(elem)->private_data)->caps & (SM_CAP_PENUM|SM_CAP_CENUM)) \
+ if (!(((sm_selem_t *)(elem)->private_data)->caps & (SM_CAP_PENUM|SM_CAP_CENUM))) \
return -EINVAL;
#define COND_CAPS(xelem, what) \
@@ -878,7 +878,6 @@
int snd_mixer_selem_is_enumerated(snd_mixer_elem_t *elem)
{
CHECK_BASIC(elem);
- CHECK_ENUM(elem);
return sm_selem_ops(elem)->is(elem, SM_PLAY, SM_OPS_IS_ENUMERATED, 0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/mixer/simple_none.c new/alsa-lib-1.0.22/src/mixer/simple_none.c
--- old/alsa-lib-1.0.21/src/mixer/simple_none.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/mixer/simple_none.c 2009-12-16 16:18:51.000000000 +0100
@@ -40,6 +40,7 @@
#include
#include
#include "mixer_simple.h"
+#include "config.h"
#ifndef DOC_HIDDEN
@@ -134,6 +135,7 @@
static const char *const names[] = {
"Master",
"Headphone",
+ "Speaker",
"Tone",
"Bass",
"Treble",
@@ -158,6 +160,7 @@
"I2S",
"IEC958",
"PC Speaker",
+ "Beep",
"Aux",
"Mono",
"Playback",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/pcm/pcm.c new/alsa-lib-1.0.22/src/pcm/pcm.c
--- old/alsa-lib-1.0.21/src/pcm/pcm.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/pcm/pcm.c 2009-12-16 16:18:51.000000000 +0100
@@ -168,17 +168,17 @@
the operation.
\par SND_PCM_STATE_RUNNING
-The PCM device is running. It processes the samples. The stream can
+The PCM device has been started and is running. It processes the samples. The stream can
be stopped using the #snd_pcm_drop() or
-#snd_pcm_drain calls.
+#snd_pcm_drain() calls.
\par SND_PCM_STATE_XRUN
The PCM device reached overrun (capture) or underrun (playback).
You can use the -EPIPE return code from I/O functions
(#snd_pcm_writei(), #snd_pcm_writen(), #snd_pcm_readi(), #snd_pcm_readn())
to determine this state without checking
-the actual state via #snd_pcm_state() call. You can recover from
-this state with #snd_pcm_prepare(),
+the actual state via #snd_pcm_state() call. It is recommended to use
+the helper function #snd_pcm_recover() to recover from this state, but you can also use #snd_pcm_prepare(),
#snd_pcm_drop() or #snd_pcm_drain() calls.
\par SND_PCM_STATE_DRAINING
@@ -1226,9 +1226,9 @@
* \retval -EPIPE an underrun occurred
* \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery)
*
- * If the blocking behaviour is selected, then routine waits until
- * all requested bytes are played or put to the playback ring buffer.
- * The count of bytes can be less only if a signal or underrun occurred.
+ * If the blocking behaviour is selected and it is running, then routine waits until
+ * all requested frames are played or put to the playback ring buffer.
+ * The returned number of frames can be less only if a signal or underrun occurred.
*
* If the non-blocking behaviour is selected, then routine doesn't wait at all.
*/
@@ -1258,9 +1258,9 @@
* \retval -EPIPE an underrun occurred
* \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery)
*
- * If the blocking behaviour is selected, then routine waits until
- * all requested bytes are played or put to the playback ring buffer.
- * The count of bytes can be less only if a signal or underrun occurred.
+ * If the blocking behaviour is selected and it is running, then routine waits until
+ * all requested frames are played or put to the playback ring buffer.
+ * The returned number of frames can be less only if a signal or underrun occurred.
*
* If the non-blocking behaviour is selected, then routine doesn't wait at all.
*/
@@ -1290,8 +1290,8 @@
* \retval -EPIPE an overrun occurred
* \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery)
*
- * If the blocking behaviour was selected, then routine waits until
- * all requested bytes are filled. The count of bytes can be less only
+ * If the blocking behaviour was selected and it is running, then routine waits until
+ * all requested frames are filled. The returned number of frames can be less only
* if a signal or underrun occurred.
*
* If the non-blocking behaviour is selected, then routine doesn't wait at all.
@@ -1322,8 +1322,8 @@
* \retval -EPIPE an overrun occurred
* \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery)
*
- * If the blocking behaviour was selected, then routine waits until
- * all requested bytes are filled. The count of bytes can be less only
+ * If the blocking behaviour was selected and it is running, then routine waits until
+ * all requested frames are filled. The returned number of frames can be less only
* if a signal or underrun occurred.
*
* If the non-blocking behaviour is selected, then routine doesn't wait at all.
@@ -7211,6 +7211,8 @@
* \param silent do not print error reason
* \return 0 when error code was handled successfuly, otherwise a negative error code
*
+ * This a high-level helper function building on other functions.
+ *
* This functions handles -EINTR (interrupted system call),
* -EPIPE (overrun or underrun) and -ESTRPIPE (stream is suspended)
* error codes trying to prepare given stream for next I/O.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/pcm/pcm_direct.c new/alsa-lib-1.0.22/src/pcm/pcm_direct.c
--- old/alsa-lib-1.0.21/src/pcm/pcm_direct.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/pcm/pcm_direct.c 2009-12-16 16:18:51.000000000 +0100
@@ -591,7 +591,10 @@
int snd_pcm_direct_info(snd_pcm_t *pcm, snd_pcm_info_t * info)
{
- // snd_pcm_direct_t *dmix = pcm->private_data;
+ snd_pcm_direct_t *dmix = pcm->private_data;
+
+ if (dmix->spcm && !dmix->shmptr->use_server)
+ return snd_pcm_info(dmix->spcm, info);
memset(info, 0, sizeof(*info));
info->stream = pcm->stream;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/pcm/pcm_hw.c new/alsa-lib-1.0.22/src/pcm/pcm_hw.c
--- old/alsa-lib-1.0.21/src/pcm/pcm_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/pcm/pcm_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -507,28 +507,6 @@
{
snd_pcm_hw_t *hw = pcm->private_data;
int fd = hw->fd, err;
- if (hw->sync_ptr) {
- err = sync_ptr1(hw, SNDRV_PCM_SYNC_PTR_HWSYNC);
- if (err < 0)
- return err;
- switch (FAST_PCM_STATE(hw)) {
- case SNDRV_PCM_STATE_RUNNING:
- case SNDRV_PCM_STATE_DRAINING:
- case SNDRV_PCM_STATE_PAUSED:
- case SNDRV_PCM_STATE_PREPARED:
- case SNDRV_PCM_STATE_SUSPENDED:
- break;
- case SNDRV_PCM_STATE_XRUN:
- return -EPIPE;
- default:
- return -EBADFD;
- }
- if (pcm->stream == SND_PCM_STREAM_PLAYBACK)
- *delayp = snd_pcm_mmap_playback_hw_avail(pcm);
- else
- *delayp = snd_pcm_mmap_capture_avail(pcm);
- return 0;
- }
if (ioctl(fd, SNDRV_PCM_IOCTL_DELAY, delayp) < 0) {
err = -errno;
SYSMSG("SNDRV_PCM_IOCTL_DELAY failed");
@@ -1166,18 +1144,6 @@
if (fmode & O_ASYNC)
mode |= SND_PCM_ASYNC;
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- ret = -errno;
- SYSMSG("fcntl FD_CLOEXEC failed");
- close(fd);
- return ret;
- }
-#endif
-
if (ioctl(fd, SNDRV_PCM_IOCTL_PVERSION, &ver) < 0) {
ret = -errno;
SYSMSG("SNDRV_PCM_IOCTL_PVERSION failed");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/pcm/pcm_params.c new/alsa-lib-1.0.22/src/pcm/pcm_params.c
--- old/alsa-lib-1.0.21/src/pcm/pcm_params.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/pcm/pcm_params.c 2009-12-16 16:18:51.000000000 +0100
@@ -1081,6 +1081,7 @@
static int snd_pcm_hw_params_choose(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{
int err;
+ const char *compat = getenv("LIBASOUND_COMPAT");
#ifdef CHOOSE_DEBUG
snd_output_t *log;
snd_output_stdio_attach(&log, stderr, 0);
@@ -1103,15 +1104,29 @@
err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_RATE, NULL, 0);
if (err < 0)
return err;
- err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_TIME, NULL, 0);
- if (err < 0)
- return err;
- err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_SIZE, NULL, 0);
- if (err < 0)
- return err;
- err = snd_pcm_hw_param_set_last(pcm, params, SND_PCM_HW_PARAM_BUFFER_SIZE, NULL, 0);
- if (err < 0)
- return err;
+ if (compat && *compat) {
+ /* old mode */
+ err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_TIME, NULL, 0);
+ if (err < 0)
+ return err;
+ err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_SIZE, NULL, 0);
+ if (err < 0)
+ return err;
+ err = snd_pcm_hw_param_set_last(pcm, params, SND_PCM_HW_PARAM_BUFFER_SIZE, NULL, 0);
+ if (err < 0)
+ return err;
+ } else {
+ /* determine buffer size first */
+ err = snd_pcm_hw_param_set_last(pcm, params, SND_PCM_HW_PARAM_BUFFER_SIZE, NULL, 0);
+ if (err < 0)
+ return err;
+ err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_SIZE, NULL, 0);
+ if (err < 0)
+ return err;
+ err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_PERIOD_TIME, NULL, 0);
+ if (err < 0)
+ return err;
+ }
err = snd_pcm_hw_param_set_first(pcm, params, SND_PCM_HW_PARAM_TICK_TIME, NULL, 0);
if (err < 0)
return err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/pcm/pcm_rate_linear.c new/alsa-lib-1.0.22/src/pcm/pcm_rate_linear.c
--- old/alsa-lib-1.0.21/src/pcm/pcm_rate_linear.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/pcm/pcm_rate_linear.c 2009-12-16 16:18:51.000000000 +0100
@@ -405,15 +405,15 @@
free(obj);
}
-static int get_supported_rates(void *rate, unsigned int *rate_min,
- unsigned int *rate_max)
+static int get_supported_rates(ATTRIBUTE_UNUSED void *rate,
+ unsigned int *rate_min, unsigned int *rate_max)
{
*rate_min = SND_PCM_PLUGIN_RATE_MIN;
*rate_max = SND_PCM_PLUGIN_RATE_MAX;
return 0;
}
-static void linear_dump(void *rate, snd_output_t *out)
+static void linear_dump(ATTRIBUTE_UNUSED void *rate, snd_output_t *out)
{
snd_output_printf(out, "Converter: linear-interpolation\n");
}
@@ -432,7 +432,8 @@
.dump = linear_dump,
};
-int SND_PCM_RATE_PLUGIN_ENTRY(linear) (unsigned int version, void **objp, snd_pcm_rate_ops_t *ops)
+int SND_PCM_RATE_PLUGIN_ENTRY(linear) (ATTRIBUTE_UNUSED unsigned int version,
+ void **objp, snd_pcm_rate_ops_t *ops)
{
struct rate_linear *rate;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/rawmidi/rawmidi_hw.c new/alsa-lib-1.0.22/src/rawmidi/rawmidi_hw.c
--- old/alsa-lib-1.0.21/src/rawmidi/rawmidi_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/rawmidi/rawmidi_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -234,17 +234,6 @@
return -errno;
}
}
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- SYSERR("fcntl FD_CLOEXEC failed");
- ret = -errno;
- close(fd);
- return ret;
- }
-#endif
if (ioctl(fd, SNDRV_RAWMIDI_IOCTL_PVERSION, &ver) < 0) {
ret = -errno;
SYSERR("SNDRV_RAWMIDI_IOCTL_PVERSION failed");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/seq/seq_hw.c new/alsa-lib-1.0.22/src/seq/seq_hw.c
--- old/alsa-lib-1.0.21/src/seq/seq_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/seq/seq_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -457,17 +457,6 @@
SYSERR("open %s failed", filename);
return -errno;
}
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- SYSERR("fcntl FD_CLOEXEC failed");
- ret = -errno;
- close(fd);
- return ret;
- }
-#endif
if (ioctl(fd, SNDRV_SEQ_IOCTL_PVERSION, &ver) < 0) {
SYSERR("SNDRV_SEQ_IOCTL_PVERSION failed");
ret = -errno;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/src/timer/timer_hw.c new/alsa-lib-1.0.22/src/timer/timer_hw.c
--- old/alsa-lib-1.0.21/src/timer/timer_hw.c 2009-08-31 15:09:38.000000000 +0200
+++ new/alsa-lib-1.0.22/src/timer/timer_hw.c 2009-12-16 16:18:51.000000000 +0100
@@ -23,7 +23,6 @@
#include
#include
#include
-#define __USE_GNU
#include
#include
#include "timer_local.h"
@@ -236,17 +235,6 @@
fd = snd_open_device(SNDRV_FILE_TIMER, tmode);
if (fd < 0)
return -errno;
-#if 0
- /*
- * this is bogus, an application have to care about open filedescriptors
- */
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) {
- SYSERR("fcntl FD_CLOEXEC failed");
- ret = -errno;
- close(fd);
- return ret;
- }
-#endif
if (ioctl(fd, SNDRV_TIMER_IOCTL_PVERSION, &ver) < 0) {
ret = -errno;
close(fd);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-lib-1.0.21/version new/alsa-lib-1.0.22/version
--- old/alsa-lib-1.0.21/version 2009-08-31 15:15:50.000000000 +0200
+++ new/alsa-lib-1.0.22/version 2009-12-16 16:27:36.000000000 +0100
@@ -1 +1 @@
-1.0.21
+1.0.22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org