Author: jwrdegoede Update of /cvs/free/rpms/audacious-plugins-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30167 Modified Files: audacious-plugins-freeworld.spec Added Files: audacious-plugins-2.2-madplug-hang.patch Log Message: * Fri Jan 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-3 - Fix another hang in the madplug plugin (rf1061) audacious-plugins-2.2-madplug-hang.patch: input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE audacious-plugins-2.2-madplug-hang.patch --- # HG changeset patch # User John Lindgren <john.lindgren(a)tds.net # Date 1264711608 18000 # Node ID bcf2c84660d8674caf7a1dc843b802b2878abae9 # Parent 439b7f5f72685527fd4db9facf369513fed9de16 madplug: Ignore empty string in stream metadata, as noted on AUD-136. diff -r 439b7f5f7268 -r bcf2c84660d8 src/madplug/input.c --- a/src/madplug/input.c Wed Jan 27 23:45:19 2010 -0500 +++ b/src/madplug/input.c Thu Jan 28 15:46:48 2010 -0500 @@ -396,7 +396,7 @@ static gchar * get_stream_metadata (VFSFile * file, const gchar * name) { gchar * raw = aud_vfs_get_metadata (file, name); - gchar * converted = (raw != NULL) ? aud_str_to_utf8 (raw) : NULL; + gchar * converted = (raw != NULL && raw[0]) ? aud_str_to_utf8 (raw) : NULL; g_free (raw); return converted; Index: audacious-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- audacious-plugins-freeworld.spec 25 Jan 2010 15:25:28 -0000 1.7 +++ audacious-plugins-freeworld.spec 29 Jan 2010 14:12:12 -0000 1.8 @@ -7,7 +7,7 @@ Name: audacious-plugins-freeworld Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia @@ -19,6 +19,7 @@ Source3: audacious-ffaudio.desktop Patch0: audacious-plugins-2.2-m4a.patch Patch1: audacious-plugins-2.2-madplug.patch +Patch2: audacious-plugins-2.2-madplug-hang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: audacious-devel >= %{aud_ver} @@ -131,6 +132,7 @@ %setup -q -n audacious-plugins-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -217,6 +219,9 @@ %changelog +* Fri Jan 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.2-3 +- Fix another hang in the madplug plugin (rf1061) + * 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)