From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kHztBeRXFWDObgAA0tVLHw (envelope-from ) for ; Sat, 30 Jan 2021 12:58:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sD+0AeRXFWByOQAAB5/wlQ (envelope-from ) for ; Sat, 30 Jan 2021 12:58:12 +0000 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 366379403C8 for ; Sat, 30 Jan 2021 12:58:11 +0000 (UTC) Received: from localhost ([::1]:37944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5ppK-0004rb-6l for larch@yhetil.org; Sat, 30 Jan 2021 07:58:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5ppD-0004rL-Bg for guix-patches@gnu.org; Sat, 30 Jan 2021 07:58:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5ppC-0005xy-CY for guix-patches@gnu.org; Sat, 30 Jan 2021 07:58:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l5ppC-0002vk-C8 for guix-patches@gnu.org; Sat, 30 Jan 2021 07:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46190] [PATCH] gnu: teeworlds: Fix audio Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Jan 2021 12:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46190@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161201143511207 (code B ref -1); Sat, 30 Jan 2021 12:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jan 2021 12:57:15 +0000 Received: from localhost ([127.0.0.1]:54061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5poQ-0002ug-VY for submit@debbugs.gnu.org; Sat, 30 Jan 2021 07:57:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:59326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5poM-0002uW-TO for submit@debbugs.gnu.org; Sat, 30 Jan 2021 07:57:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5poM-0004Od-KN for guix-patches@gnu.org; Sat, 30 Jan 2021 07:57:10 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:22122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1l5poI-0005YX-UT for guix-patches@gnu.org; Sat, 30 Jan 2021 07:57:09 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4DSZ3f4YG4zQl9v for ; Sat, 30 Jan 2021 13:57:02 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1612011420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDOC9kiv6Ua8vHtMJHWbrf4YBGgF2pMW2gADp0uquWs=; b=J015SKpiHXGzPwLNn7xD0uylvet2iEgIV2OmOjZ3Nub29SsegqeRg6M+aEGb75+iHYcRso tDLNaicErGlGTL8Hc8ynAZfShf+IonEo70WGqp8gU1W97Icy5fFP9EFOf2DzyAKxuFP+J2 Pwf3bBfyDp55jp9w0Lsld3Mb1PkYhErNLQmuL7RC3t6EqmYvZGQQyFqdoLCDXEeRp9aVrh AdYm78X1pPvH3WK8m/n8s6pJsvL9s/yVdgau6kYe20+0CoEgl+gVuBRyQG+pF9NhBG0Uxm TzXWtofeUQjaip9fN5bqPI3OTQvvd0OkSWOvVw/XmhG1brg+2GfOhbWMmnY4XA== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id 9FLPpw0kOl_D for ; Sat, 30 Jan 2021 13:56:59 +0100 (CET) Date: Sat, 30 Jan 2021 13:56:57 +0100 From: Lars-Dominik Braun Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="22q4qfqrajqi4ZS4" Content-Disposition: inline Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -8.36 / 15.00 / 15.00 X-Rspamd-Queue-Id: 5C4991847 X-Rspamd-UID: a5bba6 Received-SPF: pass client-ip=80.241.56.151; envelope-from=lars@6xq.net; helo=mout-p-101.mailbox.org 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=J015SKpi; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 366379403C8 X-Spam-Score: -1.25 X-Migadu-Scanner: scn1.migadu.com X-TUID: L46/Xa7H4qoL --22q4qfqrajqi4ZS4 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi, attached patch switches teeworlds’s build to cmake, which fixes the audio issue. Looks like cmake has a feature check for wavpack, which the bam build system does not have and thus it selects the wrong code path, causing wavpack to fail loading audio files. Cheers, Lars --22q4qfqrajqi4ZS4 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-teeworlds-Fix-audio.patch" >From 223a48785cc111e2428f8041a8cc7dd436598dbb Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 Jan 2021 13:53:05 +0100 Subject: [PATCH] gnu: teeworlds: Fix audio * gnu/packages/games.scm (teeworlds)[source]: Enable recursive cloning [build-system]: Switch to cmake-build-system [arguments]: Remove custom phases 'build and 'install [inputs]: Add openssl [native-inputs]: Remove bam [license]: Add map/language data license --- gnu/packages/games.scm | 65 +++++++----------------------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index be7a3cc181..e3e18bf09e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6104,11 +6104,13 @@ small robot living in the nano world, repair its maker.") (method git-fetch) (uri (git-reference (url "https://github.com/teeworlds/teeworlds") - (commit version))) + (commit version) + ;; There are two submodules in datasrc/{languages,maps} + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "169dl83q08zl4h813az8hjs4rs3dms9yjn6bnsld4fjcj0imvvc6")) + "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz")) (modules '((guix build utils) (ice-9 ftw) (ice-9 regex) @@ -6121,15 +6123,12 @@ small robot living in the nano world, repair its maker.") (remove (cut string-match "(^.)|(^md5$)" <>) (scandir base-dir))) #t)))) - (build-system gnu-build-system) + (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'unpack 'patch-paths (lambda* (#:key outputs #:allow-other-keys) ;; Embed path to assets. (substitute* "src/engine/shared/storage.cpp" @@ -6138,51 +6137,7 @@ small robot living in the nano world, repair its maker.") (assoc-ref outputs "out") "/share/teeworlds/data" "\""))) - - ;; Bam expects all files to have a recent time stamp. - (for-each (cut utime <> 1 1) - (find-files ".")) - - ;; Do not use bundled libraries. - (substitute* "bam.lua" - (("local json = Compile.+$") - "local json = nil -settings.link.libs:Add(\"jsonparser\")") - (("local png = Compile.+$") - "local png = nil -settings.link.libs:Add(\"pnglite\")") - (("local wavpack = Compile.+$") - "local wavpack = nil -settings.link.libs:Add(\"wavpack\")") - (("if config\\.zlib\\.value == 1") - "if config.zlib.value")) - (substitute* "src/engine/client/graphics_threaded.cpp" - (("engine/external/pnglite/pnglite\\.h") - "pnglite.h")) - (substitute* "src/engine/client/sound.cpp" - (("engine/external/wavpack/wavpack\\.h") - "wavpack/wavpack.h")) - #t)) - (replace 'build - (lambda _ - (invoke "bam" "-a" "-v" "conf=release"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((arch ,(system->linux-architecture - (or (%current-target-system) - (%current-system)))) - (build (string-append "build/" (if (string=? arch "i386") - "x86" arch) - "/release/")) - (data-built (string-append build "data/")) - (out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (data (string-append out "/share/teeworlds/data/"))) - (for-each (cut install-file <> bin) - (map (cut string-append build <>) - '("teeworlds" "teeworlds_srv"))) - (copy-recursively data-built data) - #t)))))) + #t))))) (inputs `(("freetype" ,freetype) ("glu" ,glu) @@ -6193,17 +6148,17 @@ settings.link.libs:Add(\"wavpack\")") ("sdl2-image" ,sdl2-image) ("sdl2-mixer" ,sdl2-mixer) ("wavpack" ,wavpack) + ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs - `(("bam" ,bam) - ("python" ,python-wrapper) + `(("python" ,python-wrapper) ("pkg-config" ,pkg-config))) (home-page "https://www.teeworlds.com") (synopsis "2D retro multiplayer shooter game") (description "Teeworlds is an online multiplayer game. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!") - (license license:bsd-3))) + (license (list license:bsd-3 license:cc-by-sa3.0)))) ; game+maps&languages (define-public enigma (package -- 2.26.2 --22q4qfqrajqi4ZS4--