From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WCekDj6UbGfDGwEA62LTzQ:P1 (envelope-from ) for ; Wed, 25 Dec 2024 23:24:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WCekDj6UbGfDGwEA62LTzQ (envelope-from ) for ; Thu, 26 Dec 2024 00:24:46 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r7EmhLq9; dkim=fail ("headers rsa verify failed") header.d=icloud.com header.s=1a1hai header.b="dBS75ab/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735169086; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=3AgL5spnVjr7WQc2BEL61h/P5GIgw6lV1AESDgptmlg=; b=W0aucRBcLaGHWRGaMBkCaeLMlND4Lj9PEDow6iV1Mr8avtZhmqTnANCn9ZYE2hlDckYesl X+KH2GTrt17enBLtR0v4ThXVXSFrLS43hVJCtl2CIHKasWyZqUn1LEomI1ZIEkdoHq5pGd ec9ATB4kaB9lzoHgIriyjxUkZlZ/o4yZGeAUpbRp1b4gcjJoVi5S4URdpOkd1m7rzWDLYH bR3xSVkWEYjPelKBLk7NqLZ3tOf/zw+Flr1CjXTBDJJLVaTvmzCnPXuOX3Ci1t0pkg5SI/ OoQiY79T9nHlNvPJ9Px3425xQUAxoqWQa2fWAFAVv8YJlz3T25blkfBza3n5qA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r7EmhLq9; dkim=fail ("headers rsa verify failed") header.d=icloud.com header.s=1a1hai header.b="dBS75ab/"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735169086; a=rsa-sha256; cv=none; b=tnO6qoBTXgVHYJnmJF4ulLSiypDxbmtOb+oFxsIcytapfId9OiN2QVavYFcOQJ3O21bM9E 0PX5npQKnkhF7RDmSqB0u1lXIvGL8yeSNa1WWLcGgZ8nQrJLZdakhgmeS+c6RldMHmeXW+ 5OPeMzgXKTUlEQmxBLBQyvtV0kCqGjpEsq9dury0NheCjBMQzTrkopiUMFi8IwZlS6rHDi 9SPRTb7lHTxns8PFldn2orHiFsVzv3JB58zjCiYsdjoBTUrWtPO09Tdi4+XCnLH5Wvs5Rt w8/ud9DcG5JvVtN6n57uJKhsdc2hetoohfs6MNMhgjEt0JkPlAQmDDEObX02YQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E3C2446413 for ; Thu, 26 Dec 2024 00:24:45 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQajY-0006R4-En; Wed, 25 Dec 2024 18:24:08 -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 1tQajU-0006Qv-CG for guix-patches@gnu.org; Wed, 25 Dec 2024 18:24:04 -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 1tQajT-0001FO-OP for guix-patches@gnu.org; Wed, 25 Dec 2024 18:24:03 -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:Subject; bh=3AgL5spnVjr7WQc2BEL61h/P5GIgw6lV1AESDgptmlg=; b=r7EmhLq9sMdrdr/U9PzxznSduusqMWeNFT6XDPNOuT9LKbb6CibCYvYb1LRZiStae52CSY/ZHpK4sLj/9ZfdiF5gPAnpNgvNv6Zu+Engt0xPXzvdbkRJOa2zGg0w1Az0aU6qbKaypEL2CH+psewkdwyNJc2fsEknpasSXnYt4dielxNcJlyJZw+zQwY/8teeT6ZR61XGS9V71xUhLTr0gy77dOLUP7sjA53Galjj5DBfEXV9eHO0JHdm8DDSL/2f9cI2liSOIOfWsjVwA+ZpO6owB40Gq0M/JxERiiPncGh2s8cml83H/zSyspAQ9oNDsuCQD4SZhFT/Y8/L572ZDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tQajS-0007M4-KM for guix-patches@gnu.org; Wed, 25 Dec 2024 18:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75104] [PATCH] gnu: gzdoom: Update to 4.13.2 Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Dec 2024 23:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75104@debbugs.gnu.org Cc: Andrew Wong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173516898828190 (code B ref -1); Wed, 25 Dec 2024 23:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Dec 2024 23:23:08 +0000 Received: from localhost ([127.0.0.1]:39343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQaiZ-0007Kb-Ru for submit@debbugs.gnu.org; Wed, 25 Dec 2024 18:23:08 -0500 Received: from lists.gnu.org ([209.51.188.17]:50450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQaiW-0007KC-5U for submit@debbugs.gnu.org; Wed, 25 Dec 2024 18:23:06 -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 1tQagP-0006Iw-Qt for guix-patches@gnu.org; Wed, 25 Dec 2024 18:20:53 -0500 Received: from qs51p00im-qukt01071901.me.com ([17.57.155.8]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQagN-0000Pa-Uz for guix-patches@gnu.org; Wed, 25 Dec 2024 18:20:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1735168850; bh=3AgL5spnVjr7WQc2BEL61h/P5GIgw6lV1AESDgptmlg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type: x-icloud-hme; b=dBS75ab/PdvsUipcEygfy2jgatf5J3N4kQBiHHe4A9CXxs66TcCkNAZJhnMzg89Se FUcXcMd1ng3B0sdiVhR6+9VvBED+LkEg63w/udRalS0SYyl901+h/E0REuuBwjChYm 3J9hzb8Z5DYsjjtTKhsCfrCJcecjFP2s5l2it0H0s3XS/Fvk1GYZS/ZwVnoBg55TFJ BXNSkQ0069Xz0ZR2IcG36jDSwuo0pfpDSV983Wck1JdmnHixVVuE5HFgz4FjYoSDGj GrfFF0K/W1akgvQnikFkaPiV3kaBUcL8yJMlHqwlWq3kFqVbu16GGv95337vYzfzN1 kxkpq9ip7AGOQ== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01071901.me.com (Postfix) with ESMTPSA id 50763628024E; Wed, 25 Dec 2024 23:20:50 +0000 (UTC) Date: Wed, 25 Dec 2024 18:17:22 -0500 Message-ID: <20241225232043.28431-1-wongandj@icloud.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: EuBW8L6LWkt_Xji4vmAHXCSPJOiK7abU X-Proofpoint-GUID: EuBW8L6LWkt_Xji4vmAHXCSPJOiK7abU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-25_07,2024-12-24_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 mlxscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2412250211 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 Received-SPF: pass client-ip=17.57.155.8; envelope-from=wongandj@icloud.com; helo=qs51p00im-qukt01071901.me.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , Reply-to: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches From: Andrew Wong via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -3.81 X-Spam-Score: -3.81 X-Migadu-Queue-Id: E3C2446413 X-TUID: faHyUShNn1L5 Change-Id: I73e6a86944ab3433d4425f3b3c345b509210a16d --- GZDoom has changed a lot since its last update here, and it (and it's new dependency, zmusic) have a lot of new bundled libraries. I'm not sure how to un-bundle most of them, so help on that front would be appreciated. The patches no longer work correctly either, so I've removed them; they seem unnecessary now, anyways. gnu/packages/games.scm | 132 ++++++++---------- .../patches/gzdoom-find-system-libgme.patch | 21 --- .../gzdoom-search-in-installed-share.patch | 23 --- 3 files changed, 56 insertions(+), 120 deletions(-) delete mode 100644 gnu/packages/patches/gzdoom-find-system-libgme.patch delete mode 100644 gnu/packages/patches/gzdoom-search-in-installed-share.patch diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c2bb9aa1c4..d966f742ef 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8403,67 +8403,44 @@ (define-public colobot (home-page "https://colobot.info") (license license:gpl3+))) +(define-public zmusic + (package + (name "zmusic") + (version "1.1.14") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ZDoom/ZMusic") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19arzkbwdj84vw1cfawc6930dfxdhhq4k6yawkkppaphj8qkfhdc")))) + (arguments (list #:tests? #f)) + (build-system cmake-build-system) + (native-inputs (list pkg-config glib)) + (home-page "https://github.com/ZDoom/ZMusic") + (synopsis "GZDoom's music system as a standalone library") + (description "GZDoom's music system as a standalone library, for use with +GZDoom, Raze, and PrBoom+.") + (license license:gpl3))) + (define-public gzdoom (package (name "gzdoom") - (version "4.3.2") + (version "4.13.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/coelckers/gzdoom") + (url "https://github.com/ZDoom/gzdoom") (commit (string-append "g" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0i4hyg72z84fc6ca2ic9q82q5cbgrbd7bynl3kpkypxvyasq08wz")) - (patches (search-patches "gzdoom-search-in-installed-share.patch" - "gzdoom-find-system-libgme.patch")) - (modules '((guix build utils) - (ice-9 regex))) - (snippet - '(begin - ;; Remove files which mustn't be commercially redistributed. See - ;; , the ‘Contribution - ;; Guidelines’ at , and Guix issue #73435. - (for-each - (lambda (directory) - (delete-file-recursively directory) - (substitute* "CMakeLists.txt" - (((string-append "add_subdirectory\\([[:blank:]]*" - directory - "[[:blank:]]*\\)")) - ""))) - '( ;; "wadsrc_extra" ;game_support.pk3 - "wadsrc_bm")) ;brightmaps.pk3 - - ;; Removing game_support.pk3 entirely would break Freedoom & remove - ;; users' ability to play commercial games, despite owning (only) the - ;; non-functional data. That can't be right. Out of an abundance of - ;; caution, remove anything from the PK3 that could conceivably be - ;; derived from copyrightable data that's not freely redistributable. - (display "Keeping only the following game_support.pk3 files:\n") - (let* ((regexps (list "/font\\.inf$" - "/harmony/.*\\.(txt|zs)$" - "/(iwadinfo|mapinfo|sprofs)\\.txt$" - "\\.z$")) - (regexp* (format #f "(~{~a~^|~})" regexps)) - (regexp (make-regexp regexp* regexp/icase))) - (define (keep-file? file stat) - (let ((keep? (regexp-exec regexp file))) - (when keep? - (format #t " ~a~%" file)) - keep?)) - - (for-each delete-file (find-files "wadsrc_extra/static" - (negate keep-file?)))) - - ;; Remove some bundled libraries. XXX There are more, but removing - ;; them would require, at least, patching the build system. - (with-directory-excursion "libraries" - (delete-file-recursively "bzip2") - (delete-file-recursively "game-music-emu") - (delete-file-recursively "jpeg") - (delete-file-recursively "zlib")))))) + (base32 "0zlvrdayrj1rk5x2hwnc57l8pl29bl64zmfq3qc9yfypknj1syfy")) + ;; (patches (search-patches "gzdoom-search-in-installed-share.patch" + ;; "gzdoom-find-system-libgme.patch")) + )) (arguments (list #:tests? #f @@ -8484,30 +8461,33 @@ (define (keep-file? file stat) "-DDYN_GTK=OFF" "-DDYN_MPG123=OFF" "-DDYN_SNDFILE=OFF") - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'fix-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/CMakeLists.txt" - (("COMMAND /bin/sh") - (string-append "COMMAND " (which "sh")))) - (substitute* - "libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp" - (("/usr/share/sounds/sf2/FluidR3_GM.sf2") - (search-input-file inputs - "share/soundfonts/FluidR3Mono_GM.sf3"))) - (substitute* - "libraries/zmusic/mididevices/music_timiditypp_mididevice.cpp" - (("(exename = \")(timidity)(\".*)" _ prefix exe suffix) - (string-append prefix - (search-input-file inputs - (string-append "bin/" exe)) - suffix)))))))) + ;; #:phases + ;; #~(modify-phases %standard-phases + ;; (add-before 'configure 'fix-file-names + ;; (lambda* (#:key inputs #:allow-other-keys) + ;; ;; (substitute* "src/CMakeLists.txt" + ;; ;; (("COMMAND /bin/sh") + ;; ;; (string-append "COMMAND " (which "sh")))) + ;; (substitute* + ;; "libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp" + ;; (("/usr/share/sounds/sf2/FluidR3_GM.sf2") + ;; (search-input-file inputs + ;; "share/soundfonts/FluidR3Mono_GM.sf3"))) + ;; (substitute* + ;; "libraries/zmusic/mididevices/music_timiditypp_mididevice.cpp" + ;; (("(exename = \")(timidity)(\".*)" dum prefix exe suffix) + ;; (string-append prefix + ;; (search-input-file inputs + ;; (string-append "bin/" exe)) + ;; suffix)))))) + )) (build-system cmake-build-system) - (inputs (list bzip2 + (inputs (list zmusic + libvpx + bzip2 fluid-3 fluidsynth - gtk+ + gtk+ libgme libjpeg-turbo libsndfile @@ -8517,7 +8497,7 @@ (define (keep-file? file stat) sdl2 timidity++ zlib)) - (native-inputs (list pkg-config unzip)) + (native-inputs (list pkg-config unzip python)) (synopsis "Modern Doom 2 source port") (description "GZdoom is a port of the Doom 2 game engine, with a modern renderer. It improves modding support with ZDoom's advanced mapping features @@ -8526,9 +8506,9 @@ (define (keep-file? file stat) (home-page "https://zdoom.org/index") ;; The source uses x86 assembly (supported-systems '("x86_64-linux" "i686-linux")) - (license (list license:gpl3+ ; gzdoom game - license:lgpl3+ ; gzdoom renderer - license:expat ; gdtoa + (license (list license:gpl3+ ; gzdoom game + license:lgpl3+ ; gzdoom renderer + license:expat ; gdtoa (license:non-copyleft ; modified dumb "file://dumb/licence.txt" "Dumb license, explicitly GPL compatible."))))) diff --git a/gnu/packages/patches/gzdoom-find-system-libgme.patch b/gnu/packages/patches/gzdoom-find-system-libgme.patch deleted file mode 100644 index a7f277d614..0000000000 --- a/gnu/packages/patches/gzdoom-find-system-libgme.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /CMakeLists.txt 2020-01-20 21:47:35.460119141 +0100 -+++ /CMakeLists.txt 2020-01-20 21:47:47.690112400 +0100 -@@ -195,12 +195,12 @@ - #endif() - - # GME --#find_path( GME_INCLUDE_DIR gme/gme.h ) --#find_library( GME_LIBRARIES gme ) --#mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) --#FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME --# REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR --#) -+find_path( GME_INCLUDE_DIR gme/gme.h ) -+find_library( GME_LIBRARIES gme ) -+mark_as_advanced( GME_INCLUDE_DIR GME_LIBRARIES ) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS( GME -+ REQUIRED_VARS GME_LIBRARIES GME_INCLUDE_DIR -+) - - if( MSVC ) - # Eliminate unreferenced functions and data diff --git a/gnu/packages/patches/gzdoom-search-in-installed-share.patch b/gnu/packages/patches/gzdoom-search-in-installed-share.patch deleted file mode 100644 index f312686566..0000000000 --- a/gnu/packages/patches/gzdoom-search-in-installed-share.patch +++ /dev/null @@ -1,23 +0,0 @@ -Lookup gzdoom pk3 files in the installed directory in -addition to the path that is stored in ~/.config/gzdoom/. - -Simply replacing the hardcoded /usr/share would leave the -configfile pointing to outdated guix builds, which could get -garbage collected and break the gzdoom installation. -This ensures that the files installed with the corresponding -build will be used. - ---- /src/d_main.cpp 2018-01-16 22:13:09.700602781 +0200 -+++ /src/d_main.cpp 2018-01-16 22:22:36.560617961 +0200 -@@ -1716,6 +1716,11 @@ - return wad; - } - -+ mysnprintf (wad, countof(wad), "%s/%s", GUIX_OUT_PK3, file); -+ if (DirEntryExists (wad)) { -+ return wad; -+ } -+ - if (GameConfig != NULL && GameConfig->SetSection ("FileSearch.Directories")) - { - const char *key; -- 2.46.0