rpms/audacious-plugins-freeworld/devel audacious-plugins-3.2-mp3-err-handling-fix.patch, NONE, 1.1 audacious-plugins-freeworld.spec, 1.22, 1.23
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28187
Modified Files:
audacious-plugins-freeworld.spec
Added Files:
audacious-plugins-3.2-mp3-err-handling-fix.patch
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-2
- Silence false error printf's when reaching EOF on mp3 files
audacious-plugins-3.2-mp3-err-handling-fix.patch:
mpg123.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE audacious-plugins-3.2-mp3-err-handling-fix.patch ---
diff -up audacious-plugins-3.2/src/mpg123/mpg123.c~
audacious-plugins-3.2/src/mpg123/mpg123.c
--- audacious-plugins-3.2/src/mpg123/mpg123.c~ 2012-01-20 20:48:30.000000000 +0100
+++ audacious-plugins-3.2/src/mpg123/mpg123.c 2012-01-29 21:49:43.991545176 +0100
@@ -432,7 +432,9 @@ GET_FORMAT:
if (! outbuf_size && (ret = mpg123_read (ctx.decoder, (void *) outbuf,
sizeof outbuf, & outbuf_size)) < 0)
{
- if (ret == MPG123_DONE || ret == MPG123_ERR_READER)
+ if (ret == MPG123_NEED_MORE)
+ continue;
+ if (ret == MPG123_DONE)
goto decode_cleanup;
fprintf (stderr, "mpg123 error in %s: %s\n", filename,
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file:
/cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- audacious-plugins-freeworld.spec 29 Jan 2012 20:07:10 -0000 1.22
+++ audacious-plugins-freeworld.spec 29 Jan 2012 20:55:09 -0000 1.23
@@ -5,7 +5,7 @@
Name: audacious-plugins-freeworld
Version: 3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -19,6 +19,8 @@
# Revert 166902832b0e94d090acaf1c31688e70668388ac
# (this can be dropped once we have ffmpeg-0.9.x in rpmfusion)
Patch0: audacious-plugins-3.2-ffmpeg-0.8.8.patch
+# emailed to upstream
+Patch1: audacious-plugins-3.2-mp3-err-handling-fix.patch
BuildRequires: audacious-devel >= %{version}
BuildRequires: zlib-devel, libxml2-devel, desktop-file-utils >= 0.9
@@ -108,6 +110,7 @@
%prep
%setup -q -n audacious-plugins-%{version}
%patch0 -p1
+%patch1 -p1
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -187,6 +190,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-2
+- Silence false error printf's when reaching EOF on mp3 files
+
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-1
- Upgrade to 3.2