Hello community, here is the log from the commit of package snack for openSUSE:Factory checked in at Wed Nov 4 11:51:33 CET 2009. -------- --- snack/snack.changes 2009-10-02 15:34:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/snack/snack.changes 2009-11-03 10:49:42.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 3 10:46:40 CET 2009 - max@suse.de + +- Adopt patch from other distros to fix and re-enable ALSA support + (snack-alsa.patch). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- snack-alsa.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snack.spec ++++++ --- /var/tmp/diff_new_pack.M3aDVN/_old 2009-11-04 11:47:03.000000000 +0100 +++ /var/tmp/diff_new_pack.M3aDVN/_new 2009-11-04 11:47:03.000000000 +0100 @@ -20,9 +20,10 @@ Name: snack BuildRequires: fdupes libvorbis-devel python tk-devel xorg-x11-devel +BuildRequires: alsa-devel Summary: Sound Extension for Tcl/Tk and Python Version: 2.2.10 -Release: 190 +Release: 191 Group: Development/Libraries/Tcl Requires: tcl tk %{py_requires} @@ -30,6 +31,7 @@ Url: http://www.speech.kth.se/snack Source0: %{name}%{version}.tar.bz2 Patch0: snack.patch +Patch1: snack-alsa.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +59,7 @@ %prep %setup -q -n %{name}%{version} %patch0 +%patch1 chmod 644 BSD.txt changes README COPYING doc/* ext/* chmod 755 ext/configure @@ -69,7 +72,8 @@ --with-tcl=%_libdir \ --with-tk=%_libdir \ --with-ogg-include=%_includedir \ - --with-ogg-lib=%_libdir + --with-ogg-lib=%_libdir \ + --enable-alsa make OPTFLAGS="$CFLAGS" %install ++++++ snack-alsa.patch ++++++ --- unix/jkAudIO_alsa.c 2005-12-14 12:29:38.000000000 +0100 +++ unix/jkAudIO_alsa.c 2008-09-01 22:51:20.000000000 +0200 @@ -49,6 +49,8 @@ static int minNumChan = 1; +static snd_pcm_uframes_t hw_bufsize = 0; + int SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq, int nchannels, int encoding) @@ -135,6 +137,9 @@ Tcl_AppendResult(interp, "Failed setting HW params.", NULL); return TCL_ERROR; } + + snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize); + snd_pcm_hw_params_free(hw_params); snd_pcm_prepare(A->handle); if (A->mode == RECORD) { @@ -202,6 +207,8 @@ int i; static char buf[64]; + return; + if (A->debug > 1) Snack_WriteLog(" Enter SnackAudioPost\n"); for (i = 0; i < 1000; i++) { @@ -267,12 +274,14 @@ long SnackAudioPlayed(ADesc *A) { - long avail = _snd_pcm_mmap_hw_ptr(A->handle); + // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib + long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A)); + // long avail = _snd_pcm_mmap_hw_ptr(A->handle); - if (avail < 0) - avail = 0; + if (played < 0) + return 0; - return (avail+A->nPlayed); + return (played); } void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org