From patchwork Sun Dec 3 18:25:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodion Goritskov X-Patchwork-Id: 57262 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 CEB7F27BBE9; Sun, 3 Dec 2023 18:28:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 CB5DA27BBE2 for ; Sun, 3 Dec 2023 18:28:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9rCB-0001zy-4h; Sun, 03 Dec 2023 13:27:59 -0500 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 1r9rC6-0001ya-2R for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:55 -0500 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 1r9rC5-0005fV-QC for guix-patches@gnu.org; Sun, 03 Dec 2023 13:27:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9rCD-0002xm-RB; Sun, 03 Dec 2023 13:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67607] [PATCH] gnu: openmw: Update to 0.48.0. Resent-From: Rodion Goritskov Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 03 Dec 2023 18:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67607 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67607@debbugs.gnu.org Cc: Rodion Goritskov , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.170162803011214 (code B ref -1); Sun, 03 Dec 2023 18:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Dec 2023 18:27:10 +0000 Received: from localhost ([127.0.0.1]:60859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rBN-0002uo-5s for submit@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9rBJ-0002uF-09 for submit@debbugs.gnu.org; Sun, 03 Dec 2023 13:27:07 -0500 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 1r9rB3-0001tL-Kp for guix-patches@gnu.org; Sun, 03 Dec 2023 13:26:49 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r9rAy-0005Xj-BG for guix-patches@gnu.org; Sun, 03 Dec 2023 13:26:49 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-50bf7bc38c0so215764e87.2 for ; Sun, 03 Dec 2023 10:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701628002; x=1702232802; darn=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=ad9IccmiSM/DwMCwVldbmQllZa3cyukVXYfMVcXBwPg=; b=cdUG6kerL5S2k1TEwCrcICqPZ5oeOvBX/vQE01s299OXKxfhYKcWSlVDA22Y0nK8C6 sXC5wWRy0CP+Sk9wbMPE5iFvc56FMopzm06M03xwQa2unSLkbjyec6+JlAk6JLWAWtEP EdXM+ETfPa2rgex+uVactdHmYjxQvB8oj4cInXdlY1+NSh0Y/I+KUR/dmG1WEx24LtiP UUlLd9GAmogDiuOaHs3mgRnKTRo8vCT/VEp53cDIOyY/iFuuPuONxXh2CZvEIq2xz8er ijbN/y+exb3jO497XN6ER3kEehqG/8a74CPYiHc53WEw6PU1/azMGcoL+YZhHqBiR0Tn /+Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701628002; x=1702232802; 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=ad9IccmiSM/DwMCwVldbmQllZa3cyukVXYfMVcXBwPg=; b=nket95NXsdxzg9LDpi97HeWEerGrixn8AOPybcbLb7Z3/VD4J1kboyMc89oHU/HIo8 ftTe0JnMeKmRA1W3eGvEtkaN3wQJuKK69D1uccVtf2flHRnZLlbKH9ug17TpfvF06mV5 D5mHeGuGEKD+nHSFmgsFyETm2oKrKTobjnybybH+7qCTMIZgrkwm94NLxUj6y45NijEd VYxI20m5RgWtP+NyEfa7zAC3R1fz1t3Ucmru2UiXpTvRp8+MPTfmuKyzpv9BldqLwn/6 wHg7WTc17ROKdChUE6Y8SBaFJVs6tHPJXnxTLr9w8sgaIlL8VnJQy0XyeVrePxfpFtlp BWng== X-Gm-Message-State: AOJu0YyeKuxtHETfvgO3LIqylkWsk4bQtjbCSfozrvOoy/roQRppKudK v/WucA9wJCtmoSFORu7OPXSXoXyEPAz2bg== X-Google-Smtp-Source: AGHT+IHPs/puBNvbV65ba3BmKN32d++lhahn+tu+RXPN8P4AogPrOo+SlyP/e+wypc1r3aWLpyGUtQ== X-Received: by 2002:a19:7005:0:b0:50b:eec5:b227 with SMTP id h5-20020a197005000000b0050beec5b227mr576946lfc.61.1701628001286; Sun, 03 Dec 2023 10:26:41 -0800 (PST) Received: from localhost.localdomain ([92.51.75.166]) by smtp.gmail.com with ESMTPSA id a4-20020a056000050400b003334675634bsm1631002wrf.29.2023.12.03.10.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 10:26:40 -0800 (PST) From: Rodion Goritskov Date: Sun, 3 Dec 2023 22:25:05 +0400 Message-ID: <67383547b34ece39cf8fd28667d75ea5e179b84a.1701627905.git.rodion.goritskov@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=rodion.goritskov@gmail.com; helo=mail-lf1-x136.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (openmw): Update to 0.48.0. * gnu/packages/graphics.scm (openmw-openscenegraph): Update to commit 68c5c5. Change-Id: I5e1ae0d59ead8de7976714cb82e8d514c308f19a --- gnu/local.mk | 1 - gnu/packages/game-development.scm | 49 ++++++++++--------- gnu/packages/graphics.scm | 6 +-- .../openmw-assume-nonconst-SIGSTKSZ.patch | 39 --------------- 4 files changed, 28 insertions(+), 67 deletions(-) delete mode 100644 gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch base-commit: ab8612d99eca5c25ecbefe026b04ed9f00e3f8b5 diff --git a/gnu/local.mk b/gnu/local.mk index fde91b33eb..a10161123e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1729,7 +1729,6 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openjdk-21-fix-rpath.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ - %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \ %D%/packages/patches/openssh-trust-guix-store-directory.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openrgb-unbundle-hueplusplus.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 671c7839ac..c960f11e85 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -109,8 +109,10 @@ (define-module (gnu packages game-development) #:use-module (gnu packages readline) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages serialization) #:use-module (gnu packages speech) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages stb) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) @@ -1841,38 +1843,37 @@ (define-public mygui-gl (define-public openmw (package (name "openmw") - (version "0.47.0") + (version "0.48.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/OpenMW/openmw") - (commit (string-append "openmw-" version)))) + (url "https://github.com/OpenMW/openmw") + (commit (string-append "openmw-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "19mcbnjl4279qalb97msf965bjax48mx1r1qczyvwhn28h6n3bsy")) - (patches (search-patches "openmw-assume-nonconst-SIGSTKSZ.patch")))) + (base32 "0amkxfylk1l67d2igihnhhql62xr89wvg1sxbq2rnhczf6vxaj6f")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DDESIRED_QT_VERSION=5" - "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON"))) - (native-inputs - (list boost doxygen pkg-config)) - (inputs - (list bullet - ffmpeg-4 ; https://gitlab.com/OpenMW/openmw/-/issues/6631 - libxt - lz4 - mygui-gl ; OpenMW does not need Ogre. - openal - openmw-openscenegraph - qtbase-5 - recastnavigation - sdl2 - unshield)) + `(#:tests? #f ;No test target + #:configure-flags (list "-DDESIRED_QT_VERSION=5" + "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON"))) + (native-inputs (list boost doxygen pkg-config)) + (inputs (list bullet + ffmpeg + libxt + lz4 + mygui-gl ;OpenMW does not need Ogre. + openal + openmw-openscenegraph + qtbase-5 + recastnavigation + sdl2 + unshield + icu4c + yaml-cpp + luajit + sqlite)) (synopsis "Re-implementation of the RPG Morrowind engine") (description "OpenMW is a game engine which reimplements and extends the one that runs diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9e2efaa7fb..9bc81a3a81 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1490,11 +1490,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 "69cfecebfb6dc703b42e8de39eed750a84a87489")) + (let ((commit "68c5c573d47766507bfb191e0c8d213b1997ad20")) (hidden-package (package (inherit openscenegraph) - (version (git-version "3.6" "2" commit)) + (version (git-version "3.6" "3" commit)) (outputs (list "out")) (source (origin @@ -1505,7 +1505,7 @@ (define-public openmw-openscenegraph (file-name (git-file-name (package-name openscenegraph) version)) (sha256 (base32 - "1qayk2gklm8zvss90dcjfxv6717rvcmwmgmgyy1qzkli67a0zbw2")))) + "12xgdmymjh4rb7djzniy15lvi45y0x4i0l5swf031r8g4zn72v2n")))) (arguments (substitute-keyword-arguments (package-arguments openscenegraph) ((#:configure-flags flags) diff --git a/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch b/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch deleted file mode 100644 index ed35563c2c..0000000000 --- a/gnu/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001 -From: elsid -Date: Fri, 24 Sep 2021 19:40:29 +0200 -Subject: [PATCH] Assume SIGSTKSZ is not a constant - -SIGSTKSZ is not defined as constant since glibc 2.34: -https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53 ---- - components/crashcatcher/crashcatcher.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp -index 86571e1e3a..c828e1ca81 100644 ---- a/components/crashcatcher/crashcatcher.cpp -+++ b/components/crashcatcher/crashcatcher.cpp -@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n"; - - static char argv0[PATH_MAX]; - --static char altstack[SIGSTKSZ]; -- - - static struct { - int signum; -@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig - - /* Set an alternate signal stack so SIGSEGVs caused by stack overflows - * still run */ -+ static char* altstack = new char [SIGSTKSZ]; - altss.ss_sp = altstack; - altss.ss_flags = 0; -- altss.ss_size = sizeof(altstack); -+ altss.ss_size = SIGSTKSZ; - sigaltstack(&altss, nullptr); - - memset(&sa, 0, sizeof(sa)); --- -GitLab -