Author: belegdol Update of /cvs/free/rpms/mplayer/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16582 Modified Files: mplayer.spec Added Files: mplayer-libass-multiline.patch Log Message: * Sun Feb 03 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.144.20120205svn - Fixed multi-line subtitles when using libass (RPM Fusion bug #2615) mplayer-libass-multiline.patch: subassconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE mplayer-libass-multiline.patch --- Index: sub/subassconvert.c =================================================================== --- sub/subassconvert.c (wersja 34844) +++ sub/subassconvert.c (wersja 34845) @@ -86,7 +86,7 @@ {"<u>", "{\\u1}"}, {"</u>", "{\\u0}"}, {"<s>", "{\\s1}"}, {"</s>", "{\\s0}"}, {"{", "\\{"}, {"}", "\\}"}, - {"\n", "\\N"} + {"\r\n", "\\N"}, {"\n", "\\N"}, {"\r", "\\N"}, }; static const struct { Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/F-17/mplayer.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- mplayer.spec 16 Sep 2012 07:22:49 -0000 1.54 +++ mplayer.spec 3 Feb 2013 17:02:31 -0000 1.55 @@ -6,7 +6,7 @@ Name: mplayer Version: 1.0 -Release: 0.142.%{pre}%{?dist} +Release: 0.144.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -35,6 +35,8 @@ Patch14: %{name}-nodvdcss.patch # use system FFmpeg libraries Patch18: %{name}-ffmpeg.patch +#fix multi-line subtitles when using libass +Patch20: %{name}-libass-multiline.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -233,6 +235,7 @@ %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss %patch18 -p1 -b .ffmpeg +%patch20 -p0 -b .multiline mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -388,6 +391,9 @@ %{_datadir}/mplayer/*.fp %changelog +* Sun Feb 03 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.144.20120205svn +- Fixed multi-line subtitles when using libass (RPM Fusion bug #2615) + * Sun Sep 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.142.20120205svn - Use --cpu-runtime-detection only on supported arches - rfbz#2467