From patchwork Thu Apr 27 15:54:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 49595 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 C4CD727BBE9; Thu, 27 Apr 2023 16:55: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=-3.7 required=5.0 tests=BAYES_00,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 8334327BBE2 for ; Thu, 27 Apr 2023 16:55:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps3xh-0000Le-UG; Thu, 27 Apr 2023 11:55:17 -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 1ps3xW-0000EY-SF for guix-patches@gnu.org; Thu, 27 Apr 2023 11:55: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 1ps3xW-0006sQ-CT for guix-patches@gnu.org; Thu, 27 Apr 2023 11:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps3xW-0001zm-15 for guix-patches@gnu.org; Thu, 27 Apr 2023 11:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62728] [PATCH v2] gnu: openmw-openscenegraph: Update to Nov 2022 commit. References: In-Reply-To: Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 15:55:01 +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.16826108967623 (code B ref 62728); Thu, 27 Apr 2023 15:55:01 +0000 Received: (at 62728) by debbugs.gnu.org; 27 Apr 2023 15:54:56 +0000 Received: from localhost ([127.0.0.1]:59590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps3xP-0001yq-IO for submit@debbugs.gnu.org; Thu, 27 Apr 2023 11:54:55 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:53697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps3xL-0001xc-BH for 62728@debbugs.gnu.org; Thu, 27 Apr 2023 11:54:54 -0400 Date: Thu, 27 Apr 2023 15:54:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682610885; x=1682870085; bh=Rs9j/uzdODb4+ytQlJWhWzMQWzlMX+DX91E9ye/WAQU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=N22eH/77/Vg47m8k2BrAdUG96Lg/tgWCGVpjVCas517jPDojMcl96+pPDsvFzvzsf nBimT1u9gLp7gZn2I1wQ/yl13U8f7mYEBkcYVXp8opcSv5uA98O0DSafym/4RM/fu9 NSqWVnFFNomQL0+b5B8czsK6UxHWRKRJh/yaShp1fxRkgAp57zIQ5lY7r6sROCuzi9 A+GPIzqk5Sd4bumJVhacyWnTfdnVxL6e1oHdlRIktcSBD4ZJSAiuusPYesrj4thXSW kkvGI5LNlwlEQeCh/ONgZLFaAMVGH8C4Eqo+PHOj+hp+Vt5nmt53WGop4cO3QmFGtK 169LQjch+MCog== Message-ID: 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 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) base-commit: 297805b1f83aa58ba9fc775c203373338aafd5ac -- 2.39.2 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 261fcf9547..a7b1024185 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1448,11 +1448,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)) (outputs (list "out")) (source (origin @@ -1463,7 +1463,7 @@ (define-public openmw-openscenegraph (file-name (git-file-name (package-name openscenegraph) version)) (sha256 (base32 - "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia")))) + "1qayk2gklm8zvss90dcjfxv6717rvcmwmgmgyy1qzkli67a0zbw2")))) (arguments (substitute-keyword-arguments (package-arguments openscenegraph) ((#:configure-flags flags) @@ -1471,14 +1471,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 phases) #~(modify-phases #$phases @@ -2589,4 +2589,3 @@ (define-public gpaint It features cut-and-paste for irregular regions or polygons.") (home-page "https://www.gnu.org/software/gpaint/") (license license:gpl3+))) -