* [PR PATCH] dosbox-staging: update to 0.80.1
@ 2023-03-08 19:21 joshuakraemer
2023-03-08 19:34 ` [PR PATCH] [Updated] " joshuakraemer
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: joshuakraemer @ 2023-03-08 19:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
There is a new pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/42660
dosbox-staging: update to 0.80.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/42660.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-42660.patch --]
[-- Type: text/x-diff, Size: 3911 bytes --]
From 38ca437377d490be68873acb223b71b6ba21f811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
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 | 9 +--
2 files changed, 5 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..26e39ac4f884 100644
--- a/srcpkgs/dosbox-staging/template
+++ b/srcpkgs/dosbox-staging/template
@@ -1,18 +1,19 @@
# Template file for 'dosbox-staging'
pkgname=dosbox-staging
-version=0.79.1
+version=0.80.1
revision=1
build_style=meson
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 <joshua@kraemer.link>"
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.80.1
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
@ 2023-03-08 19:34 ` joshuakraemer
2023-03-08 19:47 ` joshuakraemer
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: joshuakraemer @ 2023-03-08 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/42660
dosbox-staging: update to 0.80.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/42660.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-42660.patch --]
[-- Type: text/x-diff, Size: 3953 bytes --]
From 56e7fc66afd36717bfc249808da6c921d77c1adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
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..75377619f660 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
+configure_args="-Dwrap_mode=nofallback"
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 <joshua@kraemer.link>"
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.80.1
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
2023-03-08 19:34 ` [PR PATCH] [Updated] " joshuakraemer
@ 2023-03-08 19:47 ` joshuakraemer
2023-03-08 21:36 ` joshuakraemer
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: joshuakraemer @ 2023-03-08 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/42660
dosbox-staging: update to 0.80.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/42660.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-42660.patch --]
[-- Type: text/x-diff, Size: 3953 bytes --]
From 06065a7a6e5ff467721c24f12e06038b36c0f910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
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..693beb50ad38 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
+configure_args="--wrap-mode=nofallback"
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 <joshua@kraemer.link>"
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.80.1
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
2023-03-08 19:34 ` [PR PATCH] [Updated] " joshuakraemer
2023-03-08 19:47 ` joshuakraemer
@ 2023-03-08 21:36 ` joshuakraemer
2023-03-08 21:52 ` joshuakraemer
2023-03-09 13:47 ` [PR PATCH] [Merged]: " abenson
4 siblings, 0 replies; 6+ messages in thread
From: joshuakraemer @ 2023-03-08 21:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/42660
dosbox-staging: update to 0.80.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/42660.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-42660.patch --]
[-- Type: text/x-diff, Size: 3931 bytes --]
From 77230ecb775437c8a6d08ab879df9f544994b4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
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 <joshua@kraemer.link>"
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.80.1
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
` (2 preceding siblings ...)
2023-03-08 21:36 ` joshuakraemer
@ 2023-03-08 21:52 ` joshuakraemer
2023-03-09 13:47 ` [PR PATCH] [Merged]: " abenson
4 siblings, 0 replies; 6+ messages in thread
From: joshuakraemer @ 2023-03-08 21:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by joshuakraemer against master on the void-packages repository
https://github.com/joshuakraemer/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/42660
dosbox-staging: update to 0.80.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/42660.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-42660.patch --]
[-- Type: text/x-diff, Size: 4006 bytes --]
From 689228fdc386fff17da47f2798ace522527748c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Wed, 8 Mar 2023 20:08:55 +0100
Subject: [PATCH] dosbox-staging: update to 0.80.1
Qemu build helper added to fix SpeexDSP test in cross builds (see #39871).
---
.../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 <joshua@kraemer.link>"
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: dosbox-staging: update to 0.80.1
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
` (3 preceding siblings ...)
2023-03-08 21:52 ` joshuakraemer
@ 2023-03-09 13:47 ` abenson
4 siblings, 0 replies; 6+ messages in thread
From: abenson @ 2023-03-09 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
There's a merged pull request on the void-packages repository
dosbox-staging: update to 0.80.1
https://github.com/void-linux/void-packages/pull/42660
Description:
Qemu build helper added to fix SpeexDSP test in cross builds (see https://github.com/void-linux/void-packages/pull/39871).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-09 13:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-08 19:21 [PR PATCH] dosbox-staging: update to 0.80.1 joshuakraemer
2023-03-08 19:34 ` [PR PATCH] [Updated] " joshuakraemer
2023-03-08 19:47 ` joshuakraemer
2023-03-08 21:36 ` joshuakraemer
2023-03-08 21:52 ` joshuakraemer
2023-03-09 13:47 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).