From e92094f47c6852b3a7750702877225ede77a362a Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm Date: Sun, 25 Sep 2022 16:04:46 +0100 Subject: [PATCH] dosbox-staging: update to 0.79.1 --- .../dosbox-staging/patches/fix_cross.patch | 55 +++++++++++++++++++ srcpkgs/dosbox-staging/template | 10 ++-- 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/dosbox-staging/patches/fix_cross.patch diff --git a/srcpkgs/dosbox-staging/patches/fix_cross.patch b/srcpkgs/dosbox-staging/patches/fix_cross.patch new file mode 100644 index 00000000000..98b0b6b7884 --- /dev/null +++ b/srcpkgs/dosbox-staging/patches/fix_cross.patch @@ -0,0 +1,55 @@ +--- a/meson.build ++++ b/meson.build +@@ -376,24 +376,37 @@ + static: ('speexdsp' in static_libs_list or prefers_static_libs), + ) + +-# The system has SpeexDSP, so test its floating-point handling +-if speexdsp_dep.found() +- system_speexdsp_test = cxx.run( +- files('contrib/check-speexdsp/test_speexdsp_float_api.cpp'), +- dependencies: speexdsp_dep, +- name: 'SpeexDSP system library has reliable floating-point API', +- ) +- is_system_speexdsp_reliable = ( +- system_speexdsp_test.compiled() +- and system_speexdsp_test.returncode() == 0 +- ) +- if is_system_speexdsp_reliable +- speexdsp_summary_msg = 'system library' ++if meson.can_run_host_binaries() ++ # The system has SpeexDSP, so test its floating-point handling ++ if speexdsp_dep.found() ++ system_speexdsp_test = cxx.run( ++ files('contrib/check-speexdsp/test_speexdsp_float_api.cpp'), ++ dependencies: speexdsp_dep, ++ name: 'SpeexDSP system library has reliable floating-point API', ++ ) ++ is_system_speexdsp_reliable = ( ++ system_speexdsp_test.compiled() ++ and system_speexdsp_test.returncode() == 0 ++ ) ++ if is_system_speexdsp_reliable ++ speexdsp_summary_msg = 'system library' ++ endif + endif ++else ++ speexdsp_summary_msg = 'system library' + endif + +-# The system doesn't have SpeexDSP or it's unreiable, so use the wrap +-if not speexdsp_dep.found() or not is_system_speexdsp_reliable ++use_speex_wrap = false ++# The system doesn't have SpeexDSP or it's unreliable, so use the wrap ++if not speexdsp_dep.found() ++ use_speex_wrap = true ++elif meson.can_run_host_binaries() ++ if not is_system_speexdsp_reliable ++ use_speex_wrap = true ++ endif ++endif ++ ++if use_speex_wrap + speexdsp_dep = subproject( + 'speexdsp', + default_options: default_wrap_options, diff --git a/srcpkgs/dosbox-staging/template b/srcpkgs/dosbox-staging/template index fc68f8562f3..7173a6fda80 100644 --- a/srcpkgs/dosbox-staging/template +++ b/srcpkgs/dosbox-staging/template @@ -1,19 +1,21 @@ # Template file for 'dosbox-staging' pkgname=dosbox-staging -version=0.77.0 +version=0.79.1 revision=1 build_style=meson hostmakedepends="pkg-config" -makedepends="alsa-lib-devel libpng-devel SDL2-devel SDL2_net-devel - opusfile-devel fluidsynth-devel libmt32emu-devel" +makedepends="SDL2-devel SDL2_net-devel alsa-lib-devel fluidsynth-devel libiir1-devel + libmt32emu-devel libpng-devel libslirp-devel opusfile-devel speexdsp-devel" +checkdepends="gtest-devel" short_desc="DOS/x86 emulator focusing on ease of use" maintainer="Joshua Krämer " license="GPL-2.0-or-later" homepage="https://dosbox-staging.github.io" distfiles="https://github.com/dosbox-staging/dosbox-staging/archive/v${version}.tar.gz" -checksum=85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986 +checksum=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f conflicts="dosbox" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" fi