From patchwork Tue Oct 29 01:40:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69611 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 D8E3D27BBEA; Tue, 29 Oct 2024 01:42:38 +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 A2E8627BBE2 for ; Tue, 29 Oct 2024 01:42:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFI-0001so-Kn; 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 1t5bFD-0001rW-10 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:03 -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 1t5bFC-0007Ps-OD for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -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:Date:From:To:In-Reply-To:References:Subject; bh=L2xMgobcHwUoFiMzPLf2F97H0NKFWZdyDFfgf+zv76o=; b=O4sPuLuJVs7N5ByL6JxeSzEm0sl+7n4QAdNj9Sr36zdyPHp7/Qiz1ctErX9o8U5G/uxzhgP9h3nWezAYNe3K4fJqKc5c5arF8D8RLsjCjVeYpzjxpgavFEbQrxmAQcb4+BoTg1eZS3j4hds8c/NIQP8BjTysSKP5jEEfqPEiJnM4bNGWsxqBQwWs6lZwYsOx7ftBm8XBmyFoDNu1FcUxxuaFnuqfF8Xd05G3W114UwXh+STzg0HSS+VOvYv/SQPHoLGeg1NgHEON/zsiwgPR6dowujC4skQ9+A7a0GlKHXAJ37POH9WzNDqcYV3we5IN1WFzYRt+CojaoKAkW6uZ9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFC-0000WT-HJ for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 1/5] gnu: imgui: Update to 1.91.4. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 01:42:02 +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.17301660991930 (code B ref 74075); Tue, 29 Oct 2024 01:42:02 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:39 +0000 Received: from localhost ([127.0.0.1]:55289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEo-0000V3-Ip for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:38 -0400 Received: from mail-il1-f181.google.com ([209.85.166.181]:61664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEl-0000UZ-V4 for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:36 -0400 Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3a3b7442db5so17873725ab.2 for <74075@debbugs.gnu.org>; Mon, 28 Oct 2024 18:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730166030; x=1730770830; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=L2xMgobcHwUoFiMzPLf2F97H0NKFWZdyDFfgf+zv76o=; b=RgNcChXrmPUtxCmwrsU3FXR3h52NWzM6jsOxMLj5vJo58zM4aR/HEwFRIe1Nvy9NcN HdXJI+WrwGl//bouDmqEEe4lYbHeXOxfTUvOnyrpnLlZGtv0mnz7DUiPam83qyclHuAH tfOK9QEH8NyhoZK+QpnwfApUhDYxcUgRn2ssuWSwenaxxTEGVlNI6lj143fcKMkgpQSk aO+hlW69hoTCrEeTNNxy/9yp7Rlw+/lFd3meuzEeXCifmnTsiELOfKixBVvJ2reBcVSv zNyGQ6O045VaDTY7bPr7uL/SSTH0sunQB4gO/T+8GdC3wfcdFwKjlubGgETHPoVVz+D9 mB1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166030; x=1730770830; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L2xMgobcHwUoFiMzPLf2F97H0NKFWZdyDFfgf+zv76o=; b=r4QLN2kJV5sLHJZuUF5HSGg1t6o9P+BAC4RfPVNLoyw3xmtp/lnoSH5KWzS5zPd9Ie I9JJgptHPcFEAbqyKpsw5+25pzEO2Tr2TUXsiTpK4AdNV35Uvc3aSbjljKSK70zEsyab TEVxP2+bgTfm7zo1Hm/rb8Js+NDFjlFW2iW/9jVeYds4jTzxcJle7sBhVX4gg9KlVWCh BvDOGlO1IrlDBKNdqGVs7wif5Pof0hPK/VbWAUP27bZ3Gee639kmDFDe8TYC1H6U9JmB EeoD5ZLTfv5DAR0oGYtkKdv5cKLB4eFwToskpMpAUqEBBFQottjLnvQJ/5D8tpVrwyM8 ydGw== X-Gm-Message-State: AOJu0YyeQ4kdbvtl0tAe5sd0lWM/vijadrsVvwXxcn3eMghHmfmOdKys BNbRP5jOOQTC9f38sk8SQXQ9TWhByLrk706g/EfIiEHPQpNiKM/ZZdyRTicu X-Google-Smtp-Source: AGHT+IHWRVIU9MEo8oHbnPj9AulfPCoyQY7cz3kuq/LJEtgGZuVHLSjy6XwVqvepYojeuV6FwJ5N0w== X-Received: by 2002:a05:6e02:1d04:b0:3a3:449b:5989 with SMTP id e9e14a558f8ab-3a4ed304cebmr74906895ab.21.1730166029877; Mon, 28 Oct 2024 18:40:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:29 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:04 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 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/toolkits.scm (imgui): Update to 1.91.4. Change-Id: I9a8f03db59fc795e065ebe4eaee60ca994164349 --- (no changes since v1) gnu/packages/toolkits.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 4009d1de954d694cb11af391d4113d29c5c1379d diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 3ba3399899..50b30812f2 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -34,7 +34,7 @@ (define-module (gnu packages toolkits) (define-public imgui (package (name "imgui") - (version "1.89.9") + (version "1.91.4") (source (origin (method git-fetch) (uri (git-reference @@ -43,7 +43,7 @@ (define-public imgui (file-name (git-file-name name version)) (sha256 (base32 - "0db11pin6kdzyd07dnwch8sf0z3386h42ibki1lnzb2ln8m66kyj")) + "1lqcsyqj5m4d4g390x7n3jvjanrnsf64fgjxn51v1kc02dw28gpa")) (modules '((guix build utils))) (snippet ;; Remove bundled fonts. From patchwork Tue Oct 29 01:40:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69609 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 388C327BBEA; Tue, 29 Oct 2024 01:42:31 +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 A364F27BBE2 for ; Tue, 29 Oct 2024 01:42:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFD-0001rh-OM; Mon, 28 Oct 2024 21:42:03 -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 1t5bFC-0001rM-Ed for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -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 1t5bFC-0007Pm-67 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -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=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=O6u5ualzQxdq4SzrkCL1le6eEf17BegnvYo1+SVR/g4Q5Yy7KJ4hYaWdnyKu6MzsBqfT+j++N94gksq0+lvfh5ijjBX3fapPgTfqLFEXXFJY9TFwJ6DrPe6wJNjHVi5kx+CkgMoJXKg58jmri5qb+kCssXK0h1l6hXDlEp48bUdrXGg2FsfZ/rASALEVoyek+SLPvsOZ/L9P/PhrBaBHcTJzMx0+PhD0L2b2RAkPdpC6ZTT3WNEBh91mTNRIEgBN1NtsP9A8au6aLYVJHH99GCgT52pfeWjJE/GwVXLki8QBLRouQwb0nCM5SugEOcU3oTWc/b2NfTgeFeDKXoQ/+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFB-0000WL-W4 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 2/5] gnu: ogre: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 01:42:01 +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.17301660951912 (code B ref 74075); Tue, 29 Oct 2024 01:42:01 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:35 +0000 Received: from localhost ([127.0.0.1]:55286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEl-0000Ul-4t for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:35 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:46310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEi-0000Uc-Va for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:33 -0400 Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7205646f9ebso2835129b3a.0 for <74075@debbugs.gnu.org>; Mon, 28 Oct 2024 18:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730166032; x=1730770832; 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=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=dpM+Y+XG0dG0fSCEoBABOzV++Kb7fx9uNpC9HfCzDLAnZAkBDZm2qkQk8JSkJ+TAdv CXHVBGoeoVEf4WE4shplvXvZFJ2rsMiFBhd+aSnhn/kPp2B+fKiZm0ji7LGFXneettdy wCvYiqrx1YFwfgHkra4hhIoUtqNWETEBsazLiEhZAX188psbWPVC+bwA8wrwnd9z98b2 X38ticm/lR3nvTaZaY5Um5xhiZrKFBOnJ0YlSq9j9Kk0qXG2x3kocFObXYXrxztNdlS4 N9wTFPN+06bB0NZznDA//1YIbAkCMcGvpDkOkhu88V0kO1do9CG7s9C9sVroG/afZx7I Ca6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166032; x=1730770832; 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=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=U3aYfwwEdmg8ppVVLQ4cZKR/sI0QXa1O24L/IgRIhxeGQFV7dwyMf8zsN7Qlw1Ucsn 1LLXkTpWbFqciJI8UnlpByti3MDL4u35wUX8VYxyWyZuC1fGC4/NOnE7RPcBtcPYg7VJ +SQ5yqdsZ7gZ4rYZd/8FtItl0NnjIxv4KUCk2E3mGZs66pLFFYBUgoIyjSSGmc2sWB7U Pzk8qxsn+T6IYy3G2MKK9RmrVK3vfvj/n8ItOngAKlhYlRyeQOjJyLNvEPS2F30M9Hhd OqiRtK8xAz1P2znMmvHfqZTk00WT+2WvhiHTLSCN5w43avyIVuDD5p145FSrcGhzyq75 RHlA== X-Gm-Message-State: AOJu0Yx1JM+jlKciN2+PAb131SrfKW/Y59YuNgWxV16pJniZN+gWhmf8 0Jzo3oDazmua+un9lWuCVUlCTmMCggwKhPLBXqm4LCNdbNNN5PXGik7BP+YP X-Google-Smtp-Source: AGHT+IHv6owyYLbIeZIGZC+eY7b+gWPwI5eGYnL1UGoROZOTZ14+Q50V7rJRo4Xo5LLU3d6l2bh7gA== X-Received: by 2002:a05:6a00:8d2:b0:71e:795f:92f0 with SMTP id d2e1a72fcca58-72062f8304dmr15102191b3a.3.1730166031650; Mon, 28 Oct 2024 18:40:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:31 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:05 +0900 Message-ID: <25f0b75b2224f626d7afb3e6e9e896483967884c.1730166007.git.maxim.cournoyer@gmail.com> 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) [arguments]: Use gexps. Change-Id: I0e9ebeea06769dc849e9579501ffa44fbd4ebc3b --- (no changes since v1) gnu/packages/graphics.scm | 81 ++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8686cac7f7..0e13208d80 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1188,46 +1188,47 @@ (define-public ogre (base32 "157vpfzivg2wf349glyd0cpbyaw1j3fm4nggban70pghql3x48kb")))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'unpack-imgui - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "imgui-source") - "../imgui-source"))) - (add-before 'configure 'pre-configure - ;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As - ;; a consequence, we cannot suggest ours in configure flags. Fix - ;; it. - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("set\\(CMAKE_INSTALL_RPATH .*") ""))))) - #:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (runpath - (string-join (list (string-append out "/lib") - (string-append out "/lib/OGRE")) - ";"))) - (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) - "-DIMGUI_DIR=../imgui-source" - "-DOGRE_BUILD_DEPENDENCIES=OFF" - "-DOGRE_BUILD_TESTS=TRUE" - "-DOGRE_INSTALL_DOCS=TRUE" - "-DOGRE_INSTALL_SAMPLES=TRUE" - "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) - (native-inputs `(("doxygen" ,doxygen) - ("imgui-source" ,(package-source imgui-1.86)) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (inputs (list freeimage - freetype - libxaw - libxrandr - libxt - mesa - pugixml - sdl2 - zlib)) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'unpack-imgui + (lambda _ + (copy-recursively #$(this-package-native-input "imgui-source") + "../imgui-source"))) + (add-before 'configure 'pre-configure + ;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As + ;; a consequence, we cannot suggest ours in configure flags. Fix + ;; it. + (lambda _ + (substitute* "CMakeLists.txt" + (("set\\(CMAKE_INSTALL_RPATH .*") ""))))) + #:configure-flags + #~(let ((runpath (string-join (list (string-append #$output "/lib") + (string-append #$output "/lib/OGRE")) + ";"))) + (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) + "-DIMGUI_DIR=../imgui-source" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_TESTS=TRUE" + "-DOGRE_INSTALL_DOCS=TRUE" + "-DOGRE_INSTALL_SAMPLES=TRUE" + "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) + (native-inputs + `(("doxygen" ,doxygen) + ("imgui-source" ,(package-source imgui-1.86)) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + (list freeimage + freetype + libxaw + libxrandr + libxt + mesa + pugixml + sdl2 + zlib)) (synopsis "Scene-oriented, flexible 3D engine written in C++") (description "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, 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 From patchwork Tue Oct 29 01:40:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69608 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 E2A0727BBE9; Tue, 29 Oct 2024 01:42:19 +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=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 B3A5327BBE2 for ; Tue, 29 Oct 2024 01:42:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFG-0001sH-4D; Mon, 28 Oct 2024 21:42:06 -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-0001s5-KI 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 1t5bFE-0007Q4-C1 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:04 -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=uFL93tOKUhR2y8kZgSNDINz4llx/Ji6KFxmjj1lW8c4=; b=M+ysQ2jMaKiZ1RKEH74MLRZS9b3YIg827oYpn+Bwk+eLmhvW9PX0LVGQDHVJRdlivKl01FgT4KdacX7K+6adicl0uOXCbAMmJa8xZY3Zw0uCpFMui+UPX5C71KDNNVwzL0LoyqEauBb5QI5i74YvS7hZvoVrMTbrI3lrosP4ZzTkuLpoTaDJDgr6nA86birytz7JqOxp57sorcyk+/OSpB+U3wI9baVufz9oa9boGoCyCoFkT69SC+r7uFSa00n4Ax5l0tl0CafjkhPYd836kNcirYndm9P5SiUd0snTjIWYKEi9o4pKmXNmlJ2jEHtO+b7lofs6mCuwsQshOIvcAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFE-0000Wo-6R for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 4/5] gnu: ogre: Add support for Wayland, Vulkan and Bullet. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 01:42:04 +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.17301661041973 (code B ref 74075); Tue, 29 Oct 2024 01:42:04 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:44 +0000 Received: from localhost ([127.0.0.1]:55298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEt-0000Vg-UB for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:44 -0400 Received: from mail-oo1-f41.google.com ([209.85.161.41]:55580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEr-0000Uw-HE for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:42 -0400 Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5e5a0519d00so2301200eaf.3 for <74075@debbugs.gnu.org>; Mon, 28 Oct 2024 18:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730166035; x=1730770835; 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=uFL93tOKUhR2y8kZgSNDINz4llx/Ji6KFxmjj1lW8c4=; b=j1qXeLN8E5XXCzfO9tj17tHI14sgd7fWx+F+XLrd4Qxba/zW9dNYiNWEvIMqOfC8Gm kyNvsTLWMTWABy9MOqeGqmylS2hHDS8WAoiBgN5sDn5m2mq//H1Lhl/QdhzcNFESIWxQ 5x/FBTDi96q4Ouvj//8GlnZuO3rddFKmgEmCYIRNwYT8HsgIE+chGlRFsyS7r4Qx27mg XjWmqCArb/81BzR8j6ZvJl5H/OlRiDig6hEg7563veiKDm10+PH/6wa/8LVrWrE+p8uB 2yvHhUC+dyRm4ERYlLV81DmgXOJ3/kgMruhBeyR+EFLfqgb6MOslSKUtBj3GR9jbyQEZ IYRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166035; x=1730770835; 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=uFL93tOKUhR2y8kZgSNDINz4llx/Ji6KFxmjj1lW8c4=; b=itXWBGn9l578a1DturhpqfwPwZwBhykUyJpXpRhW2t5yJmXvB/Nfd05UwyRe90so5g vn6NUN5pSxjPzEXadrzAXp9QM93yHGuNVIRwTR9iNyIInAWTgrjhHqrc5BzZ+9I+gFpe k3QFKUDrvqNRLlnmx4XNfxcvt6WgD7IStKs6ynNqrpf9D3YZOpx6bmgnjaPglpkMD+Aj F7fTvjyEpkH7wLVpSL/FdsYLqYnHzginuQrpEOs31zCfCu9676cEjZriDNuiEzJ86xtk 0AjIb30QU2tS8/y9eg1+gUMJDQfltm+NOLFX99DOKyCsmsif+vrWThkxs3ffEB2YsxCX xenw== X-Gm-Message-State: AOJu0Yza830KCl34MrdkeccHncCXXI1wH/sS5ZncecTngsGWZsNZa3SM 1GfzaidnPdZzn5e2AGQixyMWahBtmYJqf7JH5dXONXaCmrFnwPTkLnjOoimU X-Google-Smtp-Source: AGHT+IFsbPd4tbJSZITkaqp2kRTzO4h/0InBAYkRbFebaJpl9/e3fAPGHznDsBMh5/Gd2prP2goJwg== X-Received: by 2002:a05:6870:1cd:b0:25d:ff4c:bc64 with SMTP id 586e51a60fabf-29051af0f90mr7836001fac.6.1730166035226; Mon, 28 Oct 2024 18:40:35 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:34 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:07 +0900 Message-ID: <41ab210b8582c7f709734d71fb30188ef120badb.1730166008.git.maxim.cournoyer@gmail.com> 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/patches/ogre-glslang.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/graphics.scm (ogre): Apply patch. [configure-flags]: Add -DOGRE_BUILD_RENDERSYSTEM_VULKAN=ON. [native-inputs]: Add vulkan-headers. [inputs]: Add bullet, glslang, spirv-tools and wayland. Change-Id: I77f8964f36facd40f48a80006cfaa0a17c7971e5 --- (no changes since v1) gnu/local.mk | 1 + gnu/packages/graphics.scm | 11 ++++++-- gnu/packages/patches/ogre-glslang.patch | 36 +++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ogre-glslang.patch diff --git a/gnu/local.mk b/gnu/local.mk index c432685775..ac53887aa3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1836,6 +1836,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ + %D%/packages/patches/ogre-glslang.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onionshare-cli-async-mode.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7659bec27d..bde89b487b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1185,7 +1185,8 @@ (define-public ogre (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l5rlxk2jiz8sb5w4bd8xvyzrmwnas27sxzkar7xc5azs1x2vgxf")))) + (base32 "0l5rlxk2jiz8sb5w4bd8xvyzrmwnas27sxzkar7xc5azs1x2vgxf")) + (patches (search-patches "ogre-glslang.patch")))) (build-system cmake-build-system) (arguments (list @@ -1218,6 +1219,7 @@ (define-public ogre (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) "-DIMGUI_DIR=../imgui-source" "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_RENDERSYSTEM_VULKAN=ON" "-DOGRE_BUILD_TESTS=TRUE" "-DOGRE_INSTALL_DOCS=TRUE" "-DOGRE_INSTALL_SAMPLES=TRUE" @@ -1228,16 +1230,21 @@ (define-public ogre ("googletest" ,googletest) ("pkg-config" ,pkg-config) ("python" ,python) + ("vulkan-headers" ,vulkan-headers) ("xorg-server-for-tests" ,xorg-server-for-tests))) (inputs - (list freeimage + (list bullet + freeimage freetype + glslang libxaw libxrandr libxt mesa pugixml sdl2 + spirv-tools + wayland zlib)) (synopsis "Scene-oriented, flexible 3D engine written in C++") (description diff --git a/gnu/packages/patches/ogre-glslang.patch b/gnu/packages/patches/ogre-glslang.patch new file mode 100644 index 0000000000..a0711f8ead --- /dev/null +++ b/gnu/packages/patches/ogre-glslang.patch @@ -0,0 +1,36 @@ +From ab1a39e0610c737993ef605559d9b7998a975666 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Tue, 29 Oct 2024 09:52:48 +0900 +Subject: [PATCH] build/glslang: Fix build when OSDependent library is missing. + +The OSDependent glslang library is only available when it is built as +a static library, not a shared one; look for the library but do not +fail the build when it doesn't exist. + +Fixes: +--- + PlugIns/GLSLang/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/PlugIns/GLSLang/CMakeLists.txt b/PlugIns/GLSLang/CMakeLists.txt +index bfe03d9b8..7de816939 100644 +--- a/PlugIns/GLSLang/CMakeLists.txt ++++ b/PlugIns/GLSLang/CMakeLists.txt +@@ -19,7 +19,11 @@ elseif(DEFINED ENV{VULKAN_SDK}) + target_link_directories(Plugin_GLSLangProgramManager PUBLIC $ENV{VULKAN_SDK}/lib) + target_link_libraries(Plugin_GLSLangProgramManager PUBLIC OgreMain shaderc_combined) + else() +- set(GLSLANG_LIBS glslang OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools) ++ set(GLSLANG_LIBS glslang SPIRV SPIRV-Tools-opt SPIRV-Tools) ++ find_library(GLSLANG_OSDependent OSDependent) ++ if(GLSLANG_OGLCompiler) ++ set(GLSLANG_LIBS ${GLSLANG_LIBS} ${GLSLANG_OSDependent}) ++ endif() + find_library(GLSLANG_HLSL HLSL) + if(GLSLANG_HLSL) + set(GLSLANG_LIBS ${GLSLANG_LIBS} ${GLSLANG_HLSL}) + +base-commit: edb3d26fa6fa2a40498e80db03e2c0e17c51d46d +-- +2.46.0 + From patchwork Tue Oct 29 01:40:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69610 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 D4D1027BBEB; Tue, 29 Oct 2024 01:42:31 +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 A663A27BBE2 for ; Tue, 29 Oct 2024 01:42:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFH-0001sk-VV; 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 1t5bFG-0001sL-81 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42: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 1t5bFF-0007QA-VZ for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:06 -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=gLliPfuo9ZYcrqyUwl5q95stE/xyzoje9g3iGaaPdSM=; b=RzSSwinTJfCV9wkQ8WWEK+R+JkMmaGZ1zUrTBMvhcpo2H4TxIyyKyZUDWl2DVw+al7sc3EjEPAbYSy3C7P/1AQ5jhwEKUK2jnXOMQf2/CY31KvDsOXcD1jqOZv0KqqdMsr0cuMG9bgPfRvGkUT6SrdacC/DkAFf23KW27SZUnqkrCrOL/AJKn3i9mCQulieAv+47nKJaHRVIi/LUJE4CUeFNo9uPuRyy/v7vxW4i2TRcGXRJverfOwBhJzektFsqKbrbtGeVcTbmwZY3fNA6sREw2X7O7DO6ty/obtGIhj+lQUrKNPcsPQs8G0EXXaBCMZo5L2JcIO1UaD14I509SQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFD-0000Wa-5P; Mon, 28 Oct 2024 21:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 5/5] gnu: mygui: Update to 3.4.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, 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 , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74075-submit@debbugs.gnu.org id=B74075.17301661031959 (code B ref 74075); Tue, 29 Oct 2024 01:42:03 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:43 +0000 Received: from localhost ([127.0.0.1]:55294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEs-0000VW-VH for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:43 -0400 Received: from mail-ot1-f42.google.com ([209.85.210.42]:57465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEp-0000VB-II for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:40 -0400 Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-7181a8af549so2490249a34.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=1730166037; x=1730770837; 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=gLliPfuo9ZYcrqyUwl5q95stE/xyzoje9g3iGaaPdSM=; b=G98n/1f/Mhf2TXxvdSGxSFF9Sa/xsIL5K0lgq3fSOb2DK2Ex6UCGyIZ1RMMhKas/pP iumVV+2y01Bg4tiQnTjJ9ZexjScE2r/KMxjTdQYU+t0CMqz4O9bQ0ppsvlLgUfpqb3Vr d7rnqniMlaMbP3my8GcZ/jByAIr5o94cpoGi2gmYZ6rDlcjvdSI1BtVZkPQSzhbJCBkm XI09rxlri11NSa17aV5RE7BnOm/fZcoeWuZ4a4SXhkM3qC4wMogdnd9mi6fYuDmnpe9K gbQIpRn3nKu6KRe9UkCeX+wIA8Q7gysatXnMUoH3gN1au+OX6EioORaV8fSF7l8Yv7IL 8Sgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166037; x=1730770837; 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=gLliPfuo9ZYcrqyUwl5q95stE/xyzoje9g3iGaaPdSM=; b=rtDP91Yp9YzLZOeuAdMEws1Wdz9ezXLTjg5ByiPN3ulcEv0xhBUIJzCu7yc5rjbBOq IFRe9gV1BzkY+zpmRQaBwfpaO1oAHvNQcsavATvhmEaeuTSK4lJaHXYITZyaIgTiYuK6 bWEQaR8n2G7pu/l5et8SXFN1W9fJAunLQb3tBmkUv8NmM+JV0Gjg2YdCa4oBk+8keZNV A1hbiSRIOM5i1JwTfX62sKIqv3l7Nw0YJh2EfVPjwGr6bqj8Q7AdnqBdRBYTgKxjCmxG r1sdtVdX5kFh4E3g3juXzbDUw9MnI+zJgZKKwJqdnP6nSFzlvmH9mGVoQyUXxZkwdYOQ ViUw== X-Gm-Message-State: AOJu0YybqmghyEJjyYhauEA6OKQRcgiE+JD6s1XaNZheBEP9BzByAWAu xdf+xOlvF1xCTgQa9nOU+vd+kNPaZY5o8AEdstCI5x8aeeb7+CJynS0Hc5wT X-Google-Smtp-Source: AGHT+IFVV7mJNb+XrIL0gYl1TwM5XNoGysqgaP9nOfDgBeXxk4TIuzwUE5TcXWazIEyKLZuHTO5Xzg== X-Received: by 2002:a05:6830:2c09:b0:718:6da3:e238 with SMTP id 46e09a7af769-7186da3e2f4mr6503774a34.15.1730166037068; Mon, 28 Oct 2024 18:40:37 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:36 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:08 +0900 Message-ID: <57d6a8d0a5e0b32f11097db8c52760c49330a622.1730166008.git.maxim.cournoyer@gmail.com> 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/game-development.scm (mygui): Update to 3.4.3. Change-Id: I5732fc176c5cfafabe3346367f0790e6a5f4a8e9 --- (no changes since v1) gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee869c9cc5..2c64388079 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1825,7 +1825,7 @@ (define-public ois (define-public mygui (package (name "mygui") - (version "3.4.2") + (version "3.4.3") (source (origin (method git-fetch) @@ -1834,7 +1834,7 @@ (define-public mygui (commit (string-append "MyGUI" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gkfahz118gpqa2906cjb3d4w8g13rv8v3ma7s0ml9l5cci785f8")))) + (base32 "0nayw5shm5nly9bjp0g372kg5ia64dvn6mrmi1c6mdg0n6vgs9xa")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; No test target