[arch-commits] Commit in dvd+rw-tools/repos (8 files)

Evangelos Foutras foutrelis at archlinux.org
Sat May 16 09:51:00 UTC 2020


    Date: Saturday, May 16, 2020 @ 09:50:59
  Author: foutrelis
Revision: 383963

archrelease: copy trunk to staging-x86_64

Added:
  dvd+rw-tools/repos/staging-x86_64/
  dvd+rw-tools/repos/staging-x86_64/PKGBUILD
    (from rev 383962, dvd+rw-tools/trunk/PKGBUILD)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-dvddl.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-dvddl.patch)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-glibc2.6.90.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-glibc2.6.90.patch)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-wctomb.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-wctomb.patch)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-wexit.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-wexit.patch)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.1-layerbreaksetup.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.1-layerbreaksetup.patch)
  dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.1-minor-major.patch
    (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.1-minor-major.patch)

----------------------------------------+
 PKGBUILD                               |   47 +++++++++++++++
 dvd+rw-tools-7.0-dvddl.patch           |   13 ++++
 dvd+rw-tools-7.0-glibc2.6.90.patch     |   11 +++
 dvd+rw-tools-7.0-wctomb.patch          |   11 +++
 dvd+rw-tools-7.0-wexit.patch           |   11 +++
 dvd+rw-tools-7.1-layerbreaksetup.patch |   93 +++++++++++++++++++++++++++++++
 dvd+rw-tools-7.1-minor-major.patch     |   11 +++
 7 files changed, 197 insertions(+)

Copied: dvd+rw-tools/repos/staging-x86_64/PKGBUILD (from rev 383962, dvd+rw-tools/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-05-16 09:50:59 UTC (rev 383963)
@@ -0,0 +1,47 @@
+# Maintainer: damir <damir at archlinux.org>
+
+pkgname=dvd+rw-tools
+pkgver=7.1
+pkgrel=9
+pkgdesc="dvd burning tools"
+arch=('x86_64')
+license=('GPL')
+url="http://fy.chalmers.se/~appro/linux/DVD+RW"
+depends=('cdrkit' 'gcc-libs')
+source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz"
+        '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'
+	'dvd+rw-tools-7.1-layerbreaksetup.patch'
+        'dvd+rw-tools-7.1-minor-major.patch')
+sha512sums=('938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31'
+            'b1ea9a68a47e41742afc3a35bef6bcb405cea3d9696dac0437f26d9a143b8ca11b8fc459d70d9a289f3bcd49902d2df785f91f6b7f8c997dff6c8ca534a8d608'
+            'a6e0b3df85ec6c28ae13b1f3e67bd26a4c35588f37493e0cb65d0b3f382b05207e421ea1f3cd92432237c2b7479d71c44ed639155cea3b52ccae741c78c3c2a4'
+            'e52457b9b2faef14ab6b1bdf104c58ec8b6e51501c7ad2bc59d02d59a0ed82ae15b9df89c4a28a4b922f21c72cfa416b950fdfdfadce95b9326334b9ece25033'
+            'd98a66ea2e08b14683377c3aff491fb2ee6cd2742e42191c1f7d47fe3474c2ce5f940ba82bce46e557886adbb1fd94431531f7aa73a572a7d41ee227428576fd'
+            'f2dadf57da0b83a9ab83b02127b267fc29e599a479d48b5cd6d83e7ae7d07957d1880c565c0a252e6a9b1ab4ad8c66ef1584ebc0e3922d3836dc3e53df9df41f'
+            '4424c24a143b3346330e04039b170da5e8201617e6b620d8e33897e80580e9b4e572ca4757dd885ba09d1df45151a277ddb299f2735f18a19e9deffac731d8aa')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # patches from Gentoo/Fedora
+  # see https://bugs.gentoo.org/257360, https://bugzilla.redhat.com/show_bug.cgi?id=426068
+  # and https://bugzilla.redhat.com/show_bug.cgi?id=243036
+  patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-dvddl.patch"
+  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"
+  patch -p1 -i ../dvd+rw-tools-7.1-minor-major.patch # Fix build with glibc 2.29
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+
+  install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/"
+  install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1
+}

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-dvddl.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-dvddl.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.0-dvddl.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.0-dvddl.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -0,0 +1,13 @@
+--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
++++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-glibc2.6.90.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-glibc2.6.90.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.0-glibc2.6.90.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.0-glibc2.6.90.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -0,0 +1,11 @@
+diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
+--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
++++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-wctomb.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-wctomb.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.0-wctomb.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.0-wctomb.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -0,0 +1,11 @@
+--- 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 {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.0-wexit.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.0-wexit.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.0-wexit.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.0-wexit.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -0,0 +1,11 @@
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
++++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
+@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
+ 	alarm(1);
+ 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
+ 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
+-	exit (0);
++	exit (WEXITSTATUS(i));
+     }
+ #endif
+ 

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.1-layerbreaksetup.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.1-layerbreaksetup.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.1-layerbreaksetup.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.1-layerbreaksetup.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -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>

Copied: dvd+rw-tools/repos/staging-x86_64/dvd+rw-tools-7.1-minor-major.patch (from rev 383962, dvd+rw-tools/trunk/dvd+rw-tools-7.1-minor-major.patch)
===================================================================
--- staging-x86_64/dvd+rw-tools-7.1-minor-major.patch	                        (rev 0)
+++ staging-x86_64/dvd+rw-tools-7.1-minor-major.patch	2020-05-16 09:50:59 UTC (rev 383963)
@@ -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 <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
++#include <sys/sysmacros.h>
+ #include "mp.h"
+ 
+ #if defined(__unix) || defined(__unix__)


More information about the arch-commits mailing list