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

alsa-lib-1.0.16rc1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d452552ad2e1d1b4767c6842e69d6c8d9bc92ff469c524f840ef755812c1e3b
-size 781932

alsa-lib-1.0.16rc2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3860fcb9a9b6f025484bc719c1af3471105e71ee4bd2769105e6cab263d22131
+size 782576

alsa-lib-hg-fixes.diff

@@ -1,57 +0,0 @@
-diff -r 81eabb0e6c10 doc/doxygen.cfg
---- a/doc/doxygen.cfg	Mon Jan 21 10:42:47 2008 +0100
-+++ b/doc/doxygen.cfg	Wed Jan 23 12:27:57 2008 +0100
-@@ -76,8 +76,7 @@ INPUT            = index.doxygen \
- 		   ../src/rawmidi \
- 		   ../src/timer \
- 		   ../src/hwdep \
--		   ../src/seq \
--		   ../src/instr
-+		   ../src/seq
- EXCLUDE		 = ../src/control/control_local.h \
- 		   ../src/pcm/atomic.h \
- 		   ../src/pcm/interval.h \
-diff -r 81eabb0e6c10 src/pcm/pcm_dshare.c
---- a/src/pcm/pcm_dshare.c	Mon Jan 21 10:42:47 2008 +0100
-+++ b/src/pcm/pcm_dshare.c	Wed Jan 23 12:27:57 2008 +0100
-@@ -894,7 +894,7 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcm
- 	bsize = psize = -1;
- 	params.periods = 3;
- 	err = snd_pcm_slave_conf(root, dopen.slave, &sconf, 8,
--				 SND_PCM_HW_PARAM_FORMAT, 0, &params.format,
-+				 SND_PCM_HW_PARAM_FORMAT, SCONF_UNCHANGED, &params.format,
- 				 SND_PCM_HW_PARAM_RATE, 0, &params.rate,
- 				 SND_PCM_HW_PARAM_CHANNELS, 0, &params.channels,
- 				 SND_PCM_HW_PARAM_PERIOD_TIME, 0, &params.period_time,
-@@ -909,6 +909,9 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcm
- 	if (psize == -1 && params.period_time == -1)
- 		params.period_time = 125000;	/* 0.125 seconds */
- 
-+	if (params.format == -2)
-+		params.format = SND_PCM_FORMAT_UNKNOWN;
-+
- 	params.period_size = psize;
- 	params.buffer_size = bsize;
- 
-diff -r 81eabb0e6c10 src/pcm/pcm_dsnoop.c
---- a/src/pcm/pcm_dsnoop.c	Mon Jan 21 10:42:47 2008 +0100
-+++ b/src/pcm/pcm_dsnoop.c	Wed Jan 23 12:27:57 2008 +0100
-@@ -766,7 +766,7 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcm
- 	bsize = psize = -1;
- 	params.periods = 3;
- 	err = snd_pcm_slave_conf(root, dopen.slave, &sconf, 8,
--				 SND_PCM_HW_PARAM_FORMAT, 0, &params.format,
-+				 SND_PCM_HW_PARAM_FORMAT, SCONF_UNCHANGED, &params.format,
- 				 SND_PCM_HW_PARAM_RATE, 0, &params.rate,
- 				 SND_PCM_HW_PARAM_CHANNELS, 0, &params.channels,
- 				 SND_PCM_HW_PARAM_PERIOD_TIME, 0, &params.period_time,
-@@ -781,6 +781,9 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcm
- 	if (psize == -1 && params.period_time == -1)
- 		params.period_time = 125000;    /* 0.125 seconds */
- 
-+	if (params.format == -2)
-+		params.format = SND_PCM_FORMAT_UNKNOWN;
-+
- 	params.period_size = psize;
- 	params.buffer_size = bsize;
- 

alsa.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 31 11:50:21 CET 2008 - tiwai@suse.de
+
+- updated to version 1.0.16rc2
+  * including the previous fixes
+- deprecate run_ldconfig
+
 -------------------------------------------------------------------
 Wed Jan 23 08:06:14 CET 2008 - tiwai@suse.de
 

alsa.spec

@@ -12,7 +12,7 @@
 
 Name:           alsa
 BuildRequires:  doxygen
-%define package_version	1.0.16rc1
+%define package_version	1.0.16rc2
 License:        GPL v2 or later
 Group:          System/Libraries
 Requires:       alsa-utils
@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Summary:        Advanced Linux Sound Architecture
 Version:        1.0.16
-Release:        1
+Release:        5
 Source:         ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
 Source8:        40-alsa.rules
 Source11:       alsasound
@@ -35,7 +35,7 @@ Source21:       README.testwav
 Source30:       all_notes_off
 Source31:       all_notes_off.bin
 Source32:       all_notes_off.mid
-Patch:          alsa-lib-hg-fixes.diff
+# Patch:          alsa-lib-hg-fixes.diff
 Url:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -107,8 +107,7 @@ Authors:
 
 %prep
 %setup -q -n alsa-lib-%{package_version}
-%patch -p1
-%{?suse_update_config:%{suse_update_config -f .}}
+# %patch -p1
 
 %build
 # build alsa-lib
@@ -210,11 +209,9 @@ exit 0
 %insserv_cleanup
 exit 0
 
-%post -n libasound2
-%run_ldconfig
+%post -n libasound2 -p /sbin/ldconfig
 
-%postun -n libasound2
-%run_ldconfig
+%postun -n libasound2 -p /sbin/ldconfig
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -249,6 +246,10 @@ exit 0
 %{_datadir}/alsa
 
 %changelog
+* Thu Jan 31 2008 tiwai@suse.de
+- updated to version 1.0.16rc2
+  * including the previous fixes
+- deprecate run_ldconfig
 * Wed Jan 23 2008 tiwai@suse.de
 - fix documentation build (removed obsolete entries)
 - fix dsnoop and dshare auto-configuration
@@ -2077,7 +2078,7 @@ exit 0
 - fixed kernel_version define -> %%(uname -r)
 - changed linux_header_dir to /usr/src/linux/include/linux
   (should fit with the pre-install then)
-* Thu Jun 08 2000 ro@suse.de
+* Fri Jun 09 2000 ro@suse.de
 - added pre-install for alsadev: create linux-srcdir if nonexistant
 * Thu Jun 08 2000 tiwai@suse.de
 - linux/* header files are installed under
@@ -2129,7 +2130,7 @@ exit 0
 - updated to alsa-0.5.6, cvsexport 2000-03-17.tar.bz2
 * Tue Mar 14 2000 bk@suse.de
 - disabled kernel headers in the file list
-* Sat Mar 11 2000 bk@suse.de
+* Sun Mar 12 2000 bk@suse.de
 - added isapnp to Requires:
 * Thu Mar 09 2000 ro@suse.de
 - removed k_deflt from neededforbuild  (endless rebuild-loop)
@@ -2139,7 +2140,7 @@ exit 0
 - added gamix from http://www1.tcnet.ne.jp/fmurata/linux/down/
 - alsa modules are no longer built here.
 - wrote listcards.sh and added generated /usr/doc/packages/alsa/cards.txt
-* Sun Mar 05 2000 ro@suse.de
+* Mon Mar 06 2000 ro@suse.de
 - added Makefile.module and subpackage km_alsa to build the
   kernel-modules
 * Sat Mar 04 2000 bk@suse.de