Merge pull request #3590 from joolswills/dosbox-staging_armv6_fix

dosbox-staging - fix building for armv6

Author: joolswills

scriptmodules/admin/image.sh

@@ -174,7 +174,7 @@ function _init_chroot_image() {
     trap "_trap_chroot_image '$chroot'" INT
 
     # mount special filesystems to chroot
-    mkdir -p "$chroot"/dev/pts
+    mkdir -p "$chroot"{/dev/pts,/proc}
     mount none -t devpts "$chroot/dev/pts"
     mount -t proc /proc "$chroot/proc"
 

scriptmodules/emulators/dosbox-staging.sh

@@ -27,6 +27,10 @@ function depends_dosbox-staging() {
 
 function sources_dosbox-staging() {
     gitPullOrClone
+    # patch the dosbox-staging meson.build script to disable neon instructions for older arm
+    if ! isPlatform "neon"; then
+        applyPatch "$md_data/speexdsp_simd_disable.diff"
+    fi
 }
 
 function build_dosbox-staging() {

scriptmodules/emulators/dosbox-staging/speexdsp_simd_disable.diff

@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 8db4dd4..e5e7549 100644
+--- a/meson.build
++++ b/meson.build
+@@ -396,7 +396,7 @@ endif
+ if not speexdsp_dep.found() or not is_system_speexdsp_reliable
+     speexdsp_dep = subproject(
+         'speexdsp',
+-        default_options: default_wrap_options,
++        default_options: default_wrap_options + ['simd=false']
+     ).get_variable('speexdsp_dep')
+     speexdsp_summary_msg = 'built-in'
+ endif