[k3b] - k3b-2.0.2 (#670325) - use growisofs for dvd's (#610976)
Rex Dieter
rdieter at fedoraproject.org
Wed Jan 19 14:40:17 UTC 2011
commit 169b4d42f9dd1c78b70067e5908535fc20dc1413
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Jan 19 08:42:00 2011 -0600
- k3b-2.0.2 (#670325)
- use growisofs for dvd's (#610976)
.gitignore | 2 +-
k3b-2.0.2-use_growisofs_for_dvds.patch | 32 ++++++++++++++++++++
...2-use_growisofs_instead_of_wodim_for_dvds.patch | 32 ++++++++++++++++++++
k3b.spec | 19 ++++++++++-
sources | 2 +-
5 files changed, 83 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a57b46f..6ecb1a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/k3b-2.0.1.tar.bz2
+/k3b-2.0.2.tar.bz2
diff --git a/k3b-2.0.2-use_growisofs_for_dvds.patch b/k3b-2.0.2-use_growisofs_for_dvds.patch
new file mode 100644
index 0000000..73d007c
--- /dev/null
+++ b/k3b-2.0.2-use_growisofs_for_dvds.patch
@@ -0,0 +1,32 @@
+diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.growisofs k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp
+--- k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.growisofs 2011-01-15 14:47:30.000000000 -0600
++++ k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp 2011-01-19 07:53:47.384235930 -0600
+@@ -309,22 +309,17 @@ bool K3b::MetaWriter::determineUsedAppAn
+ if( d->toc.count() != 1 || d->toc.first().mode() != Device::Track::MODE1 ) {
+ emit infoMessage( i18n("DVD and Blu-ray tracks can only be written in MODE1."), MessageWarning );
+ }
+-
+- if( mediaType & (K3b::Device::MEDIA_DVD_PLUS_RW|K3b::Device::MEDIA_DVD_RW_OVWR) &&
+- d->multiSession ) {
+- // we can only do this with growisofs
++ if( mediaType & Device::MEDIA_DVD_ALL ) {
++ // use growisofs for DVDs
+ d->usedWritingApp = WritingAppGrowisofs;
+ }
+- else if( mediaType & Device::MEDIA_DVD_ALL ) {
+- d->usedWritingApp = WritingAppCdrecord;
+- }
+ else if( mediaType & Device::MEDIA_BD_ALL ) {
+- if( cdrecordBluRay ) {
+- d->usedWritingApp = WritingAppCdrecord;
+- }
+- else if( growisofsBluRay ) {
++ if( growisofsBluRay ) {
+ d->usedWritingApp = WritingAppGrowisofs;
+ }
++ else if( cdrecordBluRay ) {
++ d->usedWritingApp = WritingAppCdrecord;
++ }
+ else {
+ emit infoMessage( i18n("Missing Blu-ray support in cdrecord and growisofs. Please update the system."), MessageError );
+ return false;
diff --git a/k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch b/k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
new file mode 100644
index 0000000..4afa3d1
--- /dev/null
+++ b/k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
@@ -0,0 +1,32 @@
+diff -up k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp
+--- k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp.use_growisofs_for_dvds 2011-01-15 14:47:30.000000000 -0600
++++ k3b-2.0.2/libk3b/jobs/k3bmetawriter.cpp 2011-01-19 08:19:21.953526402 -0600
+@@ -261,11 +261,13 @@ bool K3b::MetaWriter::determineUsedAppAn
+ bool cdrecordOnTheFly = false;
+ bool cdrecordCdText = false;
+ bool cdrecordBluRay = false;
++ bool cdrecordWodim = false;
+ bool growisofsBluRay = false;
+ if( k3bcore->externalBinManager()->binObject("cdrecord") ) {
+ cdrecordOnTheFly = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "audio-stdin" );
+ cdrecordCdText = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "cdtext" );
+ cdrecordBluRay = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "blu-ray" );
++ cdrecordWodim = k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "wodim" );
+ }
+ if( k3bcore->externalBinManager()->binObject("growisofs") ) {
+ growisofsBluRay = k3bcore->externalBinManager()->binObject("growisofs")->hasFeature( "blu-ray" );
+@@ -316,7 +318,13 @@ bool K3b::MetaWriter::determineUsedAppAn
+ d->usedWritingApp = WritingAppGrowisofs;
+ }
+ else if( mediaType & Device::MEDIA_DVD_ALL ) {
+- d->usedWritingApp = WritingAppCdrecord;
++ // wodim (at least on fedora) doesn't do DVDs all that well, use growisofs instead
++ if ( cdrecordWodim ) {
++ d->usedWritingApp = WritingAppGrowisofs;
++ }
++ else {
++ d->usedWritingApp = WritingAppCdrecord;
++ }
+ }
+ else if( mediaType & Device::MEDIA_BD_ALL ) {
+ if( cdrecordBluRay ) {
diff --git a/k3b.spec b/k3b.spec
index 2fed490..8620a75 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -2,8 +2,8 @@
Name: k3b
Summary: CD/DVD/Blu-ray burning application
Epoch: 1
-Version: 2.0.1
-Release: 5%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -14,6 +14,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# ie, where cdrecord and friends aren't present
ExcludeArch: s390 s390x
+## upstreamable patches
+# wodim(cdrecord) doesnt work for dvds, use growisofs instead
+# http://bugzilla.redhat.com/610976
+# we'll see which approach upstream likes best
+# use growisofs for all dvds
+Patch50: k3b-2.0.2-use_growisofs_for_dvds.patch
+# use growisofs (intead of wodim) for dvds
+Patch51: k3b-2.0.2-use_growisofs_instead_of_wodim_for_dvds.patch
+
BuildRequires: desktop-file-utils
BuildRequires: flac-devel
BuildRequires: gettext
@@ -72,6 +81,8 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%prep
%setup -q -n %{name}-%{version}
+%patch51 -p1 -b .use_growisofs_instead_of_wodim_for_dvds
+
%build
@@ -163,6 +174,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
%changelog
+* Wed Jan 19 2011 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.2-1
+- k3b-2.0.2 (#670325)
+- use growisofs for dvd's (#610976)
+
* Tue Nov 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.1-5
- turns out existing hal support is mostly harmless (not required, but will
use if present), so back out those changes.
diff --git a/sources b/sources
index d10dcb2..bc98070 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e5b6665d91d4984cbfa814b797257cb k3b-2.0.1.tar.bz2
+c86113af31a2032e57fd2f302b5f637a k3b-2.0.2.tar.bz2
More information about the scm-commits
mailing list