From 751a19b379b677839b0bf3b408a3205bfd3b15c29a79075518811dcb7811cec5 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 1 Sep 2011 13:27:43 +0000 Subject: [PATCH] Accepting request 80361 from KDE:Distro:Factory - Add k3b-short-trackinfo.patch: Too short track info dataLen returned at least on HL-DT-ST BH10LS30 , bko #268307 OBS-URL: https://build.opensuse.org/request/show/80361 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=41 --- k3b-short-trackinfo.patch | 24 ++++++++++++++++++++++++ k3b.changes | 6 ++++++ k3b.spec | 7 +++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 k3b-short-trackinfo.patch diff --git a/k3b-short-trackinfo.patch b/k3b-short-trackinfo.patch new file mode 100644 index 0000000..e6e9281 --- /dev/null +++ b/k3b-short-trackinfo.patch @@ -0,0 +1,24 @@ +commit fb12ab0afd49493df8d33a4e334775d9407ddfa9 +Author: Stephane Berthelot +Date: Mon Aug 8 09:39:49 2011 +0200 + + Too short track info dataLen returned at least on HL-DT-ST BH10LS30 + Workaround the structure len like other drives but extend from 4 + to 6 bytes minimum check. + This avoids a 0 byte BR-R capacity bug with this drive + + BUG: 268307 + +diff --git a/libk3bdevice/k3bdevice_mmc.cpp b/libk3bdevice/k3bdevice_mmc.cpp +index ab82bfa..3e7147f 100644 +--- a/libk3bdevice/k3bdevice_mmc.cpp ++++ b/libk3bdevice/k3bdevice_mmc.cpp +@@ -309,7 +309,7 @@ bool K3b::Device::Device::readTrackInformation( UByteArray& data, int type, int + // DVD-DL: 48 (MMC5) + // CD: 36 (MMC2) + // +- if( dataLen <= 4 ) { ++ if( dataLen <= 6 ) { + int m = mediaType(); + if( m & (MEDIA_DVD_R_DL|MEDIA_DVD_R_DL_SEQ|MEDIA_DVD_R_DL_JUMP) ) + dataLen = 48; diff --git a/k3b.changes b/k3b.changes index 0906baf..9106918 100644 --- a/k3b.changes +++ b/k3b.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 31 09:44:15 UTC 2011 - idonmez@suse.com + +- Add k3b-short-trackinfo.patch: Too short track info dataLen + returned at least on HL-DT-ST BH10LS30 , bko #268307 + ------------------------------------------------------------------- Sun Aug 14 16:41:53 UTC 2011 - reddwarf@opensuse.org diff --git a/k3b.spec b/k3b.spec index cb7c934..8db5365 100644 --- a/k3b.spec +++ b/k3b.spec @@ -33,8 +33,10 @@ Source0: http://prdownloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz Patch0: initial-preference.diff # PATCH-FIX-OPENSUSE add_mimetypes_bnc661777.diff bnc#661777 ctrippe@gmx.net -- Add a few mimetypes to the desktop file for better integration in GNOME Patch1: add_mimetypes_bnc661777.diff +# PATCH-FIX-UPSTREAM k3b-short-trackinfo.patch bko #268307 idoenmez@suse.de -- Too short track info dataLen returned at least on HL-DT-ST BH10LS30 +Patch2: k3b-short-trackinfo.patch # PATCH-FIX-UPSTREAM %{name}-2.0.2-ffmpeg08.diff kde#274817 reddwarf@opensuse.org -- Make it compile with the latest ffmpeg. -Patch2: %{name}-2.0.2-ffmpeg08.patch +Patch3: %{name}-2.0.2-ffmpeg08.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball @@ -99,8 +101,9 @@ This package contain files needed for development with k3b. %setup -q %patch0 %patch1 -%if %{with ffmpeg} %patch2 -p1 +%if %{with ffmpeg} +%patch3 -p1 %endif # patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size"