From: Thomas Danckaert <thomas.danckaert@gmail.com>
To: 26669@debbugs.gnu.org
Cc: Thomas Danckaert <post@thomasdanckaert.be>
Subject: bug#26669: [PATCH 2/7] gnu: Add dvd+rw-tools.
Date: Wed, 26 Apr 2017 18:30:33 +0200 [thread overview]
Message-ID: <20170426163038.23515-1-thomas.danckaert@gmail.com> (raw)
In-Reply-To: <20170426.180534.1677459693482729603.post@thomasdanckaert.be>
From: Thomas Danckaert <post@thomasdanckaert.be>
* 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 <alezost@gmail.com>
;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 John Darrington <jmd@gnu.org>
+;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;;
;;; 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 <limits.h>, 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 <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
--
2.12.2
next prev parent reply other threads:[~2017-04-26 16:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 16:05 bug#26669: [PATCH 1/7] gnu: Add cdrtools Thomas Danckaert
2017-04-26 16:30 ` Thomas Danckaert [this message]
2017-04-26 16:30 ` bug#26669: [PATCH 3/7] gnu: brasero: Embed growisofs store item Thomas Danckaert
2017-04-28 5:54 ` Danny Milosavljevic
2017-04-26 16:30 ` bug#26669: [PATCH 4/7] gnu: Add dvdauthor Thomas Danckaert
2017-04-27 18:50 ` Danny Milosavljevic
2017-04-26 16:30 ` bug#26669: [PATCH 5/7] gnu: Add wxwidgets-3.1 Thomas Danckaert
2017-05-03 13:00 ` Ludovic Courtès
2017-04-26 16:30 ` bug#26669: [PATCH 6/7] gnu: Add wxsvg Thomas Danckaert
2017-05-03 13:02 ` Ludovic Courtès
2017-04-26 16:30 ` bug#26669: [PATCH 7/7] gnu: Add dvdstyler Thomas Danckaert
2017-05-03 13:04 ` Ludovic Courtès
2017-05-10 7:48 ` bug#26669: [PATCH 1/7] gnu: Add cdrtools Thomas Danckaert
2017-05-10 11:55 ` Ludovic Courtès
2017-04-26 17:15 ` bug#26669: [PATCH 2/7] gnu: Add dvd+rw-tools Danny Milosavljevic
2017-04-26 16:59 ` bug#26669: [PATCH 1/7] gnu: Add cdrtools Mathieu Othacehe
2017-05-03 12:59 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170426163038.23515-1-thomas.danckaert@gmail.com \
--to=thomas.danckaert@gmail.com \
--cc=26669@debbugs.gnu.org \
--cc=post@thomasdanckaert.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).