Re: [bug#28453] [PATCH 5/5] gnu: openttd-opengfx: Change installation directory.
Kei Kebreau writes: > Arun Isaac writes: > >> Please find attached an updated patchset. >> >> Changes are as follows: >> >> * Disabled parallel build. >> * Included a make-reproducible phase for openttd-opensfx. >> * Changed the license for openmsx from cc-sampling+ to gpl2. It was >> wrong earlier. >> * Changed python dependency to python2-minimal for both openttd-openmsx >> and openttd-opensfx. >> >>>From 8e1a146fde935cc1635c7a9f162e95c16871a8cf Mon Sep 17 00:00:00 2001 >> From: Arun Isaac >> Date: Wed, 13 Sep 2017 22:06:12 +0530 >> Subject: [PATCH 1/6] gnu: Add catcodec. >> >> * gnu/packages/game-development.scm (catcodec): New variable. >> --- >> gnu/packages/game-development.scm | 26 ++ >> 1 file changed, 26 insertions(+) >> >> diff --git a/gnu/packages/game-development.scm >> b/gnu/packages/game-development.scm >> index 5633456d4..9916a1cb3 100644 >> --- a/gnu/packages/game-development.scm >> +++ b/gnu/packages/game-development.scm >> @@ -11,6 +11,7 @@ >> ;;; Copyright © 2017 Tobias Geerinckx-Rice >> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis >> ;;; Copyright © 2017 Peter Mikkelsen >> +;;; Copyright © 2017 Arun Isaac >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -192,6 +193,31 @@ necessary. >> ;; The MD5 implementation contained in GRFID is under the zlib license. >> (license (list license:gpl2 license:gpl2+ license:zlib >> >> +(define-public catcodec >> + (package >> +(name "catcodec") >> +(version "1.0.5") >> +(source >> + (origin >> + (method url-fetch) >> + (uri (string-append "https://binaries.openttd.org/extra/catcodec/"; >> + version "/catcodec-" version "-source.tar.xz")) >> + (sha256 >> +(base32 >> + "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7" >> +(build-system gnu-build-system) >> +(arguments >> + `(#:tests? #f ; no tests >> + #:make-flags (list (string-append "prefix=" %output)) >> + #:phases (modify-phases %standard-phases >> + (delete 'configure >> +(home-page "http://dev.openttdcoop.org/projects/catcodec";) >> +(synopsis "Encode/decode OpenTTD sounds") >> +(description "catcodec encodes and decodes sounds for OpenTTD. These >> +sounds are not much more than some metadata (description and filename) and >> raw >> +PCM data.") >> +(license license:gpl2))) >> + >> (define-public gzochi >>(package >> (name "gzochi") >> -- >> 2.14.1 >> >>>From f5c1a501c9ba193178db40d514aa337807cdfefb Mon Sep 17 00:00:00 2001 >> From: Arun Isaac >> Date: Wed, 13 Sep 2017 22:21:56 +0530 >> Subject: [PATCH 2/6] licenses: Add CC-Sampling+ 1.0. >> >> * guix/licenses.scm (cc-sampling-plus-1.0): New variable. >> --- >> guix/licenses.scm | 6 ++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/guix/licenses.scm b/guix/licenses.scm >> index b7dadd975..6de611da2 100644 >> --- a/guix/licenses.scm >> +++ b/guix/licenses.scm >> @@ -41,6 +41,7 @@ >> cc0 >> cc-by2.0 cc-by3.0 cc-by4.0 >> cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0 >> +cc-sampling-plus-1.0 >> cddl1.0 >> cecill cecill-b cecill-c >> artistic2.0 clarified-artistic >> @@ -206,6 +207,11 @@ at URI, which may be a file:// URI pointing the >> package's tree." >> "http://creativecommons.org/licenses/by/2.0/"; >> "Creative Commons Attribution 2.0 Generic")) >> >> +(define cc-sampling-plus-1.0 >> + (license "CC-Sampling+ 1.0" >> + "https://creativecommons.org/licenses/sampling+/1.0"; >> + "Creative Commons Sampling Plus 1.0")) >> + >> (define cddl1.0 >>(license "CDDL 1.0" >> "http://directory.fsf.org/wiki/License:CDDLv1.0"; >> -- >> 2.14.1 >> >>>From 3c5f0b4ecbe05f7957c324946ab108fce73dd875 Mon Sep 17 00:00:00 2001 >> From: Arun Isaac >> Date: Wed, 13 Sep 2017 22:35:02 +0530 >> Subject: [PATCH 3/6] gnu: Add openttd-opensfx. >> >> * gnu/packages/games.scm (openttd-opensfx): New variable. >> --- >> gnu/packages/games.scm | 38 ++ >> 1 file changed, 38 insertions(+) >> >> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm >> index 7bfd05cc7..ed386fc84 100644 >> --- a/gnu/packages/games.scm >> +++ b/gnu/packages/games.scm >> @@ -2525,6 +2525,44 @@ OpenGFX provides you with... >> @end enumerate") >> (license license:gpl2))) >> >> +(define openttd-opensfx >> + (package >> +(name "openttd-opensfx") >> +(version "0.2.3") >> +(source >> + (origin >> + (method url-fetch) >> + (uri (string-append >> + "https://binaries.openttd.org/extra/opensfx/"; >> + version "/opensfx-" version "-source.tar.gz")) >> + (sha256 >> +(base32 >> + "03jxgp02ks31hmsdh4xh0xcpkb70ds8jakc9pfc1y9vdrdavh4p5" >> +(build-system gnu-build-system) >> +(native-inputs >> + `(
Re: [bug#28453] [PATCH 5/5] gnu: openttd-opengfx: Change installation directory.
Arun Isaac writes:
> Please find attached an updated patchset.
>
> Changes are as follows:
>
> * Disabled parallel build.
> * Included a make-reproducible phase for openttd-opensfx.
> * Changed the license for openmsx from cc-sampling+ to gpl2. It was
> wrong earlier.
> * Changed python dependency to python2-minimal for both openttd-openmsx
> and openttd-opensfx.
>
>>From 8e1a146fde935cc1635c7a9f162e95c16871a8cf Mon Sep 17 00:00:00 2001
> From: Arun Isaac
> Date: Wed, 13 Sep 2017 22:06:12 +0530
> Subject: [PATCH 1/6] gnu: Add catcodec.
>
> * gnu/packages/game-development.scm (catcodec): New variable.
> ---
> gnu/packages/game-development.scm | 26 ++
> 1 file changed, 26 insertions(+)
>
> diff --git a/gnu/packages/game-development.scm
> b/gnu/packages/game-development.scm
> index 5633456d4..9916a1cb3 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -11,6 +11,7 @@
> ;;; Copyright © 2017 Tobias Geerinckx-Rice
> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis
> ;;; Copyright © 2017 Peter Mikkelsen
> +;;; Copyright © 2017 Arun Isaac
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -192,6 +193,31 @@ necessary.
> ;; The MD5 implementation contained in GRFID is under the zlib license.
> (license (list license:gpl2 license:gpl2+ license:zlib
>
> +(define-public catcodec
> + (package
> +(name "catcodec")
> +(version "1.0.5")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append "https://binaries.openttd.org/extra/catcodec/";
> + version "/catcodec-" version "-source.tar.xz"))
> + (sha256
> +(base32
> + "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7"
> +(build-system gnu-build-system)
> +(arguments
> + `(#:tests? #f ; no tests
> + #:make-flags (list (string-append "prefix=" %output))
> + #:phases (modify-phases %standard-phases
> + (delete 'configure
> +(home-page "http://dev.openttdcoop.org/projects/catcodec";)
> +(synopsis "Encode/decode OpenTTD sounds")
> +(description "catcodec encodes and decodes sounds for OpenTTD. These
> +sounds are not much more than some metadata (description and filename) and
> raw
> +PCM data.")
> +(license license:gpl2)))
> +
> (define-public gzochi
>(package
> (name "gzochi")
> --
> 2.14.1
>
>>From f5c1a501c9ba193178db40d514aa337807cdfefb Mon Sep 17 00:00:00 2001
> From: Arun Isaac
> Date: Wed, 13 Sep 2017 22:21:56 +0530
> Subject: [PATCH 2/6] licenses: Add CC-Sampling+ 1.0.
>
> * guix/licenses.scm (cc-sampling-plus-1.0): New variable.
> ---
> guix/licenses.scm | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/guix/licenses.scm b/guix/licenses.scm
> index b7dadd975..6de611da2 100644
> --- a/guix/licenses.scm
> +++ b/guix/licenses.scm
> @@ -41,6 +41,7 @@
> cc0
> cc-by2.0 cc-by3.0 cc-by4.0
> cc-by-sa2.0 cc-by-sa3.0 cc-by-sa4.0
> +cc-sampling-plus-1.0
> cddl1.0
> cecill cecill-b cecill-c
> artistic2.0 clarified-artistic
> @@ -206,6 +207,11 @@ at URI, which may be a file:// URI pointing the
> package's tree."
> "http://creativecommons.org/licenses/by/2.0/";
> "Creative Commons Attribution 2.0 Generic"))
>
> +(define cc-sampling-plus-1.0
> + (license "CC-Sampling+ 1.0"
> + "https://creativecommons.org/licenses/sampling+/1.0";
> + "Creative Commons Sampling Plus 1.0"))
> +
> (define cddl1.0
>(license "CDDL 1.0"
> "http://directory.fsf.org/wiki/License:CDDLv1.0";
> --
> 2.14.1
>
>>From 3c5f0b4ecbe05f7957c324946ab108fce73dd875 Mon Sep 17 00:00:00 2001
> From: Arun Isaac
> Date: Wed, 13 Sep 2017 22:35:02 +0530
> Subject: [PATCH 3/6] gnu: Add openttd-opensfx.
>
> * gnu/packages/games.scm (openttd-opensfx): New variable.
> ---
> gnu/packages/games.scm | 38 ++
> 1 file changed, 38 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 7bfd05cc7..ed386fc84 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -2525,6 +2525,44 @@ OpenGFX provides you with...
> @end enumerate")
> (license license:gpl2)))
>
> +(define openttd-opensfx
> + (package
> +(name "openttd-opensfx")
> +(version "0.2.3")
> +(source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://binaries.openttd.org/extra/opensfx/";
> + version "/opensfx-" version "-source.tar.gz"))
> + (sha256
> +(base32
> + "03jxgp02ks31hmsdh4xh0xcpkb70ds8jakc9pfc1y9vdrdavh4p5"
> +(build-system gnu-build-system)
> +(native-inputs
> + `(("catcodec" ,catcodec)
> + ("python" ,python2-minimal)))
> +(arguments
> + `(#:make-flags
> + (list (string-append "INSTALL_DIR=" %output
> +
