Hello community, here is the log from the commit of package timidity checked in at Fri Aug 3 01:00:21 CEST 2007. -------- --- timidity/timidity.changes 2007-06-20 15:12:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/timidity/timidity.changes 2007-08-02 18:36:39.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 2 18:36:23 CEST 2007 - tiwai@suse.de + +- fix alsaseq polling at idle time +- clean up spec file + +------------------------------------------------------------------- New: ---- timidity-alsaseq-poll-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timidity.spec ++++++ --- /var/tmp/diff_new_pack.f17266/_old 2007-08-03 00:55:06.000000000 +0200 +++ /var/tmp/diff_new_pack.f17266/_new 2007-08-03 00:55:06.000000000 +0200 @@ -16,10 +16,10 @@ %define my_provides /tmp/my-provides Summary: Software Synthesizer and MIDI Player Version: 2.13.2 -Release: 97 +Release: 109 Group: Productivity/Multimedia/Sound/Midi Autoreqprov: on -License: GNU General Public License (GPL) +License: GPL v2 or later URL: http://www.timidity.jp Source: TiMidity++-%{package_version}.tar.bz2 # Source: timidity-cvs20040227.tar.bz2 @@ -31,6 +31,7 @@ Patch1: timidity-gcc4-fix.diff Patch2: timidity-array-range-fix.diff Patch3: timidity-tcl-wish-path-fix.diff +Patch4: timidity-alsaseq-poll-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +52,7 @@ %patch1 %patch2 %patch3 +%patch4 %{?suse_update_config:%{suse_update_config -f}} # save the original INSTALL file mv INSTALL INSTALL-orig @@ -59,36 +61,35 @@ echo >> autoconf/arts.m4 autoreconf --force --install cp INSTALL-orig INSTALL -CFLAGS=$RPM_OPT_FLAGS \ -./configure --prefix=%{_prefix} \ +%configure \ --enable-dynamic=ncurses,emacs,slang,vt100,xaw,xskin,gtk,motif,tcltk,alsaseq,server \ --enable-audio=alsa,arts,oss,esd,vorbis,jack,ao \ --with-default-output=alsa \ --enable-network \ --enable-spectrogram \ --enable-wrd \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ --with-module-dir=%{_libdir}/timidity \ --with-default-path=/etc make WISH=tclsh CFLAGS="$RPM_OPT_FLAGS" %install -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT WISH=tclsh -mkdir -p $RPM_BUILD_ROOT/usr/share/X11/app-defaults/ +%makeinstall WISH=tclsh +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/ cp TiMidity.ad $RPM_BUILD_ROOT/usr/share/X11/app-defaults/TiMidity # for japanese locale -mkdir -p $RPM_BUILD_ROOT/usr/share/X11/ja/app-defaults -cp TiMidity-uj.ad $RPM_BUILD_ROOT/usr/share/X11/ja/app-defaults/TiMidity +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults +cp TiMidity-uj.ad $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/TiMidity for i in ja_JP ja_JP.eucJP ja_JP.ujis; do - mkdir -p $RPM_BUILD_ROOT/usr/share/X11/$i/app-defaults - ln -s ../../ja/app-defaults/TiMidity $RPM_BUILD_ROOT/usr/share/X11/$i/app-defaults/TiMidity + mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/$i/app-defaults + ln -s ../../ja/app-defaults/TiMidity $RPM_BUILD_ROOT%{_datadir}/X11/$i/app-defaults/TiMidity done # copy documents mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp AUTHORS COPYING ChangeLog* INSTALL INSTALL.ja NEWS README README.ja TODO \ +cp AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO \ $RPM_BUILD_ROOT%{_docdir}/%{name} +for i in *.ja; do + iconv -f euc-jp -t utf8 $i > $RPM_BUILD_ROOT%{_docdir}/%{name}/$i +done mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/en (cd doc/C for i in * ; do @@ -154,6 +155,9 @@ %{_datadir}/xemacs %changelog +* Thu Aug 02 2007 - tiwai@suse.de +- fix alsaseq polling at idle time +- clean up spec file * Wed Jun 20 2007 - tiwai@suse.de - fix fdupes usage - fix encoding of ja_JP documents ++++++ timidity-alsaseq-poll-fix.diff ++++++ --- interface/alsaseq_c.c-dist 2004-07-10 07:07:00.000000000 +0200 +++ interface/alsaseq_c.c 2007-08-02 18:24:47.000000000 +0200 @@ -500,6 +500,8 @@ static void stop_playing(void) static void doit(struct seq_context *ctxp) { + fd_set rfds; + struct timeval timeout; for (;;) { while (snd_seq_event_input_pending(ctxp->handle, 1)) { if (do_sequencer(ctxp)) @@ -527,15 +529,17 @@ static void doit(struct seq_context *ctx play_event(&ev); aq_fill_nonblocking(); } - if (! ctxp->active || ! IS_STREAM_TRACE) { - fd_set rfds; - struct timeval timeout; - FD_ZERO(&rfds); - FD_SET(ctxp->fd, &rfds); + + FD_ZERO(&rfds); + FD_SET(ctxp->fd, &rfds); + if (ctxp->active) { timeout.tv_sec = 0; timeout.tv_usec = 10000; /* 10ms */ if (select(ctxp->fd + 1, &rfds, NULL, NULL, &timeout) < 0) goto __done; + } else { + if (select(ctxp->fd + 1, &rfds, NULL, NULL, NULL) < 0) + goto __done; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org