rpms/subtitleeditor/F-13 subtitleeditor-0.36.2-segfault.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 subtitleeditor.spec, 1.14, 1.15

[Martin Sourada]

Author: mso

Update of /cvs/pkgs/rpms/subtitleeditor/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24324/F-13

Modified Files:
	.cvsignore sources subtitleeditor.spec 
Added Files:
	subtitleeditor-0.36.2-segfault.patch 
Log Message:


Sync F12 and F13 with devel.



subtitleeditor-0.36.2-segfault.patch:
 waveformrenderercairo.cc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE subtitleeditor-0.36.2-segfault.patch ---
Index: src/we/waveformrenderercairo.cc
===================================================================
--- src/we/waveformrenderercairo.cc	(révision 714)
+++ src/we/waveformrenderercairo.cc	(copie de travail)
@@ -521,7 +521,7 @@
 
 	int width = get_width();
 
-	/*
+	
 	double skip = (double)(width * zoom()) / peaks.size();
 
 	double x = 0;
@@ -537,7 +537,7 @@
 	}
 	cr->line_to(x, bottom);
 	cr->fill();
-	*/
+	/*
 
 	double skip = 4;
 
@@ -561,6 +561,7 @@
 	}
 	cr->line_to(length, bottom);
 	cr->fill();
+	*/
 }
 
 /*


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-13/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Feb 2010 12:48:05 -0000	1.9
+++ .cvsignore	8 Jun 2010 13:28:07 -0000	1.10
@@ -1 +1 @@
-subtitleeditor-0.36.0.tar.gz
+subtitleeditor-0.36.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Feb 2010 12:48:05 -0000	1.9
+++ sources	8 Jun 2010 13:28:07 -0000	1.10
@@ -1 +1 @@
-ed9f8d650603a97f93dae4395ba8c7eb  subtitleeditor-0.36.0.tar.gz
+707009fa5eb46e305ac5135ce7ad6c03  subtitleeditor-0.36.2.tar.gz


Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subtitleeditor/F-13/subtitleeditor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- subtitleeditor.spec	14 Feb 2010 12:48:05 -0000	1.14
+++ subtitleeditor.spec	8 Jun 2010 13:28:07 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           subtitleeditor
-Version:        0.36.0
+Version:        0.36.2
 Release:        1%{?dist}
 Summary:        GTK+2 tool to edit subtitles for GNU/Linux/*BSD
 
@@ -7,6 +7,8 @@ Group:          Applications/Multimedia
 License:        GPLv3+
 URL:            http://home.gna.org/subtitleeditor/
 Source0:        http://download.gna.org/subtitleeditor/0.36/%{name}-%{version}.tar.gz
+# temporary fix for rhbz #583343, upstream #16016
+Patch0:         %{name}-0.36.2-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -37,6 +39,7 @@ to synchronise subtitles to voices.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure \
@@ -96,6 +99,13 @@ fi
 %{_libdir}/%{name}
 
 %changelog
+* Sun Jun 06 2010 Martin Sourada <mso at fedoraproject.org> - 0.36.2-1
+- New subtitle format SBV
+- Build with gl waveform renderer now works, we'll keep Cairo based one though
+- Fixes non-working video playback (upstream #15525)
+- Fixes some segfaults on waveform generation (upstream #15464)
+- Add temporary patch for rhbz #583343 (upstream #16016)
+
 * Sun Feb 14 2010 Martin Sourada <mso at fedoraproject.org> - 0.36.0-1
 - disable gl waveform renderer (fails to build, cairo based is good enough)
 - two new plugins : sortsubtitles, typewriter