rpms/k3b/F-12 k3b-1.0.5-progress_rate.patch, NONE, 1.1 k3b.spec, 1.77, 1.78

Rex Dieter rdieter at fedoraproject.org
Sun Dec 6 22:22:22 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14735

Modified Files:
	k3b.spec 
Added Files:
	k3b-1.0.5-progress_rate.patch 
Log Message:
* Sun Dec 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-11
- transcode --progress_rate 0 (#524348)


k3b-1.0.5-progress_rate.patch:
 k3bvideodvdtitletranscodingjob.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE k3b-1.0.5-progress_rate.patch ---
--- branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2007/06/02 15:56:08	670810
+++ branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009/12/06 22:04:47	1059542
@@ -206,10 +206,11 @@
     *d->process << "--nice" << "19";
 
   // we only need 100 steps, but to make sure we use 150
+  int progressRate = qMax( 1, ( int )m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150 );
   if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
-      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+      *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(progressRate);
   else
-      *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
+      *d->process << "--print_status" << QString::number(progressRate);
 
   // the input
   *d->process << "-i" << m_dvd.device()->blockDeviceName();


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- k3b.spec	26 Sep 2009 18:03:01 -0000	1.77
+++ k3b.spec	6 Dec 2009 22:22:21 -0000	1.78
@@ -22,7 +22,7 @@ Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   1
 Version: 1.0.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -51,6 +51,8 @@ Patch102: reload-for-verification.diff
 Patch105: k3b-1.0.5-hidden.patch
 # 
 Patch106: k3b-1.0.5-desktopfile.patch
+# http://websvn.kde.org/branches/extragear/kde3/multimedia/k3b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp?r1=670810&r2=1059542&pathrev=1059542&view=patch
+Patch107: k3b-1.0.5-progress_rate.patch
 
 BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
@@ -142,6 +144,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch
 %patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
 %patch106 -p1 -b .desktopfile
+%patch107 -p5 -b .progress_rate
 
 
 %build
@@ -274,6 +277,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Sun Dec 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-11
+- transcode --progress_rate 0 (#524348)
+
 * Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
 - Epoch: 1 (increment Release too, to minimize confusion)
 - -common: noarch subpkg




More information about the fedora-extras-commits mailing list