From patchwork Sun Jan 5 10:45:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19586 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 76D4C179F0; Sun, 5 Jan 2020 10:47:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 35FDD179EE for ; Sun, 5 Jan 2020 10:47:12 +0000 (GMT) Received: from localhost ([::1]:40936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R9-0005VS-D1 for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44372) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R0-0005Tr-T6 for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3Qz-0002qX-Rq for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37743) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3Qz-0002qT-Oy for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3Qz-0007Kj-NW for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 1/5] gnu: sdl-mixer: Use correct inputs for MOD file support. References: <87v9pqdwb1.fsf@araneo.si> In-Reply-To: <87v9pqdwb1.fsf@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116228069 (code B ref 38941); Sun, 05 Jan 2020 10:47:01 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:02 +0000 Received: from localhost ([127.0.0.1]:43704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q2-0007IY-4o for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:02 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Pz-0007Hz-SB for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:00 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 75f25097 for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=zy0/1ocdQNZGfAr7SwHSV Ypc5e0=; b=jN6bbXZhOfVgvGp2G5RmYuLYELPcujqiRQ8Z3T3OhG2qJw4PrKjWP VmnLci54YAVx2zxo8ycj1NdyjOBXLGZ6Uq7TJMjbwzrqv1H5pE8FIYj99iugi8L1 DgBiRcViX2EqhMFema0xbcKtdVWgfPq4h3iYKbQNAa1c6kne6zdSlLbS5dkesiR0 aTkcdh0BKhygdGovtu4XYUYUkpO/63RIp8SYEf1lE2AiO09iq5pBDrE5gGiFjDR8 1G9SrV1CeF1hDympj5zSYYUhYwc5Kif/D0mqsLqF29j0Ku/VFdK0/B0tKFPgUfqy 0nBW5W2mq7EEtVzkKIOkJ7Mr+ThsN7U+g== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5ad052d0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:45:58 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:47 +0100 Message-Id: <20200105104551.16961-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Only one MOD backend is compiled, so specify (only) the correct inputs: libmikmod for sdl-mixer and libmodplug for sdl2-mixer. * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Remove libmodplug. * gnu/packages/sdl.scm (sdl2-mixer)[inputs]: Add libmodplug. --- gnu/packages/sdl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f7a34003d1..beeec1b8ca 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -274,8 +275,7 @@ WEBP, XCF, XPM, and XV.") (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) - ("libmikmod" ,libmikmod) - ("libmodplug" ,libmodplug))) + ("libmikmod" ,libmikmod))) ;; FIXME: Add libfluidsynth (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") @@ -416,6 +416,10 @@ directory.") #t)) (sha256 (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (inputs + ;; The default MOD library changed in SDL2 mixer. + `(("libmodplug" ,libmodplug) + ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) From patchwork Sun Jan 5 10:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19587 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 20AA3179F0; Sun, 5 Jan 2020 10:47:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CB153179EE for ; Sun, 5 Jan 2020 10:47:12 +0000 (GMT) Received: from localhost ([::1]:40940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R9-0005Vg-Um for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44381) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R1-0005Tt-BO for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3R0-0002qx-A8 for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37744) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3R0-0002qr-7B for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3R0-0007Kr-5y for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 2/5] gnu: sdl-mixer: Remove unused configure flag. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116428098 (code B ref 38941); Sun, 05 Jan 2020 10:47:02 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:04 +0000 Received: from localhost ([127.0.0.1]:43710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q4-0007J7-FJ for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:04 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q0-0007Hz-Rr for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:01 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 27d27ed5 for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=/NNZMBgfkbdracNPcnmL5 0odhPI=; b=qkT7z3a1Xr3yu4tcUtjiM7G3hqcUbYBRrGbYXJrtsiMjqAHy99Qu+ 3A+iYgumZbMfOaoFosX7iqgspm5b65qAXbJ60MGM/aQaGKdoxdewAMkKT+/crkbg uL68+gRPYQ4kW9jdZroamgPhKvdxDrgZ6nt5cWK5Md27r2dPyrOZeyoPYwiOxwwB Ol+P8Aa5AMIl7ttDfFlE/vfKXuvEqulHJvprYWvQWDsot+HIy63EU/Km9kdmL73Z gzbWS0jbGiuHcxLo+UvZSiPP73mo67MKWl1/8liFQPs6gh3+Ui2Kx2Oa5bQOXoBU 8vELCoFeElQDb0Ercc3Va+KZuVyBQMlqg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id d864857e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:45:59 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:48 +0100 Message-Id: <20200105104551.16961-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches The flag --disable-music-mp3-shared is only used when building with smpeg instead of libmad, which is linked at build time by default. * gnu/packages/sdl.scm (sdl-mixer)[arguments]: Remove unused configure flag. --- gnu/packages/sdl.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index beeec1b8ca..92d8f9a922 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -270,8 +270,7 @@ WEBP, XCF, XPM, and XV.") "--disable-music-mod-shared" "--disable-music-fluidsynth-shared" "--disable-music-ogg-shared" - "--disable-music-flac-shared" - "--disable-music-mp3-shared"))) + "--disable-music-flac-shared"))) (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) From patchwork Sun Jan 5 10:45:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19588 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 711B5179F0; Sun, 5 Jan 2020 10:47:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3E8E3179EE for ; Sun, 5 Jan 2020 10:47:13 +0000 (GMT) Received: from localhost ([::1]:40944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3RA-0005WK-Bv for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44393) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R1-0005V7-Pt for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3R0-0002rC-PL for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37745) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3R0-0002r5-MM for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3R0-0007Kz-LW for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 3/5] gnu: sdl2-mixer: Fix configure flags. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116528106 (code B ref 38941); Sun, 05 Jan 2020 10:47:02 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:05 +0000 Received: from localhost ([127.0.0.1]:43712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q4-0007J9-OO for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:05 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q1-0007Hz-L3 for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:02 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id c055b163 for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=UzjmJDWT/L/D2/qM3/r/n BfjAgI=; b=Ie67/7uBeqgPJh3gbT6WSocWhhGHrGFbV4a3XgMj3nHtc+JCPl1hC +r6ntS696WSKjxclmsq5cNR30+DNWiV2gNWDyZYd7u6DmmcFBJqxIm4xMN8PZqy5 /h2U7Bwx7gZGC10UqZ3EUc9sVsuM3N8cziLh+B1P5SwNrMxW8+9UISRr6EPoKsNe mbmfZEXkFVaLIPFqdthZri/+aLzsGMCZyghRbsH4hBO/IMxILYIGoucIlFED0HeT A7R/e0Wv9awyU290sAkWJiJlq9Ry0MmTMwR+VOVenruuMX39SOU1TxpUiVyDDcac CMsGCJXums2Cgxri4dvWoYoksan0RAO6w== Received: by araneo.si (OpenSMTPD) with ESMTPSA id a9caabf0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:45:59 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:49 +0100 Message-Id: <20200105104551.16961-3-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Some configure options were renamed between SDL / SDL2 mixer; add new variants to the derived package. * gnu/packages/sdl.scm (sdl2-mixer)[arguments]: Fix flags to disable dynamic library loading. --- gnu/packages/sdl.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 92d8f9a922..d441040cd6 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -415,6 +415,15 @@ directory.") #t)) (sha256 (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (arguments + (substitute-keyword-arguments (package-arguments sdl-mixer) + ((#:configure-flags flags) + `(cons* + ;; These options were renamed in SDL2 mixer. Keeping the inherited + ;; variants produces a harmless warning. + "--disable-music-mod-modplug-shared" + "--disable-music-midi-fluidsynth-shared" + ,flags)))) (inputs ;; The default MOD library changed in SDL2 mixer. `(("libmodplug" ,libmodplug) From patchwork Sun Jan 5 10:45:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19590 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 0D439179F0; Sun, 5 Jan 2020 10:47:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BC5CE179EE for ; Sun, 5 Jan 2020 10:47:22 +0000 (GMT) Received: from localhost ([::1]:40952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3RK-0005pJ-9v for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44408) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R2-0005VI-ID for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3R1-0002rX-9u for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37746) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3R1-0002rT-6t for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3R1-0007L6-5P for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 4/5] gnu: sdl-mixer: Enable fluidsynth MIDI backend. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116528112 (code B ref 38941); Sun, 05 Jan 2020 10:47:03 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:05 +0000 Received: from localhost ([127.0.0.1]:43714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q5-0007JH-Bi for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:05 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q2-0007Hz-EL for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:02 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id d889e407 for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=6gg/ptcKyLbOAN3C0loqW GnIYwc=; b=IeXaejR+4X8xItBMIi2v34U39lxFp9g/JjXPQluNVhKr0ndLhK7xg 7Si4fMeCMXcdtB+RuPIxlvZiTnuUbOpbFOQZHOvX/H0n0pCPgt7TkqubrhSHE6Mp 4TR2JT1/8dPo86uUcSHD27OfbjfnSuSUfEevVrFDp6cXFFEYhkCb+rsvPzoAOz3t 8R9qesffqcPyvtmLeCjNNKst80KcKCqpBP2TdS+1mrMsHKrPWiJzCsbHBXnu8jkp 5AI+Fj4fFsEHM8BBF3EULcXVUCbndiChWYZkNFW6kf1tRke0XhHUcMEy5rv0GQUs CKBCO975LRgTBeczhMmUm6C409bBUbmpg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id c14affe5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:46:00 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:50 +0100 Message-Id: <20200105104551.16961-4-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sdl.scm (sdl-mixer)[inputs]: Add fluidsynth and alphabetize. [arguments]: Reformat. --- gnu/packages/sdl.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d441040cd6..80f3da9327 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -262,20 +262,21 @@ WEBP, XCF, XPM, and XV.") "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n")))) (build-system gnu-build-system) (outputs '("out" "debug")) - ;; no check target - ;; use libmad instead of smpeg - ;; explicitly link against shared libraries instead of dlopening them - (arguments `(#:tests? #f - #:configure-flags '("--enable-music-mp3-mad-gpl" - "--disable-music-mod-shared" - "--disable-music-fluidsynth-shared" - "--disable-music-ogg-shared" - "--disable-music-flac-shared"))) - (inputs `(("libvorbis" ,libvorbis) - ("libflac" ,flac) - ("libmad" ,libmad) - ("libmikmod" ,libmikmod))) - ;; FIXME: Add libfluidsynth + (arguments + `(#:tests? #f ; No check target. + #:configure-flags + '("--enable-music-mp3-mad-gpl" ; Use libmad instead of smpeg. + ;; Explicitly link against shared libraries instead of dlopening them. + "--disable-music-flac-shared" + "--disable-music-fluidsynth-shared" + "--disable-music-mod-shared" + "--disable-music-ogg-shared"))) + (inputs + `(("fluidsynth" ,fluidsynth) + ("libflac" ,flac) + ("libmad" ,libmad) + ("libmikmod" ,libmikmod) + ("libvorbis" ,libvorbis))) (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") (description "SDL_mixer is a multi-channel audio mixer library for SDL. From patchwork Sun Jan 5 10:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 19589 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 2BE46179F0; Sun, 5 Jan 2020 10:47:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E19BF179EE for ; Sun, 5 Jan 2020 10:47:17 +0000 (GMT) Received: from localhost ([::1]:40948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3RF-0005jg-FN for patchwork@mira.cbaines.net; Sun, 05 Jan 2020 05:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44411) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io3R2-0005VJ-Lz for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io3R1-0002s5-OG for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37747) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1io3R1-0002ru-L2 for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1io3R1-0007LE-Jn for guix-patches@gnu.org; Sun, 05 Jan 2020 05:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38941] [PATCH 5/5] gnu: sdl2-mixer: Enable opus support. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jan 2020 10:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38941 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38941@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 38941-submit@debbugs.gnu.org id=B38941.157822116828122 (code B ref 38941); Sun, 05 Jan 2020 10:47:03 +0000 Received: (at 38941) by debbugs.gnu.org; 5 Jan 2020 10:46:08 +0000 Received: from localhost ([127.0.0.1]:43716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q7-0007JV-NN for submit@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:08 -0500 Received: from araneo.si ([90.157.193.204]:38980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1io3Q3-0007Hz-9C for 38941@debbugs.gnu.org; Sun, 05 Jan 2020 05:46:03 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 1e265c1d for <38941@debbugs.gnu.org>; Sun, 5 Jan 2020 10:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=/Mt4mRnOLQorAoeZuhQQD VRHs3g=; b=RWMBCE+O/ZiRn9YikFj3/Q+qM4b29Lmvm1bn7Hll+lYy4f12RE0uY iBFdVdMhP+vcWG84kypvKl2V/OoTR0xdKiHgHQfR+kOu/oDU46NI03Y4p/yXuT4a BxR7Pg5LuBeiMTa1ZIlf1gOpZmzg89/CcLCmiRJGsGGfzOJ/11nL2ynYKTcEJ4fj 0zGWJDmNmDMGpmwWAMnZqc2v5trQn0/JeLbxjhrIPhweIkDAmTuet8Cx9ZHaJuF1 v3Yq/OsOe7QNeIH9ae2KwAbsLSzux08bzh2kCR7cyDAwBGjVXw1fQa6alfxAbHKK 8ne6O/7YNMB8aQvMnNVns78NgoMVCi9Ow== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 60e297c3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 5 Jan 2020 10:46:00 +0000 (UTC) From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:51 +0100 Message-Id: <20200105104551.16961-5-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200105104551.16961-1-timotej.lazar@araneo.si> References: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sdl.scm (sdl2-mixer)[inputs]: Add opusfile. [native-inputs]: Add pkg-config. [arguments]: Link opusfile at build time. --- gnu/packages/sdl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80f3da9327..80725561fb 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -420,15 +420,19 @@ directory.") (substitute-keyword-arguments (package-arguments sdl-mixer) ((#:configure-flags flags) `(cons* + "--disable-music-opus-shared" ;; These options were renamed in SDL2 mixer. Keeping the inherited ;; variants produces a harmless warning. "--disable-music-mod-modplug-shared" "--disable-music-midi-fluidsynth-shared" ,flags)))) (inputs - ;; The default MOD library changed in SDL2 mixer. - `(("libmodplug" ,libmodplug) + `(("opusfile" ,opusfile) + ;; The default MOD library changed in SDL2 mixer. + ("libmodplug" ,libmodplug) ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) + (native-inputs + `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer))))