Author: jwrdegoede Update of /cvs/free/rpms/audacious-plugins-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6622 Modified Files: audacious-plugins-freeworld.spec Added Files: audacious-plugins-2.2-madplug.patch Log Message: * Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-2 - Don't hang when trying to identify unknown files as mp3 files (rf1031) audacious-plugins-2.2-madplug.patch: plugin.c | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE audacious-plugins-2.2-madplug.patch --- diff -up audacious-plugins-2.2/src/madplug/plugin.c~ audacious-plugins-2.2/src/madplug/plugin.c --- audacious-plugins-2.2/src/madplug/plugin.c~ 2009-11-22 23:49:53.000000000 +0100 +++ audacious-plugins-2.2/src/madplug/plugin.c 2010-01-25 16:09:29.000000000 +0100 @@ -440,6 +440,10 @@ audmad_is_our_fd(const gchar *filename, } } } + + if (state == STATE_RESYNC_DO) /* reached end of data */ + state = STATE_FATAL; + break; } } while (state != STATE_FATAL && tries < max_resync_tries); Index: audacious-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- audacious-plugins-freeworld.spec 19 Dec 2009 15:59:56 -0000 1.6 +++ audacious-plugins-freeworld.spec 25 Jan 2010 15:25:28 -0000 1.7 @@ -7,7 +7,7 @@ Name: audacious-plugins-freeworld Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia @@ -18,6 +18,7 @@ Source2: audacious-aac.desktop Source3: audacious-ffaudio.desktop Patch0: audacious-plugins-2.2-m4a.patch +Patch1: audacious-plugins-2.2-madplug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver} @@ -129,6 +130,7 @@ %prep %setup -q -n audacious-plugins-%{version} %patch0 -p1 +%patch1 -p1 sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -215,6 +217,9 @@ %changelog +* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-2 +- Don't hang when trying to identify unknown files as mp3 files (rf1031) + * Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-1 - Update to 2.2