From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UJz9C3JgyGQXAAAASxT56A (envelope-from ) for ; Tue, 01 Aug 2023 03:31:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6K3vC3JgyGTJMAAAauVa8A (envelope-from ) for ; Tue, 01 Aug 2023 03:31:30 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5778C51A5C for ; Tue, 1 Aug 2023 03:31:29 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=jSmZEfnS; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690853490; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=2wexHVO7ZoshyW99UNuP5CuXN7a6+J1gwozuygq7kAM=; b=ZAkPyHW6LriGD3HigWIetc3XDi7D6fWTWcyGtVEvUHdnn2NcUZYi9bM9f+DzFc3bpv5tU5 fJCX5ZyiDXeT49rEDp5+n/P83H/TFawlPwHNk4z+doJPTMy9bIVthhkEJOLVG6AT8n+LIW 4vx7PoleLYvsrkgnF7S+3duUP2cjz0Xf8Q7vcNuFoBexjscyIBo5FJBUgP3a7s4UZrPbOV stk08xZHEBirka4jo8jgljUDPYu4yZOHvkDnLVNpZ84OG2pd0/TngazYFDTrQ8i4o4CQeP BBW9GugJVGipw7fNb2lZgX1lEvHMezhQahYGBawiaFr5kI8vCp+Kbh7BsrscfA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=jSmZEfnS; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690853490; a=rsa-sha256; cv=none; b=Tw3y6VXcaUJ4HKAFLaNYQyVjDv5SdFu4vSrjblw3RvzkjvKp46om5Ip5jfzlyKBvsmfj/1 WLT9dylRyruNHAK17Fw0kFQLfOSoHR3tCo917zrsP+4tNtGWcrV2SzUfJ3FdaGSyyv9kZD VymYiescagfKy4m7MEAoMfvVqw9fU3Thw+mP7i8hcdpzLuknwy7GyWbsTaJ1ukTqE+Hbv4 nmtVZuwvlP/Q0VCBEipx1rizLEQNjPln5G0/Iu7fSKdTbYecoEwZ1abNYJPrr4mkjeaRnu pU2VM7LprcehjIQcwI/WRTEyFAEWixlTQVsLxJwfwIuEBhBn36IsrSkxQsopHg== 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: TakeV via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.65 X-Spam-Score: -3.65 X-Migadu-Queue-Id: 5778C51A5C X-Migadu-Scanner: mx1.migadu.com X-TUID: O72bh6n+w5fp 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 - ;; - ;; 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