Skip to content

Commit 7ee0eec

Browse files
committed
dosbox-staging: updates for 0.80
Added a few modifications needed to build & install the new 0.80 version: * Meson version needed is 0.57, which is not available in Debian _bullseye_ yet. Install 0.61.5 locally for the build step. This is the last version not requiring Python 3.7, which should cover Ubuntu 18.04 (still at 3.6) * Changed the install command to `ninja`, since `meson install` requires a system install for `meson` and thus install would fail when using the locally downloaded `meson` The changes allow building and installing on Ubuntu 18.04, which was previously failing. Notable changes from the Dosbox-Staging 0.80 release (excerpts from https://dosbox-staging.github.io/v0-80-0/): * ReelMagic DOS games are now playable thanks to the efforts of Jon Dennis, Chris Guthrie, and Joseph Whittaker, with testing and feedback from Vogons users Uka, DonutKing, and Vetz * Mouse emulation has been improved and now supports up to six independent mice, enabling split-screen play in games like The Settlers and The Settlers II * More settings, including video, audio, and MIXER effects, can now be changed on the fly * Post-rendered screenshots - use Alt+F5 to capture the as-seen (post-rendered) image, in addition to the previous (Ctrl+F5) screenshot function that captured the emulated video card's image prior to rendering * More bundled OpenGL shaders. Launch DOSBox Staging with the --list-glshaders command-line argument to list the available OpenGL shaders * FluidSynth's specific reverb and chorus configuration settings are now applied and will replace the default values that were previously always applied * The modem's call now has a warm-up period where it will discard data
1 parent 09a0fbd commit 7ee0eec

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

scriptmodules/emulators/dosbox-staging.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,34 @@ function _get_branch_dosbox-staging() {
2222
}
2323

2424
function depends_dosbox-staging() {
25-
getDepends cmake libasound2-dev libglib2.0-dev libopusfile-dev libpng-dev libsdl2-dev libsdl2-net-dev libspeexdsp-dev meson ninja-build
25+
getDepends cmake libasound2-dev libglib2.0-dev libopusfile-dev libpng-dev libsdl2-dev libsdl2-net-dev libsdl2-image-dev libspeexdsp-dev meson ninja-build
2626
}
2727

2828
function sources_dosbox-staging() {
2929
gitPullOrClone
30-
# patch the dosbox-staging meson.build script to disable neon instructions for older arm
31-
if ! isPlatform "neon"; then
32-
applyPatch "$md_data/speexdsp_simd_disable.diff"
30+
# Check if we have at least meson>=0.57, otherwise install it locally for the build
31+
local meson_version="$(meson --version)"
32+
if compareVersions "$meson_version" lt 0.57; then
33+
downloadAndExtract "https://github.com/mesonbuild/meson/releases/download/0.61.5/meson-0.61.5.tar.gz" meson --strip-components 1
3334
fi
3435
}
3536

3637
function build_dosbox-staging() {
3738
local params=(-Dprefix="$md_inst" -Ddatadir="resources")
39+
# use the build local Meson installation if found
40+
local meson_cmd="meson"
41+
[[ -f "$md_build/meson/meson.py" ]] && meson_cmd="python3 $md_build/meson/meson.py"
3842

39-
meson setup "${params[@]}" build
40-
meson compile -j${__jobs} -C build
43+
$meson_cmd setup "${params[@]}" build
44+
$meson_cmd compile -j${__jobs} -C build
4145

4246
md_ret_require=(
4347
"$md_build/build/dosbox"
4448
)
4549
}
4650

4751
function install_dosbox-staging() {
48-
cd "$md_build/build"
49-
meson install
52+
ninja -C build install
5053
}
5154

5255
function configure_dosbox-staging() {

scriptmodules/emulators/dosbox-staging/speexdsp_simd_disable.diff

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)