From: Timotej Lazar <timotej.lazar@araneo.si>
To: 38941@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#38941] [PATCH 1/5] gnu: sdl-mixer: Use correct inputs for MOD file support.
Date: Sun, 5 Jan 2020 11:45:47 +0100 [thread overview]
Message-ID: <20200105104551.16961-1-timotej.lazar@araneo.si> (raw)
In-Reply-To: <87v9pqdwb1.fsf@araneo.si>
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 <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;;
;;; 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
next prev parent reply other threads:[~2020-01-05 10:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-05 10:36 [bug#38941] [PATCH 0/5] Support fluidsynth and opus in sdl(2)-mixer, and other tweaks Timotej Lazar
2020-01-05 10:45 ` Timotej Lazar [this message]
2020-01-05 10:45 ` [bug#38941] [PATCH 2/5] gnu: sdl-mixer: Remove unused configure flag Timotej Lazar
2020-01-05 10:45 ` [bug#38941] [PATCH 3/5] gnu: sdl2-mixer: Fix configure flags Timotej Lazar
2020-01-05 10:45 ` [bug#38941] [PATCH 4/5] gnu: sdl-mixer: Enable fluidsynth MIDI backend Timotej Lazar
2020-01-05 10:45 ` [bug#38941] [PATCH 5/5] gnu: sdl2-mixer: Enable opus support Timotej Lazar
2020-01-05 12:23 ` [bug#38941] [PATCH 0/5] Support fluidsynth and opus in sdl(2)-mixer, and other tweaks Danny Milosavljevic
2020-01-06 11:12 ` Timotej Lazar
2020-12-13 12:57 ` Christopher Baines
2020-12-13 13:01 ` bug#38941: " Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200105104551.16961-1-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=38941@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.