From patchwork Thu May 11 05:43:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 49927 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 3679027BBF0; Thu, 11 May 2023 06:45:20 +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,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 D688427BBEE for ; Thu, 11 May 2023 06:45:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwz6v-0007pX-MD; Thu, 11 May 2023 01:45:05 -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 1pwz6t-0007pP-TW for guix-patches@gnu.org; Thu, 11 May 2023 01:45: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 1pwz6t-0000cx-Cn for guix-patches@gnu.org; Thu, 11 May 2023 01:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwz6s-0001CQ-2c; Thu, 11 May 2023 01:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63435] Add vcmi 1.2.1 to games.scm Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Thu, 11 May 2023 05:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 63435@debbugs.gnu.org Cc: liliana.prikler@gmail.com, iyzsong@envs.net, liliana.prikler@gmail.com, iyzsong@envs.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, iyzsong@envs.net Received: via spool by submit@debbugs.gnu.org id=B.16837838444519 (code B ref -1); Thu, 11 May 2023 05:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2023 05:44:04 +0000 Received: from localhost ([127.0.0.1]:49465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwz5w-0001Ao-Cf for submit@debbugs.gnu.org; Thu, 11 May 2023 01:44:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:37212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwz5r-00019m-Ng for submit@debbugs.gnu.org; Thu, 11 May 2023 01:44: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 1pwz5r-0007TR-Dh for guix-patches@gnu.org; Thu, 11 May 2023 01:43:59 -0400 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwz5p-0000SZ-3c for guix-patches@gnu.org; Thu, 11 May 2023 01:43:59 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id C31171ACA7; Wed, 10 May 2023 22:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1683783825; bh=3FQVM0qUNFWT9vXPfHU+SAjSvDmsDLf37uKR0rYsSpg=; h=From:To:Cc:Subject:Date:From; b=Wt1P2yaGVRS+oS19GM7Afe6P9QVf87aQOiQDrxOkhDtrfd+w8yrtcIJhAkNSi+WbC 10eQC9sI58mZTg6uyXWBDxo90agerdSZoSGgMAbcsTI+eNm3xlABE2hiEypv5JbfdG GzO6GrLNJV20aTYcaBYUhdArx6bwtUx4N6bA8OBFcA54JXEr8BXtcgzVkHmvd9+MqN aQqZfQYm+akKi0/ZxK2/TpPJzS5vbOZaiuET15NJtZan4LXy7AQWO+FRnkmBiqRtyf PzUXB3GaoE0ifLOeyZnMXo//bkBlAQoT6xDZbF2nboYjF9fhLX6lDdSy0gAmbyRNVj GRh0RGTIgNiLQ== From: Vagrant Cascadian Date: Wed, 10 May 2023 22:43:42 -0700 Message-ID: <87a5yb4e41.fsf@wireframe> MIME-Version: 1.0 Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c; envelope-from=vagrant@debian.org; helo=cascadia.aikidev.net 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=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 X-Debbugs-Cc: liliana.prikler@gmail.com, iyzsong@envs.net The attached patch adds "vcmi", which is in many ways very similar to the "fheroes2" package, in that it (currently) requires external non-free assets, but the game engine itself is GPL2. They also both use assets from the same game lineage (heroes of might and magic). I struggled to get the tests to work, and they do not seem to be terribly well maintained upstream. They are even disabled by default by upstream. I did some very brief manual "testing" that it actually works, at least! I had successfully built with various qt*@6 packages, but they are not currently building; it seems to support qt*@5 too. Some things failed to build with gcc-11, so I tried gcc-12 and it worked! We probably want to try to apply Debian's "privacy-breach" patch to disable phoning home, as well as the reproducible builds patch and some additional reproducibility patches I am working on, but figured I would submit the package to guix for review now, in case anyone else wants to join me down this rabbit hole... live well, vagrant From 94eabedcac6fb61ae1ddd77c6c28f89594586017 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 7 May 2023 17:43:33 -0700 Subject: [PATCH] gnu: Add vcmi 1.2.1. FIXME review debian patches: https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/disable-privacy-breach https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/reproducible.patch ...and secrent as-yet-unsubmitted reproducibility patches... https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/minizip_maxu32 X-Debbugs-Cc: liliana.prikler@gmail.com, iyzsong@envs.net * gnu/packages/games.scm (vcmi): New variable. --- gnu/packages/games.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2e3994543a..c2b60037cc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -199,6 +199,7 @@ (define-module (gnu packages games) #:use-module (gnu packages sqlite) #:use-module (gnu packages squirrel) #:use-module (gnu packages swig) + #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) @@ -11169,6 +11170,53 @@ (define-public fheroes2 play; it will look for them at @file{~/.local/share/fheroes2} folder.") (license license:gpl2))) +(define-public vcmi + (package + (name "vcmi") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcmi/vcmi") + (commit version) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nx3i078cxkak2ci514pf4pgi5269mp08njynsg35pin4yp3fn0p")))) + (build-system cmake-build-system) + (arguments + ;; Test suites do not seem well supported upstream and are disabled by default. + ;; Pass -DENABLE_TEST to configure to enable. + `(#:tests? #f)) + (native-inputs (list boost + ffmpeg + ;; Build errors with gcc-11 + gcc-12 + ;; googletest ; needed for tests, but tests are disabled + libxkbcommon + luajit + minizip + pkg-config + python + ;; qtbase and qttools @6 not currently buildable but may work ok + qtbase-5 + qttools-5 + sdl2 + sdl2-mixer + sdl2-image + sdl2-ttf + tbb + vulkan-headers + zlib)) + (home-page "https://vcmi.eu/") + (synopsis "Turn-based strategy game engine") + (description + "@code{vcmi} is an implementation of Heroes of Might and +Magic III (aka HOMM3) game engine. It requires assets and game resources to +play; it will look for them at @file{~/.local/share/vcmi} folder.") + (license license:gpl2))) + (define-public apricots (package (name "apricots") base-commit: e2eb43f945fd467e9b55a4b3c91cd186cf32e268 -- 2.39.2