From patchwork Sat Feb 22 06:08:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 38976 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 2B6C427BBEA; Sat, 22 Feb 2025 06:09:46 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 3124A27BBE2 for ; Sat, 22 Feb 2025 06:09:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tlihM-0007oo-Mt; Sat, 22 Feb 2025 01:09:13 -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 1tlihI-0007oW-Sa for guix-patches@gnu.org; Sat, 22 Feb 2025 01:09:09 -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 1tlihG-0000Yg-TO for guix-patches@gnu.org; Sat, 22 Feb 2025 01:09:08 -0500 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=Y7fhtfM7wiDzYd5AXhCBaWh61WgObiis+l5cCWgqPF0=; b=Y3mYOTmKBlPUPMmnDw1kbgLUVGqMmhOLkWTuiAEn9TBUiUes/o5B0kFtF6c3ycKAamI6sYYBgPI/SimAR7mBsYNXnEnqLeETcaJz2+4bv0bkoiLNfjEhIbvVCTN/VItyee8PJ4oQA2odAn1K1/afCP1nMTgN/BMPX8IDELEAAFAQoSJemmdD4ddcRZyVzyReO8yGdfHaxrtdavSQjvkrXOPqIzC9/2XVZc5vZhBJ/1zmLEK5SyH5V5mk7I/7R7RnvLcB5lKKaVZNytujgXw1JNN88aJusBR/z0PyhxZtEBnGq/rl9JqVAETzakwpa9g0t0LxEN5IwUJkNNk5e1ivbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tlihC-00074v-5L; Sat, 22 Feb 2025 01:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75641] [PATCH v4] gnu: Add woof-doom. References: In-Reply-To: Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: wongandj@icloud.com, ian@retrospec.tv, iyzsong@envs.net, adam.faiz@disroot.org, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 22 Feb 2025 06:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75641@debbugs.gnu.org Cc: Andrew Wong , Andrew Wong , Ian Eure , =?utf-8?b?5a6L5paH5q2m?= , Adam Faiz , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Wong , Ian Eure , =?utf-8?b?5a6L5paH5q2m?= , Adam Faiz , Liliana Marie Prikler Received: via spool by 75641-submit@debbugs.gnu.org id=B75641.174020452927098 (code B ref 75641); Sat, 22 Feb 2025 06:09:02 +0000 Received: (at 75641) by debbugs.gnu.org; 22 Feb 2025 06:08:49 +0000 Received: from localhost ([127.0.0.1]:44402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tligy-00072r-Eo for submit@debbugs.gnu.org; Sat, 22 Feb 2025 01:08:49 -0500 Received: from qs51p00im-qukt01072102.me.com ([17.57.155.11]:52043) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tligt-00071N-K9 for 75641@debbugs.gnu.org; Sat, 22 Feb 2025 01:08:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=Y7fhtfM7wiDzYd5AXhCBaWh61WgObiis+l5cCWgqPF0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=Npr9jRcQ0S89ma8viig25OW7IvY2XrFXbVhoVfpir9LaNa4oT0EMTx0ZHAzEgn35r AJs+DEg3ks0pFVPBEjA1147sVAwgM0qEAjAWMw3ERf2267nUcAuxd7eP3HqGH9Frz7 CkIoSiNMgUbzhVd16dGoGpizDv6z4H+ZA7hHk8eWad1Gym7QCK+9FacHQgKECcnPqc esn0u7tIOtgvm39w0izphoOPKuKP0M2IhDXbI6zJGsnHOjV5TVjo6mrJK1S/BeUeTw sz910QpieR+PoQoAAa5Z0xAYvpfp9YO5W4pHb0JB26qVIxrOaNeNN0uzuYcS5AwTXq RV3gZ/Jj8yDhw== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01072102.me.com (Postfix) with ESMTPSA id 098E73401CF; Sat, 22 Feb 2025 06:08:36 +0000 (UTC) Date: Sat, 22 Feb 2025 01:08:27 -0500 Message-ID: <506a1df9eec6dc7bb29d689a7516d6f576672762.1740204476.git.wongandj@icloud.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: tzaX6AOzJEt4cbbPJcKgv_9Nq1DdmPwO X-Proofpoint-GUID: tzaX6AOzJEt4cbbPJcKgv_9Nq1DdmPwO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-22_02,2025-02-20_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 adultscore=0 clxscore=1015 suspectscore=0 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2502220046 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 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: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong 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/games.scm (woof-doom): New variable. * gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch: New file. Change-Id: I77cfa0fd2f2a20d6eee5d0339b9673899bb0ecad --- gnu/packages/games.scm | 64 +++++++++++++++++++ .../woof-doom-unbundle-spng-miniz.patch | 26 ++++++++ 2 files changed, 90 insertions(+) create mode 100644 gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch base-commit: cd20619cfcb32c2631fb602729512740bc510550 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 30aaf0767a..da3f7a05e4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -87,6 +87,7 @@ ;;; Copyright © 2024 Jan Wielkiewicz ;;; Copyright © 2024 Ashvith Shetty ;;; Copyright © 2025 Sharlatan Hellseher +;;; Copyright © 2025 Andrew Wong ;;; ;;; This file is part of GNU Guix. ;;; @@ -8784,6 +8785,69 @@ (define-public crispy-doom original.") (home-page "https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom"))) +(define-public woof-doom + (package + (name "woof-doom") + (version "15.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fabiangreffrath/woof") + (commit (string-append "woof_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04c7hm4jnr9aiz6w4520zww6b7j86qv9xaf87hdv48cjc9sp2ljk")) + (modules '((guix build utils))) + (snippet '(begin + (with-directory-excursion "third-party" + (delete-file-recursively "miniz") + (delete-file-recursively "yyjson") + (delete-file-recursively "spng")) + (delete-file-recursively "win32") + (substitute* (find-files "src" ".") + (("miniz.h") + "miniz/miniz.h")) #t)) + (patches (search-patches "woof-doom-unbundle-spng-miniz.patch")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f)) ;'demotest' requires internet access. + (native-inputs (list python)) + (inputs (list libebur128 + libsndfile + libxmp + miniz + openal + sdl2 + sdl2-net + spng + yyjson + fluidsynth)) + (home-page "https://github.com/fabiangreffrath/woof") + (synopsis "MBF-style Doom source port targeted at modern systems") + (description + "Woof! is a continuation of the MBF lineage of Doom source ports, with +modern features such as dynamic resolution scaling, uncapped framerates, +adjustable field of view, 3D audio with HRTF and 7.1 surround sound +support, and modern gamepad features including rumble, gyro, and flick +stick support. Supports the new MBF21 format, as well as the MUSINFO, +UMAPINFO, DEHEXTRA, and DSDHacked specifictions.") + (license + ;; See README.md + (list (license:non-copyleft + "https://bitbucket.org/jpommier/pffft/src/master/pffft.h" + "FFTPACK license") + license:bsd-2 + license:bsd-3 + license:cc-by3.0 + license:cc0 + license:expat + license:gpl2 + license:gpl3+ + license:public-domain + license:gpl2+)))) + (define xonotic-data (package (name "xonotic-data") diff --git a/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch b/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch new file mode 100644 index 0000000000..43c3b39193 --- /dev/null +++ b/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch @@ -0,0 +1,26 @@ +Unbundle spng, miniz +*** a/third-party/CMakeLists.txt +--- b/third-party/CMakeLists.txt +@@ -4,20 +4,13 @@ + target_woof_settings(md5) + target_include_directories(md5 INTERFACE md5) + +-add_library(miniz STATIC miniz/miniz.c) +-target_woof_settings(miniz) +-target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME) +-target_include_directories(miniz INTERFACE miniz) ++find_package(miniz) + + add_library(pffft STATIC pffft/pffft.c) + target_woof_settings(pffft) + target_include_directories(pffft INTERFACE pffft) + +-add_library(spng STATIC spng/spng.c) +-target_woof_settings(spng) +-target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC) +-target_include_directories(spng INTERFACE spng) +-target_link_libraries(spng miniz) ++find_package(spng) + + if(NOT yyjson_FOUND) + add_library(yyjson STATIC yyjson/yyjson.c)