Skip to content

Commit 20a9471

Browse files
committed
MACOSXPPC: Fetch a Debian patch for this libmikmod release
Also add a TODO for libopenmpt, maybe for the next major ScummVM release. It's a bit big compared to libmikmod, though.
1 parent 17ee91b commit 20a9471

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed

toolchains/macosx-ppc/packages/libmikmod/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#! /bin/sh
22

3+
# TODO: look at openmpt for the next major ScummVM release?
4+
# it has SO3 support (for sludge) engine.
35
LIBMIKMOD_VERSION=3.3.11.1
46
#LIBMIKMOD_SHA256=XXX
57

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From: Gergely Nagy <algernon@madhouse-project.org>
2+
Date: Fri, 21 Dec 2012 16:07:43 +0100
3+
Subject: playercode/mdreg: Register the NULL driver before the file writers
4+
5+
Register the NULL driver sooner, as having no sound is preferable to
6+
writing to music.raw: file writing should be used only when explicitly
7+
selected.
8+
9+
Reported-by: Simon McVittie <smcv@debian.org>
10+
Closes: #690943
11+
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
12+
---
13+
playercode/mdreg.c | 4 ++--
14+
1 file changed, 2 insertions(+), 2 deletions(-)
15+
16+
--- a/playercode/mdreg.c
17+
+++ b/playercode/mdreg.c
18+
@@ -129,6 +129,9 @@
19+
_mm_registerdriver(&drv_sb);
20+
#endif
21+
22+
+ /* Register 'nosound' driver */
23+
+ _mm_registerdriver(&drv_nos);
24+
+
25+
/* Register disk writers */
26+
#ifdef DRV_WAV
27+
_mm_registerdriver(&drv_wav);
28+
@@ -147,9 +150,6 @@
29+
#if defined(DRV_STDOUT) && !defined(macintosh)
30+
_mm_registerdriver(&drv_stdout);
31+
#endif
32+
-
33+
- /* Register 'nosound' driver */
34+
- _mm_registerdriver(&drv_nos);
35+
}
36+
37+
MIKMODAPI void MikMod_RegisterAllDrivers(void)

0 commit comments

Comments
 (0)