Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package k3b for openSUSE:Factory
checked in at Thu Sep 1 15:27:50 CEST 2011.



--------
--- KDE/k3b/k3b.changes 2011-08-14 18:43:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/k3b/k3b.changes        2011-08-31 
11:51:18.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 31 09:44:15 UTC 2011 - idonmez@xxxxxxxx
+
+- Add k3b-short-trackinfo.patch: Too short track info dataLen 
+  returned at least on HL-DT-ST BH10LS30 , bko #268307
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  k3b-short-trackinfo.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ k3b.spec ++++++
--- /var/tmp/diff_new_pack.p2JpU1/_old  2011-09-01 15:23:29.000000000 +0200
+++ /var/tmp/diff_new_pack.p2JpU1/_new  2011-09-01 15:23:29.000000000 +0200
@@ -22,7 +22,7 @@
 
 Name:           k3b
 Version:        2.0.2
-Release:        14
+Release:        16
 Summary:        CD/DVD/Blu-ray Burning Application for KDE
 
 License:        GPLv2+
@@ -33,8 +33,10 @@
 Patch0:         initial-preference.diff
 # PATCH-FIX-OPENSUSE add_mimetypes_bnc661777.diff bnc#661777 ctrippe@xxxxxxx 
-- 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@xxxxxxx -- 
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@xxxxxxxxxxxx -- 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 @@
 %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"

++++++ k3b-short-trackinfo.patch ++++++
commit fb12ab0afd49493df8d33a4e334775d9407ddfa9
Author: Stephane Berthelot <sberthelot@xxxxxxxxxx>
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;

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx