From 1f74979876e6d987b18e7fb6158aefa3ecf89b96 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 10 Mar 2020 21:53:44 +0300 Subject: [PATCH] hardware * --- .../files/dvd+rw-tools-7.0-wctomb.patch | 4 +- .../dvd+rw-tools-7.1-layerbreaksetup.patch | 93 +++++++++++++++++++ .../files/dvd+rw-tools-7.1-minor-major.patch | 11 +++ hardware/optical/dvd+rw-tools/pspec.xml | 4 +- hardware/printer/cups-filters/pspec.xml | 1 + 5 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-layerbreaksetup.patch create mode 100644 hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-minor-major.patch diff --git a/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch index 37b245314f..56bd72575e 100644 --- a/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch +++ b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch @@ -1,5 +1,5 @@ ---- dvd/transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 -+++ dvd/transport.hxx 2008-03-25 21:25:36.000000000 -0400 +--- transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 ++++ transport.hxx 2008-03-25 21:25:36.000000000 -0400 @@ -116,7 +116,7 @@ extern "C" char *plusminus_locale() { static class __plusminus { diff --git a/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-layerbreaksetup.patch b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-layerbreaksetup.patch new file mode 100644 index 0000000000..7636f8393d --- /dev/null +++ b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-layerbreaksetup.patch @@ -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 + #include ++#include + #include + #include + #include diff --git a/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-minor-major.patch b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-minor-major.patch new file mode 100644 index 0000000000..301fbdefa1 --- /dev/null +++ b/hardware/optical/dvd+rw-tools/files/dvd+rw-tools-7.1-minor-major.patch @@ -0,0 +1,11 @@ +diff -rauN dvd+rw-tools-7.1/growisofs.c dvd+rw-tools-7.1-minor-major-patch/growisofs.c +--- dvd+rw-tools-7.1/growisofs.c 2008-03-04 10:15:03.000000000 +0100 ++++ dvd+rw-tools-7.1-minor-major-patch/growisofs.c 2019-07-06 14:03:49.283311518 +0200 +@@ -442,6 +442,7 @@ + #include + #include + #include ++#include + #include "mp.h" + + #if defined(__unix) || defined(__unix__) diff --git a/hardware/optical/dvd+rw-tools/pspec.xml b/hardware/optical/dvd+rw-tools/pspec.xml index c093c18988..1d0efa9651 100644 --- a/hardware/optical/dvd+rw-tools/pspec.xml +++ b/hardware/optical/dvd+rw-tools/pspec.xml @@ -15,8 +15,10 @@ http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz dvd+rw-tools-7.0-dvddl.patch - dvd+rw-tools-7.0-wctomb.patch + dvd+rw-tools-7.0-wctomb.patch dvd+rw-tools-7.0-wexit.patch + dvd+rw-tools-7.1-layerbreaksetup.patch + dvd+rw-tools-7.1-minor-major.patch gcc-4.3.patch diff --git a/hardware/printer/cups-filters/pspec.xml b/hardware/printer/cups-filters/pspec.xml index e20b15f9ef..2fbb1f801a 100644 --- a/hardware/printer/cups-filters/pspec.xml +++ b/hardware/printer/cups-filters/pspec.xml @@ -21,6 +21,7 @@ Contains backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc. In addition it contains additional filters developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting. https://www.openprinting.org/download/cups-filters/cups-filters-1.27.2.tar.xz + python3-devel cups-devel glib2-devel tiff-devel