[arch-commits] Commit in dvd+rw-tools/trunk (2 files)
Ronald van Haren
ronald at archlinux.org
Thu May 14 07:09:28 UTC 2015
Date: Thursday, May 14, 2015 @ 09:09:28
Author: ronald
Revision: 239328
upgpkg: dvd+rw-tools 7.1-6
FS#37735 unable to manually set layer break
Added:
dvd+rw-tools/trunk/dvd+rw-tools-7.1-layerbreaksetup.patch
Modified:
dvd+rw-tools/trunk/PKGBUILD
----------------------------------------+
PKGBUILD | 18 +++---
dvd+rw-tools-7.1-layerbreaksetup.patch | 93 +++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-14 06:56:29 UTC (rev 239327)
+++ PKGBUILD 2015-05-14 07:09:28 UTC (rev 239328)
@@ -3,7 +3,7 @@
pkgname=dvd+rw-tools
pkgver=7.1
-pkgrel=5
+pkgrel=6
pkgdesc="dvd burning tools"
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,12 +13,14 @@
'dvd+rw-tools-7.0-dvddl.patch'
'dvd+rw-tools-7.0-glibc2.6.90.patch'
'dvd+rw-tools-7.0-wctomb.patch'
- 'dvd+rw-tools-7.0-wexit.patch')
-md5sums=('8acb3c885c87f6838704a0025e435871'
- '65d30aa98ff314f256d0a1afb9e3edf6'
- '1be5401035ca850edb7e522f22aead4b'
- '3ba1af063b30f942e1cd2004044702d3'
- 'b2c66b6c6243b207fbe4f6ae34fa6cba')
+ 'dvd+rw-tools-7.0-wexit.patch'
+ 'dvd+rw-tools-7.1-layerbreaksetup.patch')
+sha1sums=('6400e013934ff589b4b224eced03fd9f42ed719b'
+ 'd2c949bc15420f39a9055757b1f5bb5543c46b6c'
+ '6b2f496e8d95738501dcad5fb63a4faa32882202'
+ '08ad4c2309ae1602b855cf1a2bbdbe0dab5037a2'
+ 'f50dc64f5d020f0dd64ffb38c18cfa3fbf03f8a2'
+ 'dd5224fdd8e94ec9483f651b3579cf9c18381129')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,7 +31,7 @@
patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-glibc2.6.90.patch"
patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-wctomb.patch"
patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-wexit.patch"
-
+ patch -p1 -i "${srcdir}/dvd+rw-tools-7.1-layerbreaksetup.patch"
make
}
Added: dvd+rw-tools-7.1-layerbreaksetup.patch
===================================================================
--- dvd+rw-tools-7.1-layerbreaksetup.patch (rev 0)
+++ dvd+rw-tools-7.1-layerbreaksetup.patch 2015-05-14 07:09:28 UTC (rev 239328)
@@ -0,0 +1,93 @@
+diff -ur dvd+rw-tools-7.1-orig/growisofs.c dvd+rw-tools-7.1/growisofs.c
+--- dvd+rw-tools-7.1-orig/growisofs.c 2008-03-04 10:15:03.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs.c 2009-09-06 22:39:33.000000000 +0200
+@@ -535,7 +535,7 @@
+ */
+ int get_mmc_profile (void *fd);
+ int plusminus_r_C_parm (void *fd,char *C_parm);
+-pwrite64_t poor_mans_setup (void *fd,off64_t leadout);
++pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak);
+ char *plusminus_locale ();
+ int __1x ();
+ /*
+@@ -2447,7 +2447,7 @@
+ goto out;
+ }
+ if (!progress.final) progress.final = tracksize;
+- tracksize = layer_break*CD_BLOCK*2;
++ //tracksize = layer_break*CD_BLOCK*2;
+ }
+ }
+ else if (capacity > outoff)
+@@ -2648,7 +2648,7 @@
+ * further details on poor_mans_setup
+ */
+ pwrite64_method = poor_mans_setup (ioctl_handle,
+- outoff+tracksize);
++ outoff+tracksize, (unsigned int)layer_break);
+ }
+
+ if (!progress.final)
+diff -ur dvd+rw-tools-7.1-orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1-orig/growisofs_mmc.cpp 2008-03-04 18:47:49.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp 2009-09-06 20:52:46.000000000 +0200
+@@ -1612,7 +1612,7 @@
+ return 0;
+ }
+
+-static void plus_r_dl_split (Scsi_Command &cmd,off64_t size)
++static void plus_r_dl_split (Scsi_Command &cmd,off64_t size,unsigned int lbreak)
+ { int err;
+ unsigned int blocks,split;
+ unsigned char dvd_20[4+8];
+@@ -1644,10 +1644,17 @@
+ " use single layer media for this recording\n"),
+ exit (FATAL_START(EMEDIUMTYPE));
+
+- blocks /= 16;
+- blocks += 1;
+- blocks /= 2;
+- blocks *= 16;
++ if (lbreak)
++ {
++ blocks=lbreak;
++ }
++ else
++ {
++ blocks /= 16;
++ blocks += 1;
++ blocks /= 2;
++ blocks *= 16;
++ }
+
+ fprintf (stderr,"%s: splitting layers at %u blocks\n",
+ ioctl_device,blocks);
+@@ -2010,7 +2017,7 @@
+ typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
+
+ extern "C"
+-pwrite64_t poor_mans_setup (void *fd,off64_t leadout)
++pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak)
+ { Scsi_Command cmd(ioctl_handle=fd);
+ int err,profile=mmc_profile&0xFFFF;
+
+@@ -2059,7 +2066,7 @@
+ case 0x2B: // DVD+R Double Layer
+ plusminus_pages_setup(cmd,profile);
+ if (profile==0x2B && next_track==1 && dvd_compat && leadout)
+- plus_r_dl_split (cmd,leadout);
++ plus_r_dl_split (cmd,leadout,lbreak);
+ atexit (plus_r_finalize);
+ if (next_wr_addr)
+ { atsignals (no_r_finalize);
+diff -ur dvd+rw-tools-7.1-orig/transport.hxx dvd+rw-tools-7.1/transport.hxx
+--- dvd+rw-tools-7.1-orig/transport.hxx 2008-03-01 11:34:43.000000000 +0100
++++ dvd+rw-tools-7.1/transport.hxx 2009-09-06 20:53:53.000000000 +0200
+@@ -9,6 +9,7 @@
+ #if defined(__unix) || defined(__unix__)
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>
More information about the arch-commits
mailing list