* [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli
@ 2023-07-28 2:54 TakeV via Guix-patches via
2023-07-28 4:26 ` [bug#64909] [PATCH vREVISION] gnu: godot: Use " TakeV via Guix-patches via
2023-08-01 1:29 ` [bug#64909] " TakeV via Guix-patches via
0 siblings, 2 replies; 5+ messages in thread
From: TakeV via Guix-patches via @ 2023-07-28 2:54 UTC (permalink / raw)
To: 64909; +Cc: TakeV, Liliana Marie Prikler, 宋文武
I noticed this todo could be resolved, since the merge was built and
deployed upstream.
---
gnu/packages/game-development.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 127cbac127..84bbd68cce 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2017,10 +2017,6 @@ (define-public godot
"assimp"
"astcenc"
"basis_universal"
- ;; TODO: Can unbundle once
- ;; <https://github.com/godotengine/godot/pull/79101>
- ;; is merged
- "brotli"
;; Godot needs ca-certificates.crt, but that is
;; not available in build environment
"certs"
@@ -2067,6 +2063,7 @@ (define-public godot
"use_volk=no"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
+ "builtin_brotli=no"
"builtin_embree=no"
"builtin_enet=no"
"builtin_freetype=no"
@@ -2193,6 +2190,7 @@ (define-public godot
(list pkg-config))
(inputs
(list alsa-lib
+ brotli
dbus
embree
enet
base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli
2023-07-28 2:54 [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli TakeV via Guix-patches via
@ 2023-07-28 4:26 ` TakeV via Guix-patches via
2023-07-30 6:57 ` Liliana Marie Prikler
2023-08-01 1:29 ` [bug#64909] " TakeV via Guix-patches via
1 sibling, 1 reply; 5+ messages in thread
From: TakeV via Guix-patches via @ 2023-07-28 4:26 UTC (permalink / raw)
To: 64909; +Cc: TakeV, Liliana Marie Prikler, 宋文武
* gnu/packages/game-development.scm (godot) [arguments,inputs]: use system brotli
---
gnu/packages/game-development.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 127cbac127..84bbd68cce 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2017,10 +2017,6 @@ (define-public godot
"assimp"
"astcenc"
"basis_universal"
- ;; TODO: Can unbundle once
- ;; <https://github.com/godotengine/godot/pull/79101>
- ;; is merged
- "brotli"
;; Godot needs ca-certificates.crt, but that is
;; not available in build environment
"certs"
@@ -2067,6 +2063,7 @@ (define-public godot
"use_volk=no"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
+ "builtin_brotli=no"
"builtin_embree=no"
"builtin_enet=no"
"builtin_freetype=no"
@@ -2193,6 +2190,7 @@ (define-public godot
(list pkg-config))
(inputs
(list alsa-lib
+ brotli
dbus
embree
enet
base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli
2023-07-28 4:26 ` [bug#64909] [PATCH vREVISION] gnu: godot: Use " TakeV via Guix-patches via
@ 2023-07-30 6:57 ` Liliana Marie Prikler
2023-08-05 12:37 ` bug#64909: " Liliana Marie Prikler
0 siblings, 1 reply; 5+ messages in thread
From: Liliana Marie Prikler @ 2023-07-30 6:57 UTC (permalink / raw)
To: TakeV, 64909; +Cc: 宋文武
Am Donnerstag, dem 27.07.2023 um 21:26 -0700 schrieb TakeV:
> * gnu/packages/game-development.scm (godot) [arguments,inputs]: use
> system brotli
> ---
In case someone else wants to push this, the proper message (minus
leading spaces and missing sign-off) would be:
gnu: godot: Use system brotli.
* gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli.
[arguments]<#:scons-flags>: Add “builtin_brotli=no”.
[inputs]: Add brotli.
Otherwise, I'm queuing this for Saturday.
Cheers
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli.
2023-07-28 2:54 [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli TakeV via Guix-patches via
2023-07-28 4:26 ` [bug#64909] [PATCH vREVISION] gnu: godot: Use " TakeV via Guix-patches via
@ 2023-08-01 1:29 ` TakeV via Guix-patches via
1 sibling, 0 replies; 5+ messages in thread
From: TakeV via Guix-patches via @ 2023-08-01 1:29 UTC (permalink / raw)
To: 64909; +Cc: TakeV, Liliana Marie Prikler, 宋文武
Updated the commit.
* gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli.
[arguments]<#:scons-flags>: Add “builtin_brotli=no”.
[inputs]: Add brotli.
---
gnu/packages/game-development.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index f4b1a1e1e3..5771b7530f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2017,10 +2017,6 @@ (define-public godot
"assimp"
"astcenc"
"basis_universal"
- ;; TODO: Can unbundle once
- ;; <https://github.com/godotengine/godot/pull/79101>
- ;; is merged
- "brotli"
;; Godot needs ca-certificates.crt, but that is
;; not available in build environment
"certs"
@@ -2067,6 +2063,7 @@ (define-public godot
"use_volk=no"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
+ "builtin_brotli=no"
"builtin_embree=no"
"builtin_enet=no"
"builtin_freetype=no"
@@ -2193,6 +2190,7 @@ (define-public godot
(list pkg-config))
(inputs
(list alsa-lib
+ brotli
dbus
embree
enet
base-commit: 39fbc041f92489ec30075a85937c8a38723752dc
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#64909: [PATCH vREVISION] gnu: godot: Use system brotli
2023-07-30 6:57 ` Liliana Marie Prikler
@ 2023-08-05 12:37 ` Liliana Marie Prikler
0 siblings, 0 replies; 5+ messages in thread
From: Liliana Marie Prikler @ 2023-08-05 12:37 UTC (permalink / raw)
To: TakeV, 64909-done; +Cc: 宋文武
Am Sonntag, dem 30.07.2023 um 08:57 +0200 schrieb Liliana Marie
Prikler:
> Am Donnerstag, dem 27.07.2023 um 21:26 -0700 schrieb TakeV:
> > * gnu/packages/game-development.scm (godot) [arguments,inputs]: use
> > system brotli
> > ---
>
> In case someone else wants to push this, the proper message (minus
> leading spaces and missing sign-off) would be:
>
> gnu: godot: Use system brotli.
>
> * gnu/packages/game-development.scm (godot)[source]: Do not
> preserve brotli.
> [arguments]<#:scons-flags>: Add “builtin_brotli=no”.
> [inputs]: Add brotli.
>
> Otherwise, I'm queuing this for Saturday.
queue.pop (this);
Cheers
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-05 12:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-28 2:54 [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli TakeV via Guix-patches via
2023-07-28 4:26 ` [bug#64909] [PATCH vREVISION] gnu: godot: Use " TakeV via Guix-patches via
2023-07-30 6:57 ` Liliana Marie Prikler
2023-08-05 12:37 ` bug#64909: " Liliana Marie Prikler
2023-08-01 1:29 ` [bug#64909] " TakeV via Guix-patches via
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).