GNU bug report logs - #64519
[PATCH] gnu: godot: Update to 4.1. Rename godot@3 to godot-lts.

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 64519 in the body.
You can then email your comments to 64519 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: John Kehayias <john.kehayias <at> protonmail.com>
To: Guix-patches <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: godot: Update to 4.1.  Rename godot <at> 3 to godot-lts.
Date: Fri, 07 Jul 2023 16:27:08 +0000

[Message part 1 (text/plain, inline)]

Hi Guixers,

Here's a patch to add Godot 4! I've tested it builds and can load some sophisticated examples, working with the new Vulkan support. There is no longer a headless build so that has been removed as an output. The previous version, godot <at> 3 is an LTS release now (and in need of an update I see) so I kept that as godot-lts.

I wasn't sure how best to break this up in commits, let me know if these should be separate and how (1. rename godot to godot-lts and 2. add godot <at> 4?). I did my best to put in all the changes in the package definition from 3 to 4 in the changelog, but please do check. Due to the amount and scope of changes I didn't think godot-lts could easily inherit from godot.

Thanks!
John

[0001-gnu-godot-Update-to-4.1.-Rename-godot-3-to-godot-lts.patch (text/x-patch, attachment)]

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 64519 <at> debbugs.gnu.org
Subject: Re: bug#64519: [PATCH] gnu: godot: Update to 4.1.  Rename godot <at> 3
 to godot-lts.
Date: Tue, 11 Jul 2023 15:51:51 +0200

Hi John,

John Kehayias <john.kehayias <at> protonmail.com> skribis:

> From 287373c727c5292e5778f60aacf3685a4feddeca Mon Sep 17 00:00:00 2001
> Message-Id: <287373c727c5292e5778f60aacf3685a4feddeca.1688747031.git.john.kehayias <at> protonmail.com>
> From: John Kehayias <john.kehayias <at> protonmail.com>
> Date: Fri, 7 Jul 2023 12:05:39 -0400
> Subject: [PATCH] gnu: godot: Update to 4.1.  Rename godot <at> 3 to godot-lts.
>
> * gnu/packages/game-development.scm (godot): Update to 4.1.
> [source]: Update snippet: remove embree and enet; add amd-fsr, astcenc,
> basis_universal, brotli, linuxbsd_headers, etcpak, meshoptimizer, msdfgen,
> noise, openxr, rvo2, spirv-reflect, thorvg, volk, vulkan.
> [arguments]: Remove #:scons.  Update #:scons-flags to unbundle more
> libraries.
> [phases]: Remove 'build-headless phase (headless is no longer has a separate
> build).  Add 'fix-dl-open-paths and 'unbundle-xkbcommon phases.  In 'install
> phase, remove headless output.  Update 'wrap phase to remove eudev.
> [outputs]: Remove headless.
> [inputs]: Add dbus, embree, enet, fontconfig, glslang, libpng, harfbuzz,
> icu4c, libxkbcommon, openxr, speech-dispatcher, vulkan-loader, zlib.  Remove
> bullet.  Rename freetype to freetype-brotli.
> (godot-lts): New variable.  godot <at> 3 is the LTS release.
> * gnu/packages/games.scm (superstarfighter)[native-inputs]: Use it.
> [inputs]: Use it.

[...]

