From patchwork Sat Apr 8 19:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49028 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 42C891747D; Sat, 8 Apr 2023 20:28:19 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 9EB3417434 for ; Sat, 8 Apr 2023 20:28:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plEEG-00025x-35; Sat, 08 Apr 2023 15:28:04 -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 1plEEF-00025o-8V for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plEEF-0007Y9-0v for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plEEE-0007w0-Si for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62728] [PATCH 1/2] gnu: openmw-openscenegraph: Fix build. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62728@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 62728-submit@debbugs.gnu.org id=B62728.168098208130486 (code B ref 62728); Sat, 08 Apr 2023 19:28:02 +0000 Received: (at 62728) by debbugs.gnu.org; 8 Apr 2023 19:28:01 +0000 Received: from localhost ([127.0.0.1]:59566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEED-0007ve-8w for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:28:01 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:40935) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEEB-0007vD-6k for 62728@debbugs.gnu.org; Sat, 08 Apr 2023 15:27:59 -0400 Date: Sat, 08 Apr 2023 19:27:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680982073; x=1681241273; bh=9sG+UmKKDLzis83Mtv4/geh/Mi28reejOo81MbZUElQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=VG7AodpbO3rCg9eTgWh4JqdoFS0o/JhAUVku8g8WPm7fIYxcfCY8GTMmU+LbM3qOg 6U3U7sT1tWaeLsMxZQyxP3ri7BXE/xrl/vl9OI22bb/CuS3tjf1Rn8QfTW2BKU3Y2r LZGHdRMmhz5JkUx39OucY6oLER1NBcaEzH+8hp1yeSaJbpqHdZjdRo/Qo5aXHD5+ei 0fqS++/fY9BRnPyW15yD/f1beolj5695+Ou8A6HHzoquxEPSYZUG1ANz+kxQeGKQxy HFlVJ0BC0tkYlaCY77yZJTKHM47yguqYfNumOMS+08uLUi9cpcwf64h+sePSRU0xI2 xlMTrZqMtZsnw== Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (openmw-openscenegraph): Fix build. --- gnu/packages/graphics.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.39.2 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bcc27cc3bf..09c7c4b6d2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Eric Bavier +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -1488,6 +1489,7 @@ (define-public openmw-openscenegraph (sha256 (base32 "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia")))) + (outputs (list "out")) (arguments (substitute-keyword-arguments (package-arguments openscenegraph) ((#:configure-flags flags) @@ -1503,7 +1505,9 @@ (define-public openmw-openscenegraph "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" ;; The jpeg plugin requires conversion between integers and booleans "-DCMAKE_CXX_FLAGS=-fpermissive") - #$flags)))))))) + #$flags)) + ((#:phases _) + #~%standard-phases))))))) (define-public povray (package From patchwork Sat Apr 8 19:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49029 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 8B9B51747F; Sat, 8 Apr 2023 20:28:31 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 E0CA017434 for ; Sat, 8 Apr 2023 20:28:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plEEG-00026Q-LY; Sat, 08 Apr 2023 15:28:04 -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 1plEEE-00025h-UG for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plEEE-0007Y3-M1 for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plEEE-0007vt-HB for guix-patches@gnu.org; Sat, 08 Apr 2023 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62728] [PATCH 2/2] gnu: openmw-openscenegraph: Update to Nov 2022 commit. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62728@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 62728-submit@debbugs.gnu.org id=B62728.168098207930471 (code B ref 62728); Sat, 08 Apr 2023 19:28:02 +0000 Received: (at 62728) by debbugs.gnu.org; 8 Apr 2023 19:27:59 +0000 Received: from localhost ([127.0.0.1]:59562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEEA-0007vN-SE for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:27:59 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:20213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEE8-0007v9-Ua for 62728@debbugs.gnu.org; Sat, 08 Apr 2023 15:27:57 -0400 Date: Sat, 08 Apr 2023 19:27:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680982070; x=1681241270; bh=yBvjYyL1eV/4Pmuwl3/2ePfKWa//WRLfbcqjslUCKrk=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Wj7/4QTLJjVID5ocFmChxaXTTCgYvxdUTB1JyImAF7h0/ivvGr/mKATpqWU8zXLua gd603o4YyIIC1Xp/INIV0zfDP3caEAESaAMuIMaF1+HIY2X9NFIEwQUugtSggh7lKd Ol6877sfe842oDoYiTNalxThWQjG1J1CtmBi3W+rWnffH+pgY6GRyFyhls7bpQJBCy uAkDwXJ98cRtpTlC0WZmoYXkVqbBrxXC2Apyiy8Cwh2Sv0oOWRwYLdggOgFXeoDz2n Sg6ak9/PYWaS7OB8vW0np+0A9DgktAA+YCm4zmcnBlLFy68/gE+QHI1s/ZxkSjS6ws pe92n5gxt2nhw== Message-ID: <35d0c28292785c8b00b56fe04fb10400b4accbb5.1680980546.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton 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: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 (openmw-openscenegraph): Update to Nov 2022 commit. [arguments]: Sync the plugin flags with the mentioned wiki page. --- gnu/packages/graphics.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.39.2 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 09c7c4b6d2..dff1ec86c9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1474,11 +1474,11 @@ (define-public gr-framework (define-public openmw-openscenegraph ;; OpenMW prefers its own fork of openscenegraph: ;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph. - (let ((commit "36a962845a2c87a6671fd822157e0729d164e940")) + (let ((commit "69cfecebfb6dc703b42e8de39eed750a84a87489")) (hidden-package (package (inherit openscenegraph) - (version (git-version "3.6" "1" commit)) + (version (git-version "3.6" "2" commit)) (source (origin (method git-fetch) @@ -1488,7 +1488,7 @@ (define-public openmw-openscenegraph (file-name (git-file-name (package-name openscenegraph) version)) (sha256 (base32 - "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia")))) + "1qayk2gklm8zvss90dcjfxv6717rvcmwmgmgyy1qzkli67a0zbw2")))) (outputs (list "out")) (arguments (substitute-keyword-arguments (package-arguments openscenegraph) @@ -1497,14 +1497,14 @@ (define-public openmw-openscenegraph #~(append '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0" "-DBUILD_OSG_PLUGIN_OSG=1" + "-DBUILD_OSG_PLUGIN_DAE=1" "-DBUILD_OSG_PLUGIN_DDS=1" "-DBUILD_OSG_PLUGIN_TGA=1" "-DBUILD_OSG_PLUGIN_BMP=1" "-DBUILD_OSG_PLUGIN_JPEG=1" "-DBUILD_OSG_PLUGIN_PNG=1" - "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" - ;; The jpeg plugin requires conversion between integers and booleans - "-DCMAKE_CXX_FLAGS=-fpermissive") + "-DBUILD_OSG_PLUGIN_FREETYPE=1" + "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0") #$flags)) ((#:phases _) #~%standard-phases)))))))