From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 1/7] gnu: Add cdrtools. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149322276530877 (code B ref -1); Wed, 26 Apr 2017 16:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2017 16:06:05 +0000 Received: from localhost ([127.0.0.1]:41859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PS8-00081u-MZ for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:06:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PS4-00081M-UK for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3PRw-0005UU-P6 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:05:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3PRw-0005UQ-M7 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:05:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3PRt-000894-R6 for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3PRp-0005Ri-U7 for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:49 -0400 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:44635) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3PRp-0005Px-Iw for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:45 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1d3PRh-00008e-Og for guix-patches@gnu.org; Wed, 26 Apr 2017 18:05:43 +0200 Received: from mail.axc.nl ([185.182.56.42]:37794 helo=mail.axc.eu) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1d3PRg-0001z3-K8 for guix-patches@gnu.org; Wed, 26 Apr 2017 18:05:37 +0200 Date: Wed, 26 Apr 2017 18:05:34 +0200 (CEST) Message-Id: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Apr_26_18_05_34_2017_155)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 185.182.56.42 SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.21) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqb55CEwEze9asRtOYc4ChMRcOb18WfxGyg6Om6u4YYm7guVZpU+Jju0p6n D3iZ/7wvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwohOyhP1KrsWZcn2MBn4zuyG7gOvC4m Grn5xNl9tGvdjYbxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOA0LLUyFRBKwoN1I2EwhdFAvpqLTM+h/hARnyFcwgOATo6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj+xxb0AeOVQkpm2hvu5J0yjCyqf CSEgsxbFAyq6yW1bRKyj2K/uRn1rMm3cNj8TueY= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) ----Next_Part(Wed_Apr_26_18_05_34_2017_155)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi, this patch series adds a few CD/DVD/Blu Ray Disc burning tools. There is/has been some controversy about the license of cdrtools, with claims it cannot be distributed in binary form because it mixes CDDL and GPL code. As far as I understand, mkisofs is GPL, while the other executables are CDDL, and I do not really see the problem. If others disagree, or we want to be extra careful, I suppose we can disable substitutes for cdrtools, so we only distribute it as source? cdrtools also bundles a forked LGPL-licensed copy of cdparanoia. This is perhaps unfortunate, but I don't think it's easy to unbundle it (cdrtools doesn't build agains our current cdparanoia). Thomas ----Next_Part(Wed_Apr_26_18_05_34_2017_155)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-Add-cdrtools.patch" >From 96fb5484e4a4d741da685ce63f578feb69bc016f Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Fri, 21 Apr 2017 15:54:20 +0200 Subject: [PATCH 1/7] gnu: Add cdrtools. * gnu/packages/cdrom.scm (cdrtools): New variable. * gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 63 ++- .../patches/cdrtools-3.01-mkisofs-isoinfo.patch | 514 +++++++++++++++++++++ 3 files changed, 577 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch diff --git a/gnu/local.mk b/gnu/local.mk index cb94d27e9..a2c56e03d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -513,6 +513,7 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-drop-unrar.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ + %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-disable-unittest-throttle.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 7e86753ab..69af39655 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -26,7 +26,7 @@ (define-module (gnu packages cdrom) #:use-module (guix download) #:use-module (guix packages) - #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+)) + #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+ cddl1.0)) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -197,6 +197,67 @@ extra-robust data verification, synchronization, error handling and scratch reconstruction capability.") (license gpl2))) ; libraries under lgpl2.1 +(define-public cdrtools + (package + (name "cdrtools") + (version "3.01") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/cdrtools/cdrtools-" version ".tar.bz2")) + (sha256 + (base32 + "03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d")) + (patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch")))) + (build-system gnu-build-system) + (inputs + `(("linux-headers" ,linux-libre-headers))) + (native-inputs + `(("coreutils" ,coreutils))) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-linux-headers + (lambda _ + (substitute* "autoconf/configure" + (("/usr/src/linux") + (assoc-ref %build-inputs "linux-headers"))) + #t)) + (add-before 'build 'substitute-dirs + (lambda _ + (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") + (find-files "DEFAULTS_ENG" "^Defaults\\.") + (find-files "TEMPLATES" "^Defaults\\.")) + (("/opt/schily") (assoc-ref %outputs "out"))) + #t)) + (replace 'build + (lambda _ + (zero? + (system* "make" "CONFIG_SHELL=sh" "CCOM=gcc" "RM=rm")))) + (replace 'install + (lambda _ + (zero? + (system* "make" + "RM=rm" "LN=ln" "SYMLINK=ln -s" + (string-append "INS_BASE=" (assoc-ref %outputs "out")) + (string-append "INS_RBASE=" (assoc-ref %outputs "out")) + "install" ))))) + #:tests? #f ; no tests + + ;; It's unclear if binaries can be distributed due to the mixing of CDDL + ;; and GPL code. + #:substitutable? #f)) + (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") + (description "cdrtools is a collection of command line utilities to create +CD's, DVD's or Blue Ray discs. The most important components are +@command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper +which uses libparanoia, and @command{mkisofs}, which can create various disc +images.") + (home-page "http://cdrtools.sourceforge.net/private/cdrecord.html") + + ;; mkisofs is GPL, the other programs are CDDL. + (license (list cddl1.0 gpl2)))) + (define-public dvdisaster (package (name "dvdisaster") diff --git a/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch new file mode 100644 index 000000000..9c817d419 --- /dev/null +++ b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch @@ -0,0 +1,514 @@ +Patch for version 3.01, taken from upstream at +https://sourceforge.net/projects/cdrtools/files/cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch + +--- cdrtools-3.01.orig/mkisofs/diag/isoinfo.c 2015-07-22 20:36:45.000000000 +0000 ++++ cdrtools-3.01/mkisofs/diag/isoinfo.c 2015-11-17 19:35:40.000000000 +0000 +@@ -1,8 +1,8 @@ +-/* @(#)isoinfo.c 1.95 15/07/22 joerg */ ++/* @(#)isoinfo.c 1.100 15/11/17 joerg */ + #include + #ifndef lint + static UConst char sccsid[] = +- "@(#)isoinfo.c 1.95 15/07/22 joerg"; ++ "@(#)isoinfo.c 1.100 15/11/17 joerg"; + #endif + /* + * File isodump.c - dump iso9660 directory information. +@@ -148,8 +148,10 @@ LOCAL char er_id[256]; + LOCAL int su_version = 0; + LOCAL int rr_version = 0; + LOCAL int aa_version = 0; ++LOCAL int cl_extent = 0; + LOCAL int ucs_level = 0; + LOCAL BOOL iso9660_inodes = FALSE; ++LOCAL uid_t myuid; + + #ifdef USE_FIND + LOCAL findn_t *find_node; /* syntaxtree from find_parse() */ +@@ -208,6 +210,9 @@ LOCAL void extract __PR((char *rootname + LOCAL void extract_file __PR((int f, + struct iso_directory_record * idr, + char *fname)); ++LOCAL void parse_cl_dir __PR((struct iso_directory_record *idr, ++ int extent)); ++LOCAL BOOL parse_de __PR((struct iso_directory_record *idr)); + LOCAL void parse_dir __PR((char * rootname, int extent, int len)); + LOCAL void usage __PR((int excode)); + EXPORT int main __PR((int argc, char *argv[])); +@@ -459,7 +464,6 @@ parse_rr(pnt, len, cont_flag) + int slen; + int xlen; + int ncount; +- int cl_extent; + int pl_extent; + int cont_extent, cont_offset, cont_size; + int flag1, flag2; +@@ -469,7 +473,7 @@ parse_rr(pnt, len, cont_flag) + + symlinkname[0] = 0; + +- cont_extent = cont_offset = cont_size = 0; ++ cl_extent = cont_extent = cont_offset = cont_size = 0; + + ncount = 0; + flag1 = -1; +@@ -714,6 +718,7 @@ struct todo + }; + + LOCAL struct todo *todo_idr = NULL; ++LOCAL struct todo **todo_pp = &todo_idr; + + LOCAL char *months[12] = {"Jan", "Feb", "Mar", "Apr", + "May", "Jun", "Jul", +@@ -962,8 +967,14 @@ static BOOL isfirst = TRUE; + close(f); + return; + setmode: +- fchmodat(AT_FDCWD, fname, fstat_buf.st_mode, AT_SYMLINK_NOFOLLOW); + fchownat(AT_FDCWD, fname, fstat_buf.st_uid, fstat_buf.st_gid, AT_SYMLINK_NOFOLLOW); ++ if (myuid != 0 && S_ISDIR(fstat_buf.st_mode)) { ++ /* ++ * Temporary hack until we have a dirstack like star. ++ */ ++ fstat_buf.st_mode |= S_IWUSR; ++ } ++ fchmodat(AT_FDCWD, fname, fstat_buf.st_mode, AT_SYMLINK_NOFOLLOW); + times[0].tv_sec = fstat_buf.st_atime; + times[0].tv_nsec = stat_ansecs(&fstat_buf); + times[1].tv_sec = fstat_buf.st_mtime; +@@ -1001,6 +1012,143 @@ extract_file(f, idr, fname) + } + } + ++ ++LOCAL void ++parse_cl_dir(idr, extent) ++ struct iso_directory_record *idr; ++ int extent; ++{ ++ char cl_name_buf[256*3]; ++ ++ strlcpy(cl_name_buf, name_buf, sizeof (cl_name_buf)); ++#ifdef USE_SCG ++ readsecs(extent - sector_offset, idr, 1); ++#else ++ lseek(fileno(infile), ((off_t)(extent - sector_offset)) << 11, SEEK_SET); ++ read(fileno(infile), idr, 2048); ++#endif ++ ++ if (parse_de(idr) && use_rock) ++ dump_rr(idr); ++ strlcpy(name_buf, cl_name_buf, sizeof (name_buf)); ++} ++ ++LOCAL BOOL ++parse_de(idr) ++ struct iso_directory_record *idr; ++{ ++ unsigned char uc; ++ ++ if (idr->length[0] == 0) ++ return (FALSE); ++ memset(&fstat_buf, 0, sizeof (fstat_buf)); ++ found_rr = 0; ++ name_buf[0] = xname[0] = 0; ++ fstat_buf.st_size = (off_t)(unsigned)isonum_733((unsigned char *)idr->size); ++ if (idr->flags[0] & 2) ++ fstat_buf.st_mode |= S_IFDIR; ++ else ++ fstat_buf.st_mode |= S_IFREG; ++ if (idr->name_len[0] == 1 && idr->name[0] == 0) ++ strcpy(name_buf, "."); ++ else if (idr->name_len[0] == 1 && idr->name[0] == 1) ++ strcpy(name_buf, ".."); ++ else { ++ switch (ucs_level) { ++ case 3: ++ case 2: ++ case 1: ++ /* ++ * Unicode name. Convert as best we can. ++ */ ++ { ++ int j; ++ name_buf[0] = '\0'; ++#ifdef USE_ICONV ++ if (use_iconv(unls)) { ++ int u; ++ char *to = name_buf; ++ ++ for (j = 0, u = 0; j < (int)idr->name_len[0] / 2; j++) { ++ char *ibuf = (char *)&idr->name[j*2]; ++ size_t isize = 2; /* UCS-2 character size */ ++ size_t osize = 4; ++ ++ if (iconv(unls->sic_uni2cd, (__IC_CONST char **)&ibuf, &isize, ++ (char **)&to, &osize) == -1) { ++ int err = geterrno(); ++ ++ if ((err == EINVAL || err == EILSEQ) && ++ osize == 4) { ++ *to = '_'; ++ u += 1; ++ to++; ++ } ++ } else { ++ u += 4 - osize; ++ to = &name_buf[u]; ++ } ++ } ++ j = u; ++ } else ++#endif ++ for (j = 0; j < (int)idr->name_len[0] / 2; j++) { ++ UInt16_t unichar; ++ ++ unichar = (idr->name[j*2] & 0xFF) * 256 + ++ (idr->name[j*2+1] & 0xFF); ++ ++ /* ++ * Get the backconverted char ++ */ ++ if (unls) ++ uc = sic_uni2c(unls, unichar); ++ else ++ uc = unichar > 255 ? '_' : unichar; ++ ++ name_buf[j] = uc ? uc : '_'; ++ } ++ name_buf[j] = '\0'; ++ } ++ break; ++ case 0: ++ /* ++ * Normal non-Unicode name. ++ */ ++ strncpy(name_buf, idr->name, idr->name_len[0]); ++ name_buf[idr->name_len[0]] = 0; ++ break; ++ default: ++ /* ++ * Don't know how to do these yet. Maybe they are the same ++ * as one of the above. ++ */ ++ exit(1); ++ } ++ } ++ memcpy(date_buf, idr->date, 9); ++ /* ++ * Always first set up time stamps and file modes from ++ * ISO-9660. This is used as a fallback in case that ++ * there is no related Rock Ridge based data. ++ */ ++ fstat_buf.st_atime = ++ fstat_buf.st_mtime = ++ fstat_buf.st_ctime = iso9660_time(date_buf, NULL, FALSE); ++ fstat_buf.st_mode |= S_IRUSR|S_IXUSR | ++ S_IRGRP|S_IXGRP | ++ S_IROTH|S_IXOTH; ++ fstat_buf.st_nlink = 1; ++ fstat_buf.st_ino = 0; ++ fstat_buf.st_uid = 0; ++ fstat_buf.st_gid = 0; ++ if (iso9660_inodes) { ++ fstat_buf.st_ino = (unsigned long) ++ isonum_733((unsigned char *)idr->extent); ++ } ++ return (TRUE); ++} ++ + LOCAL void + parse_dir(rootname, extent, len) + char *rootname; +@@ -1012,12 +1160,13 @@ parse_dir(rootname, extent, len) + struct iso_directory_record * idr; + struct iso_directory_record didr; + struct stat dstat; +- unsigned char uc; ++ unsigned char cl_buffer[2048]; + unsigned char flags = 0; + Llong size = 0; + int sextent = 0; + int rlen; + int blen; ++ int rr_flags = 0; + static char *n = 0; + static int nlen = 0; + +@@ -1039,115 +1188,23 @@ static int nlen = 0; + i = 0; + while (1 == 1) { + idr = (struct iso_directory_record *) &buffer[i]; +- if (idr->length[0] == 0) break; +- memset(&fstat_buf, 0, sizeof (fstat_buf)); +- found_rr = 0; +- name_buf[0] = xname[0] = 0; +- fstat_buf.st_size = (off_t)(unsigned)isonum_733((unsigned char *)idr->size); +- if (idr->flags[0] & 2) +- fstat_buf.st_mode |= S_IFDIR; +- else +- fstat_buf.st_mode |= S_IFREG; +- if (idr->name_len[0] == 1 && idr->name[0] == 0) +- strcpy(name_buf, "."); +- else if (idr->name_len[0] == 1 && idr->name[0] == 1) +- strcpy(name_buf, ".."); +- else { +- switch (ucs_level) { +- case 3: +- case 2: +- case 1: +- /* +- * Unicode name. Convert as best we can. +- */ +- { +- int j; +- +- name_buf[0] = '\0'; +-#ifdef USE_ICONV +- if (use_iconv(unls)) { +- int u; +- char *to = name_buf; +- +- for (j = 0, u = 0; j < (int)idr->name_len[0] / 2; j++) { +- char *ibuf = (char *)&idr->name[j*2]; +- size_t isize = 2; /* UCS-2 character size */ +- size_t osize = 4; +- +- if (iconv(unls->sic_uni2cd, (__IC_CONST char **)&ibuf, &isize, +- (char **)&to, &osize) == -1) { +- int err = geterrno(); +- +- if ((err == EINVAL || err == EILSEQ) && +- osize == 4) { +- *to = '_'; +- u += 1; +- to++; +- } +- } else { +- u += 4 - osize; +- to = &name_buf[u]; +- } +- } +- j = u; +- } else +-#endif +- for (j = 0; j < (int)idr->name_len[0] / 2; j++) { +- UInt16_t unichar; +- +- unichar = (idr->name[j*2] & 0xFF) * 256 + +- (idr->name[j*2+1] & 0xFF); +- +- /* +- * Get the backconverted char +- */ +- if (unls) +- uc = sic_uni2c(unls, unichar); +- else +- uc = unichar > 255 ? '_' : unichar; ++ if (idr->length[0] == 0) ++ break; ++ parse_de(idr); ++ if (use_rock) { ++ rr_flags = dump_rr(idr); + +- name_buf[j] = uc ? uc : '_'; +- } +- name_buf[j] = '\0'; +- } +- break; +- case 0: ++ if (rr_flags & RR_FLAG_CL) { + /* +- * Normal non-Unicode name. ++ * Need to reparse the child link ++ * but note that we parse "CL/." ++ * so we get no usable file name. + */ +- strncpy(name_buf, idr->name, idr->name_len[0]); +- name_buf[idr->name_len[0]] = 0; +- break; +- default: +- /* +- * Don't know how to do these yet. Maybe they are the same +- * as one of the above. +- */ +- exit(1); +- } ++ idr = (struct iso_directory_record *) cl_buffer; ++ parse_cl_dir(idr, cl_extent); ++ } else if (rr_flags & RR_FLAG_RE) ++ goto cont; /* skip rr_moved */ + } +- memcpy(date_buf, idr->date, 9); +- /* +- * Always first set up time stamps and file modes from +- * ISO-9660. This is used as a fallback in case that +- * there is no related Rock Ridge based data. +- */ +- fstat_buf.st_atime = +- fstat_buf.st_mtime = +- fstat_buf.st_ctime = iso9660_time(date_buf, NULL, FALSE); +- fstat_buf.st_mode |= S_IRUSR|S_IXUSR | +- S_IRGRP|S_IXGRP | +- S_IROTH|S_IXOTH; +- fstat_buf.st_nlink = 1; +- fstat_buf.st_ino = 0; +- fstat_buf.st_uid = 0; +- fstat_buf.st_gid = 0; +- if (iso9660_inodes) { +- fstat_buf.st_ino = (unsigned long) +- isonum_733((unsigned char *)idr->extent); +- } +- if (use_rock) +- dump_rr(idr); + if (Xtract && + (idr->flags[0] & 2) != 0 && + idr->name_len[0] == 1 && +@@ -1170,30 +1227,30 @@ static int nlen = 0; + n[rlen] = '\0'; + + if ((idr->flags[0] & 2) != 0 && +- (idr->name_len[0] != 1 || ++ ((rr_flags & RR_FLAG_CL) || ++ idr->name_len[0] != 1 || + (idr->name[0] != 0 && idr->name[0] != 1))) { + /* + * This is a plain directory (neither "xxx/." + * nor "xxx/.."). + * Add this directory to the todo list. + */ +- td = todo_idr; +- if (td != NULL) { +- while (td->next != NULL) +- td = td->next; +- td->next = (struct todo *) malloc(sizeof (*td)); +- td = td->next; +- } else { +- todo_idr = td = (struct todo *) malloc(sizeof (*td)); +- } ++ td = (struct todo *) malloc(sizeof (*td)); ++ if (td == NULL) ++ comerr(_("No memory.\n")); + td->next = NULL; + td->extent = isonum_733((unsigned char *)idr->extent); + td->length = isonum_733((unsigned char *)idr->size); + td->name = (char *) malloc(strlen(rootname) + + strlen(name_buf) + 2); ++ if (td->name == NULL) ++ comerr(_("No memory.\n")); + strcpy(td->name, rootname); + strcat(td->name, name_buf); + strcat(td->name, "/"); ++ ++ *todo_pp = td; ++ todo_pp = &td->next; + } else { + if (xtract && strcmp(xtract, n) == 0) { + extract_file(STDOUT_FILENO, idr, "stdout"); +@@ -1253,6 +1310,7 @@ static int nlen = 0; + if ((idr->flags[0] & ISO_MULTIEXTENT) == 0) + size = 0; + } ++ cont: + i += buffer[i]; + if (i > 2048 - offsetof(struct iso_directory_record, name[0])) break; + } +@@ -1381,12 +1439,13 @@ main(argc, argv) + usage(0); + if (prvers) { + printf(_("isoinfo %s (%s-%s-%s) Copyright (C) 1993-1999 %s (C) 1999-2015 %s\n"), +- VERSION, ++ "3.02a02", + HOST_CPU, HOST_VENDOR, HOST_OS, + _("Eric Youngdale"), + _("Joerg Schilling")); + exit(0); + } ++ myuid = getuid(); + #ifdef USE_FIND + if (do_find) { + finda_t fa; +--- cdrtools-3.01.orig/mkisofs/udf.c 2013-04-24 20:45:18.000000000 +0000 ++++ cdrtools-3.01/mkisofs/udf.c 2015-11-25 22:07:30.000000000 +0000 +@@ -1,15 +1,15 @@ +-/* @(#)udf.c 1.42 13/04/24 Copyright 2001-2013 J. Schilling */ ++/* @(#)udf.c 1.43 15/11/25 Copyright 2001-2015 J. Schilling */ + #include + #ifndef lint + static UConst char sccsid[] = +- "@(#)udf.c 1.42 13/04/24 Copyright 2001-2013 J. Schilling"; ++ "@(#)udf.c 1.43 15/11/25 Copyright 2001-2015 J. Schilling"; + #endif + /* + * udf.c - UDF support for mkisofs + * + * Written by Ben Rudiak-Gould (2001). + * +- * Copyright 2001-2013 J. Schilling. ++ * Copyright 2001-2015 J. Schilling. + */ + /* + * This program is free software; you can redistribute it and/or modify +@@ -98,7 +98,7 @@ static UConst char sccsid[] = + extern int use_sparcboot; + + extern struct directory *root; +-extern time_t begun; ++extern struct timeval tv_begun; + + static unsigned lba_main_seq; + static unsigned lba_main_seq_copy; +@@ -110,7 +110,7 @@ static unsigned lba_end_anchor_vol_desc; + static unsigned num_udf_files; + static unsigned num_udf_directories; + +-static unsigned volume_set_id[2]; ++static unsigned volume_set_id[2] = { 0, 0 }; + + #define UDF_MAIN_SEQ_LENGTH (16) + #define UDF_INTEG_SEQ_LENGTH (2) +@@ -723,7 +723,7 @@ set_primary_vol_desc(buf, lba) + /*pvd->volume_abstract;*/ + /*pvd->volume_copyright_notice;*/ + /*pvd->application_ident;*/ +- set_timestamp_from_time_t(&pvd->recording_date_and_time, begun); ++ set_timestamp_from_time_t(&pvd->recording_date_and_time, tv_begun.tv_sec); + set_impl_ident(&pvd->impl_ident); + set_tag(&pvd->desc_tag, UDF_TAGID_PRIMARY_VOLUME_DESC, lba, 512); + } +@@ -831,7 +831,7 @@ set_logical_vol_integrity_desc(buf, lba) + udf_logical_volume_integrity_desc *lvid = + (udf_logical_volume_integrity_desc *)buf; + +- set_timestamp_from_time_t(&lvid->recording_date, begun); ++ set_timestamp_from_time_t(&lvid->recording_date, tv_begun.tv_sec); + set32(&lvid->integrity_type, UDF_INTEGRITY_TYPE_CLOSE); + /*lvid->next_integrity_extent;*/ + set64(&lvid->logical_volume_contents_use.unique_id, +@@ -859,7 +859,7 @@ set_file_set_desc(buf, rba) + { + udf_file_set_desc *fsd = (udf_file_set_desc *)buf; + +- set_timestamp_from_time_t(&fsd->recording_date_and_time, begun); ++ set_timestamp_from_time_t(&fsd->recording_date_and_time, tv_begun.tv_sec); + set16(&fsd->interchange_level, 3); + set16(&fsd->maximum_interchange_level, 3); + set32(&fsd->character_set_list, 1); +@@ -1986,8 +1986,10 @@ udf_main_seq_write(out) + * volume_set_id needs to be set to a (64-bit) "unique" number. + * This will have to do for now. + */ +- volume_set_id[0] = begun; +- volume_set_id[1] = (unsigned)clock(); /* XXX Maybe non-portable */ ++ if (volume_set_id[0] == 0) { ++ volume_set_id[0] = tv_begun.tv_sec; ++ volume_set_id[1] = (unsigned)tv_begun.tv_usec; ++ } + + memset(buf, 0, sizeof (buf)); + set_primary_vol_desc(buf, last_extent_written++); +--- cdrtools-3.01.orig/mkisofs/mkisofs.c 2015-01-01 14:19:51.000000000 +0000 ++++ cdrtools-3.01/mkisofs/mkisofs.c +@@ -69 +69 @@ int path_ind; +-char version_string[] = VERSION; ++char version_string[] = "3.01-fix-20151126"; -- 2.12.2 ----Next_Part(Wed_Apr_26_18_05_34_2017_155)---- From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 3/7] gnu: brasero: Embed growisofs store item. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243701026 (code B ref 26669); Wed, 26 Apr 2017 16:33:01 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:32:50 +0000 Received: from localhost ([127.0.0.1]:41878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps0-0000GR-Ib for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:48 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Prz-0000G8-Dm for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:47 -0400 Received: by mail-wm0-f67.google.com with SMTP id z129so2544460wmb.1 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nrXDMlXk9NpzI8B9OC9keVYyqrgxnWxHrgyZCozvkPo=; b=k8BTVgAtK027ERCfntuxCWXm53O89x39NA5IE2I49VmgqY4mn44ZbII+ND3RR5xXZ7 kTih5Ken/T/q68SoQjwWX5wKzyXndWS7tcvjIzYXmRc5peDz6IN7r1OOe2PnL61j/Dlp t0wlcsYmcaibx+c+F3s1NGo31xc7jKqJznn+EWKm6fGoFobakc7ALIjtCdEd+c3K5kVF hJ0mwl/xFiS0lQp+xhRcva7ZLgVbVLJWYfWj3ZSUu7d2YW5+5+bo0+dgp7jRf7zr+u6Y 8dTnlFaC9tPA1aKVpiRQrOkiVQHVWIPZOhfJA/PKz9gcN1nIBJQNYPDCQvhbkfrmdkli AYfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nrXDMlXk9NpzI8B9OC9keVYyqrgxnWxHrgyZCozvkPo=; b=mz+YCePSwtnNUZbWoq+htXW5m6FrzuETg7JwpQOjxSnpNS+vnQW/e0Lc4RNwt+rsg6 T9k3pCjhfXVV9pnGgCiEJuEK5qjahM4fSG6snK8T5juiK/PPBipv+D+0NRDEYsSNx1IH 2ou/06eEfwpaHMSSfPGOotgueNTmFxbrhVEW7d39Rr/GO47QTtnhxHLxZplacwxIJCxH z52GZXsG9Bns/9SYIv3SZUAyk0TrLdhnUJ+qSuYlVG2QCekJm7dNcFYZxgh3gzGoobm8 ZU1bjD8c4UT0zrVg6c+RUu4h2TK9D0o6aS7LNDzjIFNVYU42XceudY5dnxG2vKcg3dkh a+ZQ== X-Gm-Message-State: AN3rC/600Om0JnuVgCklnt1zXyl6MDS/77XZ15P55yp2hkviX/DSlg5x nX/v4Dif7G+Fnspk X-Received: by 10.28.140.132 with SMTP id o126mr1555801wmd.67.1493224361533; Wed, 26 Apr 2017 09:32:41 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:40 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:34 +0200 Message-Id: <20170426163038.23515-2-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) From: Thomas Danckaert * gnu/packages/gnome.scm (brasero)[arguments]: Add phase 'embed-growisofs. --- gnu/packages/gnome.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc19318b9..ef56168bf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -150,7 +150,14 @@ "/share/gir-1.0") (string-append "--with-typelibdir=" (assoc-ref %outputs "out") - "/lib/girepository-1.0")))) + "/lib/girepository-1.0")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'embed-growisofs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "plugins/growisofs/burn-growisofs.c" + (("\"growisofs") (string-append "\"" (which "growisofs")))) + #t ))))) (propagated-inputs `(("hicolor-icon-theme" ,hicolor-icon-theme))) (native-inputs @@ -159,7 +166,8 @@ ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib) + `(("dvd+rw-tools" ,dvd+rw-tools) + ("glib" ,glib) ("gnome-doc-utils" ,gnome-doc-utils) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 2/7] gnu: Add dvd+rw-tools. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243731042 (code B ref 26669); Wed, 26 Apr 2017 16:33:02 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:32:53 +0000 Received: from localhost ([127.0.0.1]:41880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps1-0000GW-VV for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:53 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Prw-0000G3-TY for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:47 -0400 Received: by mail-wm0-f45.google.com with SMTP id m123so10027522wma.0 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V30C6uRjgjhWf+txdYCS7mGy8kyAbGftwKjYm31XcPk=; b=RKlsxEUlYCTlPRgtTBlPD8vm1dd2LBN1sfmMvSs8TdCyFjY4EoalPaXYQpGwSFlkiB bG2sN5XhpQTvhs47oBzXKi1y0fKYfCpFa2x6RbV0cUGxavEurPGIMmtwlICf4nA5JVaS jksIysju2DEpMKjbSiapU93hrpRaP5Ot/R3an4oUBSzy/vupHoH8InKUKp8emRrrG+VK Io7PFm1amFXc2aO4A6Vu2n00LPjDAQ9zn3IPHVoJtX5DwRLFTa/WuksTXv4eRghkxfMq LZHrX0SyE4xvvrfUXbKUhTBlccJXH1OKeeAuVYpF90JMT+wf3DGI0wQjwyPY5MTvOcIz 197w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V30C6uRjgjhWf+txdYCS7mGy8kyAbGftwKjYm31XcPk=; b=sigBkxVu8BDt8aI2kNQU44YWEw9aQ9ElR8bBpNWVvnjm+w6fEDsMdsxmCxONjUdnGd 59+Rk4SyRdTTLJY+iyjB/qF+JiVypuVHIXIzkMb5/b9Vnz6xVGDVWOLs2ejiV8dcBv3F MDTURZTmFGIlNregPeMQd2pv173uS7O4uICEJ+lRGjIOAu6v2XeuwcA2TZRiyEHKk3EO fpex02RbwI9KnjaTKF5Q2u/iwZt6yAEQ+aAPqaOzPT56h/l1rQtwoHbyuYbzC7WNJ+9O 0HUf4BmhlW/yi/3oMuLt7ivK1zMB1mdRQltBDGPpgeJi5mySv7GoIkrbSQ4WV7/I2b82 y1ew== X-Gm-Message-State: AN3rC/4JTmDX/cEG1WrdeNZT6EA6FFIPWXap0VIPutFf0Lpl22dZuc88 GmXdsJ5MWiaG8aYq X-Received: by 10.28.109.220 with SMTP id b89mr1563925wmi.21.1493224358831; Wed, 26 Apr 2017 09:32:38 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:37 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:33 +0200 Message-Id: <20170426163038.23515-1-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) From: Thomas Danckaert * gnu/packages/cdrom.scm (dvd+rw-tools): New variable. * gnu/packages/patches/dvd+rw-tools-add-include.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 44 ++++++++++++++++++++++ .../patches/dvd+rw-tools-add-include.patch | 14 +++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/packages/patches/dvd+rw-tools-add-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index a2c56e03d..22431ddc0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -544,6 +544,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ %D%/packages/patches/einstein-build.patch \ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 69af39655..5c1ac4a50 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 John Darrington +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages glib) #:use-module (gnu packages man) + #:use-module (gnu packages m4) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages elf) @@ -258,6 +260,48 @@ images.") ;; mkisofs is GPL, the other programs are CDDL. (license (list cddl1.0 gpl2)))) +(define-public dvd+rw-tools + (package + (name "dvd+rw-tools") + (version "7.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-" + version ".tar.gz")) + (sha256 + (base32 + "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq")) + (patches (search-patches "dvd+rw-tools-add-include.patch")))) + (build-system gnu-build-system) + (inputs + `(("cdrtools" ,cdrtools))) + (native-inputs + `(("m4" ,m4))) + (arguments + `(#:tests? #f ; No tests. + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ (setenv "prefix" (assoc-ref %outputs "out")) #t)) + (add-before 'build 'embed-mkisofs + (lambda* (#:key inputs #:allow-other-keys) + ;; We use sed --in-place because substitute* cannot handle the + ;; character encoding used by growisofs.c. + (system* "sed" "-i" "-e" + (string-append + "s,\"mkisofs\"," + "\"" (assoc-ref inputs "cdrtools") "/bin/mkisofs\",") + "growisofs.c") + #t))))) + (home-page "http://fy.chalmers.se/~appro/linux/DVD+RW/") + (synopsis "DVD and Blu-ray Disc burning tools") + (description "dvd+rw-tools, mostly known for its command +@command{growisofs}, is a collection of DVD and Blu-ray Disc burning tools. +It requires another program, such as @command{mkisofs}, @command{genisoimage}, +or @command{xorrisofs} to create ISO 9660 images.") + (license gpl2))) + (define-public dvdisaster (package (name "dvdisaster") diff --git a/gnu/packages/patches/dvd+rw-tools-add-include.patch b/gnu/packages/patches/dvd+rw-tools-add-include.patch new file mode 100644 index 000000000..800f8f30b --- /dev/null +++ b/gnu/packages/patches/dvd+rw-tools-add-include.patch @@ -0,0 +1,14 @@ +Without , INT_MAX is not defined. + +diff --git a/transport.hxx b/transport.hxx +index 35a57a7..838add6 100644 +--- a/transport.hxx ++++ b/transport.hxx +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 4/7] gnu: Add dvdauthor. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243741049 (code B ref 26669); Wed, 26 Apr 2017 16:33:02 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:32:54 +0000 Received: from localhost ([127.0.0.1]:41883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps5-0000Gp-NV for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:53 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps4-0000GF-4h for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:52 -0400 Received: by mail-wm0-f50.google.com with SMTP id m123so10030769wma.0 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3VeqkAbes4vSRy5vOyT6X1ouMRwN9JUAswIaw7jqkco=; b=VyQZVpWCbxWV2jb+T0d4ooGmJtFWM86D3KGZErbfyFeVhszRhWpdlO19+X/tu71+WT KeOp1EAsLdFuwIuR1IGw/Jn4ziidoea7iMyzn2rBKFSfuuilm9+B2S5SRIHx0ixDPLVs Rh8v62o/J7v5hwIqF8PPxqNPQ2P/qslAu7ImFUuGm0uM9+a1iyQz8m+G9bZRLnZeQrqW whM/XLAmQGqx7WgxumKYCr+CRLiMFAgXLo0TqSclykX1PjNkDNYgCPpYFELn+irrlB4x 1btqSj5rtZaaRvUtqL8ePziS6coU1fd9S355WvPHiTG/dfv/p+cqkuklXjUZ8OfqF9JI kyhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3VeqkAbes4vSRy5vOyT6X1ouMRwN9JUAswIaw7jqkco=; b=txDx0NxWDGa7BRUr5bHxoTE1TgpG0/8U0ywRYGb4ezSuB2Mstval7UMvRfjKBWlHtq Y0hgRSeo6QUfGx0vWw2bmZU62rYqSmLYrSbVm1rWth8LctN26azSKrIzZvvW2Ozo8dBY eh4NDN5h68JSP1NHe/UAHsU38bZmIUtf4R4eP61fZdoLRCEwoElSxyDO/vcnOLpA+13Q v789/5kp6zDFcA7zi4BX4gKnkbCJeLsqDPID6tK5L2zQsBkwDUsQbPqn6NQa8eg/kYRq HswXCc27kMNzB09JHtnMkew5IWKZ+Z8PiE85N9roEqcS8YSoa4WY4F2A4DsXXt5QHHro 29pg== X-Gm-Message-State: AN3rC/77q+qfuK6wWPVDnasIe4EfJiE1xX3/B7lr1O04Ib50jpHjleqJ 8dEXwR/x3dGsLA== X-Received: by 10.28.191.129 with SMTP id o1mr6173725wmi.102.1493224366017; Wed, 26 Apr 2017 09:32:46 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:45 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:35 +0200 Message-Id: <20170426163038.23515-3-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) From: Thomas Danckaert * gnu/packages/video.scm (dvdauthor): New variable. --- gnu/packages/video.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cc07cc712..b04956a00 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 Chris Marusich +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) @@ -1193,6 +1195,33 @@ authentication and descrambling (if an external libdvdcss library is installed).") (license license:gpl2+))) +(define-public dvdauthor + (package + (name "dvdauthor") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dvdauthor/dvdauthor-" + version ".tar.gz")) + (sha256 + (base32 + "1drfc47hikfzc9d7hjk34rw10iqw01d2vwmn91pv73ppx4nsj81h")))) + (build-system gnu-build-system) + (inputs + `(("libdvdread" ,libdvdread) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("libxml2" ,libxml2) + ("freetype" ,freetype))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "Generates a DVD-Video movie from a MPEG-2 stream") + (description "@command{dvdauthor} will generate a DVD-Video movie from a +MPEG-2 stream containing VOB packets.") + (home-page "http://dvdauthor.sourceforge.net") + (license license:gpl3+))) + (define-public libdvdnav (package (name "libdvdnav") -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 5/7] gnu: Add wxwidgets-3.1. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243761064 (code B ref 26669); Wed, 26 Apr 2017 16:33:03 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:32:56 +0000 Received: from localhost ([127.0.0.1]:41886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps7-0000H5-Vr for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:56 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps5-0000GS-UQ for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:54 -0400 Received: by mail-wm0-f49.google.com with SMTP id u65so55815501wmu.1 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L4F/mrNL6rDk/O9oD0zUhVCa/S6yjj0VUMPghtzcdL8=; b=NtvukUeuVamIVVkiK0BHWrVNWg9m2uZ2N6RqpA+u+OcNPG27wO61lAwDlAXbyVDUAT Y9KwaMqKX0I0Xt/vy2NQctwCfXGGDg4eoSXtXCLjxZcOhW7w455tOkzV/vZcj2r++Wf9 ZFP0q0y74exkQb0kBEqY1eEDyV67Pq75C2w0YNbKJfv1qOdD/bJsPxTkvKYH0A5zRep8 3x8cKEbF07Q4QCDO6SomaEKJhfX4w6SYlmML7nQpztXuIjlzz7uJELgvoFnHFc02FPXO Mz0XwDvPKEV+SRnikpr5xrRKccUE97HF3SEE/M7Cj07yaBkUTWkIC3em3D4COy9cwz1W /fUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4F/mrNL6rDk/O9oD0zUhVCa/S6yjj0VUMPghtzcdL8=; b=kOuwRoIxm3wT7vgEDzhZ6duNXJ0Tesx8qqvK93gP8irHkByIee0LUvDj1fyz0j0ahu avX1feNokH7aCf0VXfCoxdXJRyrEw3kX+JUJND+JzzM0ch8hwQsyfRjut6jk2qBX0BZP Zg23k4FRB+O4zyk1PD35kvj4ZBeVWJ+AZ1COemw8jsrnv6cEdSQjLAhf5bKkYBAbswAi 7e7zTYGv/IgG/0V0LpYmgO5lUwT6GCHYgP773X3RV+fhnS4XU08h9Q8UT4NQnLzxxl0B BujQgO84nysv48fJRejyfDjLxMVqh9iH2eTpOHGx5qiMdNMEsjQdsJRfhEwiQqOc3OWY 2S1w== X-Gm-Message-State: AN3rC/59/2J3HpxIzPvCtAZyq0/aPVTaI4cxcIiL5+Ly6qDDwAgqnuuI FUhu0a9CPywacLT5 X-Received: by 10.28.225.10 with SMTP id y10mr6163539wmg.34.1493224368032; Wed, 26 Apr 2017 09:32:48 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:47 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:36 +0200 Message-Id: <20170426163038.23515-4-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) From: Thomas Danckaert * gnu/packages/wxwidgets.scm (wxwidgets-3.1): New variable. --- gnu/packages/wxwidgets.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 077195cca..bd6ffec0f 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2017 Thomas Danckaert ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system python) #:use-module (guix build utils) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages databases) @@ -97,6 +99,27 @@ and many other languages.") (package-inputs wxwidgets)))) (name "wxwidgets-gtk2"))) +;; Development version of wxWidgets, required to build against gstreamer-1.x. +;; This can be removed when wxWidgets is updated to the next stable version. +(define-public wxwidgets-3.1 + (package (inherit wxwidgets) + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/wxWidgets/wxWidgets/archive/v" + version ".tar.gz")) + (file-name (string-append "wxwidgets-" version ".tar.gz")) + (sha256 + (base32 "1yan5ysjwh6a7xw82sfjd1xn0nsy1dn2s0cx9ac7cw19191blc3y")))) + (inputs `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ,@(package-inputs wxwidgets))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + `(cons "--enable-mediactrl" ,flags)))))) + (define-public python2-wxpython (package (name "python2-wxpython") -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 6/7] gnu: Add wxsvg. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243781078 (code B ref 26669); Wed, 26 Apr 2017 16:33:03 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:32:58 +0000 Received: from localhost ([127.0.0.1]:41889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PsA-0000HK-AA for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:58 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3Ps7-0000Gc-VL for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:32:56 -0400 Received: by mail-wm0-f65.google.com with SMTP id u65so2506836wmu.3 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hLn5UdS5tkuhi5UXb4BvkOCobtwDyo6+HX4LUupMXM8=; b=nbzs0d6FClyyRKrPdLNM7FUHNBR9443hJTaIc4o2r6Akor4swPkwDXwp1rlXc7fu/P LMiFauCYugFzk9xx2NU8bErYD8b3iqCvSiNtpr205X4OEkPiQMyZEar8rA1oH6gY7L+P JevLoHQtaAhH1SSS4dH5nhJ0BWl40f6s/jTtZj7Kq/qwBEy2BK63ifumHXCf4fCOl0J1 o2M0pI9+kr4iysgxSlT8O+zXzfAoxeuVnK/dANFbyc7hyDXW5CejLzEyShGCGzHqfPIW gVO/7w8hAuVlxk9PJoYZkbdlP8DvsgKEWd8RofhoIDByHh4k8iYjnzUzWezIEa2E90WE +bVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hLn5UdS5tkuhi5UXb4BvkOCobtwDyo6+HX4LUupMXM8=; b=qlbokGdqCfGcCaMOA7Jc05rADJVvcJQTzgeK0weT/EXT9xyrLP9koqAJm5ADoKSphq rP9+JVksqFMpl5Qse3nM/ePi44yE+El3vVHvs5y+n0oabEchfFFaTuNRhLlMBWbKVjrl n/elO9fttyhnQNlvFUMWbwDCG5RU1Q9DAKBIWiY8gU6LVMzJOy3xCx21xxjuxRNErjCt 3wivQxyjxmj7HjL021KEPwB0iE3870OGW76FGTywMXVfaXOPe2/lmqDgjr7KNLYDuDZX BB1gCdDAVRbiAeAkwUxj87+OQPFwho0NfynGNf8n9RvdOJm8RY6g4Vaxic6LGK3hNE1M CtEg== X-Gm-Message-State: AN3rC/4B5cSdcOsSglAg2ab7OuGO4F4RvrZFXnQJHV4Xl+Dbp1ZmSZ+d mgCrvf4Gv8hdbGW6 X-Received: by 10.28.230.84 with SMTP id d81mr6194747wmh.58.1493224370030; Wed, 26 Apr 2017 09:32:50 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:49 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:37 +0200 Message-Id: <20170426163038.23515-5-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) From: Thomas Danckaert * gnu/packages/wxwidgets.scm (wxsvg): New variable. --- gnu/packages/wxwidgets.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index bd6ffec0f..b603fe588 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -36,6 +36,8 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages photo) + #:use-module (gnu packages video) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sdl) @@ -190,3 +192,30 @@ and many other languages.") (description "@code{wxpython} provides Python 2 bindings for wxWidgets.") (home-page "http://wxpython.org/") (license (package-license wxwidgets)))) + +(define-public wxsvg + (package + (name "wxsvg") + (version "1.5.11") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/wxsvg/wxsvg/" + version "/wxsvg-" version ".tar.bz2")) + (sha256 + (base32 + "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x")))) + (build-system glib-or-gtk-build-system) + (inputs + `(("wxwidgets" ,wxwidgets-3.1) + ("cairo" ,cairo) + ("pango" ,pango) + ("libexif" ,libexif) + ("ffmpeg" ,ffmpeg))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "C++ library to create, manipulate and render SVG files") + (description "wxSVG is a C++ library to create, manipulate and render +@dfn{Scalable Vector Graphics} (SVG) files with the wxWidgets toolkit.") + (home-page "http://wxsvg.sourceforge.net") + (license (list l:lgpl2.0+ (l:fsf-free "file://COPYING"))))) -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 7/7] gnu: Add dvdstyler. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 16:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26669@debbugs.gnu.org Cc: Thomas Danckaert Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932243831119 (code B ref 26669); Wed, 26 Apr 2017 16:33:04 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 16:33:03 +0000 Received: from localhost ([127.0.0.1]:41894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PsE-0000Hv-I6 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:33:02 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PsD-0000H6-Bl for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 12:33:01 -0400 Received: by mail-wr0-f195.google.com with SMTP id v42so733159wrc.3 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 09:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bgCOW82timBYl859yRg1T5ECTl8rKLAfsDtabTTtGPA=; b=IlwZ0bOqDjOVtQaBCMVgTLNDoRl6D4dw2IefV1qkQ7URaGVWRERj2mUQuna7876EmH akq7qCRXFImyayB+lOrvQeGa2viLcPRKJq1Eza9yGDlrv28kXm5ZhMY+RFOipNIHzU5u VG0CG7qm6oY1AWJ4JX4Da53tYzNxT5fUVYlHY0SNw4dttdsfTlP6OmI2hIV0zc28y7Qe vCbsSTvRf7dKA1tT/yNCWYS4uXlDx4DtMVl8sMKIrNZcTe66WBnnQVzA/BG0oShhsKBF F/uEGFIfbR1vUtL05oq42qs5jSpaM4VQxullVAt2dzoRbh0jXwHn25ZnrdNF1qGBc4GP bV6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bgCOW82timBYl859yRg1T5ECTl8rKLAfsDtabTTtGPA=; b=GdRenNaCBxsr/riQz1wX7r1+2ImLXm3bRI4c3ad060tro4sHOkxd7kOWxs1F4XIy3T AYWHwI7n+VXEcPqIxlYnlvh5EkmUyTIwI+jYgS9geRYPvM4bRD8IASjiXyVWn8zVhvky Jx+I8u+oZFaYg8tU2pz2zES0SV9VkoxJOG4pIVqejsLY7CyUiGk+dqrFbgqVNGiXudFY UBcOEmx9jrIE6x7fBaAvB/Rjt+uQClYRwgE4qU/RDVDKJ3DFKbtTAoMtXHz9cre/DVfI Ahxke0iEt1qZ6JLYoBwXAWERgcvOJgDrx6Gbc/nag+H8LzQQneIi9oRZXc9yrkizVrXS 4OBg== X-Gm-Message-State: AN3rC/6G8XLWTm0q/q41CyaNfgnC0GhwT+eO5MTRdJUtaUo4vVwdXubE VGEeaX1ACEv37DGx X-Received: by 10.223.162.147 with SMTP id s19mr463640wra.142.1493224375383; Wed, 26 Apr 2017 09:32:55 -0700 (PDT) Received: from smtp1.oma.be (254.202-247-81.adsl-dyn.isp.belgacom.be. [81.247.202.254]) by smtp.gmail.com with ESMTPSA id v52sm793153wrc.53.2017.04.26.09.32.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Apr 2017 09:32:54 -0700 (PDT) From: Thomas Danckaert Date: Wed, 26 Apr 2017 18:30:38 +0200 Message-Id: <20170426163038.23515-6-thomas.danckaert@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) From: Thomas Danckaert * gnu/packages/cdrom.scm (dvdstyler): New variable. --- gnu/packages/cdrom.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 5c1ac4a50..eb8a82f30 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -37,8 +37,12 @@ #:use-module (gnu packages audio) #:use-module (gnu packages bison) #:use-module (gnu packages compression) + #:use-module (gnu packages zip) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages docbook) + #:use-module (gnu packages xml) #:use-module (gnu packages gtk) #:use-module (gnu packages glib) #:use-module (gnu packages man) @@ -46,11 +50,16 @@ #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages elf) + #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages base) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages image) + #:use-module (gnu packages photo) + #:use-module (gnu packages video) #:use-module (gnu packages wget) #:use-module (gnu packages xiph)) @@ -343,6 +352,69 @@ depend on the file system of the medium. The maximum error correction capacity is user-selectable.") (license gpl2+))) +(define-public dvdstyler + (package + (name "dvdstyler") + (version "3.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dvdstyler/dvdstyler/" + version "/DVDStyler-" version ".tar.bz2")) + (sha256 + (base32 + "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "XMLTO=" + (assoc-ref %build-inputs "xmlto") + "/bin/xmlto" + " --searchpath " + (assoc-ref %build-inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.1/htmlhelp:" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook")) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") "/bin/dvdstyler") + `("PATH" ":" prefix + (,(string-join + (map (lambda (in) (string-append (assoc-ref inputs in) "/bin")) + '("cdrtools" "dvdauthor" "dvd+rw-tools" "ffmpeg")) + ":"))))))) + #:tests? #f)) ; No tests. + (inputs ; TODO package bundled wxvillalib + `(("wxwidgets" ,wxwidgets-3.1) + ("wssvg" ,wxsvg) + ("dbus" ,dbus) + ("cdrtools" ,cdrtools) + ("dvd+rw-tools" ,dvd+rw-tools) + ("dvdauthor" ,dvdauthor) + ("eudev" ,eudev) + ("fontconfig" ,fontconfig) + ("libexif" ,libexif) + ("libjpeg" ,libjpeg) + ("ffmpeg" ,ffmpeg))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("flex" ,flex) + ("python" ,python-2) + ("xmlto" ,xmlto) + ("gettext" ,gnu-gettext) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("zip" ,zip))) + (synopsis "DVD authoring application") + (description "DVDStyler is a DVD authoring application which allows users +to burn video files in many formats to DVD discs, complete with individually +designed menus. It can be used to create professional-looking DVD's with +custom buttons, backgrounds and animations, from within a user-friendly +graphical interface.") + (home-page "https://www.dvdstyler.org") + (license gpl2))) + (define-public libcue (package (name "libcue") -- 2.12.2 From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 1/7] gnu: Add cdrtools. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 17:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932260023681 (code B ref 26669); Wed, 26 Apr 2017 17:01:01 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 17:00:02 +0000 Received: from localhost ([127.0.0.1]:41920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3QIL-0000wr-J1 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 13:00:02 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3QIK-0000we-7E for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 13:00:00 -0400 Received: by mail-wm0-f68.google.com with SMTP id u65so2712701wmu.3 for <26669@debbugs.gnu.org>; Wed, 26 Apr 2017 10:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=k62aYMja8N+NQDziZHRTpe5wWgygYhCoOlx8ebgaJS8=; b=DLMAaElpzBjZEl3zRrV8iOWLYPWDkos1hZKW2zvwdnu9vo6SkfewzcngA9vfcOEvb1 eEV+GFMjBCUs3fRFlQWINeujdiX/sxM/saGRG76bS0GyPrMZ035YDEYfnH16KjtH4Ppi KeJXvDBH0PJoGfz+s0HQ9GEViBk+5odVpAHD7nsX1Bg8UBCQlPQiJHD/vVLHsnytMEwc nHm1lYqhD4XT4ZcGq3vshchp22K/NIKdXd+Pm7Zh0NuoOJSnVH21dcv9pgQESvV2HUgn aMIADVhMrh/nGTEnI2u4Zz/D8UV3sbj4dhDER6E0+SjL7Yd5YIlGWYyG20CxfMxNt7f4 OR5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=k62aYMja8N+NQDziZHRTpe5wWgygYhCoOlx8ebgaJS8=; b=KToWDEsS8emAhGgLCeJr5TqgQ13fscQE7BD0D1f/EN3ZuWVbTd4V6lBdG7dtbr+ctv OGufzZqGAVBzWw90Unj73XB8KsxeUOpwupyowg6az8DUPaUY9CC1GSJimlGKNqSdHxpb ME58G488Z49ACiDteFLIRmXN+aGk+6KsWuREeI6muGnQaUELYUWP3cVWlbWgbYeeqqKS 3ylHAM2D8uW7kXZXpSXmjB6d+kCNV9SzRFoG08/6IxSvoIqi9+S2OVZb93nOjqE8DLSt YfDEfl+9r8KGxYDbi9D4dcC6/GMCaZZXbjfPC/HO+yB5+BEhXJciza+eK+Z1AMCrduRE Vniw== X-Gm-Message-State: AN3rC/5w8Rvl85z/yrjo2mkI3FxKVuqFPTUCyiKzruWBvoq3HlB5OJ1s +30z/mWS/ZcSBw== X-Received: by 10.28.147.198 with SMTP id v189mr1616003wmd.52.1493225994282; Wed, 26 Apr 2017 09:59:54 -0700 (PDT) Received: from cervin (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id w186sm168178wme.26.2017.04.26.09.59.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Apr 2017 09:59:53 -0700 (PDT) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Mathieu Othacehe In-reply-to: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> Date: Wed, 26 Apr 2017 18:59:53 +0200 Message-ID: <874lxbdrzq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) Hi Thomas, Thanks for the patches ! Without going into details, it seems to me that you have indentation issues in this serie. > +(define-public cdrtools > + (package >From here indentation is broken. > + (name "cdrtools") > + (version "3.01") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "mirror://sourceforge/cdrtools/cdrtools-" version ".tar.bz2")) > + (sha256 > + (base32 > + "03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d")) > + (patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch")))) > + (build-system gnu-build-system) > + (inputs > + `(("linux-headers" ,linux-libre-headers))) > + (native-inputs > + `(("coreutils" ,coreutils))) > + (arguments > + `(#:phases (modify-phases %standard-phases > + (delete 'configure) > + (add-before 'build 'set-linux-headers > + (lambda _ > + (substitute* "autoconf/configure" > + (("/usr/src/linux") > + (assoc-ref %build-inputs "linux-headers"))) > + #t)) > + (add-before 'build 'substitute-dirs > + (lambda _ > + (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") > + (find-files "DEFAULTS_ENG" "^Defaults\\.") Please keep all lines in *.scm files to 80 columns or less. > + (find-files "TEMPLATES" "^Defaults\\.")) > + (("/opt/schily") (assoc-ref %outputs "out"))) > + #t)) Thanks, Mathieu From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 2/7] gnu: Add dvd+rw-tools. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Apr 2017 17:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14932269535185 (code B ref 26669); Wed, 26 Apr 2017 17:16:02 +0000 Received: (at 26669) by debbugs.gnu.org; 26 Apr 2017 17:15:53 +0000 Received: from localhost ([127.0.0.1]:41928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3QXh-0001LZ-N1 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 13:15:53 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:45822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3QXg-0001LQ-0r for 26669@debbugs.gnu.org; Wed, 26 Apr 2017 13:15:52 -0400 Received: from localhost (unknown [193.170.94.190]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 83FE01CA0265; Wed, 26 Apr 2017 19:15:50 +0200 (CEST) Date: Wed, 26 Apr 2017 19:15:49 +0200 From: Danny Milosavljevic Message-ID: <20170426191549.6774bd32@scratchpost.org> In-Reply-To: <20170426163038.23515-1-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Wed, 26 Apr 2017 18:30:33 +0200 Thomas Danckaert wrote: > + (lambda* (#:key inputs #:allow-other-keys) > + ;; We use sed --in-place because substitute* cannot handle the > + ;; character encoding used by growisofs.c. > + (system* "sed" "-i" "-e" > + (string-append > + "s,\"mkisofs\"," > + "\"" (assoc-ref inputs "cdrtools") "/bin/mkisofs\",") > + "growisofs.c") > + #t))))) Maybe rather use (zero? (system* ...)) instead of (system* ...) #t Otherwise LGTM! From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 4/7] gnu: Add dvdauthor. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2017 18:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14933190407051 (code B ref 26669); Thu, 27 Apr 2017 18:51:02 +0000 Received: (at 26669) by debbugs.gnu.org; 27 Apr 2017 18:50:40 +0000 Received: from localhost ([127.0.0.1]:43187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3oUx-0001pf-Rb for submit@debbugs.gnu.org; Thu, 27 Apr 2017 14:50:39 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:52478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3oUw-0001pX-ED for 26669@debbugs.gnu.org; Thu, 27 Apr 2017 14:50:38 -0400 Received: from localhost (77.118.156.104.wireless.dyn.drei.com [77.118.156.104]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 61F071CA02C5; Thu, 27 Apr 2017 20:50:33 +0200 (CEST) Date: Thu, 27 Apr 2017 20:50:27 +0200 From: Danny Milosavljevic Message-ID: <20170427205027.5a6fc6c5@scratchpost.org> In-Reply-To: <20170426163038.23515-3-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> <20170426163038.23515-3-thomas.danckaert@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) LGTM! From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 3/7] gnu: brasero: Embed growisofs store item. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2017 05:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.14933588713381 (code B ref 26669); Fri, 28 Apr 2017 05:55:01 +0000 Received: (at 26669) by debbugs.gnu.org; 28 Apr 2017 05:54:31 +0000 Received: from localhost ([127.0.0.1]:43515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3yrP-0000sT-HC for submit@debbugs.gnu.org; Fri, 28 Apr 2017 01:54:31 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:36750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3yrN-0000sK-Fb for 26669@debbugs.gnu.org; Fri, 28 Apr 2017 01:54:30 -0400 Received: from localhost (77.118.195.144.wireless.dyn.drei.com [77.118.195.144]) by dd1012.kasserver.com (Postfix) with ESMTPSA id E68A81CA00D3; Fri, 28 Apr 2017 07:54:25 +0200 (CEST) Date: Fri, 28 Apr 2017 07:54:20 +0200 From: Danny Milosavljevic Message-ID: <20170428075420.0a4c927b@scratchpost.org> In-Reply-To: <20170426163038.23515-2-thomas.danckaert@gmail.com> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> <20170426163038.23515-2-thomas.danckaert@gmail.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Please also mention the added input "dvd+rw-tools". From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 1/7] gnu: Add cdrtools. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2017 13:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149381637524977 (code B ref 26669); Wed, 03 May 2017 13:00:02 +0000 Received: (at 26669) by debbugs.gnu.org; 3 May 2017 12:59:35 +0000 Received: from localhost ([127.0.0.1]:52059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5tsT-0006Um-LY for submit@debbugs.gnu.org; Wed, 03 May 2017 08:59:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5tsQ-0006UY-8y for 26669@debbugs.gnu.org; Wed, 03 May 2017 08:59:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5tsH-0001aj-6C for 26669@debbugs.gnu.org; Wed, 03 May 2017 08:59:25 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5tsH-0001af-2c; Wed, 03 May 2017 08:59:21 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:55560 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d5tsF-0005fd-Ga; Wed, 03 May 2017 08:59:20 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> Date: Wed, 03 May 2017 14:59:12 +0200 In-Reply-To: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> (Thomas Danckaert's message of "Wed, 26 Apr 2017 18:05:34 +0200 (CEST)") Message-ID: <8760hit7tr.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi! Thomas Danckaert skribis: > There is/has been some controversy about the license of cdrtools, with > claims it cannot be distributed in binary form because it mixes CDDL > and GPL code. As far as I understand, mkisofs is GPL, while the other > executables are CDDL, and I do not really see the problem. If others > disagree, or we want to be extra careful, I suppose we can disable > substitutes for cdrtools, so we only distribute it as source? We could do that if needed. From your description it=E2=80=99s not clear t= o me either what the problem is though. It=E2=80=99s a case where I would recom= mend checking (apparently there=E2=80=99s nothing about it) or Debian. :-) > cdrtools also bundles a forked LGPL-licensed copy of cdparanoia. This > is perhaps unfortunate, but I don't think it's easy to unbundle it > (cdrtools doesn't build agains our current cdparanoia). Just leave an XXX explaining this. A couple of comments to complement what Mathieu wrote: >>>From 96fb5484e4a4d741da685ce63f578feb69bc016f Mon Sep 17 00:00:00 2001 > From: Thomas Danckaert > Date: Fri, 21 Apr 2017 15:54:20 +0200 > Subject: [PATCH 1/7] gnu: Add cdrtools. > > * gnu/packages/cdrom.scm (cdrtools): New variable. > * gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. [...] > + (inputs > + `(("linux-headers" ,linux-libre-headers))) > + (native-inputs > + `(("coreutils" ,coreutils))) These are implicit inputs already so you can remove them. > +++ b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch > @@ -0,0 +1,514 @@ > +Patch for version 3.01, taken from upstream at > +https://sourceforge.net/projects/cdrtools/files/cdrtools-3.01-fix-201511= 26-mkisofs-isoinfo.patch It would be nice to add a few words about what it does, like =E2=80=9CFix compilation with recent glibc=E2=80=9D or something. Ludo=E2=80=99. From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 5/7] gnu: Add wxwidgets-3.1. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2017 13:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149381645625182 (code B ref 26669); Wed, 03 May 2017 13:01:02 +0000 Received: (at 26669) by debbugs.gnu.org; 3 May 2017 13:00:56 +0000 Received: from localhost ([127.0.0.1]:52063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5tto-0006Y6-HZ for submit@debbugs.gnu.org; Wed, 03 May 2017 09:00:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5ttm-0006Xs-CU for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:00:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5ttg-0002PM-OI for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:00:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5tta-0002KQ-Mn; Wed, 03 May 2017 09:00:42 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:55566 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d5ttY-00007Z-OD; Wed, 03 May 2017 09:00:42 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> <20170426163038.23515-4-thomas.danckaert@gmail.com> Date: Wed, 03 May 2017 15:00:33 +0200 In-Reply-To: <20170426163038.23515-4-thomas.danckaert@gmail.com> (Thomas Danckaert's message of "Wed, 26 Apr 2017 18:30:36 +0200") Message-ID: <871ss6t7ri.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Thomas Danckaert skribis: > From: Thomas Danckaert > > * gnu/packages/wxwidgets.scm (wxwidgets-3.1): New variable. LGTM, thanks! From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 6/7] gnu: Add wxsvg. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2017 13:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149381656025362 (code B ref 26669); Wed, 03 May 2017 13:03:02 +0000 Received: (at 26669) by debbugs.gnu.org; 3 May 2017 13:02:40 +0000 Received: from localhost ([127.0.0.1]:52071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5tvU-0006aw-9e for submit@debbugs.gnu.org; Wed, 03 May 2017 09:02:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5tvS-0006aa-5n for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5tvH-0003A4-D0 for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:02:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46783) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5tvA-00037P-AX; Wed, 03 May 2017 09:02:20 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:55572 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d5tv9-0001tG-M1; Wed, 03 May 2017 09:02:20 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> <20170426163038.23515-5-thomas.danckaert@gmail.com> Date: Wed, 03 May 2017 15:02:17 +0200 In-Reply-To: <20170426163038.23515-5-thomas.danckaert@gmail.com> (Thomas Danckaert's message of "Wed, 26 Apr 2017 18:30:37 +0200") Message-ID: <87wp9yrt46.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Thomas Danckaert skribis: > From: Thomas Danckaert > > * gnu/packages/wxwidgets.scm (wxsvg): New variable. [...] > + (home-page "http://wxsvg.sourceforge.net") > + (license (list l:lgpl2.0+ (l:fsf-free "file://COPYING"))))) Please add a comment explaining what is meant here (the kind of license that appears in COPYING, whether we=E2=80=99re talking of a combination of licenses or a choice users can make, etc.) OK with this change, thanks! Ludo=E2=80=99. From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 7/7] gnu: Add dvdstyler. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2017 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Thomas Danckaert , 26669@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149381671325596 (code B ref 26669); Wed, 03 May 2017 13:06:02 +0000 Received: (at 26669) by debbugs.gnu.org; 3 May 2017 13:05:13 +0000 Received: from localhost ([127.0.0.1]:52076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5txw-0006em-Mr for submit@debbugs.gnu.org; Wed, 03 May 2017 09:05:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5txv-0006eZ-1U for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5txk-0004Vp-0p for 26669@debbugs.gnu.org; Wed, 03 May 2017 09:05:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:46813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5txa-0004Qc-Gb; Wed, 03 May 2017 09:04:50 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:55578 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d5txZ-00070p-UO; Wed, 03 May 2017 09:04:50 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <20170426163038.23515-1-thomas.danckaert@gmail.com> <20170426163038.23515-6-thomas.danckaert@gmail.com> Date: Wed, 03 May 2017 15:04:47 +0200 In-Reply-To: <20170426163038.23515-6-thomas.danckaert@gmail.com> (Thomas Danckaert's message of "Wed, 26 Apr 2017 18:30:38 +0200") Message-ID: <87r306rt00.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Thomas Danckaert skribis: > From: Thomas Danckaert > > * gnu/packages/cdrom.scm (dvdstyler): New variable. [...] > + (arguments > + `(#:configure-flags (list (string-append "XMLTO=3D" > + (assoc-ref %build-inputs "= xmlto") > + "/bin/xmlto" > + " --searchpath " > + (assoc-ref %build-inputs "= docbook-xsl") > + "/xml/xsl/docbook-xsl-1.79= .1/htmlhelp:" > + (assoc-ref %build-inputs "= docbook-xml") > + "/xml/dtd/docbook")) I'd expect that adding libxml2 as an input would lead to the appropriate definition of XML_CATALOG_FILES, and thus remove the need for these #:configure-flags. Could you try that? > + #:phases > + (modify-phases %standard-phases > + (add-after 'install 'wrap-program > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (wrap-program (string-append (assoc-ref outputs "out") "/bi= n/dvdstyler") > + `("PATH" ":" prefix > + (,(string-join > + (map (lambda (in) (string-append (assoc-ref inputs i= n) "/bin")) > + '("cdrtools" "dvdauthor" "dvd+rw-tools"= "ffmpeg")) <-------' Identation. :-) > + ":"))))))) Please return #t at the end of the phase. > + (license gpl2))) GPLv2-only, right? Otherwise LGTM, thanks! Ludo=E2=80=99. From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 1/7] gnu: Add cdrtools. Resent-From: Thomas Danckaert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 07:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org, Danny Milosavljevic , Mathieu Othacehe Cc: 26669@debbugs.gnu.org, 26669-close@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149440254226124 (code B ref 26669); Wed, 10 May 2017 07:50:02 +0000 Received: (at 26669) by debbugs.gnu.org; 10 May 2017 07:49:02 +0000 Received: from localhost ([127.0.0.1]:35007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8MMo-0006nE-0D for submit@debbugs.gnu.org; Wed, 10 May 2017 03:49:02 -0400 Received: from s02.spamexperts.axc.nl ([185.182.56.112]:34271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8MMm-0006mt-8w; Wed, 10 May 2017 03:49:01 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1d8MMd-0001R3-PL; Wed, 10 May 2017 09:48:52 +0200 Received: from mail.axc.nl ([185.182.56.42]:52276 helo=mail.axc.eu) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1d8MMZ-000805-Qe; Wed, 10 May 2017 09:48:48 +0200 Date: Wed, 10 May 2017 09:48:34 +0200 (CEST) Message-Id: <20170510.094834.43521092439100471.post@thomasdanckaert.be> From: Thomas Danckaert In-Reply-To: <8760hit7tr.fsf@gnu.org> <87r306rt00.fsf@gnu.org> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <8760hit7tr.fsf@gnu.org> X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 185.182.56.42 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi all, Thanks for your comments. I pushed the series to master, with all comments addressed. Except these 2 by Ludo, where I didn't really manage... [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: SB/global_tokens (0.00659404267736) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXrmcAUbk/ASLtFPAlnfSiIwRcOb18WfxGyg6Om6u4YYm4HbFs+78oAMIDyB DuVyR3svPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwrVGuV9Td3oxLbkL966xCxvZQsafF15 mJPpv5GT66Q2cobxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOAPg7kD1o1SPFCnueyS/sCaOHWlaJu+Q0aA9kweItd4cE6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDERYzUG4pIA+ZNWHiVFtbbSZIg4JZyZE4oLFw/56kWZ/BMrY wNLPWbX1z+Q3mTGjRibfv7Clh37Q2T3wH1f+cMgSxcWTtGUbhKTMAnZnPRl7KhwQvWD3ECL3iwxU sRht74vpbPGrkgNXJMcR6aLekWS43kJU+43+SX+jhsW4Y/eBvS0DE2TrNhCqMaiQxQX99V4/s1IP JkB+hIu1Xel6LbE4x3lv9vcgk7q7g72l7Qho X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) SGkgYWxsLA0KDQpUaGFua3MgZm9yIHlvdXIgY29tbWVudHMuDQoNCkkgcHVzaGVkIHRoZSBzZXJp ZXMgdG8gbWFzdGVyLCB3aXRoIGFsbCBjb21tZW50cyBhZGRyZXNzZWQuICBFeGNlcHQgDQp0aGVz ZSAyIGJ5IEx1ZG8sIHdoZXJlIEkgZGlkbid0IHJlYWxseSBtYW5hZ2UuLi4NCg0KRnJvbTogbHVk b0BnbnUub3JnIChMdWRvdmljIENvdXJ0w6hzKQ0KU3ViamVjdDogUmU6IGJ1ZyMyNjY2OTogW1BB VENIIDEvN10gZ251OiBBZGQgY2RydG9vbHMuDQpEYXRlOiBXZWQsIDAzIE1heSAyMDE3IDE0OjU5 OjEyICswMjAwDQoNCj4+ICsrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2NkcnRvb2xzLTMuMDEt bWtpc29mcy1pc29pbmZvLnBhdGNoDQo+PiBAQCAtMCwwICsxLDUxNCBAQA0KPj4gK1BhdGNoIGZv ciB2ZXJzaW9uIDMuMDEsIHRha2VuIGZyb20gdXBzdHJlYW0gYXQNCj4+ICtodHRwczovL3NvdXJj ZWZvcmdlLm5ldC9wcm9qZWN0cy9jZHJ0b29scy9maWxlcy9jZHJ0b29scy0zLjAxLWZpeC0yMDE1 MTEyNi1ta2lzb2ZzLWlzb2luZm8ucGF0Y2gNCj4NCj4gSXQgd291bGQgYmUgbmljZSB0byBhZGQg YSBmZXcgd29yZHMgYWJvdXQgd2hhdCBpdCBkb2VzLCBsaWtlIOKAnEZpeA0KPiBjb21waWxhdGlv biB3aXRoIHJlY2VudCBnbGliY+KAnSBvciBzb21ldGhpbmcuDQoNClVuZm9ydHVuYXRlbHksIEkg Y291bGRuJ3QgZmluZCBhIHByb3BlciBleHBsYW5hdGlvbiBmb3IgdGhlIHBhdGNoLCANCmFuZCBJ J20gbm90IGZhbWlsaWFyIGVub3VnaCB3aXRoIHRoZSBjZHJ0b29scyBjb2RlIGJhc2UgdG8gY29t cGxldGVseSANCnVuZGVyc3RhbmQgaXQgbXlzZWxmLiAgSXQgc2VlbXMgbGlrZSBpdCBmaXhlcyBz b21lIGlzc3VlcyBhbmQgDQp1cGdyYWRlcyBoYWxmLXdheSB0byAzLjAyIGF0IHRoZSBzYW1lIHRp bWUuLi4gIFdlbGwgYXQgbGVhc3Qgd2UgY2FuIA0KZ2V0IHJpZCBvZiB0aGUgcGF0Y2ggaWYvd2hl biB0aGV5IHJlbGVhc2UgMy4wMi4NCg0KRnJvbTogbHVkb0BnbnUub3JnIChMdWRvdmljIENvdXJ0 w6hzKQ0KU3ViamVjdDogUmU6IGJ1ZyMyNjY2OTogW1BBVENIIDcvN10gZ251OiBBZGQgZHZkc3R5 bGVyLg0KRGF0ZTogV2VkLCAwMyBNYXkgMjAxNyAxNTowNDo0NyArMDIwMA0KDQo+PiArICAgIChh cmd1bWVudHMNCj4+ICsgICAgIGAoIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgKHN0cmluZy1hcHBl bmQgIlhNTFRPPSINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgInhtbHRvIikNCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9iaW4veG1sdG8iDQo+PiAr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgLS1zZWFyY2hw YXRoICINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgImRvY2Jvb2steHNsIikNCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgDQo+PiAiL3htbC94c2wvZG9j Ym9vay14c2wtMS43OS4xL2h0bWxoZWxwOiINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgImRvY2Jv b2steG1sIikNCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIi94bWwvZHRkL2RvY2Jvb2siKSkNCj4NCj4gSSdkIGV4cGVjdCB0aGF0IGFkZGluZyBsaWJ4 bWwyIGFzIGFuIGlucHV0IHdvdWxkIGxlYWQgdG8gdGhlIA0KPiBhcHByb3ByaWF0ZQ0KPiBkZWZp bml0aW9uIG9mIFhNTF9DQVRBTE9HX0ZJTEVTLCBhbmQgdGh1cyByZW1vdmUgdGhlIG5lZWQgZm9y IHRoZXNlDQo+ICM6Y29uZmlndXJlLWZsYWdzLiAgQ291bGQgeW91IHRyeSB0aGF0Pw0KDQpJIHRy aWVkIGl0LCBidXQgaXQgZGlkbid0IHdvcmsuICBFdmVuIHdpdGggdGhlc2UgZmxhZ3MsIGRvY3Vt ZW50YXRpb24gDQpnZW5lcmF0aW9uIHBoYXNlIHNwaXRzIG91dCBhIGZldyB3YXJuaW5ncyBhYm91 dCBhdHRlbXB0ZWQgbmV0d29yayANCmFjY2VzcyB0byByZXRyaWV2ZSB4c2QgZmlsZXMsIGJ1dCB3 YXkgbGVzcyB0aGFuIHdpdGhvdXQgdGhlIGZsYWdzLCANCmFuZCBhdCBodG1sIGhlbHAgaXMgZ2Vu ZXJhdGVkIHN1Y2Nlc3NmdWxseSA6LSkgLg0KDQpUaG9tYXMNCg== From unknown Sat Sep 13 07:22:28 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Thomas Danckaert Subject: bug#26669: closed (Re: bug#26669: [PATCH 1/7] gnu: Add cdrtools.) Message-ID: References: <20170510.094834.43521092439100471.post@thomasdanckaert.be> <20170426.180534.1677459693482729603.post@thomasdanckaert.be> X-Gnu-PR-Message: they-closed 26669 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26669@debbugs.gnu.org Date: Wed, 10 May 2017 07:50:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1494402603-26227-1" This is a multi-part message in MIME format... ------------=_1494402603-26227-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26669: [PATCH 1/7] gnu: Add cdrtools. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26669@debbugs.gnu.org. --=20 26669: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26669 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494402603-26227-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26669-close) by debbugs.gnu.org; 10 May 2017 07:49:02 +0000 Received: from localhost ([127.0.0.1]:35009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8MMo-0006nI-8R for submit@debbugs.gnu.org; Wed, 10 May 2017 03:49:02 -0400 Received: from s02.spamexperts.axc.nl ([185.182.56.112]:34271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8MMm-0006mt-8w; Wed, 10 May 2017 03:49:01 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1d8MMd-0001R3-PL; Wed, 10 May 2017 09:48:52 +0200 Received: from mail.axc.nl ([185.182.56.42]:52276 helo=mail.axc.eu) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1d8MMZ-000805-Qe; Wed, 10 May 2017 09:48:48 +0200 Date: Wed, 10 May 2017 09:48:34 +0200 (CEST) Message-Id: <20170510.094834.43521092439100471.post@thomasdanckaert.be> To: ludo@gnu.org, Danny Milosavljevic , Mathieu Othacehe Subject: Re: bug#26669: [PATCH 1/7] gnu: Add cdrtools. From: Thomas Danckaert In-Reply-To: <8760hit7tr.fsf@gnu.org> <87r306rt00.fsf@gnu.org> References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <8760hit7tr.fsf@gnu.org> X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8; format=flowed Content-Transfer-Encoding: base64 PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 185.182.56.42 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "vserver42.axc.nl", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi all, Thanks for your comments. I pushed the series to master, with all comments addressed. Except these 2 by Ludo, where I didn't really manage... [...] Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: SB/global_tokens (0.00659404267736) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXrmcAUbk/ASLtFPAlnfSiIwRcOb18WfxGyg6Om6u4YYm4HbFs+78oAMIDyB DuVyR3svPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwrVGuV9Td3oxLbkL966xCxvZQsafF15 mJPpv5GT66Q2cobxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOAPg7kD1o1SPFCnueyS/sCaOHWlaJu+Q0aA9kweItd4cE6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDERYzUG4pIA+ZNWHiVFtbbSZIg4JZyZE4oLFw/56kWZ/BMrY wNLPWbX1z+Q3mTGjRibfv7Clh37Q2T3wH1f+cMgSxcWTtGUbhKTMAnZnPRl7KhwQvWD3ECL3iwxU sRht74vpbPGrkgNXJMcR6aLekWS43kJU+43+SX+jhsW4Y/eBvS0DE2TrNhCqMaiQxQX99V4/s1IP JkB+hIu1Xel6LbE4x3lv9vcgk7q7g72l7Qho X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26669-close Cc: 26669@debbugs.gnu.org, 26669-close@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) SGkgYWxsLA0KDQpUaGFua3MgZm9yIHlvdXIgY29tbWVudHMuDQoNCkkgcHVzaGVkIHRoZSBzZXJp ZXMgdG8gbWFzdGVyLCB3aXRoIGFsbCBjb21tZW50cyBhZGRyZXNzZWQuICBFeGNlcHQgDQp0aGVz ZSAyIGJ5IEx1ZG8sIHdoZXJlIEkgZGlkbid0IHJlYWxseSBtYW5hZ2UuLi4NCg0KRnJvbTogbHVk b0BnbnUub3JnIChMdWRvdmljIENvdXJ0w6hzKQ0KU3ViamVjdDogUmU6IGJ1ZyMyNjY2OTogW1BB VENIIDEvN10gZ251OiBBZGQgY2RydG9vbHMuDQpEYXRlOiBXZWQsIDAzIE1heSAyMDE3IDE0OjU5 OjEyICswMjAwDQoNCj4+ICsrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2NkcnRvb2xzLTMuMDEt bWtpc29mcy1pc29pbmZvLnBhdGNoDQo+PiBAQCAtMCwwICsxLDUxNCBAQA0KPj4gK1BhdGNoIGZv ciB2ZXJzaW9uIDMuMDEsIHRha2VuIGZyb20gdXBzdHJlYW0gYXQNCj4+ICtodHRwczovL3NvdXJj ZWZvcmdlLm5ldC9wcm9qZWN0cy9jZHJ0b29scy9maWxlcy9jZHJ0b29scy0zLjAxLWZpeC0yMDE1 MTEyNi1ta2lzb2ZzLWlzb2luZm8ucGF0Y2gNCj4NCj4gSXQgd291bGQgYmUgbmljZSB0byBhZGQg YSBmZXcgd29yZHMgYWJvdXQgd2hhdCBpdCBkb2VzLCBsaWtlIOKAnEZpeA0KPiBjb21waWxhdGlv biB3aXRoIHJlY2VudCBnbGliY+KAnSBvciBzb21ldGhpbmcuDQoNClVuZm9ydHVuYXRlbHksIEkg Y291bGRuJ3QgZmluZCBhIHByb3BlciBleHBsYW5hdGlvbiBmb3IgdGhlIHBhdGNoLCANCmFuZCBJ J20gbm90IGZhbWlsaWFyIGVub3VnaCB3aXRoIHRoZSBjZHJ0b29scyBjb2RlIGJhc2UgdG8gY29t cGxldGVseSANCnVuZGVyc3RhbmQgaXQgbXlzZWxmLiAgSXQgc2VlbXMgbGlrZSBpdCBmaXhlcyBz b21lIGlzc3VlcyBhbmQgDQp1cGdyYWRlcyBoYWxmLXdheSB0byAzLjAyIGF0IHRoZSBzYW1lIHRp bWUuLi4gIFdlbGwgYXQgbGVhc3Qgd2UgY2FuIA0KZ2V0IHJpZCBvZiB0aGUgcGF0Y2ggaWYvd2hl biB0aGV5IHJlbGVhc2UgMy4wMi4NCg0KRnJvbTogbHVkb0BnbnUub3JnIChMdWRvdmljIENvdXJ0 w6hzKQ0KU3ViamVjdDogUmU6IGJ1ZyMyNjY2OTogW1BBVENIIDcvN10gZ251OiBBZGQgZHZkc3R5 bGVyLg0KRGF0ZTogV2VkLCAwMyBNYXkgMjAxNyAxNTowNDo0NyArMDIwMA0KDQo+PiArICAgIChh cmd1bWVudHMNCj4+ICsgICAgIGAoIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgKHN0cmluZy1hcHBl bmQgIlhNTFRPPSINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgInhtbHRvIikNCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi9iaW4veG1sdG8iDQo+PiAr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgLS1zZWFyY2hw YXRoICINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgImRvY2Jvb2steHNsIikNCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgDQo+PiAiL3htbC94c2wvZG9j Ym9vay14c2wtMS43OS4xL2h0bWxoZWxwOiINCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGFzc29jLXJlZiANCj4+ICVidWlsZC1pbnB1dHMgImRvY2Jv b2steG1sIikNCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIi94bWwvZHRkL2RvY2Jvb2siKSkNCj4NCj4gSSdkIGV4cGVjdCB0aGF0IGFkZGluZyBsaWJ4 bWwyIGFzIGFuIGlucHV0IHdvdWxkIGxlYWQgdG8gdGhlIA0KPiBhcHByb3ByaWF0ZQ0KPiBkZWZp bml0aW9uIG9mIFhNTF9DQVRBTE9HX0ZJTEVTLCBhbmQgdGh1cyByZW1vdmUgdGhlIG5lZWQgZm9y IHRoZXNlDQo+ICM6Y29uZmlndXJlLWZsYWdzLiAgQ291bGQgeW91IHRyeSB0aGF0Pw0KDQpJIHRy aWVkIGl0LCBidXQgaXQgZGlkbid0IHdvcmsuICBFdmVuIHdpdGggdGhlc2UgZmxhZ3MsIGRvY3Vt ZW50YXRpb24gDQpnZW5lcmF0aW9uIHBoYXNlIHNwaXRzIG91dCBhIGZldyB3YXJuaW5ncyBhYm91 dCBhdHRlbXB0ZWQgbmV0d29yayANCmFjY2VzcyB0byByZXRyaWV2ZSB4c2QgZmlsZXMsIGJ1dCB3 YXkgbGVzcyB0aGFuIHdpdGhvdXQgdGhlIGZsYWdzLCANCmFuZCBhdCBodG1sIGhlbHAgaXMgZ2Vu ZXJhdGVkIHN1Y2Nlc3NmdWxseSA6LSkgLg0KDQpUaG9tYXMNCg== ------------=_1494402603-26227-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Apr 2017 16:06:05 +0000 Received: from localhost ([127.0.0.1]:41859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PS8-00081u-MZ for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:06:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d3PS4-00081M-UK for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3PRw-0005UU-P6 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:05:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3PRw-0005UQ-M7 for submit@debbugs.gnu.org; Wed, 26 Apr 2017 12:05:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3PRt-000894-R6 for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3PRp-0005Ri-U7 for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:49 -0400 Received: from s02-out.spamexperts.axc.nl ([185.175.200.125]:44635) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3PRp-0005Px-Iw for guix-patches@gnu.org; Wed, 26 Apr 2017 12:05:45 -0400 Received: from vserver42.axc.nl ([185.182.56.92]) by s02.spamexperts.axc.nl with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86) (envelope-from ) id 1d3PRh-00008e-Og for guix-patches@gnu.org; Wed, 26 Apr 2017 18:05:43 +0200 Received: from mail.axc.nl ([185.182.56.42]:37794 helo=mail.axc.eu) by vserver42.axc.nl with esmtp (Exim 4.89) (envelope-from ) id 1d3PRg-0001z3-K8 for guix-patches@gnu.org; Wed, 26 Apr 2017 18:05:37 +0200 Date: Wed, 26 Apr 2017 18:05:34 +0200 (CEST) Message-Id: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> To: guix-patches@gnu.org Subject: [PATCH 1/7] gnu: Add cdrtools. From: Thomas Danckaert X-Mailer: Mew version 6.7 on Emacs 25.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Apr_26_18_05_34_2017_155)--" Content-Transfer-Encoding: 7bit PrimaryMX: Accepted email from trusted host. Hint: This skips spam scanning so make sure other host is not vulnerable X-Relay-Host: 185.182.56.42 SpamTally: Final spam score: 0 X-Originating-IP: 185.182.56.92 X-SpamExperts-Domain: vserver42.axc.nl X-SpamExperts-Username: 185.182.56.92 Authentication-Results: spamexperts.axc.nl; auth=pass smtp.auth=185.182.56.92@vserver42.axc.nl X-SpamExperts-Outgoing-Class: ham X-SpamExperts-Outgoing-Evidence: Combined (0.21) X-Recommended-Action: accept X-Filter-ID: s0sct1PQhAABKnZB5plbIaExX4b9HB97Y0LqBeziPXa8B5kabb+8+DRlCqSxA333/bPom7IVowNb jNmNSGjlJADpxEq2QWue0NVTi1XPmXej1KRrf1Y8eevl1lZRQAkHO76XSTAwtV4mg4i2ouCDa4AU hvIWAV5xUW/+gAh4vXqb55CEwEze9asRtOYc4ChMRcOb18WfxGyg6Om6u4YYm7guVZpU+Jju0p6n D3iZ/7wvPRYKza70yK2TxRJHcdD+oEAP/to+02F3J4r01qcN199fxN2oReTDHAyOynaY0Cldue3r +qEeQYBWND7fDPGoUqYOv6lKxxeboK+YPP3g5J9Wyy39ARVu6lpph/EphEmSUaqSECP9/MJNMfS9 WPFvtKiR9oEdyOK7GnLP3Jw7nAFKpw6uarMIchUUKBPMSwohOyhP1KrsWZcn2MBn4zuyG7gOvC4m Grn5xNl9tGvdjYbxR0PuC4wwYQTc8Sg/23VtqGjgyi5JHolhrWpNa9YQsl4SUWp4U8fCCSBjefGq te4ROxlmGgdR7QBaGWEQFYs+dvusjRV96oP1cmFb05OHyZAZLfpWinSu+danhtKvH9pAsaSpuQPS cbIWdeXhkZC4rAXOgWX2FBHgH187+EKv5hICVo92zvI9isesxBu4AK5YVcPPq3MXlUe9sP5+k0dp Y7f6EqR6zsgzOR3cDnOA0LLUyFRBKwoN1I2EwhdFAvpqLTM+h/hARnyFcwgOATo6qQzLuCe/hQ3A 5i3Uw+OAbBH+DkNPnrywBHhKB8rPDBfx1bbfhyaO3VHMr4+RLj+xxb0AeOVQkpm2hvu5J0yjCyqf CSEgsxbFAyq6yW1bRKyj2K/uRn1rMm3cNj8TueY= X-Report-Abuse-To: spam@s01.spamexperts.axc.nl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) ----Next_Part(Wed_Apr_26_18_05_34_2017_155)-- Content-Type: Text/Plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hi, this patch series adds a few CD/DVD/Blu Ray Disc burning tools. There is/has been some controversy about the license of cdrtools, with claims it cannot be distributed in binary form because it mixes CDDL and GPL code. As far as I understand, mkisofs is GPL, while the other executables are CDDL, and I do not really see the problem. If others disagree, or we want to be extra careful, I suppose we can disable substitutes for cdrtools, so we only distribute it as source? cdrtools also bundles a forked LGPL-licensed copy of cdparanoia. This is perhaps unfortunate, but I don't think it's easy to unbundle it (cdrtools doesn't build agains our current cdparanoia). Thomas ----Next_Part(Wed_Apr_26_18_05_34_2017_155)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-gnu-Add-cdrtools.patch" >From 96fb5484e4a4d741da685ce63f578feb69bc016f Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Fri, 21 Apr 2017 15:54:20 +0200 Subject: [PATCH 1/7] gnu: Add cdrtools. * gnu/packages/cdrom.scm (cdrtools): New variable. * gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cdrom.scm | 63 ++- .../patches/cdrtools-3.01-mkisofs-isoinfo.patch | 514 +++++++++++++++++++++ 3 files changed, 577 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch diff --git a/gnu/local.mk b/gnu/local.mk index cb94d27e9..a2c56e03d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -513,6 +513,7 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-drop-unrar.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ + %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/ceph-disable-unittest-throttle.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 7e86753ab..69af39655 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -26,7 +26,7 @@ (define-module (gnu packages cdrom) #:use-module (guix download) #:use-module (guix packages) - #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+)) + #:use-module ((guix licenses) #:select (lgpl2.1+ gpl2 gpl2+ gpl3+ cddl1.0)) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -197,6 +197,67 @@ extra-robust data verification, synchronization, error handling and scratch reconstruction capability.") (license gpl2))) ; libraries under lgpl2.1 +(define-public cdrtools + (package + (name "cdrtools") + (version "3.01") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/cdrtools/cdrtools-" version ".tar.bz2")) + (sha256 + (base32 + "03w6ypsmwwy4d7vh6zgwpc60v541vc5ywp8bdb758hbc4yv2wa7d")) + (patches (search-patches "cdrtools-3.01-mkisofs-isoinfo.patch")))) + (build-system gnu-build-system) + (inputs + `(("linux-headers" ,linux-libre-headers))) + (native-inputs + `(("coreutils" ,coreutils))) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-linux-headers + (lambda _ + (substitute* "autoconf/configure" + (("/usr/src/linux") + (assoc-ref %build-inputs "linux-headers"))) + #t)) + (add-before 'build 'substitute-dirs + (lambda _ + (substitute* (append (find-files "DEFAULTS" "^Defaults\\.") + (find-files "DEFAULTS_ENG" "^Defaults\\.") + (find-files "TEMPLATES" "^Defaults\\.")) + (("/opt/schily") (assoc-ref %outputs "out"))) + #t)) + (replace 'build + (lambda _ + (zero? + (system* "make" "CONFIG_SHELL=sh" "CCOM=gcc" "RM=rm")))) + (replace 'install + (lambda _ + (zero? + (system* "make" + "RM=rm" "LN=ln" "SYMLINK=ln -s" + (string-append "INS_BASE=" (assoc-ref %outputs "out")) + (string-append "INS_RBASE=" (assoc-ref %outputs "out")) + "install" ))))) + #:tests? #f ; no tests + + ;; It's unclear if binaries can be distributed due to the mixing of CDDL + ;; and GPL code. + #:substitutable? #f)) + (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") + (description "cdrtools is a collection of command line utilities to create +CD's, DVD's or Blue Ray discs. The most important components are +@command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper +which uses libparanoia, and @command{mkisofs}, which can create various disc +images.") + (home-page "http://cdrtools.sourceforge.net/private/cdrecord.html") + + ;; mkisofs is GPL, the other programs are CDDL. + (license (list cddl1.0 gpl2)))) + (define-public dvdisaster (package (name "dvdisaster") diff --git a/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch new file mode 100644 index 000000000..9c817d419 --- /dev/null +++ b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch @@ -0,0 +1,514 @@ +Patch for version 3.01, taken from upstream at +https://sourceforge.net/projects/cdrtools/files/cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch + +--- cdrtools-3.01.orig/mkisofs/diag/isoinfo.c 2015-07-22 20:36:45.000000000 +0000 ++++ cdrtools-3.01/mkisofs/diag/isoinfo.c 2015-11-17 19:35:40.000000000 +0000 +@@ -1,8 +1,8 @@ +-/* @(#)isoinfo.c 1.95 15/07/22 joerg */ ++/* @(#)isoinfo.c 1.100 15/11/17 joerg */ + #include + #ifndef lint + static UConst char sccsid[] = +- "@(#)isoinfo.c 1.95 15/07/22 joerg"; ++ "@(#)isoinfo.c 1.100 15/11/17 joerg"; + #endif + /* + * File isodump.c - dump iso9660 directory information. +@@ -148,8 +148,10 @@ LOCAL char er_id[256]; + LOCAL int su_version = 0; + LOCAL int rr_version = 0; + LOCAL int aa_version = 0; ++LOCAL int cl_extent = 0; + LOCAL int ucs_level = 0; + LOCAL BOOL iso9660_inodes = FALSE; ++LOCAL uid_t myuid; + + #ifdef USE_FIND + LOCAL findn_t *find_node; /* syntaxtree from find_parse() */ +@@ -208,6 +210,9 @@ LOCAL void extract __PR((char *rootname + LOCAL void extract_file __PR((int f, + struct iso_directory_record * idr, + char *fname)); ++LOCAL void parse_cl_dir __PR((struct iso_directory_record *idr, ++ int extent)); ++LOCAL BOOL parse_de __PR((struct iso_directory_record *idr)); + LOCAL void parse_dir __PR((char * rootname, int extent, int len)); + LOCAL void usage __PR((int excode)); + EXPORT int main __PR((int argc, char *argv[])); +@@ -459,7 +464,6 @@ parse_rr(pnt, len, cont_flag) + int slen; + int xlen; + int ncount; +- int cl_extent; + int pl_extent; + int cont_extent, cont_offset, cont_size; + int flag1, flag2; +@@ -469,7 +473,7 @@ parse_rr(pnt, len, cont_flag) + + symlinkname[0] = 0; + +- cont_extent = cont_offset = cont_size = 0; ++ cl_extent = cont_extent = cont_offset = cont_size = 0; + + ncount = 0; + flag1 = -1; +@@ -714,6 +718,7 @@ struct todo + }; + + LOCAL struct todo *todo_idr = NULL; ++LOCAL struct todo **todo_pp = &todo_idr; + + LOCAL char *months[12] = {"Jan", "Feb", "Mar", "Apr", + "May", "Jun", "Jul", +@@ -962,8 +967,14 @@ static BOOL isfirst = TRUE; + close(f); + return; + setmode: +- fchmodat(AT_FDCWD, fname, fstat_buf.st_mode, AT_SYMLINK_NOFOLLOW); + fchownat(AT_FDCWD, fname, fstat_buf.st_uid, fstat_buf.st_gid, AT_SYMLINK_NOFOLLOW); ++ if (myuid != 0 && S_ISDIR(fstat_buf.st_mode)) { ++ /* ++ * Temporary hack until we have a dirstack like star. ++ */ ++ fstat_buf.st_mode |= S_IWUSR; ++ } ++ fchmodat(AT_FDCWD, fname, fstat_buf.st_mode, AT_SYMLINK_NOFOLLOW); + times[0].tv_sec = fstat_buf.st_atime; + times[0].tv_nsec = stat_ansecs(&fstat_buf); + times[1].tv_sec = fstat_buf.st_mtime; +@@ -1001,6 +1012,143 @@ extract_file(f, idr, fname) + } + } + ++ ++LOCAL void ++parse_cl_dir(idr, extent) ++ struct iso_directory_record *idr; ++ int extent; ++{ ++ char cl_name_buf[256*3]; ++ ++ strlcpy(cl_name_buf, name_buf, sizeof (cl_name_buf)); ++#ifdef USE_SCG ++ readsecs(extent - sector_offset, idr, 1); ++#else ++ lseek(fileno(infile), ((off_t)(extent - sector_offset)) << 11, SEEK_SET); ++ read(fileno(infile), idr, 2048); ++#endif ++ ++ if (parse_de(idr) && use_rock) ++ dump_rr(idr); ++ strlcpy(name_buf, cl_name_buf, sizeof (name_buf)); ++} ++ ++LOCAL BOOL ++parse_de(idr) ++ struct iso_directory_record *idr; ++{ ++ unsigned char uc; ++ ++ if (idr->length[0] == 0) ++ return (FALSE); ++ memset(&fstat_buf, 0, sizeof (fstat_buf)); ++ found_rr = 0; ++ name_buf[0] = xname[0] = 0; ++ fstat_buf.st_size = (off_t)(unsigned)isonum_733((unsigned char *)idr->size); ++ if (idr->flags[0] & 2) ++ fstat_buf.st_mode |= S_IFDIR; ++ else ++ fstat_buf.st_mode |= S_IFREG; ++ if (idr->name_len[0] == 1 && idr->name[0] == 0) ++ strcpy(name_buf, "."); ++ else if (idr->name_len[0] == 1 && idr->name[0] == 1) ++ strcpy(name_buf, ".."); ++ else { ++ switch (ucs_level) { ++ case 3: ++ case 2: ++ case 1: ++ /* ++ * Unicode name. Convert as best we can. ++ */ ++ { ++ int j; ++ name_buf[0] = '\0'; ++#ifdef USE_ICONV ++ if (use_iconv(unls)) { ++ int u; ++ char *to = name_buf; ++ ++ for (j = 0, u = 0; j < (int)idr->name_len[0] / 2; j++) { ++ char *ibuf = (char *)&idr->name[j*2]; ++ size_t isize = 2; /* UCS-2 character size */ ++ size_t osize = 4; ++ ++ if (iconv(unls->sic_uni2cd, (__IC_CONST char **)&ibuf, &isize, ++ (char **)&to, &osize) == -1) { ++ int err = geterrno(); ++ ++ if ((err == EINVAL || err == EILSEQ) && ++ osize == 4) { ++ *to = '_'; ++ u += 1; ++ to++; ++ } ++ } else { ++ u += 4 - osize; ++ to = &name_buf[u]; ++ } ++ } ++ j = u; ++ } else ++#endif ++ for (j = 0; j < (int)idr->name_len[0] / 2; j++) { ++ UInt16_t unichar; ++ ++ unichar = (idr->name[j*2] & 0xFF) * 256 + ++ (idr->name[j*2+1] & 0xFF); ++ ++ /* ++ * Get the backconverted char ++ */ ++ if (unls) ++ uc = sic_uni2c(unls, unichar); ++ else ++ uc = unichar > 255 ? '_' : unichar; ++ ++ name_buf[j] = uc ? uc : '_'; ++ } ++ name_buf[j] = '\0'; ++ } ++ break; ++ case 0: ++ /* ++ * Normal non-Unicode name. ++ */ ++ strncpy(name_buf, idr->name, idr->name_len[0]); ++ name_buf[idr->name_len[0]] = 0; ++ break; ++ default: ++ /* ++ * Don't know how to do these yet. Maybe they are the same ++ * as one of the above. ++ */ ++ exit(1); ++ } ++ } ++ memcpy(date_buf, idr->date, 9); ++ /* ++ * Always first set up time stamps and file modes from ++ * ISO-9660. This is used as a fallback in case that ++ * there is no related Rock Ridge based data. ++ */ ++ fstat_buf.st_atime = ++ fstat_buf.st_mtime = ++ fstat_buf.st_ctime = iso9660_time(date_buf, NULL, FALSE); ++ fstat_buf.st_mode |= S_IRUSR|S_IXUSR | ++ S_IRGRP|S_IXGRP | ++ S_IROTH|S_IXOTH; ++ fstat_buf.st_nlink = 1; ++ fstat_buf.st_ino = 0; ++ fstat_buf.st_uid = 0; ++ fstat_buf.st_gid = 0; ++ if (iso9660_inodes) { ++ fstat_buf.st_ino = (unsigned long) ++ isonum_733((unsigned char *)idr->extent); ++ } ++ return (TRUE); ++} ++ + LOCAL void + parse_dir(rootname, extent, len) + char *rootname; +@@ -1012,12 +1160,13 @@ parse_dir(rootname, extent, len) + struct iso_directory_record * idr; + struct iso_directory_record didr; + struct stat dstat; +- unsigned char uc; ++ unsigned char cl_buffer[2048]; + unsigned char flags = 0; + Llong size = 0; + int sextent = 0; + int rlen; + int blen; ++ int rr_flags = 0; + static char *n = 0; + static int nlen = 0; + +@@ -1039,115 +1188,23 @@ static int nlen = 0; + i = 0; + while (1 == 1) { + idr = (struct iso_directory_record *) &buffer[i]; +- if (idr->length[0] == 0) break; +- memset(&fstat_buf, 0, sizeof (fstat_buf)); +- found_rr = 0; +- name_buf[0] = xname[0] = 0; +- fstat_buf.st_size = (off_t)(unsigned)isonum_733((unsigned char *)idr->size); +- if (idr->flags[0] & 2) +- fstat_buf.st_mode |= S_IFDIR; +- else +- fstat_buf.st_mode |= S_IFREG; +- if (idr->name_len[0] == 1 && idr->name[0] == 0) +- strcpy(name_buf, "."); +- else if (idr->name_len[0] == 1 && idr->name[0] == 1) +- strcpy(name_buf, ".."); +- else { +- switch (ucs_level) { +- case 3: +- case 2: +- case 1: +- /* +- * Unicode name. Convert as best we can. +- */ +- { +- int j; +- +- name_buf[0] = '\0'; +-#ifdef USE_ICONV +- if (use_iconv(unls)) { +- int u; +- char *to = name_buf; +- +- for (j = 0, u = 0; j < (int)idr->name_len[0] / 2; j++) { +- char *ibuf = (char *)&idr->name[j*2]; +- size_t isize = 2; /* UCS-2 character size */ +- size_t osize = 4; +- +- if (iconv(unls->sic_uni2cd, (__IC_CONST char **)&ibuf, &isize, +- (char **)&to, &osize) == -1) { +- int err = geterrno(); +- +- if ((err == EINVAL || err == EILSEQ) && +- osize == 4) { +- *to = '_'; +- u += 1; +- to++; +- } +- } else { +- u += 4 - osize; +- to = &name_buf[u]; +- } +- } +- j = u; +- } else +-#endif +- for (j = 0; j < (int)idr->name_len[0] / 2; j++) { +- UInt16_t unichar; +- +- unichar = (idr->name[j*2] & 0xFF) * 256 + +- (idr->name[j*2+1] & 0xFF); +- +- /* +- * Get the backconverted char +- */ +- if (unls) +- uc = sic_uni2c(unls, unichar); +- else +- uc = unichar > 255 ? '_' : unichar; ++ if (idr->length[0] == 0) ++ break; ++ parse_de(idr); ++ if (use_rock) { ++ rr_flags = dump_rr(idr); + +- name_buf[j] = uc ? uc : '_'; +- } +- name_buf[j] = '\0'; +- } +- break; +- case 0: ++ if (rr_flags & RR_FLAG_CL) { + /* +- * Normal non-Unicode name. ++ * Need to reparse the child link ++ * but note that we parse "CL/." ++ * so we get no usable file name. + */ +- strncpy(name_buf, idr->name, idr->name_len[0]); +- name_buf[idr->name_len[0]] = 0; +- break; +- default: +- /* +- * Don't know how to do these yet. Maybe they are the same +- * as one of the above. +- */ +- exit(1); +- } ++ idr = (struct iso_directory_record *) cl_buffer; ++ parse_cl_dir(idr, cl_extent); ++ } else if (rr_flags & RR_FLAG_RE) ++ goto cont; /* skip rr_moved */ + } +- memcpy(date_buf, idr->date, 9); +- /* +- * Always first set up time stamps and file modes from +- * ISO-9660. This is used as a fallback in case that +- * there is no related Rock Ridge based data. +- */ +- fstat_buf.st_atime = +- fstat_buf.st_mtime = +- fstat_buf.st_ctime = iso9660_time(date_buf, NULL, FALSE); +- fstat_buf.st_mode |= S_IRUSR|S_IXUSR | +- S_IRGRP|S_IXGRP | +- S_IROTH|S_IXOTH; +- fstat_buf.st_nlink = 1; +- fstat_buf.st_ino = 0; +- fstat_buf.st_uid = 0; +- fstat_buf.st_gid = 0; +- if (iso9660_inodes) { +- fstat_buf.st_ino = (unsigned long) +- isonum_733((unsigned char *)idr->extent); +- } +- if (use_rock) +- dump_rr(idr); + if (Xtract && + (idr->flags[0] & 2) != 0 && + idr->name_len[0] == 1 && +@@ -1170,30 +1227,30 @@ static int nlen = 0; + n[rlen] = '\0'; + + if ((idr->flags[0] & 2) != 0 && +- (idr->name_len[0] != 1 || ++ ((rr_flags & RR_FLAG_CL) || ++ idr->name_len[0] != 1 || + (idr->name[0] != 0 && idr->name[0] != 1))) { + /* + * This is a plain directory (neither "xxx/." + * nor "xxx/.."). + * Add this directory to the todo list. + */ +- td = todo_idr; +- if (td != NULL) { +- while (td->next != NULL) +- td = td->next; +- td->next = (struct todo *) malloc(sizeof (*td)); +- td = td->next; +- } else { +- todo_idr = td = (struct todo *) malloc(sizeof (*td)); +- } ++ td = (struct todo *) malloc(sizeof (*td)); ++ if (td == NULL) ++ comerr(_("No memory.\n")); + td->next = NULL; + td->extent = isonum_733((unsigned char *)idr->extent); + td->length = isonum_733((unsigned char *)idr->size); + td->name = (char *) malloc(strlen(rootname) + + strlen(name_buf) + 2); ++ if (td->name == NULL) ++ comerr(_("No memory.\n")); + strcpy(td->name, rootname); + strcat(td->name, name_buf); + strcat(td->name, "/"); ++ ++ *todo_pp = td; ++ todo_pp = &td->next; + } else { + if (xtract && strcmp(xtract, n) == 0) { + extract_file(STDOUT_FILENO, idr, "stdout"); +@@ -1253,6 +1310,7 @@ static int nlen = 0; + if ((idr->flags[0] & ISO_MULTIEXTENT) == 0) + size = 0; + } ++ cont: + i += buffer[i]; + if (i > 2048 - offsetof(struct iso_directory_record, name[0])) break; + } +@@ -1381,12 +1439,13 @@ main(argc, argv) + usage(0); + if (prvers) { + printf(_("isoinfo %s (%s-%s-%s) Copyright (C) 1993-1999 %s (C) 1999-2015 %s\n"), +- VERSION, ++ "3.02a02", + HOST_CPU, HOST_VENDOR, HOST_OS, + _("Eric Youngdale"), + _("Joerg Schilling")); + exit(0); + } ++ myuid = getuid(); + #ifdef USE_FIND + if (do_find) { + finda_t fa; +--- cdrtools-3.01.orig/mkisofs/udf.c 2013-04-24 20:45:18.000000000 +0000 ++++ cdrtools-3.01/mkisofs/udf.c 2015-11-25 22:07:30.000000000 +0000 +@@ -1,15 +1,15 @@ +-/* @(#)udf.c 1.42 13/04/24 Copyright 2001-2013 J. Schilling */ ++/* @(#)udf.c 1.43 15/11/25 Copyright 2001-2015 J. Schilling */ + #include + #ifndef lint + static UConst char sccsid[] = +- "@(#)udf.c 1.42 13/04/24 Copyright 2001-2013 J. Schilling"; ++ "@(#)udf.c 1.43 15/11/25 Copyright 2001-2015 J. Schilling"; + #endif + /* + * udf.c - UDF support for mkisofs + * + * Written by Ben Rudiak-Gould (2001). + * +- * Copyright 2001-2013 J. Schilling. ++ * Copyright 2001-2015 J. Schilling. + */ + /* + * This program is free software; you can redistribute it and/or modify +@@ -98,7 +98,7 @@ static UConst char sccsid[] = + extern int use_sparcboot; + + extern struct directory *root; +-extern time_t begun; ++extern struct timeval tv_begun; + + static unsigned lba_main_seq; + static unsigned lba_main_seq_copy; +@@ -110,7 +110,7 @@ static unsigned lba_end_anchor_vol_desc; + static unsigned num_udf_files; + static unsigned num_udf_directories; + +-static unsigned volume_set_id[2]; ++static unsigned volume_set_id[2] = { 0, 0 }; + + #define UDF_MAIN_SEQ_LENGTH (16) + #define UDF_INTEG_SEQ_LENGTH (2) +@@ -723,7 +723,7 @@ set_primary_vol_desc(buf, lba) + /*pvd->volume_abstract;*/ + /*pvd->volume_copyright_notice;*/ + /*pvd->application_ident;*/ +- set_timestamp_from_time_t(&pvd->recording_date_and_time, begun); ++ set_timestamp_from_time_t(&pvd->recording_date_and_time, tv_begun.tv_sec); + set_impl_ident(&pvd->impl_ident); + set_tag(&pvd->desc_tag, UDF_TAGID_PRIMARY_VOLUME_DESC, lba, 512); + } +@@ -831,7 +831,7 @@ set_logical_vol_integrity_desc(buf, lba) + udf_logical_volume_integrity_desc *lvid = + (udf_logical_volume_integrity_desc *)buf; + +- set_timestamp_from_time_t(&lvid->recording_date, begun); ++ set_timestamp_from_time_t(&lvid->recording_date, tv_begun.tv_sec); + set32(&lvid->integrity_type, UDF_INTEGRITY_TYPE_CLOSE); + /*lvid->next_integrity_extent;*/ + set64(&lvid->logical_volume_contents_use.unique_id, +@@ -859,7 +859,7 @@ set_file_set_desc(buf, rba) + { + udf_file_set_desc *fsd = (udf_file_set_desc *)buf; + +- set_timestamp_from_time_t(&fsd->recording_date_and_time, begun); ++ set_timestamp_from_time_t(&fsd->recording_date_and_time, tv_begun.tv_sec); + set16(&fsd->interchange_level, 3); + set16(&fsd->maximum_interchange_level, 3); + set32(&fsd->character_set_list, 1); +@@ -1986,8 +1986,10 @@ udf_main_seq_write(out) + * volume_set_id needs to be set to a (64-bit) "unique" number. + * This will have to do for now. + */ +- volume_set_id[0] = begun; +- volume_set_id[1] = (unsigned)clock(); /* XXX Maybe non-portable */ ++ if (volume_set_id[0] == 0) { ++ volume_set_id[0] = tv_begun.tv_sec; ++ volume_set_id[1] = (unsigned)tv_begun.tv_usec; ++ } + + memset(buf, 0, sizeof (buf)); + set_primary_vol_desc(buf, last_extent_written++); +--- cdrtools-3.01.orig/mkisofs/mkisofs.c 2015-01-01 14:19:51.000000000 +0000 ++++ cdrtools-3.01/mkisofs/mkisofs.c +@@ -69 +69 @@ int path_ind; +-char version_string[] = VERSION; ++char version_string[] = "3.01-fix-20151126"; -- 2.12.2 ----Next_Part(Wed_Apr_26_18_05_34_2017_155)---- ------------=_1494402603-26227-1-- From unknown Sat Sep 13 07:22:28 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26669: [PATCH 1/7] gnu: Add cdrtools. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2017 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Thomas Danckaert Cc: Danny Milosavljevic , 26669@debbugs.gnu.org, Mathieu Othacehe , 26669-close@debbugs.gnu.org Received: via spool by 26669-submit@debbugs.gnu.org id=B26669.149441733522165 (code B ref 26669); Wed, 10 May 2017 11:56:02 +0000 Received: (at 26669) by debbugs.gnu.org; 10 May 2017 11:55:35 +0000 Received: from localhost ([127.0.0.1]:35167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8QDO-0005lR-M7 for submit@debbugs.gnu.org; Wed, 10 May 2017 07:55:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d8QDN-0005l9-Ef for 26669@debbugs.gnu.org; Wed, 10 May 2017 07:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8QDH-0003c5-CB for 26669@debbugs.gnu.org; Wed, 10 May 2017 07:55:28 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8QD7-0003aZ-6B; Wed, 10 May 2017 07:55:17 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:33308 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d8QD6-0002Hx-B4; Wed, 10 May 2017 07:55:16 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170426.180534.1677459693482729603.post@thomasdanckaert.be> <8760hit7tr.fsf@gnu.org> <20170510.094834.43521092439100471.post@thomasdanckaert.be> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 =?UTF-8?Q?Flor=C3=A9al?= an 225 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-unknown-linux-gnu Date: Wed, 10 May 2017 13:55:13 +0200 In-Reply-To: <20170510.094834.43521092439100471.post@thomasdanckaert.be> (Thomas Danckaert's message of "Wed, 10 May 2017 09:48:34 +0200 (CEST)") Message-ID: <8737cdvsda.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Thomas, Thomas Danckaert skribis: > Thanks for your comments. > > I pushed the series to master, with all comments addressed. Except > these 2 by Ludo, where I didn't really manage... > > From: ludo@gnu.org (Ludovic Court=C3=A8s) > Subject: Re: bug#26669: [PATCH 1/7] gnu: Add cdrtools. > Date: Wed, 03 May 2017 14:59:12 +0200 > >>> +++ b/gnu/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch >>> @@ -0,0 +1,514 @@ >>> +Patch for version 3.01, taken from upstream at >>> +https://sourceforge.net/projects/cdrtools/files/cdrtools-3.01-fix-2015= 1126-mkisofs-isoinfo.patch >> >> It would be nice to add a few words about what it does, like =E2=80=9CFix >> compilation with recent glibc=E2=80=9D or something. > > Unfortunately, I couldn't find a proper explanation for the patch, and > I'm not familiar enough with the cdrtools code base to completely > understand it myself. It seems like it fixes some issues and upgrades > half-way to 3.02 at the same time... Well at least we can get rid of > the patch if/when they release 3.02. OK, sounds reasonable. > From: ludo@gnu.org (Ludovic Court=C3=A8s) > Subject: Re: bug#26669: [PATCH 7/7] gnu: Add dvdstyler. > Date: Wed, 03 May 2017 15:04:47 +0200 > >>> + (arguments >>> + `(#:configure-flags (list (string-append "XMLTO=3D" >>> + (assoc-ref >>> %build-inputs "xmlto") >>> + "/bin/xmlto" >>> + " --searchpath " >>> + (assoc-ref >>> %build-inputs "docbook-xsl") >>> + >>> "/xml/xsl/docbook-xsl-1.79.1/htmlhelp:" >>> + (assoc-ref >>> %build-inputs "docbook-xml") >>> + "/xml/dtd/docbook")) >> >> I'd expect that adding libxml2 as an input would lead to the >> appropriate >> definition of XML_CATALOG_FILES, and thus remove the need for these >> #:configure-flags. Could you try that? > > I tried it, but it didn't work. Even with these flags, documentation > generation phase spits out a few warnings about attempted network > access to retrieve xsd files, but way less than without the flags, and > at html help is generated successfully :-) . Noted. Thanks! Ludo=E2=80=99.