* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
@ 2022-10-01 13:05 ` mmnmnnmnmm
2022-10-01 13:39 ` mmnmnnmnmm
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: mmnmnnmnmm @ 2022-10-01 13:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
There is an updated pull request by mmnmnnmnmm against master on the void-packages repository
https://github.com/mmnmnnmnmm/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/39582
dosbox-staging: update to 0.79.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-39582.patch --]
[-- Type: text/x-diff, Size: 7020 bytes --]
From 21cde8101dd22de32687277b43124220201e716e Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 18:59:25 +0100
Subject: [PATCH 1/3] New package: libiir1-1.9.3
---
common/shlibs | 1 +
srcpkgs/libiir1-devel | 1 +
srcpkgs/libiir1/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libiir1-devel
create mode 100644 srcpkgs/libiir1/template
diff --git a/common/shlibs b/common/shlibs
index c962f0ab7622..074e68823199 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4162,3 +4162,4 @@ libgbinder.so.1 libgbinder-1.1.20_1
libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
libmujs.so.1.2.0 mujs-1.2.0_2
+libiir.so.1 libiir1-1.9.3_1
diff --git a/srcpkgs/libiir1-devel b/srcpkgs/libiir1-devel
new file mode 120000
index 000000000000..2996526d4bda
--- /dev/null
+++ b/srcpkgs/libiir1-devel
@@ -0,0 +1 @@
+libiir1
\ No newline at end of file
diff --git a/srcpkgs/libiir1/template b/srcpkgs/libiir1/template
new file mode 100644
index 000000000000..f3ac8968cbd4
--- /dev/null
+++ b/srcpkgs/libiir1/template
@@ -0,0 +1,28 @@
+# Template file for 'libiir1'
+pkgname=libiir1
+version=1.9.3
+revision=1
+wrksrc="iir1-${version}"
+build_style=cmake
+short_desc="DSP IIR realtime filter library written in C++ "
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
+license="MIT"
+homepage="https://github.com/berndporr/iir1"
+distfiles="https://github.com/berndporr/iir1/archive/${version}.tar.gz"
+checksum=de241ef7a3e5ae8e1309846fe820a2e18978aa3df3922bd83c2d75a0fcf4e78f
+
+post_install() {
+ vlicense COPYING
+}
+
+libiir1-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
From 934b9914dccfac401180aee9dd40e55c86fce537 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 19:01:11 +0100
Subject: [PATCH 2/3] libmt32emu: update to 2.7.0
---
srcpkgs/libmt32emu/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libmt32emu/template b/srcpkgs/libmt32emu/template
index 12df672189de..8c197d303a83 100644
--- a/srcpkgs/libmt32emu/template
+++ b/srcpkgs/libmt32emu/template
@@ -1,6 +1,6 @@
# Template file for 'libmt32emu'
pkgname=libmt32emu
-version=2.5.1
+version=2.7.0
revision=1
_version_string=${version//./_}
wrksrc=munt-libmt32emu_${_version_string}
@@ -12,8 +12,9 @@ short_desc="Emulate Roland MT-32, CM-32L and LAPC-I synthesizer modules"
maintainer="Joshua Krämer <joshua@kraemer.link>"
license="LGPL-2.1-or-later"
homepage="http://munt.sourceforge.net"
+changelog="https://raw.githubusercontent.com/munt/munt/libmt32emu_2_7_0/mt32emu/NEWS.txt"
distfiles="https://github.com/munt/munt/archive/libmt32emu_${_version_string}.tar.gz"
-checksum=684988ab4d2b103554d9a38ad556cebc3ebc28d1d8fbb49fb4808ec9c80a2bf4
+checksum=5ede7c3d28a3bb0d9e637935b8b96484fadb409c9e5952a9e5432b3e05e5dbc1
build_options="libsoxr libsamplerate"
desc_option_libsoxr="Use libsoxr for sample rate conversion"
From f26e0e45f05ca5c114043e50d1df48af55d78983 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Sun, 25 Sep 2022 16:04:46 +0100
Subject: [PATCH 3/3] dosbox-staging: update to 0.79.1
---
.../dosbox-staging/patches/fix_cross.patch | 55 +++++++++++++++++++
srcpkgs/dosbox-staging/template | 9 +--
2 files changed, 60 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 000000000000..98b0b6b7884c
--- /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 fc68f8562f37..8929cb5c8a1b 100644
--- a/srcpkgs/dosbox-staging/template
+++ b/srcpkgs/dosbox-staging/template
@@ -1,17 +1,18 @@
# 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 <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=85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986
+checksum=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f
conflicts="dosbox"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
2022-10-01 13:05 ` [PR PATCH] [Updated] " mmnmnnmnmm
@ 2022-10-01 13:39 ` mmnmnnmnmm
2022-10-02 0:49 ` [PR REVIEW] " classabbyamp
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: mmnmnnmnmm @ 2022-10-01 13:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
There is an updated pull request by mmnmnnmnmm against master on the void-packages repository
https://github.com/mmnmnnmnmm/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/39582
dosbox-staging: update to 0.79.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-39582.patch --]
[-- Type: text/x-diff, Size: 7082 bytes --]
From 21cde8101dd22de32687277b43124220201e716e Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 18:59:25 +0100
Subject: [PATCH 1/3] New package: libiir1-1.9.3
---
common/shlibs | 1 +
srcpkgs/libiir1-devel | 1 +
srcpkgs/libiir1/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libiir1-devel
create mode 100644 srcpkgs/libiir1/template
diff --git a/common/shlibs b/common/shlibs
index c962f0ab7622..074e68823199 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4162,3 +4162,4 @@ libgbinder.so.1 libgbinder-1.1.20_1
libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
libmujs.so.1.2.0 mujs-1.2.0_2
+libiir.so.1 libiir1-1.9.3_1
diff --git a/srcpkgs/libiir1-devel b/srcpkgs/libiir1-devel
new file mode 120000
index 000000000000..2996526d4bda
--- /dev/null
+++ b/srcpkgs/libiir1-devel
@@ -0,0 +1 @@
+libiir1
\ No newline at end of file
diff --git a/srcpkgs/libiir1/template b/srcpkgs/libiir1/template
new file mode 100644
index 000000000000..f3ac8968cbd4
--- /dev/null
+++ b/srcpkgs/libiir1/template
@@ -0,0 +1,28 @@
+# Template file for 'libiir1'
+pkgname=libiir1
+version=1.9.3
+revision=1
+wrksrc="iir1-${version}"
+build_style=cmake
+short_desc="DSP IIR realtime filter library written in C++ "
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
+license="MIT"
+homepage="https://github.com/berndporr/iir1"
+distfiles="https://github.com/berndporr/iir1/archive/${version}.tar.gz"
+checksum=de241ef7a3e5ae8e1309846fe820a2e18978aa3df3922bd83c2d75a0fcf4e78f
+
+post_install() {
+ vlicense COPYING
+}
+
+libiir1-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
From 934b9914dccfac401180aee9dd40e55c86fce537 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 19:01:11 +0100
Subject: [PATCH 2/3] libmt32emu: update to 2.7.0
---
srcpkgs/libmt32emu/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libmt32emu/template b/srcpkgs/libmt32emu/template
index 12df672189de..8c197d303a83 100644
--- a/srcpkgs/libmt32emu/template
+++ b/srcpkgs/libmt32emu/template
@@ -1,6 +1,6 @@
# Template file for 'libmt32emu'
pkgname=libmt32emu
-version=2.5.1
+version=2.7.0
revision=1
_version_string=${version//./_}
wrksrc=munt-libmt32emu_${_version_string}
@@ -12,8 +12,9 @@ short_desc="Emulate Roland MT-32, CM-32L and LAPC-I synthesizer modules"
maintainer="Joshua Krämer <joshua@kraemer.link>"
license="LGPL-2.1-or-later"
homepage="http://munt.sourceforge.net"
+changelog="https://raw.githubusercontent.com/munt/munt/libmt32emu_2_7_0/mt32emu/NEWS.txt"
distfiles="https://github.com/munt/munt/archive/libmt32emu_${_version_string}.tar.gz"
-checksum=684988ab4d2b103554d9a38ad556cebc3ebc28d1d8fbb49fb4808ec9c80a2bf4
+checksum=5ede7c3d28a3bb0d9e637935b8b96484fadb409c9e5952a9e5432b3e05e5dbc1
build_options="libsoxr libsamplerate"
desc_option_libsoxr="Use libsoxr for sample rate conversion"
From 77ffe64e791c4c945a193814e2efc4d3fa5b9c5c Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Sun, 25 Sep 2022 16:04:46 +0100
Subject: [PATCH 3/3] 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 000000000000..98b0b6b7884c
--- /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 fc68f8562f37..7173a6fda80a 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 <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=85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986
+checksum=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f
conflicts="dosbox"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
fi
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR REVIEW] dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
2022-10-01 13:05 ` [PR PATCH] [Updated] " mmnmnnmnmm
2022-10-01 13:39 ` mmnmnnmnmm
@ 2022-10-02 0:49 ` classabbyamp
2022-10-03 10:33 ` [PR PATCH] [Updated] " mmnmnnmnmm
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-10-02 0:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/39582#discussion_r985161234
Comment:
```suggestion
short_desc="DSP IIR realtime filter library written in C++"
```
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
` (2 preceding siblings ...)
2022-10-02 0:49 ` [PR REVIEW] " classabbyamp
@ 2022-10-03 10:33 ` mmnmnnmnmm
2022-10-03 10:37 ` mmnmnnmnmm
2022-10-03 14:13 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: mmnmnnmnmm @ 2022-10-03 10:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
There is an updated pull request by mmnmnnmnmm against master on the void-packages repository
https://github.com/mmnmnnmnmm/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/39582
dosbox-staging: update to 0.79.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-39582.patch --]
[-- Type: text/x-diff, Size: 7081 bytes --]
From 68947977cc084c0b286c405d9fe0febbef6f05c4 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 18:59:25 +0100
Subject: [PATCH 1/3] New package: libiir1-1.9.3
---
common/shlibs | 1 +
srcpkgs/libiir1-devel | 1 +
srcpkgs/libiir1/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libiir1-devel
create mode 100644 srcpkgs/libiir1/template
diff --git a/common/shlibs b/common/shlibs
index c962f0ab7622..074e68823199 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4162,3 +4162,4 @@ libgbinder.so.1 libgbinder-1.1.20_1
libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
libmujs.so.1.2.0 mujs-1.2.0_2
+libiir.so.1 libiir1-1.9.3_1
diff --git a/srcpkgs/libiir1-devel b/srcpkgs/libiir1-devel
new file mode 120000
index 000000000000..2996526d4bda
--- /dev/null
+++ b/srcpkgs/libiir1-devel
@@ -0,0 +1 @@
+libiir1
\ No newline at end of file
diff --git a/srcpkgs/libiir1/template b/srcpkgs/libiir1/template
new file mode 100644
index 000000000000..071fe3671bb2
--- /dev/null
+++ b/srcpkgs/libiir1/template
@@ -0,0 +1,28 @@
+# Template file for 'libiir1'
+pkgname=libiir1
+version=1.9.3
+revision=1
+wrksrc="iir1-${version}"
+build_style=cmake
+short_desc="DSP IIR realtime filter library written in C++"
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
+license="MIT"
+homepage="https://github.com/berndporr/iir1"
+distfiles="https://github.com/berndporr/iir1/archive/${version}.tar.gz"
+checksum=de241ef7a3e5ae8e1309846fe820a2e18978aa3df3922bd83c2d75a0fcf4e78f
+
+post_install() {
+ vlicense COPYING
+}
+
+libiir1-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
From f8e613b63aecbd7a98940fbe9b0944c4356dbe0b Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 19:01:11 +0100
Subject: [PATCH 2/3] libmt32emu: update to 2.7.0
---
srcpkgs/libmt32emu/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libmt32emu/template b/srcpkgs/libmt32emu/template
index 12df672189de..8c197d303a83 100644
--- a/srcpkgs/libmt32emu/template
+++ b/srcpkgs/libmt32emu/template
@@ -1,6 +1,6 @@
# Template file for 'libmt32emu'
pkgname=libmt32emu
-version=2.5.1
+version=2.7.0
revision=1
_version_string=${version//./_}
wrksrc=munt-libmt32emu_${_version_string}
@@ -12,8 +12,9 @@ short_desc="Emulate Roland MT-32, CM-32L and LAPC-I synthesizer modules"
maintainer="Joshua Krämer <joshua@kraemer.link>"
license="LGPL-2.1-or-later"
homepage="http://munt.sourceforge.net"
+changelog="https://raw.githubusercontent.com/munt/munt/libmt32emu_2_7_0/mt32emu/NEWS.txt"
distfiles="https://github.com/munt/munt/archive/libmt32emu_${_version_string}.tar.gz"
-checksum=684988ab4d2b103554d9a38ad556cebc3ebc28d1d8fbb49fb4808ec9c80a2bf4
+checksum=5ede7c3d28a3bb0d9e637935b8b96484fadb409c9e5952a9e5432b3e05e5dbc1
build_options="libsoxr libsamplerate"
desc_option_libsoxr="Use libsoxr for sample rate conversion"
From d95c81f92c58f3fec888b89e6f534538aa55cbd3 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Sun, 25 Sep 2022 16:04:46 +0100
Subject: [PATCH 3/3] 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 000000000000..98b0b6b7884c
--- /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 fc68f8562f37..7173a6fda80a 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 <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=85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986
+checksum=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f
conflicts="dosbox"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
fi
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
` (3 preceding siblings ...)
2022-10-03 10:33 ` [PR PATCH] [Updated] " mmnmnnmnmm
@ 2022-10-03 10:37 ` mmnmnnmnmm
2022-10-03 14:13 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: mmnmnnmnmm @ 2022-10-03 10:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]
There is an updated pull request by mmnmnnmnmm against master on the void-packages repository
https://github.com/mmnmnnmnmm/void-packages dosbox-staging
https://github.com/void-linux/void-packages/pull/39582
dosbox-staging: update to 0.79.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-39582.patch --]
[-- Type: text/x-diff, Size: 7081 bytes --]
From e3fdb2db8b12e43afa551242ebb3a145dff66fd9 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 18:59:25 +0100
Subject: [PATCH 1/3] New package: libiir1-1.9.3
---
common/shlibs | 1 +
srcpkgs/libiir1-devel | 1 +
srcpkgs/libiir1/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libiir1-devel
create mode 100644 srcpkgs/libiir1/template
diff --git a/common/shlibs b/common/shlibs
index 3297091f7cc0..5d4b0a9899ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4163,3 +4163,4 @@ libgbinder.so.1 libgbinder-1.1.20_1
libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
libmujs.so.1.2.0 mujs-1.2.0_2
+libiir.so.1 libiir1-1.9.3_1
diff --git a/srcpkgs/libiir1-devel b/srcpkgs/libiir1-devel
new file mode 120000
index 000000000000..2996526d4bda
--- /dev/null
+++ b/srcpkgs/libiir1-devel
@@ -0,0 +1 @@
+libiir1
\ No newline at end of file
diff --git a/srcpkgs/libiir1/template b/srcpkgs/libiir1/template
new file mode 100644
index 000000000000..071fe3671bb2
--- /dev/null
+++ b/srcpkgs/libiir1/template
@@ -0,0 +1,28 @@
+# Template file for 'libiir1'
+pkgname=libiir1
+version=1.9.3
+revision=1
+wrksrc="iir1-${version}"
+build_style=cmake
+short_desc="DSP IIR realtime filter library written in C++"
+maintainer="mmnmnnmnmm <mnnnm@disroot.org>"
+license="MIT"
+homepage="https://github.com/berndporr/iir1"
+distfiles="https://github.com/berndporr/iir1/archive/${version}.tar.gz"
+checksum=de241ef7a3e5ae8e1309846fe820a2e18978aa3df3922bd83c2d75a0fcf4e78f
+
+post_install() {
+ vlicense COPYING
+}
+
+libiir1-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ }
+}
From 9184ba522e4a04558a1dc78f050bdecf42e3deb4 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Tue, 20 Sep 2022 19:01:11 +0100
Subject: [PATCH 2/3] libmt32emu: update to 2.7.0
---
srcpkgs/libmt32emu/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libmt32emu/template b/srcpkgs/libmt32emu/template
index 12df672189de..8c197d303a83 100644
--- a/srcpkgs/libmt32emu/template
+++ b/srcpkgs/libmt32emu/template
@@ -1,6 +1,6 @@
# Template file for 'libmt32emu'
pkgname=libmt32emu
-version=2.5.1
+version=2.7.0
revision=1
_version_string=${version//./_}
wrksrc=munt-libmt32emu_${_version_string}
@@ -12,8 +12,9 @@ short_desc="Emulate Roland MT-32, CM-32L and LAPC-I synthesizer modules"
maintainer="Joshua Krämer <joshua@kraemer.link>"
license="LGPL-2.1-or-later"
homepage="http://munt.sourceforge.net"
+changelog="https://raw.githubusercontent.com/munt/munt/libmt32emu_2_7_0/mt32emu/NEWS.txt"
distfiles="https://github.com/munt/munt/archive/libmt32emu_${_version_string}.tar.gz"
-checksum=684988ab4d2b103554d9a38ad556cebc3ebc28d1d8fbb49fb4808ec9c80a2bf4
+checksum=5ede7c3d28a3bb0d9e637935b8b96484fadb409c9e5952a9e5432b3e05e5dbc1
build_options="libsoxr libsamplerate"
desc_option_libsoxr="Use libsoxr for sample rate conversion"
From 9ba5ad74c689431623ee14a4ed3017b4ebca5616 Mon Sep 17 00:00:00 2001
From: mmnmnnmnmm <mnnnm@disroot.org>
Date: Sun, 25 Sep 2022 16:04:46 +0100
Subject: [PATCH 3/3] 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 000000000000..98b0b6b7884c
--- /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 fc68f8562f37..7173a6fda80a 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 <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=85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986
+checksum=43f23fd0a5cff55e06a3ba2be8403f872ae47423f3bb4f823301eaae8a39ac2f
conflicts="dosbox"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
fi
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: dosbox-staging: update to 0.79.1
2022-10-01 11:50 [PR PATCH] dosbox-staging: update to 0.79.1 mmnmnnmnmm
` (4 preceding siblings ...)
2022-10-03 10:37 ` mmnmnnmnmm
@ 2022-10-03 14:13 ` classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-10-03 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
dosbox-staging: update to 0.79.1
https://github.com/void-linux/void-packages/pull/39582
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread