From patchwork Tue Apr 18 01:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 49276 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 77C9417971; Tue, 18 Apr 2023 02:40:21 +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=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 34F9D174A3 for ; Tue, 18 Apr 2023 02:40:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poaKG-0000nw-DQ; Mon, 17 Apr 2023 21:40:08 -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 1poaKB-0000nK-5z for guix-patches@gnu.org; Mon, 17 Apr 2023 21:40: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 1poaKA-0003rv-T5 for guix-patches@gnu.org; Mon, 17 Apr 2023 21:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poaKA-00070D-FO for guix-patches@gnu.org; Mon, 17 Apr 2023 21:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62918] [PATCH] gnu: schismtracker: Update to 20221201. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Apr 2023 01:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62918@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168178199426897 (code B ref -1); Tue, 18 Apr 2023 01:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2023 01:39:54 +0000 Received: from localhost ([127.0.0.1]:57267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poaK1-0006zk-Vy for submit@debbugs.gnu.org; Mon, 17 Apr 2023 21:39:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:52450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poaK0-0006zd-33 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 21:39:52 -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 1poaJz-0000kp-Pv for guix-patches@gnu.org; Mon, 17 Apr 2023 21:39:51 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1poaJx-0003l5-VT for guix-patches@gnu.org; Mon, 17 Apr 2023 21:39:51 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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-103.mailbox.org (Postfix) with ESMTPS id 4Q0mnB5vX2z9sR5 for ; Tue, 18 Apr 2023 03:39:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1681781982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hyPBVsBLXOVLddwNRX8Oj/5gLsLC55/96nXWf4LBmhk=; b=xwFeRRLWF6kuUpSNahe91+Elx8zjoRdd20gECOdQDVgF8arN9DZn7ZiBlEWcPwUbzuPzoH GhoYC1bVMDuk1K0jITXvaX9Tm7I08oVAFjnaCErqrdJ9gRBTRVkZ6CqVApO4pJCZASD7fP YnSGOm9wyVTASjy1tRHWgbNA2gJNmr1flqkaA9gUsCXngTNb/Vv5giuZw1JNQ7Z2wI+tqU XmHRVYTJAfHmAq7GdQ/b13+Sn0gYKWEM6QkvCEFN6R5A4scEcraweCR75crOhZugjGcNa8 vsSIiF1tu6kqq5N6zyxmN97ugnlUh6toWuHtAGPl+jJp89H7F9uFoyjPtIjo8Q== Date: Tue, 18 Apr 2023 01:39:31 +0000 Message-Id: <20230418013931.29432-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: kc4grrxefbujaqutbnb7gy8sdbu4ytrg X-MBO-RS-ID: a2ae91b6c664c16f9f6 Received-SPF: pass client-ip=80.241.56.161; envelope-from=antero@mailbox.org; helo=mout-p-103.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, 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: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr 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/music.scm (schismtracker): Update to 20221201. [source]: Convert snippet to gexp. [arguments]: Convert to gexp, add configure flags for FLAC and Wayland support. [inputs]: Remove libx11, libxext, and sdl; add flac and sdl2. --- Tested working in XWayland and pure Wayland on a AMD64 pulseaudio system. gnu/packages/music.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0a66ece40a..3c0ebcfd82 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4127,7 +4127,7 @@ (define-public milkytracker (define-public schismtracker (package (name "schismtracker") - (version "20190805") + (version "20221201") (source (origin (method git-fetch) (uri (git-reference @@ -4136,26 +4136,27 @@ (define-public schismtracker (file-name (git-file-name name version)) (sha256 (base32 - "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd")) + "11yy5zrdfvnwzwdwmc3s3lx1ymwiyp1si5mmv4h9qxipd9j96ijp")) (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. - `(begin - (substitute* "schism/version.c" - (("Schism Tracker built %s %s.*$") - (string-append "Schism Tracker version " ,version "\") ;"))) - #t)))) + #~(substitute* "schism/version.c" + (("Schism Tracker built %s %s.*$") + (string-append + "Schism Tracker version " #$version "\") ;")))))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'link-libm - (lambda _ (setenv "LIBS" "-lm") #t))))) + (list #:configure-flags #~(list "--with-flac=yes" "--with-x11=no") + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'link-libm + (lambda _ + (setenv "LIBS" "-lm")))))) (native-inputs (list autoconf automake python)) (inputs (list alsa-lib ; for asound dependency - libx11 libxext sdl)) + flac + sdl2)) (home-page "https://schismtracker.org") (synopsis "Oldschool sample-based music composition tool") (description