GNU bug report logs - #30381
gnu: Add gzdoom.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30381 in the body.
You can then email your comments to 30381 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: okapi <at> firemail.cc
To: guix-patches <at> gnu.org
Subject: gnu: Add gzdoom.
Date: Wed, 07 Feb 2018 19:03:24 +0100

[0001-gnu-Add-fluid-3.patch (text/x-diff, attachment)]

[0002-gnu-Add-gzdoom.patch (text/x-diff, attachment)]

Message #8 received at 30381 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: okapi <at> firemail.cc
Cc: 30381 <at> debbugs.gnu.org
Subject: Re: [bug#30381] gnu: Add gzdoom.
Date: Fri, 09 Feb 2018 11:16:37 +0100

Hello,

okapi <at> firemail.cc skribis:

> From f75ca85cd1cc89a3ba60c6c813ae4ab33bc86a40 Mon Sep 17 00:00:00 2001
> From: okapi <okapi <at> firemail.cc>
> Date: Wed, 17 Jan 2018 00:08:23 +0100
> Subject: [PATCH 1/2] gnu: Add fluid-3.
>
> * gnu/packages/audio.scm (fluid-3): New variable.

Could you add a copyright line for you?  You can use a nickname, that’s
fine.

> +(define-public fluid-3
> +  (let ((commit "871c8ce2002e8b3c198f532fdb4fbcce7914f951"))
> +    (package
> +      (name "fluid-3")
> +      (version "2.1")
> +      (source
> +       (origin
> +         (method url-fetch)
> +         ;; Only one file is required, but the release bundles the whole
> +         ;; software which is 50MiB as tar and 200MiB unpacked. The website
> +         ;; directly links the soundfont release to the github file download.
> +         (uri (string-append "https://github.com/musescore/MuseScore/raw/"
> +                             commit "/share/sound/FluidR3Mono_GM.sf3"))
> +         (file-name (string-append name "-" commit ".tar.gz"))
> +         (sha256
> +          (base32
> +           "1hjfg5i15bw9279007xs92zsggjgn4s4k9pc00s851l3kvc6dkfg"))))
> +      (build-system trivial-build-system)
> +      (arguments
> +       `(#:modules ((guix build utils))
> +         #:builder
> +         (begin
> +           (use-modules (guix build utils))
> +           (let ((file (assoc-ref %build-inputs "source"))
> +                 (out (string-append %output "/share/soundfonts")))
> +             (mkdir-p out)
> +             (copy-file file (string-append out "/FluidR3Mono_GM.sf3"))))))

You can write: (install-file file out).

> +      (home-page  "https://github.com/musescore/MuseScore/tree/master/share/sound")
> +      (synopsis "Pro-quality GM soundfont")
> +      (description "Fluid-3 is Frank Wen's pro-quality GM soundfont.")

I find the synopsis/description a bit vague but I don’t have a better
suggestion.  :-)

Could you send an updated patch?

Thanks!

Ludo’.

Message #11 received at 30381 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: okapi <at> firemail.cc
Cc: 30381 <at> debbugs.gnu.org
Subject: Re: [bug#30381] gnu: Add gzdoom.
Date: Fri, 09 Feb 2018 11:20:03 +0100

okapi <at> firemail.cc skribis:

> From c3b7fea66a5bc5bd13f448da15d704659ee5bcb7 Mon Sep 17 00:00:00 2001
> From: okapi <okapi <at> firemail.cc>
> Date: Wed, 17 Jan 2018 00:21:42 +0100
> Subject: [PATCH 2/2] gnu: Add gzdoom.
>
> * gnu/packages/games.scm (gzdoom): New variable.
> * gnu/packages/patches/gzdoom-search-in-installed-share.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Overall LGTM!  Minor issues:

> +    (native-inputs `(("pkg-config" ,pkg-config)
> +                     ("unzip" ,unzip)))
> +    (synopsis "Modern Doom 2 source port")
> +    (description "Gzdoom is a Doom 2 source port with a modern renderer.

To give a bit more context, maybe: “Gzdoom is a port of the Doom 2
ADJECTIVE game, using a modern renderer.” (I’ll let you find what
ADJECTIVE to use.  :-))

> +It improves modding support with ZDoom's advanced mapping features and the new
> +ZScript language.  In addition to Doom, it supports Heretic, Hexen, Strife,
> +Chex Quest, and fan-created games like Harmony and Hacx.")
> +    (home-page "https://zdoom.org/index")
> +    (license (list license:gpl3+         ; gzdoom game
> +                   license:lgpl3+        ; gzdoom renderer
> +                   license:expat         ; gdtoa
> +                   (license:non-copyleft ; modified dumb
> +                    "file://dumb/licence.txt"
> +                    "Dumb license, explicitly GPL compatible.")))))
> diff --git a/gnu/packages/patches/gzdoom-search-in-installed-share.patch b/gnu/packages/patches/gzdoom-search-in-installed-share.patch
> new file mode 100644
> index 000000000..d16b604db
> --- /dev/null
> +++ b/gnu/packages/patches/gzdoom-search-in-installed-share.patch
> @@ -0,0 +1,14 @@

Please add a couple of lines explaining what the patch does, and what
its upstream status is (with a link to the upstream commit/issue, if
any.)

Could you send an updated patch?

Thanks,
Ludo’.

Message #14 received at 30381 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: okapi <at> firemail.cc
Cc: 30381 <at> debbugs.gnu.org
Subject: Re: [bug#30381] gnu: Add gzdoom.
Date: Mon, 19 Feb 2018 00:17:34 +0100

Hi,

okapi <at> firemail.cc skribis:

[...]

>> You can write: (install-file file out).
>>
> That gives it a name like
> 16ldh2gb8vvc9rw0b1lavfjx5rr1mvv8-fluid-3-2.1.sf3.
> With the custom name it's easier to find by other software.

Indeed.

> From 474523dd49f737677573b188909c0068e537a48a Mon Sep 17 00:00:00 2001
> From: okapi <okapi <at> firemail.cc>
> Date: Wed, 17 Jan 2018 00:08:23 +0100
> Subject: [PATCH 1/2] gnu: Add fluid-3.
>
> * gnu/packages/audio.scm (fluid-3): New variable.

Applied, thanks!

Ludo’.

Message #19 received at 30381-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: okapi <at> firemail.cc
Cc: 30381-done <at> debbugs.gnu.org
Subject: Re: [bug#30381] gnu: Add gzdoom.
Date: Mon, 19 Feb 2018 00:26:00 +0100

okapi <at> firemail.cc skribis:

> The patch is a guix specific fix to make it not use files from
> outdated /gnu/store builds, I don't expect it to go upstream.

OK.

> From bacbe4a090fb09f04dca7bf3e3a4c6e0002a7e93 Mon Sep 17 00:00:00 2001
> From: okapi <okapi <at> firemail.cc>
> Date: Wed, 17 Jan 2018 00:21:42 +0100
> Subject: [PATCH 2/2] gnu: Add gzdoom.
>
> * gnu/packages/games.scm (gzdoom): New variable.
> * gnu/packages/patches/gzdoom-search-in-installed-share.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Applied, thanks!

Ludo'.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.