rpms/k3b/F-11 k3b-1.0.5-progress_rate.patch, NONE, 1.1 k3b.spec, 1.70, 1.71

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1872

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> - 0:1.0.5-9.1
- transcode --progress_rate 0 (#524348)


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

--- NEW FILE k3b-1.0.5-progress_rate.patch ---
diff -up k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
--- k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp.progress_rate	2008-05-27 03:24:20.000000000 -0500
+++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp	2009-12-06 16:56:02.389585008 -0600
@@ -27,6 +27,7 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 
+inline const int qMax(const int a, const int b) { if (a < b) return b; return a; }
 
 class K3bVideoDVDTitleTranscodingJob::Private
 {
@@ -206,10 +207,11 @@ void K3bVideoDVDTitleTranscodingJob::sta
     *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-11/k3b.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- k3b.spec	14 Jun 2009 04:13:21 -0000	1.70
+++ k3b.spec	21 Apr 2010 17:44:38 -0000	1.71
@@ -26,7 +26,7 @@ Name:    k3b
 Summary: CD/DVD burning application
 Epoch:   0
 Version: 1.0.5
-Release: 9%{?dist}
+Release: 9%{?dist}.1
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -44,7 +44,6 @@ Patch2: k3b-1.0.3-umount.patch
 Patch4: k3b-1.0.4-manualbufsize.patch
 
 # upstreamable patches
-Patch50: k3b-1.0.5-desktopfile.patch
 
 # upstream patches
 # http://bugs.kde.org/151816 , k3b can't reload media for verification
@@ -56,6 +55,9 @@ Patch102: reload-for-verification.diff
 # put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
 # upstreamed 2008-08-27
 Patch105: k3b-1.0.5-hidden.patch
+Patch106: k3b-1.0.5-desktopfile.patch
+# based on 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
@@ -134,12 +136,12 @@ Requires: %{name}-libs = %{epoch}:%{vers
 # set in k3brc too 
 %patch4 -p1 -b .manualbufsize
 
-%patch50 -p1 -b .desktopfile
-
 #patch100 -p1 -b .kde#151816
 #patch101 -p1 -b .kde#156684
 %patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
+%patch106 -p1 -b .desktopfile
+%patch107 -p1 -b .progress_rate
 
 
 %build
@@ -291,6 +293,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Dec 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-9.1
+- transcode --progress_rate 0 (#524348)
+
 * Sat Jun 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-9
 - another try at a reload patch that works (kde#156684#c30)
 - optimize scriptlets