Merge branch 'audio' into 'master'

Enable audio in scummvm, add schismtracker

See merge request redox-os/cookbook!199
This commit is contained in:
Jeremy Soller 2018-12-31 18:51:12 +00:00
commit ce54788076
4 changed files with 66 additions and 14 deletions

View File

@ -0,0 +1,24 @@
diff -rupNw source-original/Makefile.am source/Makefile.am
--- source-original/Makefile.am 2018-08-10 07:04:54.000000000 +0200
+++ source/Makefile.am 2018-12-30 23:18:07.957244170 +0100
@@ -223,7 +223,7 @@ files_macosx = \
endif
if USE_NETWORK
-cflags_network=-DUSE_NETWORK
+#cflags_network=-DUSE_NETWORK
endif
diff -rupNw source-original/schism/main.c source/schism/main.c
--- source-original/schism/main.c 2018-08-10 07:04:54.000000000 +0200
+++ source/schism/main.c 2018-12-30 23:19:24.954046191 +0100
@@ -1033,7 +1033,7 @@ int main(int argc, char **argv)
video_fullscreen(0);
- tzset(); // localtime_r wants this
+ //tzset(); // localtime_r wants this
srand(time(NULL));
parse_options(argc, argv); /* shouldn't this be like, first? */

View File

@ -0,0 +1,41 @@
VERSION=20181223
TAR=https://github.com/schismtracker/schismtracker/archive/$VERSION.tar.gz
TAR_SHA256=fc32930c611fdb78face87dbe8a3c62e70088fd8d4ad803140e0b9a0b2e72ad7
BUILD_DEPENDS=(sdl liborbital libiconv)
function recipe_version {
echo "$VERSION"
skip=1
}
function recipe_update {
echo "skipping update"
skip=1
}
function recipe_build {
sysroot="${PWD}/../sysroot"
export CFLAGS="-I$sysroot/include -I$sysroot/include/SDL"
export LDFLAGS="-L$sysroot/lib"
export SDL_CONFIG="$sysroot/bin/sdl-config"
autoreconf -i
./configure --host=${HOST} --prefix=''
make -j"$(nproc)"
skip=1
}
function recipe_test {
echo "skipping test"
skip=1
}
function recipe_clean {
make clean
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
skip=1
}

View File

@ -1,17 +1,3 @@
diff -rupNw source-original/audio/mixer.cpp source/audio/mixer.cpp
--- source-original/audio/mixer.cpp 2017-12-08 23:21:10.000000000 +0100
+++ source/audio/mixer.cpp 2018-12-06 02:03:37.151198853 +0100
@@ -237,7 +237,9 @@ void MixerImpl::playStream(
}
- assert(_mixerReady);
+ if (autofreeStream == DisposeAfterUse::YES)
+ delete stream;
+ return;
// Prevent duplicate sounds
if (id != -1) {
diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
--- source-original/common/stream.cpp 2017-12-08 23:21:10.000000000 +0100
+++ source/common/stream.cpp 2018-12-06 02:01:50.454108198 +0100

View File

@ -1,5 +1,6 @@
VERSION=2.0.0
TAR=https://www.scummvm.org/frs/scummvm/$VERSION/scummvm-$VERSION.tar.xz
TAR_SHA256=9784418d555ba75822d229514a05cf226b8ce1a751eec425432e6b7e128fca60
BUILD_DEPENDS=(sdl liborbital freetype zlib libpng)
function recipe_version {