From 77230ecb775437c8a6d08ab879df9f544994b4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Wed, 8 Mar 2023 20:08:55 +0100 Subject: [PATCH] dosbox-staging: update to 0.80.1 --- .../dosbox-staging/patches/fix_cross.patch | 55 ------------------- srcpkgs/dosbox-staging/template | 10 ++-- 2 files changed, 6 insertions(+), 59 deletions(-) delete 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 deleted file mode 100644 index 98b0b6b7884c..000000000000 --- a/srcpkgs/dosbox-staging/patches/fix_cross.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 7173a6fda80a..202f6a6911e2 100644 --- a/srcpkgs/dosbox-staging/template +++ b/srcpkgs/dosbox-staging/template @@ -1,18 +1,20 @@ # Template file for 'dosbox-staging' pkgname=dosbox-staging -version=0.79.1 +version=0.80.1 revision=1 build_style=meson +build_helper=qemu hostmakedepends="pkg-config" -makedepends="SDL2-devel SDL2_net-devel alsa-lib-devel fluidsynth-devel libiir1-devel - libmt32emu-devel libpng-devel libslirp-devel opusfile-devel speexdsp-devel" +makedepends="SDL2-devel SDL2_net-devel SDL2_image-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=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f +checksum=2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392 conflicts="dosbox" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then