From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: From: Timotej Lazar Date: Sun, 5 Jan 2020 11:45:47 +0100 Message-Id: <20200105104551.16961-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38941@debbugs.gnu.org Cc: Timotej Lazar 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)))) -- 2.24.1