From patchwork Tue Oct 29 01:40:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69612 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 A9A0427BBEA; Tue, 29 Oct 2024 01:42:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2FC6F27BBE2 for ; Tue, 29 Oct 2024 01:42:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFI-0001sp-KC; Mon, 28 Oct 2024 21:42:08 -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 1t5bFE-0001rx-5C for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:04 -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 1t5bFD-0007Py-SW for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=1DRq0uQaijLJetBWBMEeO18ns9fKpipkx3PDAaUVTyQ=; b=nzStqRQzg7GCuI3hyYk8RXS/Yfsiz2dryD2fwNf70cUsX3WJgetUWMUgayRawvC9W+4iaLVGXwh+2Gk3HocGE+bnXUp5Mzp/7kS7pHbRlCtOe7Sw5EiSutRLnWo8TvsLsNwM1xQ1y7SRiI60lJysPpE9VF7V83dVNlz+soanbAoQIuiDRaz5AeHOQMOFuoxNzyNREWUZBMYI5CVSxFuetJzY2V+Vhu/w+k3iXsIYs+lXpAa3YeMFDhpydm0t892bmcnDAgyc71nse1B8X3TGTSIVsINy1NIFFiFJ9Cp0pbCumOh9gj539CacnO0gXWgnYAPWFh+uJzPEaRhsqy81pA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFD-0000Wh-MY for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 3/5] gnu: ogre: Update to 14.3.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 01:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74075@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 74075-submit@debbugs.gnu.org id=B74075.17301661041967 (code B ref 74075); Tue, 29 Oct 2024 01:42:03 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:44 +0000 Received: from localhost ([127.0.0.1]:55296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEt-0000VZ-CQ for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:43 -0400 Received: from mail-il1-f180.google.com ([209.85.166.180]:55409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEp-0000Uj-EW for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:40 -0400 Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3a3c00f2c75so18700465ab.2 for <74075@debbugs.gnu.org>; Mon, 28 Oct 2024 18:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730166033; x=1730770833; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1DRq0uQaijLJetBWBMEeO18ns9fKpipkx3PDAaUVTyQ=; b=jx5nG9GhDM3J3fVKST+15aUQTiw1CwI6leOdTTuXPSQ+PLaKxW5VENODrL3tD21c6L clkPlfgpGriROh6wb0ynSDhrFdAf89cctBWI2nI19Qrz7BdY3/PO7rCqiKsD71Lti9bF oHYqIXDjFBvkhnuqMhUwqXGWNl1VY+iJiJ5ApoHMn2lBEnQvXCGoxpIoqw6qTYYoWnW1 wQFHU/0a/SNoZ2pYSIGrexfQe7j75eeB7UxhIcvxyoLuX8LNlowQN7NOW0HA89v3onh7 ot0QWwVpeo1798C/kxon8LmMYzgNETg2CHWfX7DC3G9Tjg58b2iwUfzQzu4l0kWl5peb 0T0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166033; x=1730770833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1DRq0uQaijLJetBWBMEeO18ns9fKpipkx3PDAaUVTyQ=; b=KXUFbiqlCYxOLC+wOWLQAVSc6b7lxe8DTA3soMvTt0YBYppTXG0dR+whmIJjS1U4dM vkD0Fnid74CwRDLg+KGbhD5sg7l//SFL/jDlzwgg1LTowvID64sMsIC3Jk0bMxji92Jr wJX2iGsN3q0X+7XZKsMx6GitfIdLUgL/M0McIrzpsgBrR2SIB3o0/ifvQWnR/IQq1sj0 aNzLGQ4nNXJG8Aw9+B5Oyjfs1T9Imeo2nNtnSLNqxstIZtqBqKfR9dMFo/wXYeAFOANM fcSg82Df4VebxnTJz/WVrDoLb8cZMxVvClpqCqiT1owoflZv1SAcKU5j4QD+Qgzl1M3b DFRA== X-Gm-Message-State: AOJu0YxNn2xlBXq5/cjbYQ2vTPYWeOVT+l6piQ+PCm+xfS2FBDOcTKMD HMMXzwnAJ8JgbA+HbTfrn+z//LlXPMvvmvhySgvkCTK32KiUCITMoHM4RAKL X-Google-Smtp-Source: AGHT+IF3rdf6FOQE1Cd8YTF9joKTlWxEaUW6kFZPOt+bFUOfS97fnvl/MTBu1X+0VxpP2Wna7xd2AQ== X-Received: by 2002:a05:6e02:17cf:b0:3a0:8c5f:90d8 with SMTP id e9e14a558f8ab-3a4ed291866mr87852625ab.6.1730166033463; Mon, 28 Oct 2024 18:40:33 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7edc866906dsm6401968a12.10.2024.10.28.18.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:32 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:06 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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: , 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 * gnu/packages/graphics.scm (ogre): Update to 14.3.1. [phases] : New phases. [native-inputs]: Update imgui source to latest. Add xorg-server-for-tests. Change-Id: Iabe6bb580106158976e7193bbb27d59df2466e29 --- (no changes since v1) gnu/packages/graphics.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 0e13208d80..7659bec27d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer +;;; Copyright © 2020-2024 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Andy Tai @@ -1176,7 +1176,7 @@ (define-public mangohud (define-public ogre (package (name "ogre") - (version "13.3.1") + (version "14.3.1") (source (origin (method git-fetch) @@ -1185,12 +1185,17 @@ (define-public ogre (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "157vpfzivg2wf349glyd0cpbyaw1j3fm4nggban70pghql3x48kb")))) + (base32 "0l5rlxk2jiz8sb5w4bd8xvyzrmwnas27sxzkar7xc5azs1x2vgxf")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-attempt-building-gtest + (lambda _ + (substitute* "Tests/CMakeLists.txt" + (("NOT EXISTS \\$\\{PROJECT_BINARY_DIR}/googletest-1.11.0") + "FALSE")))) (add-before 'configure 'unpack-imgui (lambda _ (copy-recursively #$(this-package-native-input "imgui-source") @@ -1201,7 +1206,11 @@ (define-public ogre ;; it. (lambda _ (substitute* "CMakeLists.txt" - (("set\\(CMAKE_INSTALL_RPATH .*") ""))))) + (("set\\(CMAKE_INSTALL_RPATH .*") "")))) + (add-before 'check 'run-x-server + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0")))) #:configure-flags #~(let ((runpath (string-join (list (string-append #$output "/lib") (string-append #$output "/lib/OGRE")) @@ -1215,10 +1224,11 @@ (define-public ogre "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) (native-inputs `(("doxygen" ,doxygen) - ("imgui-source" ,(package-source imgui-1.86)) + ("imgui-source" ,(package-source imgui)) ("googletest" ,googletest) ("pkg-config" ,pkg-config) - ("python" ,python))) + ("python" ,python) + ("xorg-server-for-tests" ,xorg-server-for-tests))) (inputs (list freeimage freetype