OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=67

alsa-lib-1.0.19.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
-size 792682

alsa-lib-1.0.20.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
+size 794728

alsa.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May  6 18:03:45 CEST 2009 - tiwai@suse.de
+
+- updated alsa-lib to version 1.0.20:
+  * including previous fixes
+
+-------------------------------------------------------------------
+Tue May  5 14:15:57 CEST 2009 - tiwai@suse.de
+
+- send SIGTERM then SIGKILL at terminating processes (bnc#486131)
+
 -------------------------------------------------------------------
 Thu Apr 23 15:01:43 CEST 2009 - tiwai@suse.de
 

alsa.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package alsa (Version 1.0.19)
+# spec file for package alsa (Version 1.0.20)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,7 +20,7 @@
 
 Name:           alsa
 BuildRequires:  doxygen
-%define package_version	1.0.19
+%define package_version	1.0.20
 License:        GPL v2 or later
 Group:          System/Libraries
 Requires:       alsa-utils
@@ -33,8 +33,8 @@ Obsoletes:      alsa-64bit
 %endif
 #
 Summary:        Advanced Linux Sound Architecture
-Version:        1.0.19
-Release:        3
+Version:        1.0.20
+Release:        1
 Source:         ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
 Source8:        40-alsa.rules
 Source11:       alsasound
@@ -50,7 +50,7 @@ Source31:       all_notes_off.bin
 Source32:       all_notes_off.mid
 Source33:       alsa-info.sh
 Source34:       alsa-init.sh
-Patch:          alsa-lib-git-fixes.diff
+# Patch:          alsa-lib-git-fixes.diff
 Url:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -122,7 +122,14 @@ Authors:
 
 %prep
 %setup -q -n alsa-lib-%{package_version}
-%patch -p1
+# %patch -p1
+# hack to fix build on older distros
+%if %suse_version < 1100
+%ifarch %ix86
+test -f $RPM_SOURCE_DIR/baselibs.conf && \
+sed -i -e'/recommends.*alsa-oss/d' $RPM_SOURCE_DIR/baselibs.conf
+%endif
+%endif
 
 %build
 # build alsa-lib
@@ -244,6 +251,11 @@ exit 0
 %{_datadir}/alsa
 
 %changelog
+* Wed May 06 2009 tiwai@suse.de
+- updated alsa-lib to version 1.0.20:
+  * including previous fixes
+* Tue May 05 2009 tiwai@suse.de
+- send SIGTERM then SIGKILL at terminating processes (bnc#486131)
 * Thu Apr 23 2009 tiwai@suse.de
 - update alsa-lib as of 2009.04.23:
   * pcm: more better documentation for snd_pcm_poll_descriptors

alsasound

@@ -131,16 +131,23 @@ start_all() {
     rc_status
 }
 
+do_kill() {
+  fuser $1 /dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \
+     /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi* /dev/mixer* /dev/music \
+     /dev/patmgr* /dev/sequencer* /dev/sndstat >/dev/null 2>&1
+  if [ -d /dev/snd ]; then
+    fuser $1 /dev/snd/* >/dev/null 2>&1
+  fi
+}
+
 terminate() {
   #
   # Kill processes holding open sound devices
   #
-  fuser -k /dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \
-     /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi* /dev/mixer* /dev/music \
-     /dev/patmgr* /dev/sequencer* /dev/sndstat >/dev/null 2>&1
-  if [ -d /dev/snd ]; then
-    fuser -k /dev/snd/* >/dev/null 2>&1
-  fi
+  do_kill -TERM
+  sleep 1
+  do_kill -k
+
   #
   # remove all sequencer connections if any
   #