[dvd+rw-tools] Align blocks count to multiple of 16 also in case of DAO writingResolves: #810483

Honza Horak hhorak at fedoraproject.org
Fri Apr 6 12:53:14 UTC 2012


commit 8d3deadb30c071cc9aafd277b6b903791ab048dc
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Fri Apr 6 14:52:58 2012 +0200

    Align blocks count to multiple of 16 also in case of DAO writingResolves: #810483

 dvd+rw-tools-7.1-blocks.patch |   13 +++++++++++++
 dvd+rw-tools.spec             |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/dvd+rw-tools-7.1-blocks.patch b/dvd+rw-tools-7.1-blocks.patch
new file mode 100644
index 0000000..4df6e46
--- /dev/null
+++ b/dvd+rw-tools-7.1-blocks.patch
@@ -0,0 +1,13 @@
+diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.blocks dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1/growisofs_mmc.cpp.blocks	2012-04-06 12:31:49.336132465 +0200
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2012-04-06 12:32:15.131645600 +0200
+@@ -1588,8 +1588,8 @@ static int minus_r_reserve_track (Scsi_C
+   unsigned int blocks;
+ 
+     blocks = (unsigned int)(size/2048);
++    blocks += 15, blocks &= ~15;
+     if (is_dao)	dao_blocks = blocks;
+-    else	blocks += 15, blocks &= ~15;
+ 
+     fprintf (stderr,"%s: reserving %u blocks",ioctl_device,blocks);
+     if (is_dao && blocks<380000)
diff --git a/dvd+rw-tools.spec b/dvd+rw-tools.spec
index 86716fc..c76375c 100644
--- a/dvd+rw-tools.spec
+++ b/dvd+rw-tools.spec
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	7.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch4: 	dvd+rw-tools-7.0-reload.patch
 Patch5: 	dvd+rw-tools-7.0-wctomb.patch
 Patch6:		dvd+rw-tools-7.0-dvddl.patch
 Patch7:		dvd+rw-tools-7.1-noevent.patch
+Patch8:		dvd+rw-tools-7.1-blocks.patch
 URL:		http://fy.chalmers.se/~appro/linux/DVD+RW/
 Requires:	mkisofs >= 2.0
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +32,7 @@ information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
 %patch5 -p0 -b .wctomb
 %patch6 -p0 -b .dvddl
 %patch7 -p1 -b .noevent
+%patch8 -p1 -b .blocks
 
 install -m 644 %{SOURCE1} index.html
 
@@ -54,6 +56,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Apr 06 2012 Honza Horak <hhorak at redhat.com> - 7.1-8
+- Align blocks count to multiple of 16 also in case of DAO writing
+  Resolves: #810483
+
 * Wed Mar 07 2012 Honza Horak <hhorak at redhat.com> - 7.1-7
 - applied patch from Petr Sumbera to handle Teac DVD drive timeout issue
   Resolves: #799299


More information about the scm-commits mailing list