From patchwork Tue Aug 1 01:29:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: TakeV X-Patchwork-Id: 52447 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 C276B27BBE2; Tue, 1 Aug 2023 02:31:30 +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 45C0727BBE9 for ; Tue, 1 Aug 2023 02:31:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQeE8-00044H-Q2; Mon, 31 Jul 2023 21:31:09 -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 1qQeE6-000443-3W for guix-patches@gnu.org; Mon, 31 Jul 2023 21:31:06 -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 1qQeE5-0008SA-RJ for guix-patches@gnu.org; Mon, 31 Jul 2023 21:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qQeE2-0003Wv-B3; Mon, 31 Jul 2023 21:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli. References: In-Reply-To: Resent-From: TakeV Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 01 Aug 2023 01:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 64909-submit@debbugs.gnu.org id=B64909.169085343413532 (code B ref 64909); Tue, 01 Aug 2023 01:31:02 +0000 Received: (at 64909) by debbugs.gnu.org; 1 Aug 2023 01:30:34 +0000 Received: from localhost ([127.0.0.1]:46901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQeDZ-0003WC-Ny for submit@debbugs.gnu.org; Mon, 31 Jul 2023 21:30:33 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQeDX-0003W0-HS for 64909@debbugs.gnu.org; Mon, 31 Jul 2023 21:30:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 20B0441BC1; Tue, 1 Aug 2023 03:30:27 +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 OZd0MrVEPV_i; Tue, 1 Aug 2023 03:30:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690853425; bh=+gIA1uAB9AUOKKFxp8r01/ZkdLL/StMSJorTfzFv8Zw=; h=From:To:Cc:Subject:Date; b=jSmZEfnSzpnOZLh4R98Bb/IcRK/2LIXw1POe42CG0s4aOCzV4Gu937u7x63MTfLAi 3JkYSYPrRDdeL/JTUSjXjeo0+3kxUxb1yCXcpn0VwLu746bt6DGMc9eaDxpwfjCqS+ ONHhLBq6mjBQ3dG6nF5s2Vfp6hRC7iLaUobOcq9gmAtzryH2A6fIqb5b51vRcWcE3R RXhhwYYeX6WJVQlG01n+IQmftatQ6OCVnEOsczUllJYoFhhk26eg+SyY9+6xo1kzSs Rwx9DYJ6C65x/jL4i+nN3WRs/yC7CUFDIjIHxQ1+HPHsrdyG5knTTk6BmD4Cu8/LXo YztaJ7rmFJrMg== Date: Mon, 31 Jul 2023 18:29:14 -0700 Message-ID: MIME-Version: 1.0 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 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(-) base-commit: 39fbc041f92489ec30075a85937c8a38723752dc 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 - ;; - ;; 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