From patchwork Fri Jul 28 02:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TakeV X-Patchwork-Id: 52276 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4719627BBE2; Fri, 28 Jul 2023 04:20:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 48BC627BBE9 for ; Fri, 28 Jul 2023 04:20:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPDg7-0003SQ-7G; Thu, 27 Jul 2023 22:58:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDg5-0003SE-Rz for guix-patches@gnu.org; Thu, 27 Jul 2023 22:58:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPDg5-0006LW-5n for guix-patches@gnu.org; Thu, 27 Jul 2023 22:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPDg1-0000hh-Qe; Thu, 27 Jul 2023 22:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli Resent-From: TakeV Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 02:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64909 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64909@debbugs.gnu.org Cc: TakeV , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.16905130782694 (code B ref -1); Fri, 28 Jul 2023 02:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2023 02:57:58 +0000 Received: from localhost ([127.0.0.1]:43345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPDfx-0000hO-Tq for submit@debbugs.gnu.org; Thu, 27 Jul 2023 22:57:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPDfw-0000hB-49 for submit@debbugs.gnu.org; Thu, 27 Jul 2023 22:57:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDfq-0003NT-GE for guix-patches@gnu.org; Thu, 27 Jul 2023 22:57:50 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDfo-0006KT-5Y for guix-patches@gnu.org; Thu, 27 Jul 2023 22:57:50 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id EF5D141615; Fri, 28 Jul 2023 04:57:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T1Czk8gQ9Sx4; Fri, 28 Jul 2023 04:57:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690513062; bh=c3LcO7HoJCygcW/l1C5U8tulXGANzj0T73ZGSgGt4FQ=; h=From:To:Cc:Subject:Date; b=AAM9pBWWjTjlsAuLjedIPzv2cTjTs8VZJO3FeLpfB//2HYSJ5g6tEkupLpW9MVpoO Hv29eDSpwghKmT64unhNaQk5omxK2g34TyLsRlRikdgLr28W/tCEIm4wiXYSUhnD1P F9lpvcAKtCWTFnFATMYXdl8wS332+Hn7zsBw2hOrPB4wEK7AKuA27xeGtHXSw7a+/j rYS3Vtyny/y/gzH/bZvrOn0eKkHUT9W59ozZOs5ZGtESXo13vrDlbkm6yaHuw7AMCU 31AaBkfLo8NYJXW0vXle8K188PiaYMcAkckus9vm/Ugs5Dl5ZIwniq6psFyLLOWOyF 8zfs3OlH863SA== Date: Thu, 27 Jul 2023 19:54:23 -0700 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=takev@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: TakeV X-ACL-Warn: , TakeV via Guix-patches X-Patchwork-Original-From: TakeV via Guix-patches via From: TakeV Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6 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 - ;; - ;; 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