> +(define-public godot-lts
>    (package
>      (name "godot")
>      (version "3.4.2")
> @@ -1982,6 +1988,253 @@ (define-public godot
>  scripted in a Python-like language.")
>      (license license:expat)))
>  
> +(define-public godot
> +  (package
> +    (name "godot")
> +    (version "4.1")

Looks like the arguments and snippet are too different to be factorized
via inheritance.  However, one could still inherit from the other to
factorize license/synopsis/description?

Apart from this minor issue, LGTM!

Thanks,
Ludo’.

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

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 64519 <at> debbugs.gnu.org
Subject: Re: bug#64519: [PATCH] gnu: Add freetype-brotli.
Date: Tue, 11 Jul 2023 16:19:31 +0000

[Message part 1 (text/plain, inline)]

Hi Ludo,

On Tue, Jul 11, 2023 at 03:51 PM, Ludovic Courtès wrote:

> Hi John,
>

[snip]

> Looks like the arguments and snippet are too different to be factorized
> via inheritance.  However, one could still inherit from the other to
> factorize license/synopsis/description?
>

Yes, thought of that afterwards and made that change locally now.

> Apart from this minor issue, LGTM!
>

I completely forgot there is another patch needed here, one to add freetype-brotli. That is just our freetype package with brotli added as a propagated-input for WOFF font support (if I recall). Attaching the patch now.

Actually I think our freetype package should do that as well, but since has nearly 18k dependents that should be grouped with other large changes. I brought this up on guix-devel [0] but didn't get any responses about this change. I think it is not controversial, just how to manage the rebuilds. Perhaps on the next mesa/related branch?

[0] <https://lists.gnu.org/r/guix-devel/2023-06/msg00113.html>

Thanks!
John

[0001-gnu-Add-freetype-brotli.patch (text/x-patch, attachment)]

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

From: John Kehayias <john.kehayias <at> protonmail.com>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: Ludovic Courtès <ludo <at> gnu.org>, 64519 <at> debbugs.gnu.org
Subject: Re: bug#64519: [PATCH] gnu: Add freetype-brotli.
Date: Wed, 12 Jul 2023 19:09:21 +0000

Hello,

On Tue, Jul 11, 2023 at 12:13 PM, John Kehayias wrote:

>
> I completely forgot there is another patch needed here, one to add
> freetype-brotli. That is just our freetype package with brotli added
> as a propagated-input for WOFF font support (if I recall). Attaching
> the patch now.
>
> Actually I think our freetype package should do that as well, but
> since has nearly 18k dependents that should be grouped with other
> large changes. I brought this up on guix-devel [0] but didn't get any
> responses about this change. I think it is not controversial, just how
> to manage the rebuilds. Perhaps on the next mesa/related branch?
>
> [0] <https://lists.gnu.org/r/guix-devel/2023-06/msg00113.html>
>

Maybe it should be called 'freetype-with-brotli' actually, in the
interim of being folded into freetype proper?

John

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 64519 <at> debbugs.gnu.org
Subject: Re: bug#64519: [PATCH] gnu: Add freetype-brotli.
Date: Fri, 14 Jul 2023 15:25:15 +0200

Hi,

John Kehayias <john.kehayias <at> protonmail.com> skribis:

> I completely forgot there is another patch needed here, one to add freetype-brotli. That is just our freetype package with brotli added as a propagated-input for WOFF font support (if I recall). Attaching the patch now.

OK.

> Actually I think our freetype package should do that as well, but since has nearly 18k dependents that should be grouped with other large changes. I brought this up on guix-devel [0] but didn't get any responses about this change. I think it is not controversial, just how to manage the rebuilds. Perhaps on the next mesa/related branch?

Yes, you should check on IRC or guix-devel whether this change can be
piggybacked on an existing mass-rebuild branch.

> From f5622c12a84d208efefc53af88fe5f284485f2ff Mon Sep 17 00:00:00 2001
> Message-Id: <f5622c12a84d208efefc53af88fe5f284485f2ff.1689091993.git.john.kehayias <at> protonmail.com>
> From: John Kehayias <john.kehayias <at> protonmail.com>
> Date: Fri, 7 Jul 2023 12:05:16 -0400
> Subject: [PATCH] gnu: Add freetype-brotli.
>
> * gnu/packages/fontutils.scm (freetype-brotli): New variable.

[...]

> +(define-public freetype-brotli
> +  (package
> +    (inherit freetype)
> +    (name "freetype-brotli")

Maybe ‘freetype-with-brotli’ as you suggested.   Also please add a TODO
about the eventual merge of this into ‘freetype’.

Thanks!

Ludo’.

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

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 64519-done <at> debbugs.gnu.org
Subject: Re: bug#64519: [PATCH] gnu: Add freetype-brotli.
Date: Fri, 14 Jul 2023 15:12:16 +0000

Hi,

On Fri, Jul 14, 2023 at 03:25 PM, Ludovic Courtès wrote:

> Hi,
>
> John Kehayias <john.kehayias <at> protonmail.com> skribis:
>
[snip]
>> Actually I think our freetype package should do that as well, but
>> since has nearly 18k dependents that should be grouped with other
>> large changes. I brought this up on guix-devel [0] but didn't get
>> any responses about this change. I think it is not controversial,
>> just how to manage the rebuilds. Perhaps on the next mesa/related
>> branch?
>
> Yes, you should check on IRC or guix-devel whether this change can be
> piggybacked on an existing mass-rebuild branch.
>

I'll see what is next. mesa-updates is built, but if that needs a
rebuild or other updates I can put it there. Otherwise the next large
branch job.

>> From f5622c12a84d208efefc53af88fe5f284485f2ff Mon Sep 17 00:00:00 2001
>> Message-Id:
>> <f5622c12a84d208efefc53af88fe5f284485f2ff.1689091993.git.john.kehayias <at> protonmail.com>
>> From: John Kehayias <john.kehayias <at> protonmail.com>
>> Date: Fri, 7 Jul 2023 12:05:16 -0400
>> Subject: [PATCH] gnu: Add freetype-brotli.
>>
>> * gnu/packages/fontutils.scm (freetype-brotli): New variable.
>
> [...]
>
>> +(define-public freetype-brotli
>> +  (package
>> +    (inherit freetype)
>> +    (name "freetype-brotli")
>
> Maybe ‘freetype-with-brotli’ as you suggested.   Also please add a TODO
> about the eventual merge of this into ‘freetype’.
>

Done.

Pushed as 49b0a5ee5f908d8efa8e792f8635f723fd1d26ed and 09e73683a2c303016fa57bf5d84a8e997d4c0a30

Thanks!
John

Previous Next

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