Re: [PR PATCH] [Updated] New package: dosbox-staging-0.77.0

[joshuakraemer <joshuakraemer@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 2424 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/31258

New package: dosbox-staging-0.77.0
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

This is a draft based on a current git snapshot, because DOSBox Staging 0.77.0 has not been released yet.

@kcgen wrote (https://github.com/joshuakraemer/void-packages/commit/2d0e6a7ee8328c8210c8ed272dc38dd8317296ff#commitcomment-51084600):
> @joshuakraemer, looks good!
> 
> I realize this is using the `master` branch right now until we can wrap up 0.77. In the meantime, regarding: `-Duse_mt32emu=false`, can you try removing that? Meson should be able to build it internally based on its wrap. There should be no copyright concerns, as users must provide their own ROMs for this feature.

Thank you for your comments. I have added libmt32emu as a separate package, and successfully tested MT-32 emulation.

> Also, there might be more configuration options needed to ensure an optimized binary is built. Here's what I use:
> 
> ```shell
> -Dbuildtype=release \
> -Dc_args=-Ofast \
> -Dcpp_args=-Ofast \
> -Db_asneeded=true -Dstrip=true \
> -Ddefault_library=static \
> -Dfluidsynth:enable-floats=true \
> -Dfluidsynth:try-static-deps=true 
> ```
> 
> Perhaps the static settings could be dropped depending on what void Linux prefers.
> I personally want to ensure that FluidSynth is compiled with the same optimization level (and uses our highly stripped down FluidSynth configuration) to ensure good performance on some of my CPU-limited platforms.

Void's build options for meson packages are specified in https://github.com/void-linux/void-packages/blob/master/common/build-style/meson.sh (using -O2 from the CFLAGS environment variable). The enable-floats option could probably be added to Void's FluidSynth package (https://github.com/void-linux/void-packages/blob/master/srcpkgs/fluidsynth/template), but I do not know if it would be a suitable default outside of DosBox.

A patch file from https://github.com/void-linux/void-packages/pull/31258.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dosbox-staging-31258.patch --]
[-- Type: text/x-diff, Size: 3840 bytes --]

From 30825b2e533a507238373fcda210fc86755f62d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 20 May 2021 16:57:20 +0200
Subject: [PATCH 1/2] New package: dosbox-staging-0.77.0

---
 srcpkgs/dosbox-staging/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/dosbox-staging/template

diff --git a/srcpkgs/dosbox-staging/template b/srcpkgs/dosbox-staging/template
new file mode 100644
index 000000000000..fc68f8562f37
--- /dev/null
+++ b/srcpkgs/dosbox-staging/template
@@ -0,0 +1,19 @@
+# Template file for 'dosbox-staging'
+pkgname=dosbox-staging
+version=0.77.0
+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"
+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
+conflicts="dosbox"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi

From 282be11cdf777d527bfab29ecf397763a61b8686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= <joshua@kraemer.link>
Date: Thu, 20 May 2021 23:04:49 +0200
Subject: [PATCH 2/2] New package: libmt32emu-2.5.1

---
 common/shlibs               |  1 +
 srcpkgs/libmt32emu-devel    |  1 +
 srcpkgs/libmt32emu/template | 41 +++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/libmt32emu-devel
 create mode 100644 srcpkgs/libmt32emu/template

diff --git a/common/shlibs b/common/shlibs
index 9df122c0edfe..5c328cc05b25 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4018,3 +4018,4 @@ libXcompshad.so.3 nx-libs-3.5.99.24_1
 libNX_X11.so.6 nx-libs-3.5.99.24_1
 librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
+libmt32emu.so.2 libmt32emu-2.5.1_1
diff --git a/srcpkgs/libmt32emu-devel b/srcpkgs/libmt32emu-devel
new file mode 120000
index 000000000000..b427be42b324
--- /dev/null
+++ b/srcpkgs/libmt32emu-devel
@@ -0,0 +1 @@
+libmt32emu
\ No newline at end of file
diff --git a/srcpkgs/libmt32emu/template b/srcpkgs/libmt32emu/template
new file mode 100644
index 000000000000..ee87f6f6d73b
--- /dev/null
+++ b/srcpkgs/libmt32emu/template
@@ -0,0 +1,41 @@
+# Template file for 'libmt32emu'
+pkgname=libmt32emu
+version=2.5.1
+revision=1
+_version_string=${version//./_}
+wrksrc=munt-libmt32emu_${_version_string}
+build_wrksrc=mt32emu
+build_style=cmake
+makedepends="$(vopt_if libsoxr libsoxr-devel)
+ $(vopt_if libsamplerate libsamplerate-devel)"
+short_desc="Library to 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"
+distfiles="https://github.com/munt/munt/archive/libmt32emu_${_version_string}.tar.gz"
+checksum=684988ab4d2b103554d9a38ad556cebc3ebc28d1d8fbb49fb4808ec9c80a2bf4
+
+build_options="libsoxr libsamplerate"
+desc_option_libsoxr="Use libsoxr for sample rate conversion"
+desc_option_libsamplerate="Use libsamplerate for sample rate conversion"
+build_options_default="libsoxr"
+vopt_conflict libsoxr libsamplerate
+
+if [ "$build_option_libsoxr" -o "$build_option_libsamplerate" ]; then
+	configure_args+=" -Dlibmt32emu_WITH_INTERNAL_RESAMPLER=off"
+fi
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc
+}
+
+libmt32emu-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}